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

Updates Average Goodie Re #2767 (#2858)

master
Hugo Thiessard 2016-04-28 20:00:13 +02:00 committed by Ben Moon
parent f59b014114
commit 59737a40f8
2 changed files with 35 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/DDG/Goodie/Average.pm
View File

@ -70,10 +70,14 @@ handle remainder => sub {
}
return "$type: $result",
structured_answer => {
input => [html_enc($_)],
operation => $type . ' of',
result => html_enc($result),
structured_answer => {
data => {
title => html_enc($result),
subtitle => $type . ' of: ' . html_enc($_)
},
templates => {
group => 'text'
}
};
};

102
t/Average.t
View File

@ -8,82 +8,34 @@ use DDG::Test::Goodie;
zci answer_type => 'average';
zci is_cached => 1;
sub build_structured_answer {
my ($input, $type, $result) = @_;
return "$type: $result",
structured_answer => {
data => {
title => $result,
subtitle => $type . ' of: ' . $input
},
templates => {
group => 'text'
}
};
}
sub build_test { test_zci(build_structured_answer(@_)) }
ddg_goodie_test(
[qw(
DDG::Goodie::Average
)],
'1 2 3 avg' => test_zci(
"Mean: 2",
structured_answer => {
input => ['1 2 3'],
operation => "Mean of",
result => '2',
}
),
'mean 1, 2, 3' => test_zci(
"Mean: 2",
structured_answer => {
input => ['1 2 3'],
operation => "Mean of",
result => '2',
}
),
'root mean square 1,2,3' => test_zci(
"Root Mean Square: 2.16024689946929",
structured_answer => {
input => ['1 2 3'],
operation => "Root Mean Square of",
result => '2.16024689946929',
}
),
'rms 1,2,3' => test_zci(
"Root Mean Square: 2.16024689946929",
structured_answer => {
input => ['1 2 3'],
operation => "Root Mean Square of",
result => '2.16024689946929',
}
),
"average 12 45 78 1234.12" => test_zci(
"Mean: 342.28",
structured_answer => {
input => ['12 45 78 1234.12'],
operation => "Mean of",
result => '342.28',
}
),
"average 12, 45, 78, 1234.12" => test_zci(
"Mean: 342.28",
structured_answer => {
input => ['12 45 78 1234.12'],
operation => "Mean of",
result => '342.28',
}
),
"average 12;45;78;1234.12" => test_zci(
"Mean: 342.28",
structured_answer => {
input => ['12 45 78 1234.12'],
operation => "Mean of",
result => '342.28',
}
),
'average 12, 45, 78, 1234' => test_zci(
'Mean: 342.25',
structured_answer => {
input => ['12 45 78 1234'],
operation => "Mean of",
result => '342.25',
}
),
'median 1,2,3' => test_zci(
'Median: 2',
structured_answer => {
input => ['1 2 3'],
operation => "Median of",
result => '2',
}
),
[qw(DDG::Goodie::Average)],
'1 2 3 avg' => build_test('1 2 3', 'Mean', '2'),
'mean 1, 2, 3' => build_test('1 2 3', 'Mean', '2'),
'root mean square 1,2,3' => build_test('1 2 3', 'Root Mean Square', '2.16024689946929'),
'rms 1,2,3' => build_test('1 2 3', 'Root Mean Square', '2.16024689946929'),
"average 12 45 78 1234.12" => build_test('12 45 78 1234.12', 'Mean', '342.28'),
"average 12, 45, 78, 1234.12" => build_test('12 45 78 1234.12', 'Mean', '342.28'),
"average 12;45;78;1234.12" => build_test('12 45 78 1234.12', 'Mean', '342.28'),
'average 12, 45, 78, 1234' => build_test('12 45 78 1234', 'Mean', '342.25'),
'median 1,2,3' => build_test('1 2 3', 'Median', '2'),
#Should not trigger
'average temperature philadelphia 2012 january' => undef,