fixed division calc and updated test file with whitespaced queries

master
puskin94 2015-04-24 14:59:06 +02:00
parent 272b86b03d
commit 8fbea4070f
2 changed files with 10 additions and 4 deletions

View File

@ -31,7 +31,7 @@ handle query_nowhitespace => sub {
} elsif ($2 eq '*') { } elsif ($2 eq '*') {
$result = ( $partRes ); $result = ( $partRes );
} elsif ($2 eq '/') { } elsif ($2 eq '/') {
$result = ( $1 * 100 / ( $partRes ) ); $result = ( $1 / ( $partRes ) );
} }
my $text = "Result: $result"; my $text = "Result: $result";

View File

@ -32,7 +32,7 @@ ddg_goodie_test(
result => 3.604 result => 3.604
}), }),
'323.7+55.3%' => test_zci('Result: 502.7061', '323.7+ 55.3%' => test_zci('Result: 502.7061',
structured_answer => { structured_answer => {
input => ['323.7+55.3%'], input => ['323.7+55.3%'],
operation => "Calculate", operation => "Calculate",
@ -46,19 +46,25 @@ ddg_goodie_test(
result => 28.87 result => 28.87
}), }),
'$577.40*0.5%' => test_zci('Result: 2.887', '$577.40 *0.5%' => test_zci('Result: 2.887',
structured_answer => { structured_answer => {
input => ['$577.40*0.5%'], input => ['$577.40*0.5%'],
operation => "Calculate", operation => "Calculate",
result => 2.887 result => 2.887
}), }),
'200-50%' => test_zci('Result: 100', '200 - 50%' => test_zci('Result: 100',
structured_answer => { structured_answer => {
input => ['200-50%'], input => ['200-50%'],
operation => "Calculate", operation => "Calculate",
result => 100 result => 100
}), }),
'234 / 25%' => test_zci('Result: 4',
structured_answer => {
input => ['234/25%'],
operation => "Calculate",
result => 4
}),
'200+50-10%' => undef, '200+50-10%' => undef,
'urldecode hello%20there' => undef, 'urldecode hello%20there' => undef,