X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F010_self_introspection.t;h=018b7c202135017739b1a2005222afbd8b12f5a6;hb=16e960bd460d404b809a1e5c24ba77405643342b;hp=a59ef868fb7b0834e98bc1d22a5d5d8d9e4df53b;hpb=058c1cf58078cdd0fcb9aa2f4a5c7556e0b8c23a;p=gitmo%2FClass-MOP.git

diff --git a/t/010_self_introspection.t b/t/010_self_introspection.t
index a59ef86..018b7c2 100644
--- a/t/010_self_introspection.t
+++ b/t/010_self_introspection.t
@@ -3,12 +3,14 @@
 use strict;
 use warnings;
 
-use Test::More tests => 136;
+use Test::More tests => 171;
 use Test::Exception;
 
 BEGIN {
     use_ok('Class::MOP');
     use_ok('Class::MOP::Class');        
+    use_ok('Class::MOP::Package');        
+    use_ok('Class::MOP::Module');                
 }
 
 {
@@ -16,50 +18,104 @@ BEGIN {
     is($class->meta, Class::MOP::Class->meta, '... instance and class both lead to the same meta');
 }
 
-my $meta = Class::MOP::Class->meta();
-isa_ok($meta, 'Class::MOP::Class');
+my $class_mop_class_meta = Class::MOP::Class->meta();
+isa_ok($class_mop_class_meta, 'Class::MOP::Class');
 
-my @methods = qw(
+my $class_mop_package_meta = Class::MOP::Package->meta();
+isa_ok($class_mop_package_meta, 'Class::MOP::Package');
+
+my $class_mop_module_meta = Class::MOP::Module->meta();
+isa_ok($class_mop_module_meta, 'Class::MOP::Module');
+
+my @class_mop_package_methods = qw(
+    meta 
+
+    initialize
+
+    name
+    
+    add_package_symbol get_package_symbol has_package_symbol remove_package_symbol    
+);
+
+my @class_mop_module_methods = qw(
+    meta 
+
+    version
+);
+
+my @class_mop_class_methods = qw(
     meta
     
     get_all_metaclasses get_all_metaclass_names get_all_metaclass_instances 
     
-    initialize create create_anon_class
+    initialize reinitialize create create_anon_class
     
+    instance_metaclass get_meta_instance
     new_object clone_object
     construct_instance construct_class_instance clone_instance
     check_metaclass_compatability
     
-    name version
-    
     attribute_metaclass method_metaclass
     
     superclasses class_precedence_list
     
     has_method get_method add_method remove_method alias_method
     get_method_list compute_all_applicable_methods 
-	find_all_methods_by_name find_next_method_by_name
+	find_method_by_name find_all_methods_by_name find_next_method_by_name
     
 	add_before_method_modifier add_after_method_modifier add_around_method_modifier
 
     has_attribute get_attribute add_attribute remove_attribute
     get_attribute_list get_attribute_map compute_all_applicable_attributes find_attribute_by_name
     
-    add_package_variable get_package_variable has_package_variable remove_package_variable
-    );
+    is_mutable is_immutable make_immutable
+    
+    DESTROY
+);
     
-is_deeply([ sort @methods ], [ sort $meta->get_method_list ], '... got the correct method list');
+# check the class ...    
+    
+is_deeply([ sort @class_mop_class_methods ], [ sort $class_mop_class_meta->get_method_list ], '... got the correct method list for class');
 
-foreach my $method_name (@methods) {
-    ok($meta->has_method($method_name), '... Class::MOP::Class->has_method(' . $method_name . ')');
+foreach my $method_name (@class_mop_class_methods) {
+    ok($class_mop_class_meta->has_method($method_name), '... Class::MOP::Class->has_method(' . $method_name . ')');
     {
         no strict 'refs';
-        is($meta->get_method($method_name), 
+        is($class_mop_class_meta->get_method($method_name), 
            \&{'Class::MOP::Class::' . $method_name},
            '... Class::MOP::Class->get_method(' . $method_name . ') == &Class::MOP::Class::' . $method_name);        
     }
 }
 
+## check the package ....
+
+is_deeply([ sort @class_mop_package_methods ], [ sort $class_mop_package_meta->get_method_list ], '... got the correct method list for package');
+
+foreach my $method_name (@class_mop_package_methods) {
+    ok($class_mop_package_meta->has_method($method_name), '... Class::MOP::Package->has_method(' . $method_name . ')');
+    {
+        no strict 'refs';
+        is($class_mop_package_meta->get_method($method_name), 
+           \&{'Class::MOP::Package::' . $method_name},
+           '... Class::MOP::Package->get_method(' . $method_name . ') == &Class::MOP::Package::' . $method_name);        
+    }
+}
+
+## check the module ....
+
+is_deeply([ sort @class_mop_module_methods ], [ sort $class_mop_module_meta->get_method_list ], '... got the correct method list for module');
+
+foreach my $method_name (@class_mop_module_methods) {
+    ok($class_mop_module_meta->has_method($method_name), '... Class::MOP::Module->has_method(' . $method_name . ')');
+    {
+        no strict 'refs';
+        is($class_mop_module_meta->get_method($method_name), 
+           \&{'Class::MOP::Module::' . $method_name},
+           '... Class::MOP::Module->get_method(' . $method_name . ') == &Class::MOP::Module::' . $method_name);        
+    }
+}
+
+
 # check for imported functions which are not methods
 
 foreach my $non_method_name (qw(
@@ -68,101 +124,158 @@ foreach my $non_method_name (qw(
     subname
     svref_2object
     )) {
-    ok(!$meta->has_method($non_method_name), '... NOT Class::MOP::Class->has_method(' . $non_method_name . ')');        
+    ok(!$class_mop_class_meta->has_method($non_method_name), '... NOT Class::MOP::Class->has_method(' . $non_method_name . ')');        
 }
 
 # check for the right attributes
 
-my @attributes = ('$:package', '%:attributes', '$:attribute_metaclass', '$:method_metaclass');
+my @class_mop_package_attributes = (
+    '$:package', 
+);
+
+my @class_mop_module_attributes = (
+);
+
+my @class_mop_class_attributes = (
+    '%:attributes', 
+    '$:attribute_metaclass', 
+    '$:method_metaclass', 
+    '$:instance_metaclass'
+);
+
+# check class
+
+is_deeply(
+    [ sort @class_mop_class_attributes ],
+    [ sort $class_mop_class_meta->get_attribute_list ],
+    '... got the right list of attributes');
+    
+is_deeply(
+    [ sort @class_mop_class_attributes ],
+    [ sort keys %{$class_mop_class_meta->get_attribute_map} ],
+    '... got the right list of attributes');    
+
+foreach my $attribute_name (@class_mop_class_attributes) {
+    ok($class_mop_class_meta->has_attribute($attribute_name), '... Class::MOP::Class->has_attribute(' . $attribute_name . ')');        
+    isa_ok($class_mop_class_meta->get_attribute($attribute_name), 'Class::MOP::Attribute');            
+}
+
+# check module
+
+is_deeply(
+    [ sort @class_mop_package_attributes ],
+    [ sort $class_mop_package_meta->get_attribute_list ],
+    '... got the right list of attributes');
+    
+is_deeply(
+    [ sort @class_mop_package_attributes ],
+    [ sort keys %{$class_mop_package_meta->get_attribute_map} ],
+    '... got the right list of attributes');    
+
+foreach my $attribute_name (@class_mop_package_attributes) {
+    ok($class_mop_package_meta->has_attribute($attribute_name), '... Class::MOP::Package->has_attribute(' . $attribute_name . ')');        
+    isa_ok($class_mop_package_meta->get_attribute($attribute_name), 'Class::MOP::Attribute');            
+}
+
+# check package 
 
 is_deeply(
-    [ sort @attributes ],
-    [ sort $meta->get_attribute_list ],
+    [ sort @class_mop_module_attributes ],
+    [ sort $class_mop_module_meta->get_attribute_list ],
     '... got the right list of attributes');
     
 is_deeply(
-    [ sort @attributes ],
-    [ sort keys %{$meta->get_attribute_map} ],
+    [ sort @class_mop_module_attributes ],
+    [ sort keys %{$class_mop_module_meta->get_attribute_map} ],
     '... got the right list of attributes');    
 
-foreach my $attribute_name (@attributes) {
-    ok($meta->has_attribute($attribute_name), '... Class::MOP::Class->has_attribute(' . $attribute_name . ')');        
-    isa_ok($meta->get_attribute($attribute_name), 'Class::MOP::Attribute');            
+foreach my $attribute_name (@class_mop_module_attributes) {
+    ok($class_mop_module_meta->has_attribute($attribute_name), '... Class::MOP::Module->has_attribute(' . $attribute_name . ')');        
+    isa_ok($class_mop_module_meta->get_attribute($attribute_name), 'Class::MOP::Attribute');            
 }
 
 ## check the attributes themselves
 
-ok($meta->get_attribute('$:package')->has_reader, '... Class::MOP::Class $:package has a reader');
-is($meta->get_attribute('$:package')->reader, 'name', '... Class::MOP::Class $:package\'s a reader is &name');
+# ... package
+
+ok($class_mop_package_meta->get_attribute('$:package')->has_reader, '... Class::MOP::Class $:package has a reader');
+is(ref($class_mop_package_meta->get_attribute('$:package')->reader), 'HASH', '... Class::MOP::Class $:package\'s a reader is { name => sub { ... } }');
+
+ok($class_mop_package_meta->get_attribute('$:package')->has_init_arg, '... Class::MOP::Class $:package has a init_arg');
+is($class_mop_package_meta->get_attribute('$:package')->init_arg, ':package', '... Class::MOP::Class $:package\'s a init_arg is :package');
 
-ok($meta->get_attribute('$:package')->has_init_arg, '... Class::MOP::Class $:package has a init_arg');
-is($meta->get_attribute('$:package')->init_arg, ':package', '... Class::MOP::Class $:package\'s a init_arg is :package');
+# ... class
 
-ok($meta->get_attribute('%:attributes')->has_reader, '... Class::MOP::Class %:attributes has a reader');
-is($meta->get_attribute('%:attributes')->reader, 
-   'get_attribute_map', 
+ok($class_mop_class_meta->get_attribute('%:attributes')->has_reader, '... Class::MOP::Class %:attributes has a reader');
+is(ref($class_mop_class_meta->get_attribute('%:attributes')->reader), 
+   'HASH', 
    '... Class::MOP::Class %:attributes\'s a reader is &get_attribute_map');
    
-ok($meta->get_attribute('%:attributes')->has_init_arg, '... Class::MOP::Class %:attributes has a init_arg');
-is($meta->get_attribute('%:attributes')->init_arg, 
+ok($class_mop_class_meta->get_attribute('%:attributes')->has_init_arg, '... Class::MOP::Class %:attributes has a init_arg');
+is($class_mop_class_meta->get_attribute('%:attributes')->init_arg, 
   ':attributes', 
   '... Class::MOP::Class %:attributes\'s a init_arg is :attributes');   
   
-ok($meta->get_attribute('%:attributes')->has_default, '... Class::MOP::Class %:attributes has a default');
-is_deeply($meta->get_attribute('%:attributes')->default, 
+ok($class_mop_class_meta->get_attribute('%:attributes')->has_default, '... Class::MOP::Class %:attributes has a default');
+is_deeply($class_mop_class_meta->get_attribute('%:attributes')->default('Foo'), 
          {}, 
          '... Class::MOP::Class %:attributes\'s a default of {}');  
 
-ok($meta->get_attribute('$:attribute_metaclass')->has_reader, '... Class::MOP::Class $:attribute_metaclass has a reader');
-is($meta->get_attribute('$:attribute_metaclass')->reader, 
+ok($class_mop_class_meta->get_attribute('$:attribute_metaclass')->has_reader, '... Class::MOP::Class $:attribute_metaclass has a reader');
+is($class_mop_class_meta->get_attribute('$:attribute_metaclass')->reader, 
   'attribute_metaclass', 
   '... Class::MOP::Class $:attribute_metaclass\'s a reader is &attribute_metaclass');
   
-ok($meta->get_attribute('$:attribute_metaclass')->has_init_arg, '... Class::MOP::Class $:attribute_metaclass has a init_arg');
-is($meta->get_attribute('$:attribute_metaclass')->init_arg, 
+ok($class_mop_class_meta->get_attribute('$:attribute_metaclass')->has_init_arg, '... Class::MOP::Class $:attribute_metaclass has a init_arg');
+is($class_mop_class_meta->get_attribute('$:attribute_metaclass')->init_arg, 
    ':attribute_metaclass', 
    '... Class::MOP::Class $:attribute_metaclass\'s a init_arg is :attribute_metaclass');  
    
-ok($meta->get_attribute('$:attribute_metaclass')->has_default, '... Class::MOP::Class $:attribute_metaclass has a default');
-is($meta->get_attribute('$:attribute_metaclass')->default, 
+ok($class_mop_class_meta->get_attribute('$:attribute_metaclass')->has_default, '... Class::MOP::Class $:attribute_metaclass has a default');
+is($class_mop_class_meta->get_attribute('$:attribute_metaclass')->default, 
   'Class::MOP::Attribute', 
   '... Class::MOP::Class $:attribute_metaclass\'s a default is Class::MOP:::Attribute');   
   
-ok($meta->get_attribute('$:method_metaclass')->has_reader, '... Class::MOP::Class $:method_metaclass has a reader');
-is($meta->get_attribute('$:method_metaclass')->reader, 
+ok($class_mop_class_meta->get_attribute('$:method_metaclass')->has_reader, '... Class::MOP::Class $:method_metaclass has a reader');
+is($class_mop_class_meta->get_attribute('$:method_metaclass')->reader, 
    'method_metaclass', 
    '... Class::MOP::Class $:method_metaclass\'s a reader is &method_metaclass');  
    
-ok($meta->get_attribute('$:method_metaclass')->has_init_arg, '... Class::MOP::Class $:method_metaclass has a init_arg');
-is($meta->get_attribute('$:method_metaclass')->init_arg, 
+ok($class_mop_class_meta->get_attribute('$:method_metaclass')->has_init_arg, '... Class::MOP::Class $:method_metaclass has a init_arg');
+is($class_mop_class_meta->get_attribute('$:method_metaclass')->init_arg, 
   ':method_metaclass', 
   '... Class::MOP::Class $:method_metaclass\'s init_arg is :method_metaclass');   
   
-ok($meta->get_attribute('$:method_metaclass')->has_default, '... Class::MOP::Class $:method_metaclass has a default');
-is($meta->get_attribute('$:method_metaclass')->default, 
+ok($class_mop_class_meta->get_attribute('$:method_metaclass')->has_default, '... Class::MOP::Class $:method_metaclass has a default');
+is($class_mop_class_meta->get_attribute('$:method_metaclass')->default, 
    'Class::MOP::Method', 
   '... Class::MOP::Class $:method_metaclass\'s a default is Class::MOP:::Method');  
 
 # check the values of some of the methods
 
-is($meta->name, 'Class::MOP::Class', '... Class::MOP::Class->name');
-is($meta->version, $Class::MOP::Class::VERSION, '... Class::MOP::Class->version');
+is($class_mop_class_meta->name, 'Class::MOP::Class', '... Class::MOP::Class->name');
+is($class_mop_class_meta->version, $Class::MOP::Class::VERSION, '... Class::MOP::Class->version');
 
-ok($meta->has_package_variable('$VERSION'), '... Class::MOP::Class->has_package_variable($VERSION)');
-is(${$meta->get_package_variable('$VERSION')}, 
+ok($class_mop_class_meta->has_package_symbol('$VERSION'), '... Class::MOP::Class->has_package_symbol($VERSION)');
+is(${$class_mop_class_meta->get_package_symbol('$VERSION')}, 
    $Class::MOP::Class::VERSION, 
-   '... Class::MOP::Class->get_package_variable($VERSION)');
+   '... Class::MOP::Class->get_package_symbol($VERSION)');
 
 is_deeply(
-    [ $meta->superclasses ], 
-    [], 
-    '... Class::MOP::Class->superclasses == []');
+    [ $class_mop_class_meta->superclasses ], 
+    [ qw/Class::MOP::Module/ ], 
+    '... Class::MOP::Class->superclasses == [ Class::MOP::Module ]');
     
 is_deeply(
-    [ $meta->class_precedence_list ], 
-    [ 'Class::MOP::Class' ], 
-    '... Class::MOP::Class->class_precedence_list == []');
+    [ $class_mop_class_meta->class_precedence_list ], 
+    [ qw/
+        Class::MOP::Class
+        Class::MOP::Module
+        Class::MOP::Package                
+    / ], 
+    '... Class::MOP::Class->class_precedence_list == [ Class::MOP::Class Class::MOP::Module Class::MOP::Package ]');
 
-is($meta->attribute_metaclass, 'Class::MOP::Attribute', '... got the right value for attribute_metaclass');
-is($meta->method_metaclass, 'Class::MOP::Method', '... got the right value for method_metaclass');
+is($class_mop_class_meta->attribute_metaclass, 'Class::MOP::Attribute', '... got the right value for attribute_metaclass');
+is($class_mop_class_meta->method_metaclass, 'Class::MOP::Method', '... got the right value for method_metaclass');
+is($class_mop_class_meta->instance_metaclass, 'Class::MOP::Instance', '... got the right value for instance_metaclass');