X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F083_load_class.t;h=67553be39d3bcee3ee268dddde2bd4e3d3487978;hb=86a4d8730cfe673db674c692f7703632b700c7c9;hp=06ff0c14b9aede22e403177970131810fbc73137;hpb=063ad0c5732b1431b6b0cfdba6c99deb66f1b9cf;p=gitmo%2FClass-MOP.git

diff --git a/t/083_load_class.t b/t/083_load_class.t
index 06ff0c1..67553be 100644
--- a/t/083_load_class.t
+++ b/t/083_load_class.t
@@ -1,13 +1,15 @@
-#!/usr/bin/env perl
 use strict;
 use warnings;
-use Test::More tests => 27;
+use Test::More;
 use Test::Exception;
 
 require Class::MOP;
 use lib 't/lib';
 
-ok(!Class::MOP::is_class_loaded(), "is_class_loaded with no argument returns false");
+dies_ok {
+    Class::MOP::is_class_loaded()
+} "is_class_loaded with no argument dies";
+
 ok(!Class::MOP::is_class_loaded(''), "can't load the empty class");
 ok(!Class::MOP::is_class_loaded(\"foo"), "can't load a class name reference??");
 
@@ -24,9 +26,7 @@ throws_ok {
     Class::MOP::load_class('__PACKAGE__')
 } qr/__PACKAGE__\.pm.*\@INC/, 'errors sanely on __PACKAGE__.pm';
 
-my $meta = Class::MOP::load_class('BinaryTree');
-ok($meta, "successfully loaded the class BinaryTree");
-is($meta->name, "BinaryTree", "load_class returns the metaclass");
+Class::MOP::load_class('BinaryTree');
 can_ok('BinaryTree' => 'traverse');
 
 do {
@@ -35,19 +35,38 @@ do {
 };
 
 
-my $ret = Class::MOP::load_class('Class');
-ok($ret, "this should not die!");
-is( $ret, "Class", "class name returned" );
+{
+    local $@;
+    eval { Class::MOP::load_class('Class') };
+    ok( ! $@, 'load_class does not die if the package is already defined' );
+}
 
 ok( !Class::MOP::does_metaclass_exist("Class"), "no metaclass for non MOP class" );
 
 throws_ok {
     Class::MOP::load_class('FakeClassOhNo');
-} qr/Can't locate /;
+}
+qr/Can't locate /;
 
 throws_ok {
     Class::MOP::load_class('SyntaxError');
-} qr/Missing right curly/;
+}
+qr/Missing right curly/;
+
+throws_ok {
+    delete $INC{'SyntaxError.pm'};
+    Class::MOP::load_first_existing_class(
+        'FakeClassOhNo', 'SyntaxError', 'Class'
+    );
+}
+qr/Missing right curly/,
+    'load_first_existing_class does not pass over an existing (bad) module';
+
+throws_ok {
+    Class::MOP::load_class('This::Does::Not::Exist');
+}
+qr{Can't locate This/Does/Not/Exist\.pm in \@INC},
+    'load_first_existing_class throws a familiar error for a single module';
 
 {
     package Other;
@@ -64,14 +83,66 @@ lives_ok {
     use metaclass;
 }
 
-isa_ok( Class::MOP::load_class("Lala"), "Class::MOP::Class", "when an object has a metaclass it is returned" );
-
 lives_ok {
-    isa_ok(Class::MOP::load_first_existing_class("Lala", "Does::Not::Exist"), "Class::MOP::Class", 'Load_classes first param ok, metaclass returned');
-    isa_ok(Class::MOP::load_first_existing_class("Does::Not::Exist", "Lala"), "Class::MOP::Class", 'Load_classes second param ok, metaclass returned');
+    is(Class::MOP::load_first_existing_class("Lala", "Does::Not::Exist"), "Lala", 'load_first_existing_class 1/2 params ok, class name returned');
+    is(Class::MOP::load_first_existing_class("Does::Not::Exist", "Lala"), "Lala", 'load_first_existing_class 2/2 params ok, class name returned');
 } 'load_classes works';
+
 throws_ok {
     Class::MOP::load_first_existing_class("Does::Not::Exist", "Also::Does::Not::Exist")
-} qr/Could not load class \(Does::Not::Exist.*Could not load class \(Also::Does::Not::Exist/s, 'Multiple non-existant classes cause exception';
+} qr/Does::Not::Exist.*Also::Does::Not::Exist/s, 'Multiple non-existant classes cause exception';
+
+{
+    sub whatever {
+        TestClassLoaded::this_method_does_not_even_exist();
+    }
+
+    ok( ! Class::MOP::is_class_loaded('TestClassLoaded'),
+        'the mere mention of TestClassLoaded in the whatever sub does not make us think it has been loaded' );
+}
+
+{
+    require TestClassLoaded::Sub;
+    ok( ! Class::MOP::is_class_loaded('TestClassLoaded'),
+        'requiring TestClassLoaded::Sub does not make us think TestClassLoaded is loaded' );
+}
+
+{
+    require TestClassLoaded;
+    ok( Class::MOP::is_class_loaded('TestClassLoaded'),
+        'We see that TestClassLoaded is loaded after requiring it (it has methods but no $VERSION or @ISA)' );
+}
+
+{
+    require TestClassLoaded2;
+    ok( Class::MOP::is_class_loaded('TestClassLoaded2'),
+        'We see that TestClassLoaded2 is loaded after requiring it (it has a $VERSION but no methods or @ISA)' );
+}
+
+{
+    require TestClassLoaded3;
+    ok( Class::MOP::is_class_loaded('TestClassLoaded3'),
+        'We see that TestClassLoaded3 is loaded after requiring it (it has an @ISA but no methods or $VERSION)' );
+}
 
+{
+    {
+        package Not::Loaded;
+        our @ISA;
+    }
+
+    ok( ! Class::MOP::is_class_loaded('Not::Loaded'),
+        'the mere existence of an @ISA for a package does not mean a class is loaded' );
+}
+
+{
+    {
+        package Loaded::Ish;
+        our @ISA = 'Foo';
+    }
+
+    ok( Class::MOP::is_class_loaded('Loaded::Ish'),
+        'an @ISA with members does mean a class is loaded' );
+}
 
+done_testing;