From: Nicholas Clark <nick@ccl4.org>
Date: Tue, 21 Jun 2005 15:27:14 +0000 (+0000)
Subject: Drag t/op/gv.t kicking and screaming into the century of the fruitbat
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=98e007d4a6d559b31b912b1f396492a8d7c59025;p=p5sagit%2Fp5-mst-13.2.git

Drag t/op/gv.t kicking and screaming into the century of the fruitbat
(or at least into the decade of t/test.pl)

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

diff --git a/t/op/gv.t b/t/op/gv.t
index 5b1237a..655e624 100755
--- a/t/op/gv.t
+++ b/t/op/gv.t
@@ -7,46 +7,44 @@
 BEGIN {
     chdir 't' if -d 't';
     @INC = '../lib';
-}   
+}
 
 use warnings;
 
-print "1..52\n";
+require './test.pl';
+plan( tests => 66 );
 
 # type coersion on assignment
 $foo = 'foo';
 $bar = *main::foo;
 $bar = $foo;
-print ref(\$bar) eq 'SCALAR' ? "ok 1\n" : "not ok 1\n";
+is(ref(\$bar), 'SCALAR');
 $foo = *main::bar;
 
 # type coersion (not) on misc ops
 
-if ($foo) {
-  print ref(\$foo) eq 'GLOB' ? "ok 2\n" : "not ok 2\n";
-}
+ok($foo);
+is(ref(\$foo), 'GLOB');
 
-unless ($foo =~ /abcd/) {
-  print ref(\$foo) eq 'GLOB' ? "ok 3\n" : "not ok 3\n";
-}
+unlike ($foo, qr/abcd/);
+is(ref(\$foo), 'GLOB');
 
-if ($foo eq '*main::bar') {
-  print ref(\$foo) eq 'GLOB' ? "ok 4\n" : "not ok 4\n";
-}
+is($foo, '*main::bar');
+is(ref(\$foo), 'GLOB');
 
 # type coersion on substitutions that match
 $a = *main::foo;
 $b = $a;
 $a =~ s/^X//;
-print ref(\$a) eq 'GLOB' ? "ok 5\n" : "not ok 5\n";
+is(ref(\$a), 'GLOB');
 $a =~ s/^\*//;
-print $a eq 'main::foo' ? "ok 6\n" : "not ok 6\n";
-print ref(\$b) eq 'GLOB' ? "ok 7\n" : "not ok 7\n";
+is($a, 'main::foo');
+is(ref(\$b), 'GLOB');
 
 # typeglobs as lvalues
 substr($foo, 0, 1) = "XXX";
