From: Nicholas Clark <nick@ccl4.org>
Date: Wed, 10 May 2006 13:08:49 +0000 (+0000)
Subject: Convert use.t to an inlined is/isnt/like implementation, to give better
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=6a4a49dd808ad2c69f6e654d449e72d713a54229;p=p5sagit%2Fp5-mst-13.2.git

Convert use.t to an inlined is/isnt/like implementation, to give better
diagnostics.

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

diff --git a/t/comp/use.t b/t/comp/use.t
index eec6fe0..915d0ee 100755
--- a/t/comp/use.t
+++ b/t/comp/use.t
@@ -7,185 +7,167 @@ BEGIN {
 
 print "1..31\n";
 
-my $i = 1;
-eval "use 5.000";	# implicit semicolon
-if ($@) {
-    print STDERR $@,"\n";
-    print "not ";
+# Can't require test.pl, as we're testing the use/require mechanism here.
+
+my $test = 1;
+
+sub _ok {
+    my ($type, $got, $expected, $name) = @_;
+
+    my @caller = caller(2);
+    if ($name) {
+	$name = " $name";
+    }
+    $name .= " at $caller[1] line $caller[2]";
+
+    my $result;
+    if ($type eq 'is') {
+	$result = $got eq $expected;
+    } elsif ($type eq 'isnt') {
+	$result = $got ne $expected;
+    } elsif ($type eq 'like') {
+	$result = $got =~ $expected;
+    } else {
+	die "Unexpected type '$type'$name";
+    }
+    if ($result) {
+	print "ok $test\n";
+    } else {
+	print "not ok $test\n";
+	print "# Failed test $name\n";
+	print "# Got      '$got'\n";
+	if ($type eq 'is') {
+	    print "# Expected '$expected'\n";
+	} elsif ($type eq 'isnt') {
+	    print "# Expected not '$expected'\n";
+	} elsif ($type eq 'like') {
+	    print "# Expected $expected\n";
+	}
+    }
+    $test = $test + 1;
+    $result;
 }
-print "ok ",$i++,"\n";
 
-eval "use 5.000;";
-if ($@) {
-    print STDERR $@,"\n";
-    print "not ";
+sub like ($$;$) {
+    _ok ('like', @_);
+}
+sub is ($$;$) {
+    _ok ('is', @_);
+}
+sub isnt ($$;$) {
+    _ok ('isnt', @_);
 }
-print "ok ",$i++,"\n";
+
+eval "use 5.000";	# implicit semicolon
+is ($@, '');
+
+eval "use 5.000;";
+is ($@, '');
 
 eval "use 6.000;";
-unless ($@ =~ /Perl v6\.0\.0 required--this is only \Q$^V\E, stopped/) {
-    print "not ";
-}
-print "ok ",$i++,"\n";
+like ($@, qr/Perl v6\.0\.0 required--this is only \Q$^V\E, stopped/);
 
 eval "no 6.000;";
-if ($@) {
-    print STDERR $@,"\n";
-    print "not ";
-}
-print "ok ",$i++,"\n";
+is ($@, '');
 
 eval "no 5.000;";
-unless ($@ =~ /Perls since v5\.0\.0 too modern--this is \Q$^V\E, stopped/) {
-    print "not ";
-}
-print "ok ",$i++,"\n";
+like ($@, qr/Perls since v5\.0\.0 too modern--this is \Q$^V\E, stopped/);
 
 eval sprintf "use %.6f;", $];
-if ($@) {
-    print STDERR $@,"\n";
-    print "not ";
-}
-print "ok ",$i++,"\n";
+is ($@, '');
 
 
 eval sprintf "use %.6f;", $] - 0.000001;
-if ($@) {
-    print STDERR $@,"\n";
-    print "not ";
-}
-print "ok ",$i++,"\n";
+is ($@, '');
 
 eval sprintf("use %.6f;", $] + 1);
-unless ($@) {
-    print "not ";
-}
-print "ok ",$i++,"\n";
+like ($@, qr/Perl v6.\d+.\d+ required--this is only \Q$^V\E, stopped/);
 
 eval sprintf "use %.6f;", $] + 0.00001;
-unless ($@) {
-    print "not ";
-}
-print "ok ",$i++,"\n";
-
+like ($@, qr/Perl v5.\d+.\d+ required--this is only \Q$^V\E, stopped/);
 
 { use lib }	# check that subparse saves pending tokens
 
 local $lib::VERSION = 1.0;
 
 eval "use lib 0.9";
-if ($@) {
-    print STDERR $@,"\n";
-    print "not ";
-}
-print "ok ",$i++,"\n";
+is ($@, '');
 
 eval "use lib 1.0";
-if ($@) {
-    print STDERR $@,"\n";
-    print "not ";
-}
-print "ok ",$i++,"\n";
+is ($@, '');
 
 eval "use lib 1.01";
-unless ($@) {
-    print "not ";
-}
-print "ok ",$i++,"\n";
+isnt ($@, '');
 
 
 eval "use lib 0.9 qw(fred)";
-if ($@) {
-    print STDERR $@,"\n";
-    print "not ";
-}
-print "ok ",$i++,"\n";
+is ($@, '');
 
