Skip to content

Commit c59881b

Browse files
author
giraffedata
committed
Add stdin tests, et al
git-svn-id: https://svn.code.sf.net/p/netpbm/code/trunk@4272 9d0c8265-081b-0410-96cb-a4ca84ce46f8
1 parent 3bf5495 commit c59881b

34 files changed

+1125
-84
lines changed

‎test/Test-Order

+16-2
Original file line numberDiff line numberDiff line change
@@ -129,16 +129,29 @@ pammixmulti-identity.test
129129

130130
symmetry.test
131131

132+
# Standard input tests
133+
134+
stdin-pbm1.test
135+
stdin-pbm2.test
136+
stdin-pgm1.test
137+
stdin-pgm2.test
138+
stdin-ppm1.test
139+
stdin-ppm2.test
140+
stdin-ppm3.test
141+
stdin-pnm1.test
142+
stdin-pnm2.test
143+
144+
pbm-misc-converters.test
145+
132146
# Format converter tests
133147

134148
pamtopdbimg.test
135149
pbmtog3.test
150+
ppmtoapplevol.test
136151
411toppm.test
137152
eyuvtoppm.test
138153
rawtoppm.test
139154

140-
pbm-misc-converters.test
141-
142155
gif-transparent1.test
143156

144157
# Miscellaneous utility tests
@@ -155,6 +168,7 @@ pnm-plain-roundtrip.test
155168
pnm-pam-roundtrip.test
156169
pnminvert-roundtrip.test
157170
pamflip-roundtrip.test
171+
pamflip-pbm-roundtrip.test
158172
pamdepth-roundtrip.test
159173
pad-crop-roundtrip.test
160174
pbm-ppm-roundtrip.test

‎test/cut-cat-roundtrip.test

+5-5
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ padded_ppm=${tmpdir}/padded.ppm
1212

1313
echo "Test 1. Should print 1926073387 101484 six times"
1414

15-
testimg_ppm_sum=`cat testimg.ppm | cksum`
15+
testimg_ppm_sum=`cksum < testimg.ppm`
1616
echo ${testimg_ppm_sum}
1717

18-
imgsize=$(pamfile -size testimg.ppm)
19-
width=$(echo ${imgsize} | cut -d " " -f 1)
20-
height=$(echo ${imgsize} | cut -d " " -f 2)
18+
imgsize=$(pamfile -size testimg.ppm)
19+
width=$(echo ${imgsize} | cut -d " " -f 1)
20+
height=$(echo ${imgsize} | cut -d " " -f 2)
2121

2222
for i in 0 1 128 224 225
2323
do
@@ -83,7 +83,7 @@ padded_pbm=${tmpdir}/padded.pbm
8383

8484
echo "Test 5. Should print 281226646 481 six times"
8585

86-
maze_pbm_sum=`cat maze.pbm | cksum`
86+
maze_pbm_sum=`cksum < maze.pbm`
8787
echo ${maze_pbm_sum}
8888

8989
imgsize=$(pamfile -size maze.pbm)

‎test/ilbm-roundtrip.ok

+5-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ Test 2. Should produce 1926073387 101484 three times
99
1926073387 101484
1010
Test 3. Should print 984199586 101484
1111
984199586 101484
12-
Test 4. Should print 2059976475 661 twice
12+
Test 4. Should print 2059976475 661 three times
1313
2059976475 661
1414
2059976475 661
15+
2059976475 661
16+
Test 5. Should print 482756572 101484 twice
17+
482756572 101484
18+
482756572 101484

‎test/ilbm-roundtrip.test

+19-8
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#! /bin/bash
1+
#! /bin/sh
22
# This script tests: ppmtoilbm ilbmtoppm
3-
# Also requires: pamseq pamdepth pamtopnm pnmremap
3+
# Also requires: pamseq pamdepth pamtopnm pnmremap pnmcolormap
44

55
echo "Test 1. Should produce 669206373 10102 five times"
66
#Output is PPM raw, 57 by 59 maxval 255
@@ -16,14 +16,25 @@ ppmtoilbm testimg.ppm | ilbmtoppm | cksum
1616
ppmtoilbm -24force testimg.ppm | ilbmtoppm | cksum
1717
ppmtoilbm -dcbits 8 8 8 -nocompress testimg.ppm | ilbmtoppm | cksum
1818

19+
tmpdir=${tmpdir:-/tmp}
1920

2021
echo "Test 3. Should print 984199586 101484"
21-
pamseq 3 5 -tupletype=RGB | pamdepth 255 | pamtopnm | \
22+
test_ppm=${tmpdir}/test.ppm
23+
pamseq 3 5 -tupletype=RGB | pamdepth 255 | pamtopnm | tee ${test_ppm} | \
2224
pnmremap -mapfile=- testimg.ppm | ppmtoilbm | ilbmtoppm | cksum
2325

2426