-print ref(\$foo) eq 'SCALAR' ? "ok 8\n" : "not ok 8\n";
-print $foo eq 'XXXmain::bar' ? "ok 9\n" : "not ok 9\n";
+is(ref(\$foo), 'SCALAR');
+is($foo, 'XXXmain::bar');
 
 # returning glob values
 sub foo {
@@ -56,13 +54,12 @@ sub foo {
 }
 
 ($fuu, $baa) = foo();
-if (defined $fuu) {
-  print ref(\$fuu) eq 'GLOB' ? "ok 10\n" : "not ok 10\n";
-}
+ok(defined $fuu);
+is(ref(\$fuu), 'GLOB');
 
-if (defined $baa) {
-  print ref(\$baa) eq 'GLOB' ? "ok 11\n" : "not ok 11\n";
-}
+
+ok(defined $baa);
+is(ref(\$baa), 'GLOB');
 
 # nested package globs
 # NOTE:  It's probably OK if these semantics change, because the
@@ -70,127 +67,131 @@ if (defined $baa) {
 #        (I hope.)
 
 { package Foo::Bar; no warnings 'once'; $test=1; }
-print exists $Foo::{'Bar::'} ? "ok 12\n" : "not ok 12\n";
-print $Foo::{'Bar::'} eq '*Foo::Bar::' ? "ok 13\n" : "not ok 13\n";
+ok(exists $Foo::{'Bar::'});
+is($Foo::{'Bar::'}, '*Foo::Bar::');
+
 
 # test undef operator clearing out entire glob
 $foo = 'stuff';
 @foo = qw(more stuff);
 %foo = qw(even more random stuff);
 undef *foo;
-print +($foo || @foo || %foo) ? "not ok" : "ok", " 14\n";
+is ($foo, undef);
+is (scalar @foo, 0);
+is (scalar %foo, 0);
 
-# test warnings from assignment of undef to glob
 {
-    my $msg;
+    # test warnings from assignment of undef to glob
+    my $msg = '';
     local $SIG{__WARN__} = sub { $msg = $_[0] };
     use warnings;
     *foo = 'bar';
-    print $msg ? "not ok" : "ok", " 15\n";
+    is($msg, '');
     *foo = undef;
-    print $msg ? "ok" : "not ok", " 16\n";
+    like($msg, qr/Undefined value assigned to typeglob/);
 }
 
+my $test = curr_test();
 # test *glob{THING} syntax
-$x = "ok 17\n";
-@x = ("ok 18\n");
-%x = ("ok 19" => "\n");
-sub x { "ok 20\n" }
+$x = "ok $test\n";
+++$test;
+@x = ("ok $test\n");
+++$test;
+%x = ("ok $test" => "\n");
+++$test;
+sub x { "ok $test\n" }
 print ${*x{SCALAR}}, @{*x{ARRAY}}, %{*x{HASH}}, &{*x{CODE}};
+# This needs to go here, after the print, as sub x will return the current
+# value of test
+++$test;
 format x =
-ok 21
+XXX This text isn't used. Should it be?
 .
-print ref *x{FORMAT} eq "FORMAT" ? "ok 21\n" : "not ok 21\n";
+curr_test($test);
+
+is (ref *x{FORMAT}, "FORMAT");
 *x = *STDOUT;
-print *{*x{GLOB}} eq "*main::STDOUT" ? "ok 22\n" : "not ok 22\n";
-print {*x{IO}} "ok 23\n";
+is (*{*x{GLOB}}, "*main::STDOUT");
 
 {
-	my $warn;
-	local $SIG{__WARN__} = sub {
-		$warn .= $_[0];
-	};
-	my $val = *x{FILEHANDLE};
-	print {*x{IO}} ($warn =~ /is deprecated/ ? "ok 24\n" : "not ok 24\n");
-	
+    my $test = curr_test();
+
+    print {*x{IO}} "ok $test\n";
+    ++$test;
+
+    my $warn;
+    local $SIG{__WARN__} = sub {
+	$warn .= $_[0];
+    };
+    my $val = *x{FILEHANDLE};
+    print {*x{IO}} ($warn =~ /is deprecated/
+		    ? "ok $test\n" : "not ok $test\n");
+    curr_test(++$test);
 }
 
-# test if defined() doesn't create any new symbols
 
 {
-    my $test = 24;
+    # test if defined() doesn't create any new symbols
 
     my $a = "SYM000";
-    print "not " if defined *{$a};
-    ++$test; print "ok $test\n";
+    ok(!defined *{$a});
 
-    print "not " if defined @{$a} or defined *{$a};
-    ++$test; print "ok $test\n";
+    ok(!defined @{$a});
+    ok(!defined *{$a});
 
-    print "not " if defined %{$a} or defined *{$a};
-    ++$test; print "ok $test\n";
+    ok(!defined %{$a});
+    ok(!defined *{$a});
 
-    print "not " if defined ${$a} or defined *{$a};
-    ++$test; print "ok $test\n";
+    ok(!defined ${$a});
+    ok(!defined *{$a});
 
-    print "not " if defined &{$a} or defined *{$a};
-    ++$test; print "ok $test\n";
+    ok(!defined &{$a});
+    ok(!defined *{$a});
 
-    *{$a} = sub { print "ok $test\n" };
-    print "not " unless defined &{$a} and defined *{$a};
-    ++$test; &{$a};
+    my $state = "not";
+    *{$a} = sub { $state = "ok" };
+    ok(defined &{$a});
+    ok(defined *{$a});
+    &{$a};
+    is ($state, 'ok');
 }
 
-# although it *should* if you're talking about magicals
-
 {
-    my $test = 30;
+    # although it *should* if you're talking about magicals
 
     my $a = "]";
-    print "not " unless defined ${$a};
-    ++$test; print "ok $test\n";
-    print "not " unless defined *{$a};
-    ++$test; print "ok $test\n";
+    ok(defined ${$a});
+    ok(defined *{$a});
 
     $a = "1";
     "o" =~ /(o)/;
-    print "not " unless ${$a};
-    ++$test; print "ok $test\n";
-    print "not " unless defined *{$a};
-    ++$test; print "ok $test\n";
+    ok(${$a});
+    ok(defined *{$a});
     $a = "2";
-    print "not " if ${$a};
-    ++$test; print "ok $test\n";
-    print "not " unless defined *{$a};
-    ++$test; print "ok $test\n";
+    ok(!${$a});
+    ok(defined *{$a});
     $a = "1x";
-    print "not " if defined ${$a};
-    ++$test; print "ok $test\n";
-    print "not " if defined *{$a};
-    ++$test; print "ok $test\n";
+    ok(!defined ${$a});
+    ok(!defined *{$a});
     $a = "11";
     "o" =~ /(((((((((((o)))))))))))/;
-    print "not " unless ${$a};
-    ++$test; print "ok $test\n";
-    print "not " unless defined *{$a};
-    ++$test; print "ok $test\n";
+    ok(${$a});
+    ok(defined *{$a});
 }
 
-
 # [ID 20010526.001] localized glob loses value when assigned to
 
 $j=1; %j=(a=>1); @j=(1); local *j=*j; *j = sub{};
 
-print $j    == 1 ? "ok 41\n"  : "not ok 41\n";
-print $j{a} == 1 ? "ok 42\n"  : "not ok 42\n";
-print $j[0] == 1 ? "ok 43\n" : "not ok 43\n";
-
-# does pp_readline() handle glob-ness correctly?
+is($j, 1);
+is($j{a}, 1);
+is($j[0], 1);
 
 {
+    # does pp_readline() handle glob-ness correctly?
     my $g = *foo;
     $g = <DATA>;
-    print $g;
+    is ($g, "Perl\n");
 }
 
 {
@@ -198,14 +199,14 @@ print $j[0] == 1 ? "ok 43\n" : "not ok 43\n";
     $SIG{__WARN__} = sub { $w = $_[0] };
     sub abc1 ();
     local *abc1 = sub { };
-    print $w eq '' ? "ok 45\n" : "not ok 45\n# $w";
+    is ($w, '');
     sub abc2 ();
     local *abc2;
     *abc2 = sub { };
-    print $w eq '' ? "ok 46\n" : "not ok 46\n# $w";
+    is ($w, '');
     sub abc3 ();
     *abc3 = sub { };
-    print $w =~ /Prototype mismatch/ ? "ok 47\n" : "not ok 47\n# $w";
+    like ($w, qr/Prototype mismatch/);
 }
 
 {
@@ -214,7 +215,7 @@ print $j[0] == 1 ? "ok 43\n" : "not ok 43\n";
     my $x = "not ";
     $x  = undef;
     $x .= <DATA>;
-    print $x;
+    is ($x, "Rules\n");
 }
 
 {
@@ -224,26 +225,29 @@ print $j[0] == 1 ? "ok 43\n" : "not ok 43\n";
     my $v;
     sub f { $_[0] = 0; $_[0] = "a"; $_[0] = *DATA }
     f($v);
-    print $v eq '*main::DATA' ? "ok 49\n" : "not ok 49\n# $e";
+    is ($v, '*main::DATA');
     my $x = <$v>;
-    print $x || "not ok 50\n";
+    is ($x, "perl\n");
 }
 
-{   
+{
+    $e = '';
     # GLOB assignment to tied element
     local $SIG{__DIE__} = sub { $e = $_[0] };
-    sub T::TIEARRAY { bless [] => "T" }
-    sub T::STORE    { $_[0]->[ $_[1] ] = $_[2] }
-    sub T::FETCH    { $_[0]->[ $_[1] ] }
+    sub T::TIEARRAY  { bless [] => "T" }
+    sub T::STORE     { $_[0]->[ $_[1] ] = $_[2] }
+    sub T::FETCH     { $_[0]->[ $_[1] ] }
+    sub T::FETCHSIZE { @{$_[0]} }
     tie my @ary => "T";
     $ary[0] = *DATA;
-    print $ary[0] eq '*main::DATA' ? "ok 51\n" : "not ok 51\n# $e";
+    is ($ary[0], '*main::DATA');
+    is ($e, '');
     my $x = readline $ary[0];
-    print $x || "not ok 52\n";
+    is($x, "rocks\n");
 }
 
 __END__
-ok 44
-ok 48
-ok 50
-ok 52
+Perl
+Rules
+perl
+rocks