simplify more stuff

[gitmo/Class-MOP.git] / t / 024_attribute_initializer.t

diff --git a/t/024_attribute_initializer.t b/t/024_attribute_initializer.t
index 76e5834..c61c7cb 100644 (file)
--- a/t/024_attribute_initializer.t
+++ b/t/024_attribute_initializer.t
@@ -1,15 +1,11 @@
-#!/usr/bin/perl
-
 use strict;
 use warnings;
 
 use Scalar::Util 'blessed', 'reftype';
 
-use Test::More tests => 4;
+use Test::More;
 
-BEGIN {
-    use_ok('Class::MOP');
-}
+use Class::MOP;
 
 =pod
 
@@ -20,24 +16,37 @@ This checks that the initializer is used to set the initial value.
 {
     package Foo;
     use metaclass;
-    
-    Foo->meta->add_attribute('bar' => 
-        reader => 'get_bar',
-        writer => 'set_bar',
+
+    Foo->meta->add_attribute('bar' =>
+        reader      => 'get_bar',
+        writer      => 'set_bar',
         initializer => sub {
-          my ($self, $value, $callback) = @_;
-          $callback->($value * 2);
+            my ($self, $value, $callback, $attr) = @_;
+
+            ::isa_ok($attr, 'Class::MOP::Attribute');
+            ::is($attr->name, 'bar', '... the attribute is our own');
+
+            $callback->($value * 2);
         },
-    );  
+    );
 }
 
 can_ok('Foo', 'get_bar');
-can_ok('Foo', 'set_bar');    
+can_ok('Foo', 'set_bar');
+
+my $foo = Foo->meta->new_object(bar => 10);
+is($foo->get_bar, 20, "... initial argument was doubled as expected");
+
+$foo->set_bar(30);
+
+is($foo->get_bar, 30, "... and setter works correctly");
+
+# meta tests ...
+
+my $bar = Foo->meta->get_attribute('bar');
+isa_ok($bar, 'Class::MOP::Attribute');
 
-my $foo = Foo->meta->construct_instance(bar => 10);
-is(
-  $foo->get_bar,
-  20,
-  "initial argument was doubled as expected",
-);
+ok($bar->has_initializer, '... bar has an initializer');
+is(reftype $bar->initializer, 'CODE', '... the initializer is a CODE ref');
 
+done_testing;