25-
echo "Test 4. Should print 2059976475 661 twice"
26-
pamseq 3 5 -tupletype=RGB | pamtopnm | \
27-
ppmtoilbm -compress | ilbmtoppm | cksum
28-
pamseq 3 5 -tupletype=RGB | pamtopnm | \
29-
ppmtoilbm -nocompress | ilbmtoppm | cksum
27+
echo "Test 4. Should print 2059976475 661 three times"
28+
cat ${test_ppm} | cksum
29+
ppmtoilbm -compress ${test_ppm} | ilbmtoppm | cksum
30+
ppmtoilbm -nocompress ${test_ppm} | ilbmtoppm | cksum
31+
32+
rm ${test_ppm}
33+
34+
echo "Test 5. Should print 482756572 101484 twice"
35+
mapfile=${tmpdir}/mapfile
36+
pnmcolormap 32 testimg.ppm > ${mapfile}
37+
ppmtoilbm -map ${mapfile} testimg.ppm | ilbmtoppm | tee ${test_ppm} | cksum
38+
ppmtoilbm -map ${mapfile} ${test_ppm} | ilbmtoppm | cksum
39+
40+
rm ${mapfile} ${test_ppm}

‎test/lps-roundtrip.ok

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
1-
Test. Should print match
1+
Test 1. Should print match
22
match
3+
Test 2. Should print 0
4+
0

‎test/lps-roundtrip.test

+12-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#! /bin/bash
1+
#! /bin/sh
22
# This script tests: pbmtolps pstopnm
33
# Also requires: gs pamdepth pamscale pnmcrop pnmpsnr pamfile
44

@@ -9,17 +9,25 @@
99

1010
tmpdir=${tmpdir:-/tmp}
1111
test_pgm=${tmpdir}/test.pgm
12+
test_ps=${tmpdir}/test.ps
1213

13-
echo "Test. Should print match"
14+
echo "Test 1. Should print match"
1415

1516
xysize=$(pamfile -size testgrid.pbm | awk '{print "-xsize="$1,"-ysize="$2}')
1617
pamdepth 255 testgrid.pbm > ${test_pgm}
1718

18-
pbmtolps -dpi 72 testgrid.pbm | \
19+
pbmtolps -dpi 72 testgrid.pbm | tee ${test_ps} | \
1920
pstopnm -dpi $((72*12)) -stdout -pgm | \
2021
pnmcrop -white | pamscale ${xysize} | \
2122
pnmpsnr -target=30 - ${test_pgm}
22-
23+
2324
# ghostscript version 8.71: pnmpsnr lumina 33.14dB
25+
26+
27+
echo "Test 2. Should print 0"
28+
29+
pbmtolps -dpi 72 < testgrid.pbm | sed 's/noname/testgrid.pbm/' | \
30+
cmp -s ${test_ps} -
31+
echo $?
2432

2533
rm ${test_pgm}

‎test/pamflip-pbm-roundtrip.ok

+122
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,122 @@
1+
Test 1. Should print 281226646 481 seven times
2+
281226646 481
3+
281226646 481
4+
281226646 481
5+
281226646 481
6+
281226646 481
7+
281226646 481
8+
281226646 481
9+
Test 2. Should print 1576602925 8 fourteen times
10+
1576602925 8
11+
1576602925 8
12+
1576602925 8
13+
1576602925 8
14+
1576602925 8
15+
1576602925 8
16+
1576602925 8
17+
1576602925 8
18+
1576602925 8
19+
1576602925 8
20+
1576602925 8
21+
1576602925 8
22+
1576602925 8
23+
1576602925 8
24+
Test 3. Should print N : 0 thirty-two times
25+
1 : 0
26+
2 : 0
27+
3 : 0
28+
4 : 0
29+
5 : 0
30+
6 : 0
31+
7 : 0
32+
8 : 0
33+
9 : 0
34+
10 : 0
35+
11 : 0
36+
12 : 0
37+
13 : 0
38+
14 : 0
39+
15 : 0
40+
16 : 0
41+
17 : 0
42+
18 : 0
43+
19 : 0
44+
20 : 0
45+
21 : 0
46+
22 : 0
47+
23 : 0
48+
24 : 0
49+
25 : 0
50+
26 : 0
51+
27 : 0
52+
28 : 0
53+
29 : 0
54+
30 : 0
55+
31 : 0
56+
32 : 0
57+
Test 4. Should print N : 0 thirty-two times
58+
1 : 0
59+
2 : 0
60+
3 : 0
61+
4 : 0
62+
5 : 0
63+
6 : 0
64+
7 : 0
65+
8 : 0
66+
9 : 0
67+
10 : 0
68+
11 : 0
69+
12 : 0
70+
13 : 0
71+
14 : 0
72+
15 : 0
73+
16 : 0
74+
17 : 0
75+
18 : 0
76+
19 : 0
77+
20 : 0
78+
21 : 0
79+
22 : 0
80+
23 : 0
81+
24 : 0
82+
25 : 0
83+
26 : 0
84+
27 : 0
85+
28 : 0
86+
29 : 0
87+
30 : 0
88+
31 : 0
89+
32 : 0
90+
Test 5. Should print N : 0 thirty-two times
91+
1 : 0
92+
2 : 0
93+
3 : 0
94+
4 : 0
95+
5 : 0
96+
6 : 0
97+
7 : 0
98+
8 : 0
99+
9 : 0
100+
10 : 0
101+
11 : 0
102+
12 : 0
103+
13 : 0
104+
14 : 0
105+
15 : 0
106+
16 : 0
107+
17 : 0
108+
18 : 0
109+
19 : 0
110+
20 : 0
111+
21 : 0
112+
22 : 0
113+
23 : 0
114+
24 : 0
115+
25 : 0
116+
26 : 0
117+
27 : 0
118+
28 : 0
119+
29 : 0
120+
30 : 0
121+
31 : 0
122+
32 : 0

