duckduckgo
/
zeroclickinfo-goodies
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updates CalendarConversion Goodie Re #2767 (#2862)

master
Hugo Thiessard 2016-04-28 20:28:56 +02:00 committed by Ben Moon
parent 1535f2117a
commit c54a2b94d8
2 changed files with 44 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/DDG/Goodie/CalendarConversion.pm
View File

@ -64,11 +64,15 @@ handle query_lc => sub {
my $converted_date = format_date($od, $om, $oy, $output_calendar);
return $input_date . ' is ' . $converted_date,
structured_answer => {
input => [$input_date],
operation => 'Calendar conversion',
result => $converted_date
};
structured_answer => {
data => {
title => $converted_date,
subtitle => 'Calendar conversion: ' . $input_date
},
templates => {
group => 'text'
}
};
};
sub g2j {

96
t/CalendarConversion.t
View File

@ -8,70 +8,44 @@ use DDG::Test::Goodie;
zci answer_type => 'calendar_conversion';
zci is_cached => 0;
my @g22h = (
'22 August 2003 (Gregorian) is 23 Jumaada Thani 1424 (Hijri)',
structured_answer => {
input => ['22 August 2003 (Gregorian)'],
operation => 'Calendar conversion',
result => '23 Jumaada Thani 1424 (Hijri)'
},
);
my @h23g = (
'23 Jumaada Thani 1424 (Hijri) is 22 August 2003 (Gregorian)',
structured_answer => {
input => ['23 Jumaada Thani 1424 (Hijri)'],
operation => 'Calendar conversion',
result => '22 August 2003 (Gregorian)'
},
);
my @g22j = (
'22 August 2003 (Gregorian) is 31 Mordad 1382 (Jalali)',
structured_answer => {
input => ['22 August 2003 (Gregorian)'],
operation => 'Calendar conversion',
result => '31 Mordad 1382 (Jalali)'
},
);
sub build_structured_answer {
my ($input_date, $converted_date) = @_;
return $input_date . ' is ' . $converted_date,
structured_answer => {
data => {
title => $converted_date,
subtitle => 'Calendar conversion: ' . $input_date
},
templates => {
group => 'text'
}
};
}
sub build_test { test_zci(build_structured_answer(@_)) }
my @g22h = (build_test('22 August 2003 (Gregorian)', '23 Jumaada Thani 1424 (Hijri)'));
my @h23g = (build_test('23 Jumaada Thani 1424 (Hijri)', '22 August 2003 (Gregorian)'));
my @g22j = (build_test('22 August 2003 (Gregorian)', '31 Mordad 1382 (Jalali)'));
ddg_goodie_test(
[qw(DDG::Goodie::CalendarConversion)],
'22/8/2003 to hijri' => test_zci(@g22h),
'22/8/2003 to the hijri calendar' => test_zci(@g22h),
'22,8,2003 to hijri' => test_zci(@g22h),
'23/6/1424 in hijri to gregorian years' => test_zci(@h23g),
'23/6/1424 hijri to gregorian' => test_zci(@h23g),
'22/8/2003 to jalali' => test_zci(@g22j),
'31/5/1382 jalali to gregorian' => test_zci(
'31 Mordad 1382 (Jalali) is 22 August 2003 (Gregorian)',
structured_answer => {
input => ['31 Mordad 1382 (Jalali)'],
operation => 'Calendar conversion',
result => '22 August 2003 (Gregorian)'
},
),
'31/5/1382 jalali to hijri' => test_zci(
'31 Mordad 1382 (Jalali) is 23 Jumaada Thani 1424 (Hijri)',
structured_answer => {
input => ['31 Mordad 1382 (Jalali)'],
operation => 'Calendar conversion',
result => '23 Jumaada Thani 1424 (Hijri)'
},
),
'23/6/1424 in hijri to jalali date' => test_zci(
'23 Jumaada Thani 1424 (Hijri) is 31 Mordad 1382 (Jalali)',
structured_answer => {
input => ['23 Jumaada Thani 1424 (Hijri)'],
operation => 'Calendar conversion',
result => '31 Mordad 1382 (Jalali)',
},
),
'August 22nd, 2003 to jalali' => test_zci(@g22j),
'22 Aug 2003 to Hijri' => test_zci(@g22h),
'22/8/2003 in the hijri calendar' => test_zci(@g22h),
'22nd Aug 2003 in jalali' => test_zci(@g22j),
'8-22-2003 in hijri years' => test_zci(@g22h),
'August 22 2003 in jalali date' => test_zci(@g22j),
'22nd Aug 2003 in gregorian time' => undef,
'22/8/2003 to hijri' => @g22h,
'22/8/2003 to the hijri calendar' => @g22h,
'22,8,2003 to hijri' => @g22h,
'23/6/1424 in hijri to gregorian years' => @h23g,
'23/6/1424 hijri to gregorian' => @h23g,
'22/8/2003 to jalali' => @g22j,
'31/5/1382 jalali to gregorian' => build_test('31 Mordad 1382 (Jalali)', '22 August 2003 (Gregorian)'),
'31/5/1382 jalali to hijri' => build_test('31 Mordad 1382 (Jalali)', '23 Jumaada Thani 1424 (Hijri)'),
'23/6/1424 in hijri to jalali date' => build_test('23 Jumaada Thani 1424 (Hijri)', '31 Mordad 1382 (Jalali)'),
'August 22nd, 2003 to jalali' => @g22j,
'22 Aug 2003 to Hijri' => @g22h,
'22/8/2003 in the hijri calendar' => @g22h,
'22nd Aug 2003 in jalali' => @g22j,
'8-22-2003 in hijri years' => @g22h,
'August 22 2003 in jalali date' => @g22j,
'22nd Aug 2003 in gregorian time' => undef,
);
done_testing;