Convert DaysBetween to full template goodie
Goodies have full support for templates, and it'd be great to make sure all Goodies use full templates. The "simple structured_answer" was provided as a temporary workaround. * change to 'text' template for structured_answer object * refactored test suite Re: #2767master
NaveenKarippai
parent
8e74d245c7
commit
ff7baf5f8e
|
|
@ -30,11 +30,15 @@ handle remainder => sub {
|
||||||
my $startDate = date_output_string($date1);
|
my $startDate = date_output_string($date1);
|
||||||
my $endDate = date_output_string($date2);
|
my $endDate = date_output_string($date2);
|
||||||
|
|
||||||
return "There are $daysBetween days between $startDate and $endDate$inclusive.",
|
return "There are $daysBetween days between $startDate and $endDate $inclusive.",
|
||||||
structured_answer => {
|
structured_answer => {
|
||||||
input => [$startDate, $endDate,],
|
data => {
|
||||||
operation => 'Days between' . $inclusive,
|
title => $daysBetween,
|
||||||
result => $daysBetween
|
subtitle => "Days between $inclusive $startDate - $endDate"
|
||||||
|
},
|
||||||
|
templates => {
|
||||||
|
group => "text"
|
||||||
|
}
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
163
t/DaysBetween.t
163
t/DaysBetween.t
|
|
@ -10,143 +10,42 @@ use Test::MockTime qw( :all );
|
||||||
zci answer_type => 'days_between';
|
zci answer_type => 'days_between';
|
||||||
zci is_cached => 1;
|
zci is_cached => 1;
|
||||||
|
|
||||||
ddg_goodie_test(
|
sub build_structured_answer{
|
||||||
[qw( DDG::Goodie::DaysBetween)],
|
my($startDate, $endDate, $daysBetween, $inclusive) = @_;
|
||||||
'days between 01/01/2000 01/01/2001' => test_zci(
|
return "There are $daysBetween days between $startDate and $endDate $inclusive.",
|
||||||
'There are 366 days between 01 Jan 2000 and 01 Jan 2001.',
|
structured_answer => {
|
||||||
structured_answer => {
|
data => {
|
||||||
input => ['01 Jan 2000', '01 Jan 2001'],
|
title => $daysBetween,
|
||||||
operation => 'Days between',
|
subtitle => "Days between $inclusive $startDate - $endDate"
|
||||||
result => 366
|
|
||||||
},
|
},
|
||||||
),
|
templates => {
|
||||||
'days between 1/1/2000 and 1/1/2001 inclusive' => test_zci(
|
group => "text"
|
||||||
'There are 367 days between 01 Jan 2000 and 01 Jan 2001, inclusive.',
|
}
|
||||||
structured_answer => {
|
}
|
||||||
input => ['01 Jan 2000', '01 Jan 2001'],
|
}
|
||||||
operation => 'Days between, inclusive',
|
|
||||||
result => 367
|
|
||||||
},
|
|
||||||
),
|
|
||||||
'daysbetween 03/4/2005 and 11/8/2020' => test_zci(
|
|
||||||
'There are 5728 days between 04 Mar 2005 and 08 Nov 2020.',
|
|
||||||
structured_answer => {
|
|
||||||
input => ['04 Mar 2005', '08 Nov 2020'],
|
|
||||||
operation => 'Days between',
|
|
||||||
result => 5728
|
|
||||||
},
|
|
||||||
),
|
|
||||||
'days_between 3/14/2005 and 1/2/2003' => test_zci(
|
|
||||||
'There are 802 days between 02 Jan 2003 and 14 Mar 2005.',
|
|
||||||
structured_answer => {
|
|
||||||
input => ['02 Jan 2003', '14 Mar 2005'],
|
|
||||||
operation => 'Days between',
|
|
||||||
result => 802
|
|
||||||
},
|
|
||||||
),
|
|
||||||
'days between 01/31/2000 01/31/2001' => test_zci(
|
|
||||||
'There are 366 days between 31 Jan 2000 and 31 Jan 2001.',
|
|
||||||
structured_answer => {
|
|
||||||
input => ['31 Jan 2000', '31 Jan 2001'],
|
|
||||||
operation => 'Days between',
|
|
||||||
result => 366
|
|
||||||
},
|
|
||||||
),
|
|
||||||
'days between 01/31/2000 01/31/2001 inclusive' => test_zci(
|
|
||||||
'There are 367 days between 31 Jan 2000 and 31 Jan 2001, inclusive.',
|
|
||||||
structured_answer => {
|
|
||||||
input => ['31 Jan 2000', '31 Jan 2001'],
|
|
||||||
operation => 'Days between, inclusive',
|
|
||||||
result => 367
|
|
||||||
},
|
|
||||||
),
|
|
||||||
'days between January 31st, 2000 and 31-Jan-2001 inclusive' => test_zci(
|
|
||||||
'There are 367 days between 31 Jan 2000 and 31 Jan 2001, inclusive.',
|
|
||||||
structured_answer => {
|
|
||||||
input => ['31 Jan 2000', '31 Jan 2001'],
|
|
||||||
operation => 'Days between, inclusive',
|
|
||||||
result => 367
|
|
||||||
},
|
|
||||||
),
|
|
||||||
'days between jan 1 2012 and jan 1 1234' => test_zci(
|
|
||||||
"There are 284158 days between 01 Jan 1234 and 01 Jan 2012.",
|
|
||||||
structured_answer => {
|
|
||||||
input => ['01 Jan 1234', '01 Jan 2012'],
|
|
||||||
operation => 'Days between',
|
|
||||||
result => 284158
|
|
||||||
},
|
|
||||||
),
|
|
||||||
'days between jan 1 and jan 15 inclusive' => test_zci(
|
|
||||||
re(qr/^There are 15 days between.+inclusive\.$/),
|
|
||||||
structured_answer => {
|
|
||||||
input => ignore(),
|
|
||||||
operation => 'Days between, inclusive',
|
|
||||||
result => 15
|
|
||||||
},
|
|
||||||
),
|
|
||||||
'days between jan 1 and 15th feb' => test_zci(
|
|
||||||
re(qr/^There are 45 days between.+and 15 Feb [0-9]{4}\.$/),
|
|
||||||
structured_answer => {
|
|
||||||
input => ignore(),
|
|
||||||
operation => 'Days between',
|
|
||||||
result => 45
|
|
||||||
},
|
|
||||||
),
|
|
||||||
'number of days between jan 1 and 15th feb' => test_zci(
|
|
||||||
re(qr/^There are 45 days between.+and 15 Feb [0-9]{4}\.$/),
|
|
||||||
structured_answer => {
|
|
||||||
input => ignore(),
|
|
||||||
operation => 'Days between',
|
|
||||||
result => 45
|
|
||||||
},
|
|
||||||
),
|
|
||||||
'number of days from jan 1 and 15th feb' => test_zci(
|
|
||||||
re(qr/^There are 45 days between.+and 15 Feb [0-9]{4}\.$/),
|
|
||||||
structured_answer => {
|
|
||||||
input => ignore(),
|
|
||||||
operation => 'Days between',
|
|
||||||
result => 45
|
|
||||||
},
|
|
||||||
),
|
|
||||||
'days from jan 1 and 15th feb' => test_zci(
|
|
||||||
re(qr/^There are 45 days between.+and 15 Feb [0-9]{4}\.$/),
|
|
||||||
structured_answer => {
|
|
||||||
input => ignore(),
|
|
||||||
operation => 'Days between',
|
|
||||||
result => 45
|
|
||||||
},
|
|
||||||
),
|
|
||||||
'days between today and tomorrow' => test_zci(
|
|
||||||
re(qr/^There are 1 days between.+ and.+\.$/),
|
|
||||||
structured_answer => {
|
|
||||||
input => ignore(),
|
|
||||||
operation => 'Days between',
|
|
||||||
result => 1
|
|
||||||
},
|
|
||||||
),
|
|
||||||
'how many days between feb 2 and feb 17' => test_zci(
|
|
||||||
re(qr/^There are 15 days between.+ and.+\.$/),
|
|
||||||
structured_answer => {
|
|
||||||
input => ignore(),
|
|
||||||
operation => 'Days between',
|
|
||||||
result => 15
|
|
||||||
},
|
|
||||||
),
|
|
||||||
'days between jan 1 2012 and jan 1 123456' => undef,
|
|
||||||
);
|
|
||||||
|
|
||||||
set_fixed_time('2015-07-14T22:36:00');
|
sub build_test{ test_zci(build_structured_answer(@_))}
|
||||||
|
|
||||||
|
set_fixed_time('2016-07-14T22:36:00');
|
||||||
|
|
||||||
|
my $test_inclusive = ", inclusive";
|
||||||
|
|
||||||
ddg_goodie_test(
|
ddg_goodie_test(
|
||||||
[qw( DDG::Goodie::DaysBetween)],
|
[qw( DDG::Goodie::DaysBetween)],
|
||||||
'days between 22nd may and today' => test_zci(
|
'days between 01/01/2000 01/01/2001' => build_test('01 Jan 2000', '01 Jan 2001', 366, '' ),
|
||||||
'There are 53 days between 22 May 2015 and 14 Jul 2015.',
|
'days between 1/1/2000 and 1/1/2001 inclusive' => build_test('01 Jan 2000', '01 Jan 2001',367, $test_inclusive),
|
||||||
structured_answer => {
|
'daysbetween 03/4/2005 and 11/8/2020' => build_test('04 Mar 2005', '08 Nov 2020', 5728, ''),
|
||||||
input => ['22 May 2015', '14 Jul 2015'],
|
'days_between 3/14/2005 and 1/2/2003' => build_test('02 Jan 2003', '14 Mar 2005', 802, ''),
|
||||||
operation => 'Days between',
|
'days between 01/31/2000 01/31/2001' => build_test('31 Jan 2000', '31 Jan 2001', 366, ''),
|
||||||
result => 53
|
'days between 01/31/2000 01/31/2001 inclusive' => build_test('31 Jan 2000', '31 Jan 2001', 367, $test_inclusive),
|
||||||
},
|
'days between January 31st, 2000 and 31-Jan-2001 inclusive' => build_test('31 Jan 2000', '31 Jan 2001', 367, $test_inclusive),
|
||||||
),
|
'days between jan 1 2012 and jan 1 1234' => build_test('01 Jan 1234', '01 Jan 2012', 284158, ''),
|
||||||
|
'days between jan 1 and jan 15 inclusive' => build_test('01 Jan 2016', '15 Jan 2016', 15, $test_inclusive),
|
||||||
|
'days between jan 1 and 15th feb' => build_test('01 Jan 2016', '15 Feb 2016', 45, ''),
|
||||||
|
'days between today and tomorrow' => build_test('14 Jul 2016', '15 Jul 2016', 1, ''),
|
||||||
|
'how many days between feb 2 and feb 17' => build_test('02 Feb 2016', '17 Feb 2016', 15, ''),
|
||||||
|
'days between 22nd may and today' => build_test('22 May 2016', '14 Jul 2016', 53, ''),
|
||||||
|
'days between jan 1 2012 and jan 1 123456' => undef
|
||||||
);
|
);
|
||||||
|
|
||||||
restore_time();
|
restore_time();
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue