about summary refs log tree commit diff
path: root/test/pamfunc.test
diff options
context:
space:
mode:
Diffstat (limited to 'test/pamfunc.test')
-rwxr-xr-xtest/pamfunc.test121
1 files changed, 35 insertions, 86 deletions
diff --git a/test/pamfunc.test b/test/pamfunc.test
index f9a8a33e..b1b9edfc 100755
--- a/test/pamfunc.test
+++ b/test/pamfunc.test
@@ -1,11 +1,11 @@
-#! /bin/bash
+#! /bin/sh
 # This script tests: pamfunc
 # Also requires: pamseq pamtopnm pbmmake
 
 tmpdir=${tmpdir:-/tmp}
 input_pgm=${tmpdir}/input.pgm
 
-echo "Test 1"  
+echo "Test 1"
 
 pamseq 1 15 | pamtopnm -assume > ${input_pgm}
 pamtopnm -plain ${input_pgm} | tr '\n' ' '; echo
@@ -73,94 +73,43 @@ pamfunc -shiftleft  0 testimg.ppm | cksum
 pamfunc -shiftright 0 testimg.ppm | cksum
 
 
-echo "Test 5: Should print 2425386270 41 six times"
+echo "Test 5: Should print 281226646 481 six times"
 
-cat testgrid.pbm | cksum
+cat maze.pbm | cksum
 
-pamfunc -andmask  0x1 testgrid.pbm | cksum
-pamfunc -ormask   0x0 testgrid.pbm | cksum
-pamfunc -xormask  0x1 testgrid.pbm | pamfunc -xormask 0x1 | cksum
+pamfunc -andmask  0x1 maze.pbm | cksum
+pamfunc -ormask   0x0 maze.pbm | cksum
+pamfunc -xormask  0x1 maze.pbm | pamfunc -xormask 0x1 | cksum
 
-pamfunc -shiftleft  0 testgrid.pbm | cksum
-pamfunc -shiftright 0 testgrid.pbm | cksum
+pamfunc -shiftleft  0 maze.pbm | cksum
+pamfunc -shiftright 0 maze.pbm | cksum
 
-echo "Invalid command-line argument combinations." 1>&2
-echo "Error messages should appear below the line." 1>&2
-echo "-----------------------------------------------------------" 1>&2
 
 echo "Test Invalid"
 
