From: Michael G. Schwern Date: Mon, 27 Aug 2001 20:12:29 +0000 (-0400) Subject: Fixing bad testing advice X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=b23b8711f24117b1b40fef434605dd6c37711992;p=p5sagit%2Fp5-mst-13.2.git Fixing bad testing advice Message-Id: <20010827201229.D12582@blackrider> p4raw-id: //depot/perl@11767 --- diff --git a/pod/perlhack.pod b/pod/perlhack.pod index 629f4d5..acaf43f 100644 --- a/pod/perlhack.pod +++ b/pod/perlhack.pod @@ -1471,26 +1471,40 @@ we must document that change. We must also provide some more regression tests to make sure our patch works and doesn't create a bug somewhere else along the line. -The regression tests for each operator live in F, and so we make -a copy of F to F. Now we can add our tests -to the end. First, we'll test that the C does indeed create Unicode -strings: +The regression tests for each operator live in F, and so we +make a copy of F to F. Now we can add our +tests to the end. First, we'll test that the C does indeed create +Unicode strings. + +t/op/pack.t has a sensible ok() function, but if it didn't we could +write one easily. + + my $test = 1; + sub ok { + my($ok) = @_; + print "not " unless $ok; + print "ok $test\n"; + $test++; + return $ok; + } + +so instead of this: print 'not ' unless "1.20.300.4000" eq sprintf "%vd", pack("U*",1,20,300,4000); print "ok $test\n"; $test++; +we can write the (somewhat) more sensible: + + ok( "1.20.300.4000" eq sprintf "%vd", pack("U*",1,20,300,4000) ); + Now we'll test that we got that space-at-the-beginning business right: - print 'not ' unless "1.20.300.4000" eq - sprintf "%vd", pack(" U*",1,20,300,4000); - print "ok $test\n"; $test++; + ok( "1.20.300.4000" eq sprintf "%vd", pack(" U*",1,20,300,4000) ); And finally we'll test that we don't make Unicode strings if C is B the first active format: - print 'not ' unless v1.20.300.4000 ne - sprintf "%vd", pack("C0U*",1,20,300,4000); - print "ok $test\n"; $test++; + ok( v1.20.300.4000 ne sprintf "%vd", pack("C0U*",1,20,300,4000) ); Mustn't forget to change the number of tests which appears at the top, or else the automated tester will get confused: diff --git a/t/op/pack.t b/t/op/pack.t index dfecc6e..02247df 100755 --- a/t/op/pack.t +++ b/t/op/pack.t @@ -1,12 +1,25 @@ -#!./perl +#!./perl -Tw BEGIN { chdir 't' if -d 't'; @INC = '../lib'; - require Config; import Config; +} + +use Config; + +$Is_EBCDIC = (defined $Config{ebcdic} && $Config{ebcdic} eq 'define'); + +my $test = 1; +sub ok { + my($ok) = @_; + print "not " unless $ok; + print "ok $test\n"; + $test++; + return $ok; } print "1..161\n"; + # Note: All test numbers in comments are off by 1 after the comment below.. $format = "c2 x5 C C x s d i l a6"; @@ -16,33 +29,29 @@ $format = "c2 x5 C C x s d i l a6"; $foo = pack($format,@ary); @ary2 = unpack($format,$foo); -print ($#ary == $#ary2 ? "ok 1\n" : "not ok 1\n"); +ok($#ary == $#ary2); $out1=join(':',@ary); $out2=join(':',@ary2); # Using long double NVs may introduce greater accuracy than wanted. $out1 =~ s/:9\.87654321097999\d*:/:9.87654321098:/; $out2 =~ s/:9\.87654321097999\d*:/:9.87654321098:/; -print ($out1 eq $out2? "ok 2\n" : "not ok 2\n"); +ok($out1 eq $out2); -print ($foo =~ /def/ ? "ok 3\n" : "not ok 3\n"); +ok($foo =~ /def/); # How about counting bits? -print +($x = unpack("%32B*", "\001\002\004\010\020\040\100\200\377")) == 16 - ? "ok 4\n" : "not ok 4 $x\n"; +ok( ($x = unpack("%32B*", "\001\002\004\010\020\040\100\200\377")) == 16 ); -print +($x = unpack("%32b69", "\001\002\004\010\020\040\100\200\017")) == 12 - ? "ok 5\n" : "not ok 5 $x\n"; +ok( ($x = unpack("%32b69", "\001\002\004\010\020\040\100\200\017")) == 12 ); -print +($x = unpack("%32B69", "\001\002\004\010\020\040\100\200\017")) == 9 - ? "ok 6\n" : "not ok 6 $x\n"; +ok( ($x = unpack("%32B69", "\001\002\004\010\020\040\100\200\017")) == 9 ); my $sum = 129; # ASCII -$sum = 103 if ($Config{ebcdic} eq 'define'); +$sum = 103 if $Is_EBCDIC; -print +($x = unpack("%32B*", "Now is the time for all good blurfl")) == $sum - ? "ok 7\n" : "not ok 7 $x\n"; +ok( ($x = unpack("%32B*", "Now is the time for all good blurfl")) == $sum ); open(BIN, "./perl") || open(BIN, "./perl.exe") || open(BIN, $^X) || die "Can't open ../perl or ../perl.exe: $!\n"; @@ -51,13 +60,11 @@ close BIN; $sum = unpack("%32b*", $foo); $longway = unpack("b*", $foo); -print $sum == $longway =~ tr/1/1/ ? "ok 8\n" : "not ok 8\n"; +ok( $sum == $longway =~ tr/1/1/ ); -print +($x = unpack("I",pack("I", 0xFFFFFFFF))) == 0xFFFFFFFF - ? "ok 9\n" : "not ok 9 $x\n"; +ok( ($x = unpack("I",pack("I", 0xFFFFFFFF))) == 0xFFFFFFFF ); # check 'w' -my $test=10; my @x = (5,130,256,560,32000,3097152,268435455,1073741844, 2**33, '4503599627365785','23728385234614992549757750638446'); my $x = pack('w*', @x); @@ -411,7 +418,7 @@ $test++; eval { ($x) = unpack 'a/a*/b*', '212ab' }; my $expected_x = '100001100100'; -if ($Config{ebcdic} eq 'define') { $expected_x = '100000010100'; } +if ($Is_EBCDIC) { $expected_x = '100000010100'; } print $@ eq '' && $x eq $expected_x ? "ok $test\n" : "#$x,$@\nnot ok $test\n"; $test++;