X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fop%2Funiversal.t;h=b7d452fc5a643d7facc8ae9946dfeec2505f5139;hb=e24631be6ac297b562086a055de17c5bd4247797;hp=b6596a3c95ffc64f7b2b7e6a7835ff978f0f99b8;hpb=39d11b7fff60fb4dbe9c17fee36ce5399b4376d8;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/t/op/universal.t b/t/op/universal.t
index b6596a3..b7d452f 100755
--- a/t/op/universal.t
+++ b/t/op/universal.t
@@ -9,7 +9,7 @@ BEGIN {
     $| = 1;
 }
 
-print "1..84\n";
+print "1..101\n";
 
 $a = {};
 bless $a, "Bob";
@@ -46,14 +46,23 @@ $Alice::VERSION = 2.718;
 package main;
 
 { my $i = 2;
-  sub test { print "not " unless shift; print "ok $i\n"; $i++; }
+  sub test {
+      print "not " unless $_[0];
+      print "ok ", $i++;
+      print " # at ", (caller)[1], ", line ", (caller)[2] unless $_[0];
+      print "\n";
+  }
 }
 
 $a = new Alice;
 
 test $a->isa("Alice");
+test $a->isa("main::Alice");    # check that alternate class names work
+
+test(("main::Alice"->new)->isa("Alice"));
 
 test $a->isa("Bob");
+test $a->isa("main::Bob");
 
 test $a->isa("Female");
 
@@ -63,12 +72,14 @@ test ! $a->isa("Male");
 
 test ! $a->isa('Programmer');
 
+test $a->isa("HASH");
+
 test $a->can("eat");
 test ! $a->can("sleep");
 test my $ref = $a->can("drink");        # returns a coderef
 test $a->$ref("tea") eq "drinking tea"; # ... which works
 test $ref = $a->can("sing");
-eval { $a->sing };
+eval { $a->$ref() };
 test $@;                                # ... but not if no actual subroutine
 
 test (!Cedric->isa('Programmer'));
@@ -110,15 +121,17 @@ test ! $a->can("export_tags");	# a method in Exporter
 test (eval { $a->VERSION }) == 2.718;
 
 test ! (eval { $a->VERSION(2.719) }) &&
-         $@ =~ /^Alice version 2.71(?:9|8999\d+) required--this is only version 2.718 at /;
+         $@ =~ /^Alice version 2.719 \(2\.719\.0\) required--this is only version 2.718 \(2\.718\.0\) at /;
 
 test (eval { $a->VERSION(2.718) }) && ! $@;
 
 my $subs = join ' ', sort grep { defined &{"UNIVERSAL::$_"} } keys %UNIVERSAL::;
+## The test for import here is *not* because we want to ensure that UNIVERSAL
+## can always import; it is an historical accident that UNIVERSAL can import.
 if ('a' lt 'A') {
-    test $subs eq "can isa VERSION";
+    test $subs eq "can import isa VERSION";
 } else {
-    test $subs eq "VERSION can isa";
+    test $subs eq "VERSION can import isa";
 }
 
 test $a->isa("UNIVERSAL");
@@ -152,3 +165,39 @@ test ! UNIVERSAL::can($b, "can");
 test ! $a->can("export_tags");	# a method in Exporter
 
 test ! UNIVERSAL::isa("\xff\xff\xff\0", 'HASH');
+
+{
+    package Pickup;
+    use UNIVERSAL qw( isa can VERSION );
+
+    main::test isa "Pickup", UNIVERSAL;
+    main::test can( "Pickup", "can" ) == \&UNIVERSAL::can;
+    main::test VERSION "UNIVERSAL" ;
+}
+
+{
+    # test isa() and can() on magic variables
+    "Human" =~ /(.*)/;
+    test $1->isa("Human");
+    test $1->can("eat");
+    package HumanTie;
+    sub TIESCALAR { bless {} }
+    sub FETCH { "Human" }
+    tie my($x), "HumanTie";
+    ::test $x->isa("Human");
+    ::test $x->can("eat");
+}
+
+# bugid 3284
+# a second call to isa('UNIVERSAL') when @ISA is null failed due to caching
+
+@X::ISA=();
+my $x = {}; bless $x, 'X';
+test $x->isa('UNIVERSAL');
+test $x->isa('UNIVERSAL');
+
+
+# Check that the "historical accident" of UNIVERSAL having an import()
+# method doesn't effect anyone else.
+eval { Some::Package->import("bar") };
+test !$@;