# HG changeset patch # User Chris Cannam # Date 1456834847 0 # Node ID a0d093495a1faf8be28f70fc1596848e18de8176 # Parent 6a804920b4a841d08bdb88fef7281628812a6044 Activate summary value tests diff -r 6a804920b4a8 -r a0d093495a1f tests/test-summaries/expected/testplug-grid-fsr-max.csv --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-summaries/expected/testplug-grid-fsr-max.csv Tue Mar 01 12:20:47 2016 +0000 @@ -0,0 +1,1 @@ +0.000000000,9.750000000,max,0.55,0.6,0.65,0.7,0.75,0.8,0.85,0.9,0.95,1,"(maximum value)" diff -r 6a804920b4a8 -r a0d093495a1f tests/test-summaries/expected/testplug-grid-fsr-min.csv --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-summaries/expected/testplug-grid-fsr-min.csv Tue Mar 01 12:20:47 2016 +0000 @@ -0,0 +1,1 @@ +0.000000000,9.750000000,min,0.1,0.15,0.2,0.25,0.3,0.35,0.4,0.45,0.5,0.55,"(minimum value)" diff -r 6a804920b4a8 -r a0d093495a1f tests/test-summaries/test-summaries-testplugin.sh --- a/tests/test-summaries/test-summaries-testplugin.sh Tue Mar 01 12:10:40 2016 +0000 +++ b/tests/test-summaries/test-summaries-testplugin.sh Tue Mar 01 12:20:47 2016 +0000 @@ -8,10 +8,19 @@ trap "rm -f $tmpfile $tmpfile2" 0 -for output in curve-vsr grid-fsr notes-regions; do +for output in curve-vsr grid-fsr; do for summary in min max mean median mode sum variance sd count; do + # grid-fsr is bulkier, and we're only really concerned that + # we're getting a sane result per bin, so just do min and max + # there + if [ "$output" = "grid-fsr" ]; then + case "$summary" in + mean|median|mode|sum|variance|sd|count) continue;; + esac + fi + id="$testplug:$output" expected="$mypath/expected/testplug-$output-$summary.csv" diff -r 6a804920b4a8 -r a0d093495a1f tests/test-summaries/test-summaries.sh --- a/tests/test-summaries/test-summaries.sh Tue Mar 01 12:10:40 2016 +0000 +++ b/tests/test-summaries/test-summaries.sh Tue Mar 01 12:20:47 2016 +0000 @@ -83,5 +83,6 @@ compare $tmpcanonical $expcanonical || \ faildiff "Output mismatch against expected $sexpected.n3 for canonicalised version of transform $stransform" $tmpcanonical $expcanonical -exit 0 +bash "$mypath/test-summaries-testplugin.sh" +