From: Nicholas Clark <nick@ccl4.org>
Date: Sat, 26 Jul 2008 19:46:41 +0000 (+0000)
Subject: Convert wantarray.t to use strict and test.pl
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=dab34d0f01ff027683d70aa7ca2f56e65aa0f06a;p=p5sagit%2Fp5-mst-13.2.git

Convert wantarray.t to use strict and test.pl

p4raw-id: //depot/perl@34157
---

diff --git a/t/op/wantarray.t b/t/op/wantarray.t
index 350270d..2ee4243 100755
--- a/t/op/wantarray.t
+++ b/t/op/wantarray.t
@@ -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 @@ $a = scalar context('S',5);
   }
   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;