-output_ppm=${tmpdir}/output.ppm
-
-pamfunc -multiplier testimg.ppm > ${output_ppm} || \
-  echo -n "Expected failure 1"
-  test -s ${output_ppm}; echo " "$?
-pamfunc -multiplier=-1 testimg.ppm > ${output_ppm} || \
-  echo -n "Expected failure 2"
-  test -s ${output_ppm}; echo " "$?
-pamfunc -divisor testimg.ppm > ${output_ppm} || \
-  echo -n "Expected failure 3"
-  test -s ${output_ppm}; echo " "$?
-pamfunc -divisor=-20 testimg.ppm > ${output_ppm} || \
-  echo -n "Expected failure 4"
-  test -s ${output_ppm}; echo " "$?
-pamfunc -adder testimg.ppm > ${output_ppm} || \
-  echo -n "Expected failure 5"
-  test -s ${output_ppm}; echo " "$?
-pamfunc -adder 0.5 testimg.ppm > ${output_ppm} || \
-  echo -n "Expected failure 6"
-  test -s ${output_ppm}; echo " "$?
-pamfunc -subtractor testimg.ppm > ${output_ppm} || \
-  echo -n "Expected failure 7"
-  test -s ${output_ppm}; echo " "$?
-pamfunc -subtractor 0.1 testimg.ppm > ${output_ppm} || \
-  echo -n "Expected failure 8"
-  test -s ${output_ppm}; echo " "$?
-pamfunc -multiplier=1 -divisor=2 testimg.ppm > ${output_ppm} || \
-  echo -n "Expected failure 9"
-  test -s ${output_ppm}; echo " "$?
-pamfunc -adder=2 -subtractor=3 testimg.ppm > ${output_ppm} || \
-  echo -n "Expected failure 10"
-  test -s ${output_ppm}; echo " "$?
-pamfunc -min testimg.ppm > ${output_ppm} || \
-  echo -n "Expected failure 11"
-  test -s ${output_ppm}; echo " "$?
-pamfunc -max testimg.ppm > ${output_ppm} || \
-  echo -n "Expected failure 12"
-  test -s ${output_ppm}; echo " "$?
-pamfunc -andmask testimg.ppm > ${output_ppm} || \
-  echo -n "Expected failure 13"
-  test -s ${output_ppm}; echo " "$?
-pamfunc -ormask testimg.ppm > ${output_ppm} || \
-  echo -n "Expected failure 14"
-  test -s ${output_ppm}; echo " "$?
-pamfunc -xormask testimg.ppm > ${output_ppm} || \
-  echo -n "Expected failure 15"
-  test -s ${output_ppm}; echo " "$?
-pamfunc -not 1 testimg.ppm > ${output_ppm} || \
-  echo -n "Expected failure 16"
-  test -s ${output_ppm}; echo " "$?
-pamfunc -min=1 -max=2 testimg.ppm > ${output_ppm} || \
-  echo -n "Expected failure 17"
-  test -s ${output_ppm}; echo " "$?
-pamfunc -andmask=1 -ormask=0 testimg.ppm > ${output_ppm} || \
-  echo -n "Expected failure 18"
-  test -s ${output_ppm}; echo " "$?
-pamfunc -andmask=0xffff testimg.ppm > ${output_ppm} || \
-  echo -n "Expected failure 19"
-  test -s ${output_ppm}; echo " "$?
-pamfunc -shiftleft testimg.ppm > ${output_ppm} || \
-  echo -n "Expected failure 20"
-  test -s ${output_ppm}; echo " "$?
-pamfunc -shiftright testimg.ppm > ${output_ppm} || \
-  echo -n "Expected failure 21"
-  test -s ${output_ppm}; echo " "$?
-pamfunc -changemaxval testimg.ppm > ${output_ppm} || \
-  echo -n "Expected failure 22"
-  test -s ${output_ppm}; echo " "$?
-pamfunc -shiftleft=1 -shiftright=1 testimg.ppm > ${output_ppm} || \
-  echo -n "Expected failure 23"
-  test -s ${output_ppm}; echo " "$?
-pamfunc -multiplier=0.5 -changemaxval=65535 testimg.ppm > ${output_ppm} || \
-  echo -n "Expected failure 24"
-  test -s ${output_ppm}; echo " "$?
+. ${srcdir}/test-invalid.inc
+
+invCmd "pamfunc -multiplier testimg.ppm"
+invCmd "pamfunc -multiplier=-1 testimg.ppm"
+invCmd "pamfunc -divisor testimg.ppm"
+invCmd "pamfunc -divisor=-20 testimg.ppm"
+invCmd "pamfunc -adder testimg.ppm"
+invCmd "pamfunc -adder 0.5 testimg.ppm"
+invCmd "pamfunc -subtractor testimg.ppm"
+invCmd "pamfunc -subtractor 0.1 testimg.ppm"
+invCmd "pamfunc -multiplier=1 -divisor=2 testimg.ppm"
+invCmd "pamfunc -adder=2 -subtractor=3 testimg.ppm"
+invCmd "pamfunc -min testimg.ppm"
+invCmd "pamfunc -max testimg.ppm"
+invCmd "pamfunc -andmask testimg.ppm"
+invCmd "pamfunc -ormask testimg.ppm"
+invCmd "pamfunc -xormask testimg.ppm"
+invCmd "pamfunc -not 1 testimg.ppm"
+invCmd "pamfunc -min=1 -max=2 testimg.ppm"
+invCmd "pamfunc -andmask=1 -ormask=0 testimg.ppm"
+invCmd "pamfunc -andmask=0xffff testimg.ppm"
+invCmd "pamfunc -shiftleft testimg.ppm"
+invCmd "pamfunc -shiftright testimg.ppm"
+invCmd "pamfunc -changemaxval testimg.ppm"
+invCmd "pamfunc -shiftleft=1 -shiftright=1 testimg.ppm"
+invCmd "pamfunc -multiplier=0.5 -changemaxval=65535 testimg.ppm"