mergeing the method fix in

[gitmo/Class-MOP.git] / t / 000_load.t

diff --git a/t/000_load.t b/t/000_load.t
index 35c93e8..57bfebf 100644 (file)
--- a/t/000_load.t
+++ b/t/000_load.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More tests => 17;
+use Test::More tests => 19;
 
 BEGIN {
     use_ok('Class::MOP');
@@ -17,13 +17,15 @@ BEGIN {
 # make sure we are tracking metaclasses correctly
 
 my %METAS = (
-    'Class::MOP::Attribute' => Class::MOP::Attribute->meta, 
-    'Class::MOP::Package'   => Class::MOP::Package->meta, 
-    'Class::MOP::Module'    => Class::MOP::Module->meta,     
-    'Class::MOP::Class'     => Class::MOP::Class->meta, 
-    'Class::MOP::Method'    => Class::MOP::Method->meta,  
-    'Class::MOP::Instance'  => Class::MOP::Instance->meta,   
-    'Class::MOP::Object'    => Class::MOP::Object->meta,          
+    'Class::MOP::Attribute'           => Class::MOP::Attribute->meta, 
+    'Class::MOP::Attribute::Accessor' => Class::MOP::Attribute::Accessor->meta,     
+    'Class::MOP::Package'             => Class::MOP::Package->meta, 
+    'Class::MOP::Module'              => Class::MOP::Module->meta,     
+    'Class::MOP::Class'               => Class::MOP::Class->meta, 
+    'Class::MOP::Method'              => Class::MOP::Method->meta,  
+    'Class::MOP::Method::Wrapped'     => Class::MOP::Method::Wrapped->meta,      
+    'Class::MOP::Instance'            => Class::MOP::Instance->meta,   
+    'Class::MOP::Object'              => Class::MOP::Object->meta,          
 );
 
 ok($_->is_immutable(), '... ' . $_->name . ' is immutable') for values %METAS;
@@ -36,10 +38,12 @@ is_deeply(
 is_deeply(
     [ sort { $a->name cmp $b->name } Class::MOP::get_all_metaclass_instances ],
     [ 
-        Class::MOP::Attribute->meta, 
+        Class::MOP::Attribute->meta,
+        Class::MOP::Attribute::Accessor->meta, 
         Class::MOP::Class->meta, 
         Class::MOP::Instance->meta,         
         Class::MOP::Method->meta,
+        Class::MOP::Method::Wrapped->meta,
         Class::MOP::Module->meta, 
         Class::MOP::Object->meta,          
         Class::MOP::Package->meta,              
@@ -49,28 +53,14 @@ is_deeply(
 is_deeply(
     [ sort { $a cmp $b } Class::MOP::get_all_metaclass_names() ],
     [ qw/
-        Class::MOP::Attribute       
+        Class::MOP::Attribute   
+        Class::MOP::Attribute::Accessor    
         Class::MOP::Class
         Class::MOP::Instance
         Class::MOP::Method
+        Class::MOP::Method::Wrapped
         Class::MOP::Module  
         Class::MOP::Object        
         Class::MOP::Package                      
     / ],
-    '... got all the metaclass names');
-    
-is_deeply(
-    [ map { $_->meta->identifier } sort { $a cmp $b } Class::MOP::get_all_metaclass_names() ],
-    [ 
-       "Class::MOP::Attribute-" . $Class::MOP::Attribute::VERSION . "-cpan:STEVAN",   
-       "Class::MOP::Class-"     . $Class::MOP::Class::VERSION     . "-cpan:STEVAN",
-       "Class::MOP::Instance-"  . $Class::MOP::Instance::VERSION  . "-cpan:STEVAN",
-       "Class::MOP::Method-"    . $Class::MOP::Method::VERSION    . "-cpan:STEVAN",
-       "Class::MOP::Module-"    . $Class::MOP::Module::VERSION    . "-cpan:STEVAN",
-       "Class::MOP::Object-"    . $Class::MOP::Object::VERSION    . "-cpan:STEVAN",
-       "Class::MOP::Package-"   . $Class::MOP::Package::VERSION   . "-cpan:STEVAN",
-    ],
-    '... got all the metaclass identifiers');    
-    
-    
     
\ No newline at end of file