-print "not " unless ($INC[0] eq "fred" || ($^O eq 'MacOS' && $INC[0] eq ":fred:"));
-print "ok ",$i++,"\n";
+if ($^O eq 'MacOS') {
+    is($INC[0], ":fred:");
+} else {
+    is($INC[0], "fred");
+}
 
 eval "use lib 1.0 qw(joe)";
-if ($@) {
-    print STDERR $@,"\n";
-    print "not ";
+is ($@, '');
+
+
+if ($^O eq 'MacOS') {
+    is($INC[0], ":joe:");
+} else {
+    is($INC[0], "joe");
 }
-print "ok ",$i++,"\n";
 
-print "not " unless ($INC[0] eq "joe" || ($^O eq 'MacOS' && $INC[0] eq ":joe:"));
-print "ok ",$i++,"\n";
 
 eval "use lib 1.01 qw(freda)";
-unless ($@) {
-    print "not ";
-}
-print "ok ",$i++,"\n";
+isnt($@, '');
 
-print "not " if ($INC[0] eq "freda" || ($^O eq 'MacOS' && $INC[0] eq ":freda:"));
-print "ok ",$i++,"\n";
+if ($^O eq 'MacOS') {
+    isnt($INC[0], ":freda:");
+} else {
+    isnt($INC[0], "freda");
+}
 
 {
     local $lib::VERSION = 35.36;
     eval "use lib v33.55";
-    print "not " if $@;
-    print "ok ",$i++,"\n";
+    is ($@, '');
 
     eval "use lib v100.105";
-    unless ($@ =~ /lib version 100.105 \(v100\.105\.0\) required--this is only version 35.360 \(v35\.360\.0\)/) {
-	print "not ";
-    }
-    print "ok ",$i++,"\n";
+    like ($@, qr/lib version 100.105 \(v100\.105\.0\) required--this is only version 35.360 \(v35\.360\.0\)/);
 
     eval "use lib 33.55";
-    print "not " if $@;
-    print "ok ",$i++,"\n";
+    is ($@, '');
 
     eval "use lib 100.105";
-    unless ($@ =~ /lib version 100.105 \(v100\.105\.0\) required--this is only version 35.360 \(v35\.360\.0\)/) {
-	print "not ";
-    }
-    print "ok ",$i++,"\n";
+    like ($@, qr/lib version 100.105 \(v100\.105\.0\) required--this is only version 35.360 \(v35\.360\.0\)/);
 
     local $lib::VERSION = '35.36';
     eval "use lib v33.55";
-    print "not " if $@;
-    print "ok ",$i++,"\n";
+    like ($@, '');
 
     eval "use lib v100.105";
-    unless ($@ =~ /lib version 100.105 \(v100\.105\.0\) required--this is only version 35.360 \(v35\.360\.0\)/) {
-	print "not ";
-    }
-    print "ok ",$i++,"\n";
+    like ($@, qr/lib version 100.105 \(v100\.105\.0\) required--this is only version 35.360 \(v35\.360\.0\)/);
 
     eval "use lib 33.55";
-    print "not " if $@;
-    print "ok ",$i++,"\n";
+    is ($@, '');
 
     eval "use lib 100.105";
-    unless ($@ =~ /lib version 100.105 \(v100\.105\.0\) required--this is only version 35.360 \(v35\.360\.0\)/) {
-	print "not ";
-    }
-    print "ok ",$i++,"\n";
+    like ($@, qr/lib version 100.105 \(v100\.105\.0\) required--this is only version 35.360 \(v35\.360\.0\)/);
 
     local $lib::VERSION = v35.36;
     eval "use lib v33.55";
-    print "not " if $@;
-    print "ok ",$i++,"\n";
+    is ($@, '');
 
     eval "use lib v100.105";
-    unless ($@ =~ /lib version 100.105 \(v100\.105\.0\) required--this is only version 35.036000 \(v35\.36\.0\)/) {
-	print "not ";
-    }
-    print "ok ",$i++,"\n";
+    like ($@, qr/lib version 100.105 \(v100\.105\.0\) required--this is only version 35.036000 \(v35\.36\.0\)/);
 
     eval "use lib 33.55";
-    print "not " if $@;
-    print "ok ",$i++,"\n";
+    is ($@, '');
 
     eval "use lib 100.105";
-    unless ($@ =~ /lib version 100.105 \(v100\.105\.0\) required--this is only version 35.036000 \(v35\.36\.0\)/) {
-	print "not ";
-    }
-    print "ok ",$i++,"\n";
+    like ($@, qr/lib version 100.105 \(v100\.105\.0\) required--this is only version 35.036000 \(v35\.36\.0\)/);
 }
 
 
@@ -196,9 +178,6 @@ print "ok ",$i++,"\n";
     print F "1;\n";
     close F;
     eval "use lib '.'; use xxx 3;";
-    unless ($@ =~ /^xxx defines neither package nor VERSION--version check failed at/) {
-	print "not ";
-    }
-    print "ok ",$i++,"\n";
+    like ($@, qr/^xxx defines neither package nor VERSION--version check failed at/);
     unlink 'xxx.pm';
 }