‎test/pamflip-pbm-roundtrip.test

+74
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
#! /bin/sh
2+
# This script tests: pamflip
3+
# Also requires: ppmpat pamseq pamtopnm
4+
5+
tmpdir=${tmpdir:-/tmp}
6+
dot_pbm=${tmpdir}/dot.pbm
7+
noise_pbm=${tmpdir}/noise.pbm
8+
9+
echo "Test 1. Should print 281226646 481 seven times"
10+
11+
pamflip -null maze.pbm | cksum
12+
pamflip -lr maze.pbm | pamflip -lr | cksum
13+
pamflip -tb maze.pbm | pamflip -tb | cksum
14+
pamflip -r180 maze.pbm | pamflip -r180 | cksum
15+
pamflip -xy maze.pbm | pamflip -xy | cksum
16+
pamflip -r90 maze.pbm | pamflip -r90 | pamflip -r90 | pamflip -r90 | cksum
17+
pamflip -r270 maze.pbm | pamflip -r270 | pamflip -r270 | pamflip -r270 | cksum
18+
19+
echo "Test 2. Should print 1576602925 8 fourteen times"
20+
21+
pbmmake -b 1 1 | tee ${dot_pbm} | cksum
22+
pamflip -null ${dot_pbm} | cksum
23+
24+
# the next six aren't round-trip
25+
pamflip -lr ${dot_pbm} | cksum
26+
pamflip -tb ${dot_pbm} | cksum
27+
pamflip -r180 ${dot_pbm} | cksum
28+
pamflip -xy ${dot_pbm} | cksum
29+
pamflip -r90 ${dot_pbm} | cksum
30+
pamflip -r270 ${dot_pbm} | cksum
31+
32+
pamflip -lr ${dot_pbm} | pamflip -lr | cksum
33+
pamflip -tb ${dot_pbm} | pamflip -tb | cksum
34+
pamflip -r180 ${dot_pbm} | pamflip -r180 | cksum
35+
pamflip -xy ${dot_pbm} | pamflip -xy | cksum
36+
pamflip -r90 ${dot_pbm} | pamflip -r90 | pamflip -r90 | pamflip -r90 | cksum
37+
pamflip -r270 ${dot_pbm} | pamflip -r270 | \
38+
pamflip -r270 | pamflip -r270 | cksum
39+
40+
rm ${dot_pbm}
41+
42+
echo "Test 3. Should print N : 0 thirty-two times"
43+
44+
for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 \
45+
20 21 22 23 24 25 26 27 28 29 30 31 32
46+
do
47+
pbmnoise -randomseed=${i} -pack ${i} 3 > ${noise_pbm} && \
48+
pamflip -lr ${noise_pbm} | pamflip -lr | cmp -s - ${noise_pbm}
49+
echo $i : $?
50+
rm ${noise_pbm}
51+
done
52+
53+
echo "Test 4. Should print N : 0 thirty-two times"
54+
55+
for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 \
56+
20 21 22 23 24 25 26 27 28 29 30 31 32
57+
do
58+
pbmnoise -randomseed=${i} -pack 7 ${i} > ${noise_pbm} && \
59+
pamflip -tb ${noise_pbm} | pamflip -tb | cmp -s - ${noise_pbm}
60+
echo $i : $?
61+
rm ${noise_pbm}
62+
done
63+
64+
65+
echo "Test 5. Should print N : 0 thirty-two times"
66+
67+
for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 \
68+
20 21 22 23 24 25 26 27 28 29 30 31 32
69+
do
70+
pbmnoise -randomseed=${i} -pack ${i} ${i} > ${noise_pbm} && \
71+
pamflip -xy ${noise_pbm} | pamflip -xy | cmp -s - ${noise_pbm}
72+
echo $i : $?
73+
rm ${noise_pbm}
74+
done

0 commit comments

Comments
 (0)