X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F005_attributes.t;h=b7a545b95cab5def8bd16d0477846ac549136739;hb=d83eddd0c97e4828272ea7a174731437ac36ebf1;hp=62d54f43e1ba58f2a3921eee8e2e9c2f0e1c933e;hpb=8768ecf37fedca893e89bc7d2b914f75b04b9361;p=gitmo%2FClass-MOP.git

diff --git a/t/005_attributes.t b/t/005_attributes.t
index 62d54f4..b7a545b 100644
--- a/t/005_attributes.t
+++ b/t/005_attributes.t
@@ -1,14 +1,10 @@
-#!/usr/bin/perl
-
 use strict;
 use warnings;
 
-use Test::More tests => 71;
+use Test::More tests => 90;
 use Test::Exception;
 
-BEGIN {
-    use_ok('Class::MOP');
-}
+use Class::MOP;
 
 my $FOO_ATTR = Class::MOP::Attribute->new('$foo');
 my $BAR_ATTR = Class::MOP::Attribute->new('$bar' => (
@@ -92,6 +88,23 @@ is($BAZ_ATTR->name, '$baz', '... got the attributes name correctly');
 }
 
 {
+    package Foo2;
+    use metaclass;
+
+    my $meta = Foo2->meta;
+    $meta->add_attribute(
+        Class::MOP::Attribute->new( '$foo2' => ( reader => 'foo2' ) ) );
+
+    ::ok( $meta->has_method('foo2'), '... a reader has been created' );
+
+    my $attr = $meta->get_attribute('$foo2');
+    ::is( $attr->get_read_method, 'foo2',
+        '... got the right read method for Foo2' );
+    ::is( $attr->get_write_method, undef,
+        '... got undef for the writer with a read-only attribute in Foo2' );
+}
+
+{
     my $meta = Baz->meta;
     isa_ok($meta, 'Class::MOP::Class');
 
@@ -100,7 +113,7 @@ is($BAZ_ATTR->name, '$baz', '... got the attributes name correctly');
     is($meta->find_attribute_by_name('$foo'), $FOO_ATTR, '... got the right attribute for "foo"');
 
     is_deeply(
-        [ sort { $a->name cmp $b->name } $meta->compute_all_applicable_attributes() ],
+        [ sort { $a->name cmp $b->name } $meta->get_all_attributes() ],
         [
             $BAR_ATTR,
             $BAZ_ATTR,
@@ -109,7 +122,7 @@ is($BAZ_ATTR->name, '$baz', '... got the attributes name correctly');
         '... got the right list of applicable attributes for Baz');
 
     is_deeply(
-        [ map { $_->associated_class } sort { $a->name cmp $b->name } $meta->compute_all_applicable_attributes() ],
+        [ map { $_->associated_class } sort { $a->name cmp $b->name } $meta->get_all_attributes() ],
         [ Bar->meta, Baz->meta, Foo->meta ],
         '... got the right list of associated classes from the applicable attributes for Baz');
 
@@ -126,7 +139,7 @@ is($BAZ_ATTR->name, '$baz', '... got the attributes name correctly');
     ok(!$meta->has_method('set_baz'), '... a writer has been removed');
 
     is_deeply(
-        [ sort { $a->name cmp $b->name } $meta->compute_all_applicable_attributes() ],
+        [ sort { $a->name cmp $b->name } $meta->get_all_attributes() ],
         [
             $BAR_ATTR,
             $FOO_ATTR,
@@ -134,7 +147,7 @@ is($BAZ_ATTR->name, '$baz', '... got the attributes name correctly');
         '... got the right list of applicable attributes for Baz');
 
     is_deeply(
-        [ map { $_->associated_class } sort { $a->name cmp $b->name } $meta->compute_all_applicable_attributes() ],
+        [ map { $_->associated_class } sort { $a->name cmp $b->name } $meta->get_all_attributes() ],
         [ Bar->meta, Foo->meta ],
         '... got the right list of associated classes from the applicable attributes for Baz');
 
@@ -151,7 +164,7 @@ is($BAZ_ATTR->name, '$baz', '... got the attributes name correctly');
      }
 
      is_deeply(
-         [ sort { $a->name cmp $b->name } $meta->compute_all_applicable_attributes() ],
+         [ sort { $a->name cmp $b->name } $meta->get_all_attributes() ],
          [
              $BAR_ATTR_2,
              $FOO_ATTR,
@@ -159,7 +172,7 @@ is($BAZ_ATTR->name, '$baz', '... got the attributes name correctly');
          '... got the right list of applicable attributes for Baz');
 
      is_deeply(
-         [ map { $_->associated_class } sort { $a->name cmp $b->name } $meta->compute_all_applicable_attributes() ],
+         [ map { $_->associated_class } sort { $a->name cmp $b->name } $meta->get_all_attributes() ],
          [ Foo->meta, Foo->meta ],
          '... got the right list of associated classes from the applicable attributes for Baz');
 
@@ -212,7 +225,9 @@ is($BAZ_ATTR->name, '$baz', '... got the attributes name correctly');
     } '... we added a method to Buzz successfully';
 }
 
-{
+
+
+for(1 .. 2){
   my $buzz;
   ::lives_ok { $buzz = Buzz->meta->new_object } '...Buzz instantiated successfully';
   ::is($buzz->foo, 'Buzz', '...foo builder works as expected');
@@ -231,17 +246,15 @@ is($BAZ_ATTR->name, '$baz', '... got the attributes name correctly');
   ::ok($buzz2->has_bar, '...bar is set');
   ::is($buzz2->bar, undef, '...bar is undef');
 
-}
+  my $buzz3;
+  ::lives_ok { $buzz3 = Buzz->meta->new_object } '...Buzz instantiated successfully';
+  ::ok($buzz3->has_bah, '...bah is set');
+  ::is($buzz3->bah, 'BAH', '...bah returns "BAH" ');
 
-{
-  my $buzz;
-  ::lives_ok { $buzz = Buzz->meta->new_object } '...Buzz instantiated successfully';
-  ::ok($buzz->has_bah, '...bah is set');
-  ::is($buzz->bah, 'BAH', '...bah returns "BAH" ');
-
-  my $buzz2;
-  ::lives_ok { $buzz2 = Buzz->meta->new_object('$bah' => undef) } '...Buzz instantiated successfully';
-  ::ok($buzz2->has_bah, '...bah is set');
-  ::is($buzz2->bah, undef, '...bah is undef');
+  my $buzz4;
+  ::lives_ok { $buzz4 = Buzz->meta->new_object('$bah' => undef) } '...Buzz instantiated successfully';
+  ::ok($buzz4->has_bah, '...bah is set');
+  ::is($buzz4->bah, undef, '...bah is undef');
 
+  Buzz->meta->make_immutable();
 }