X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F021_attribute_errors_and_edge_cases.t;h=4de3ff029887a63c9348bbeb03f074a8cadb9b1c;hb=45a183fb2121b112e516532a4d72edb042966580;hp=7e948ab4e93ee8d6151b6a8aa2741ec958c8472a;hpb=88dd563c8b2edea359b8500535b8b46a8bbe6340;p=gitmo%2FClass-MOP.git

diff --git a/t/021_attribute_errors_and_edge_cases.t b/t/021_attribute_errors_and_edge_cases.t
index 7e948ab..4de3ff0 100644
--- a/t/021_attribute_errors_and_edge_cases.t
+++ b/t/021_attribute_errors_and_edge_cases.t
@@ -1,14 +1,10 @@
-#!/usr/bin/perl
-
 use strict;
 use warnings;
 
-use Test::More tests => 23;
+use Test::More tests => 27;
 use Test::Exception;
 
-BEGIN {
-    use_ok('Class::MOP');
-    use_ok('Class::MOP::Attribute');
+BEGIN {use Class::MOP;use Class::MOP::Attribute;
 }
 
 # most values are static
@@ -19,25 +15,25 @@ BEGIN {
             default => qr/hello (.*)/
         ));
     } '... no refs for defaults';
-    
+
     dies_ok {
         Class::MOP::Attribute->new('$test' => (
             default => []
         ));
-    } '... no refs for defaults';    
-    
+    } '... no refs for defaults';
+
     dies_ok {
         Class::MOP::Attribute->new('$test' => (
             default => {}
         ));
-    } '... no refs for defaults';    
-    
-    
+    } '... no refs for defaults';
+
+
     dies_ok {
         Class::MOP::Attribute->new('$test' => (
             default => \(my $var)
         ));
-    } '... no refs for defaults';    
+    } '... no refs for defaults';
 
     dies_ok {
         Class::MOP::Attribute->new('$test' => (
@@ -47,6 +43,47 @@ BEGIN {
 
 }
 
+{
+    dies_ok {
+        Class::MOP::Attribute->new('$test' => (
+            builder => qr/hello (.*)/
+        ));
+    } '... no refs for builders';
+
+    dies_ok {
+        Class::MOP::Attribute->new('$test' => (
+            builder => []
+        ));
+    } '... no refs for builders';
+
+    dies_ok {
+        Class::MOP::Attribute->new('$test' => (
+            builder => {}
+        ));
+    } '... no refs for builders';
+
+
+    dies_ok {
+        Class::MOP::Attribute->new('$test' => (
+            builder => \(my $var)
+        ));
+    } '... no refs for builders';
+
+    dies_ok {
+        Class::MOP::Attribute->new('$test' => (
+            builder => bless {} => 'Foo'
+        ));
+    } '... no refs for builders';
+
+    dies_ok {
+        Class::MOP::Attribute->new('$test' => (
+            builder => 'Foo', default => 'Foo'
+        ));
+    } '... no default AND builder';
+
+}
+
+
 { # bad construtor args
     dies_ok {
         Class::MOP::Attribute->new();
@@ -62,37 +99,37 @@ BEGIN {
 }
 
 {
-    my $attr = Class::MOP::Attribute->new('$test');    
+    my $attr = Class::MOP::Attribute->new('$test');
     dies_ok {
         $attr->attach_to_class();
     } '... attach_to_class died as expected';
-    
+
     dies_ok {
         $attr->attach_to_class('Fail');
-    } '... attach_to_class died as expected';    
-    
+    } '... attach_to_class died as expected';
+
     dies_ok {
         $attr->attach_to_class(bless {} => 'Fail');
-    } '... attach_to_class died as expected';    
+    } '... attach_to_class died as expected';
 }
 
 {
     my $attr = Class::MOP::Attribute->new('$test' => (
         reader => [ 'whoops, this wont work' ]
     ));
-    
+
     $attr->attach_to_class(Class::MOP::Class->initialize('Foo'));
 
     dies_ok {
         $attr->install_accessors;
-    } '... bad reader format';  
+    } '... bad reader format';
 }
 
 {
     my $attr = Class::MOP::Attribute->new('$test');
 
     dies_ok {
-        $attr->process_accessors('fail', 'my_failing_sub');
+        $attr->_process_accessors('fail', 'my_failing_sub');
     } '... cannot find "fail" type generator';
 }
 
@@ -107,38 +144,38 @@ BEGIN {
     my $attr = My::Attribute->new('$test' => (
         reader => 'test'
     ));
-    
+
     dies_ok {
         $attr->install_accessors;
-    } '... failed to generate accessors correctly';    
+    } '... failed to generate accessors correctly';
 }
 
 {
     my $attr = Class::MOP::Attribute->new('$test' => (
         predicate => 'has_test'
     ));
-    
+
     my $Bar = Class::MOP::Class->create('Bar');
     isa_ok($Bar, 'Class::MOP::Class');
-    
+
     $Bar->add_attribute($attr);
-    
+
     can_ok('Bar', 'has_test');
-    
-    is($attr, $Bar->remove_attribute('$test'), '... removed the $test attribute');    
-    
-    ok(!Bar->can('has_test'), '... Bar no longer has the "has_test" method');    
+
+    is($attr, $Bar->remove_attribute('$test'), '... removed the $test attribute');
+
+    ok(!Bar->can('has_test'), '... Bar no longer has the "has_test" method');
 }
 
 
 {
     # NOTE:
-    # the next three tests once tested that 
-    # the code would fail, but we lifted the 
-    # restriction so you can have an accessor 
-    # along with a reader/writer pair (I mean 
-    # why not really). So now they test that 
-    # it works, which is kinda silly, but it 
+    # the next three tests once tested that
+    # the code would fail, but we lifted the
+    # restriction so you can have an accessor
+    # along with a reader/writer pair (I mean
+    # why not really). So now they test that
+    # it works, which is kinda silly, but it
     # tests the API change, so I keep it.
 
     lives_ok {
@@ -158,7 +195,7 @@ BEGIN {
     lives_ok {
         Class::MOP::Attribute->new('$foo', (
             accessor => 'foo',
-            reader   => 'get_foo',        
+            reader   => 'get_foo',
             writer   => 'set_foo',
         ));
     } '... can create accessors with reader/writers';