X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F014_attribute_introspection.t;h=112b9c0810258c800d2d19f9e5fbd31834765145;hb=13b8971fa6cc4edf7d55a2e5482820d62ba38f16;hp=1ead8530be184aa5948efcb08cf2871b0c298598;hpb=d7b2249e7fbce92cc716fea172cf338727478b78;p=gitmo%2FClass-MOP.git

diff --git a/t/014_attribute_introspection.t b/t/014_attribute_introspection.t
index 1ead853..112b9c0 100644
--- a/t/014_attribute_introspection.t
+++ b/t/014_attribute_introspection.t
@@ -1,50 +1,56 @@
-#!/usr/bin/perl
-
 use strict;
 use warnings;
 
-use Test::More tests => 60;
-use Test::Exception;
+use Test::More;
+use Test::Fatal;
 
-BEGIN {
-    use_ok('Class::MOP');
-}
+use Class::MOP;
 
 {
     my $attr = Class::MOP::Attribute->new('$test');
-    is($attr->meta, Class::MOP::Attribute->meta, '... instance and class both lead to the same meta');
+    is( $attr->meta, Class::MOP::Attribute->meta,
+        '... instance and class both lead to the same meta' );
 }
 
 {
     my $meta = Class::MOP::Attribute->meta();
-    isa_ok($meta, 'Class::MOP::Class');
+    isa_ok( $meta, 'Class::MOP::Class' );
 
     my @methods = qw(
-        new clone
+        new
+        clone
 
         initialize_instance_slot
         _set_initial_slot_value
 
         name
-        has_accessor  accessor
-        has_writer    writer     get_write_method get_write_method_ref
-        has_reader    reader     get_read_method  get_read_method_ref
-        has_predicate predicate
-        has_clearer   clearer
-        has_builder   builder
-        has_init_arg  init_arg
-        has_default   default    is_default_a_coderef
-        has_initializer initializer
+        has_accessor      accessor
+        has_writer        writer
+        has_write_method  get_write_method  get_write_method_ref
+        has_reader        reader
+        has_read_method   get_read_method   get_read_method_ref
+        has_predicate     predicate
+        has_clearer       clearer
+        has_builder       builder
+        has_init_arg      init_arg
+        has_default       default           is_default_a_coderef
+        has_initializer   initializer
+        has_insertion_order insertion_order _set_insertion_order
+
+        definition_context
 
         slots
         get_value
         set_value
+        get_raw_value
+        set_raw_value
         set_initial_value
         has_value
         clear_value
 
         associated_class
-        attach_to_class detach_from_class
+        attach_to_class
+        detach_from_class
 
         accessor_metaclass
 
@@ -52,41 +58,63 @@ BEGIN {
         associate_method
 
         process_accessors
+        _process_accessors
         install_accessors
         remove_accessors
-        );
+
+        inline_get
+        inline_set
+        inline_has
+        inline_clear
+
+        _new
+    );
 
     is_deeply(
-        [ sort $meta->get_method_list ],
+        [
+            sort Class::MOP::Mixin::AttributeCore->meta->get_method_list,
+            $meta->get_method_list
+        ],
         [ sort @methods ],
-        '... our method list matches');
+        '... our method list matches'
+    );
 
     foreach my $method_name (@methods) {
-        ok($meta->has_method($method_name), '... Class::MOP::Attribute->has_method(' . $method_name . ')');
+        ok( $meta->find_method_by_name($method_name),
+            '... Class::MOP::Attribute->find_method_by_name(' . $method_name . ')' );
     }
 
     my @attributes = (
-        '$!name',
-        '$!accessor',
-        '$!reader',
-        '$!writer',
-        '$!predicate',
-        '$!clearer',
-        '$!builder',
-        '$!init_arg',
-        '$!initializer',
-        '$!default',
-        '$!associated_class',
-        '@!associated_methods',
+        'name',
+        'accessor',
+        'reader',
+        'writer',
+        'predicate',
+        'clearer',
+        'builder',
+        'init_arg',
+        'initializer',
+        'definition_context',
+        'default',
+        'associated_class',
+        'associated_methods',
+        'insertion_order',
     );
 
     is_deeply(
-        [ sort $meta->get_attribute_list ],
+        [
+            sort Class::MOP::Mixin::AttributeCore->meta->get_attribute_list,
+            $meta->get_attribute_list
+        ],
         [ sort @attributes ],
-        '... our attribute list matches');
+        '... our attribute list matches'
+    );
 
     foreach my $attribute_name (@attributes) {
-        ok($meta->has_attribute($attribute_name), '... Class::MOP::Attribute->has_attribute(' . $attribute_name . ')');
+        ok( $meta->find_attribute_by_name($attribute_name),
+                  '... Class::MOP::Attribute->find_attribute_by_name('
+                . $attribute_name
+                . ')' );
     }
 
     # We could add some tests here to make sure that
@@ -96,3 +124,5 @@ BEGIN {
     # wont worry about it for now. Maybe if I get
     # bored I will do it.
 }
+
+done_testing;