X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F083_load_class.t;h=e93c427f1e4df0b668571f8a523a6ac9d884bdde;hb=164bf00ba31a0c8e486033690a54fea2112fe207;hp=c6f816a0907c7b693af783803ab98b259e4e4b5c;hpb=9e275e8685f99a57a66b8eae4c48cf1cbddaf631;p=gitmo%2FClass-MOP.git

diff --git a/t/083_load_class.t b/t/083_load_class.t
index c6f816a..e93c427 100644
--- a/t/083_load_class.t
+++ b/t/083_load_class.t
@@ -1,7 +1,6 @@
-#!/usr/bin/env perl
 use strict;
 use warnings;
-use Test::More tests => 13;
+use Test::More tests => 33;
 use Test::Exception;
 
 require Class::MOP;
@@ -11,11 +10,22 @@ ok(!Class::MOP::is_class_loaded(), "is_class_loaded with no argument returns fal
 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??");
 
-throws_ok { Class::MOP::load_class()       } qr/Invalid class name \(undef\)/;
-throws_ok { Class::MOP::load_class('')     } qr/Invalid class name \(\)/;
-throws_ok { Class::MOP::load_class(\"foo") } qr/Invalid class name \(SCALAR\(\w+\)\)/;
+ok(!Class::MOP::_is_valid_class_name(undef), 'undef is not a valid class name');
+ok(!Class::MOP::_is_valid_class_name(''), 'empty string is not a valid class name');
+ok(!Class::MOP::_is_valid_class_name(\"foo"), 'a reference is not a valid class name');
+ok(!Class::MOP::_is_valid_class_name('bogus name'), q{'bogus name' is not a valid class name});
+ok(Class::MOP::_is_valid_class_name('Foo'), q{'Foo' is a valid class name});
+ok(Class::MOP::_is_valid_class_name('Foo::Bar'), q{'Foo::Bar' is a valid class name});
+ok(Class::MOP::_is_valid_class_name('Foo_::Bar2'), q{'Foo_::Bar2' is a valid class name});
+throws_ok { Class::MOP::load_class('bogus name') } qr/Invalid class name \(bogus name\)/;
 
-ok(Class::MOP::load_class('BinaryTree'));
+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");
 can_ok('BinaryTree' => 'traverse');
 
 do {
@@ -23,19 +33,84 @@ do {
     sub method {}
 };
 
-ok(Class::MOP::load_class('Class'), "this should not die!");
+
+my $ret = Class::MOP::load_class('Class');
+ok($ret, "this should not die!");
+is( $ret, "Class", "class name returned" );
+
+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 {
+    Class::MOP::load_class('This::Does::Not::Exist');
+}
+qr/Could not load class \(This::Does::Not::Exist\) because :/,
+    'Many Moose tests rely on the exact formatting of this error';
 
 {
     package Other;
     use constant foo => "bar";
 }
 
-lives_ok { ok(Class::MOP::is_class_loaded("Other")) } "a class with just constants is still a class";
+lives_ok {
+    ok(Class::MOP::is_class_loaded("Other"), 'is_class_loaded(Other)');
+}
+"a class with just constants is still a class";
+
+{
+    package Lala;
+    use metaclass;
+}
+
+isa_ok( Class::MOP::load_class("Lala"), "Class::MOP::Class", "when an object has a metaclass it is returned" );
+
+lives_ok {
+    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';
+
+{
+    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)' );
+}