[prev in list] [next in list] [prev in thread] [next in thread] 

List:       perl5-changes
Subject:    Change 34157: Convert wantarray.t to use strict and test.pl
From:       Nicholas Clark <nwc10+p5p4 () colon ! colondot ! net>
Date:       2008-07-26 20:00:03
Message-ID: 20080726200003.55F875000A () mx ! activestate ! com
[Download RAW message or body]

Change 34157 by nicholas@mouse-mill on 2008/07/26 19:46:41

	Convert wantarray.t to use strict and test.pl

Affected files ...

... //depot/perl/t/op/wantarray.t#5 edit

Differences ...

==== //depot/perl/t/op/wantarray.t#5 (xtext) ====
Index: perl/t/op/wantarray.t
--- perl/t/op/wantarray.t#4~22651~	2004-04-05 04:50:10.000000000 -0700
+++ perl/t/op/wantarray.t	2008-07-26 12:46:41.000000000 -0700
@@ -1,22 +1,29 @@
 #!./perl
 
-print "1..12\n";
+BEGIN {
+    chdir 't' if -d 't';
+    @INC = '../lib';
+    require './test.pl';
+}
+
+use strict;
+
+plan 13;
+
 sub context {
+  local $::Level = $::Level + 1;
   my ( $cona, $testnum ) = @_;
   my $conb = (defined wantarray) ? ( wantarray ? 'A' : 'S' ) : 'V';
-  unless ( $cona eq $conb ) {
-	print "# Context $conb should be $cona\nnot ";
-  }
-  print "ok $testnum\n";
+  is $cona, $conb;
 }
 
-context('V',1);
-$a = context('S',2);
-@a = context('A',3);
-scalar context('S',4);
-$a = scalar context('S',5);
-($a) = context('A',6);
-($a) = scalar context('S',7);
+context('V');
+my $a = context('S');
+my @a = context('A');
+scalar context('S');
+$a = scalar context('S');
+($a) = context('A');
+($a) = scalar context('S');
 
 {
   # [ID 20020626.011] incorrect wantarray optimisation
@@ -27,18 +34,21 @@
   }
   my @b = inline();
   my $c = inline();
-  print +(@b == 1 && "@b" eq "2") ? "ok 8\n" : "not ok 8\t# <@b>\n";
-  print +($c == 2) ? "ok 9\n" : "not ok 9\t# <$c>\n";
+  is @b, 1;
+  is "@b", "2";
+  is $c, 2;
 }
 
+my $q;
+
 my $qcontext = q{
   $q = (defined wantarray) ? ( wantarray ? 'A' : 'S' ) : 'V';
 };
 eval $qcontext;
-print $q eq 'V' ? "ok 10\n" : "not ok 10\n";
+is $q, 'V';
 $a = eval $qcontext;
-print $q eq 'S' ? "ok 11\n" : "not ok 11\n";
+is $q, 'S';
 @a = eval $qcontext;
-print $q eq 'A' ? "ok 12\n" : "not ok 12\n";
+is $q, 'A';
 
 1;
End of Patch.
[prev in list] [next in list] [prev in thread] [next in thread]