X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F020_attribute.t;h=f23a4346e41448ee13ce434e9f830b6abb0df062;hb=5e5102f19ccb1dc52b290577b0363e97dacbd5b3;hp=4dfbc2ed7f13e2821d04c72aa6f83eb6fe72589a;hpb=988fb42e6098c592d1bf64e4c497434417b39d97;p=gitmo%2FClass-MOP.git

diff --git a/t/020_attribute.t b/t/020_attribute.t
index 4dfbc2e..f23a434 100644
--- a/t/020_attribute.t
+++ b/t/020_attribute.t
@@ -1,18 +1,17 @@
-#!/usr/bin/perl
-
 use strict;
 use warnings;
 
 use Scalar::Util 'reftype', 'blessed';
 
-use Test::More tests => 100;
-use Test::Exception;
+use Test::More;
+use Test::Fatal;
 
 use Class::MOP;
 use Class::MOP::Attribute;
+use Class::MOP::Method;
 
 
-dies_ok { Class::MOP::Attribute->name } q{... can't call name() as a class method};
+isnt( exception { Class::MOP::Attribute->name }, undef, q{... can't call name() as a class method} );
 
 
 {
@@ -31,36 +30,36 @@ dies_ok { Class::MOP::Attribute->name } q{... can't call name() as a class metho
 
     {
         my $reader = $attr->get_read_method_ref;
-        my $writer = $attr->get_write_method_ref;        
-        
+        my $writer = $attr->get_write_method_ref;
+
         ok(!blessed($reader), '... it is a plain old sub');
-        ok(!blessed($writer), '... it is a plain old sub');        
-        
+        ok(!blessed($writer), '... it is a plain old sub');
+
         is(reftype($reader), 'CODE', '... it is a plain old sub');
-        is(reftype($writer), 'CODE', '... it is a plain old sub');                
+        is(reftype($writer), 'CODE', '... it is a plain old sub');
     }
 
     my $class = Class::MOP::Class->initialize('Foo');
     isa_ok($class, 'Class::MOP::Class');
 
-    lives_ok {
+    is( exception {
         $attr->attach_to_class($class);
-    } '... attached a class successfully';
+    }, undef, '... attached a class successfully' );
 
     is($attr->associated_class, $class, '... the class was associated correctly');
-    
+
     ok(!$attr->get_read_method, '... $attr does not have an read method');
-    ok(!$attr->get_write_method, '... $attr does not have an write method');    
-    
+    ok(!$attr->get_write_method, '... $attr does not have an write method');
+
     {
         my $reader = $attr->get_read_method_ref;
-        my $writer = $attr->get_write_method_ref;        
-        
+        my $writer = $attr->get_write_method_ref;
+
         ok(blessed($reader), '... it is a plain old sub');
-        ok(blessed($writer), '... it is a plain old sub');        
-        
+        ok(blessed($writer), '... it is a plain old sub');
+
         isa_ok($reader, 'Class::MOP::Method');
-        isa_ok($writer, 'Class::MOP::Method');        
+        isa_ok($writer, 'Class::MOP::Method');
     }
 
     my $attr_clone = $attr->clone();
@@ -92,20 +91,20 @@ dies_ok { Class::MOP::Attribute->name } q{... can't call name() as a class metho
     ok(!$attr->has_accessor, '... $attr does not have an accessor');
     ok(!$attr->has_reader, '... $attr does not have an reader');
     ok(!$attr->has_writer, '... $attr does not have an writer');
-    
+
     ok(!$attr->get_read_method, '... $attr does not have an read method');
-    ok(!$attr->get_write_method, '... $attr does not have an write method');    
-    
+    ok(!$attr->get_write_method, '... $attr does not have an write method');
+
     {
         my $reader = $attr->get_read_method_ref;
-        my $writer = $attr->get_write_method_ref;        
-        
+        my $writer = $attr->get_write_method_ref;
+
         ok(!blessed($reader), '... it is a plain old sub');
-        ok(!blessed($writer), '... it is a plain old sub');        
-        
+        ok(!blessed($writer), '... it is a plain old sub');
+
         is(reftype($reader), 'CODE', '... it is a plain old sub');
-        is(reftype($writer), 'CODE', '... it is a plain old sub');                
-    }    
+        is(reftype($writer), 'CODE', '... it is a plain old sub');
+    }
 
     my $attr_clone = $attr->clone();
     isa_ok($attr_clone, 'Class::MOP::Attribute');
@@ -138,20 +137,20 @@ dies_ok { Class::MOP::Attribute->name } q{... can't call name() as a class metho
 
     ok(!$attr->has_reader, '... $attr does not have an reader');
     ok(!$attr->has_writer, '... $attr does not have an writer');
-    
+
     is($attr->get_read_method,  'foo', '... $attr does not have an read method');
-    is($attr->get_write_method, 'foo', '... $attr does not have an write method');    
-    
+    is($attr->get_write_method, 'foo', '... $attr does not have an write method');
+
     {
         my $reader = $attr->get_read_method_ref;
-        my $writer = $attr->get_write_method_ref;        
-        
+        my $writer = $attr->get_write_method_ref;
+
         ok(!blessed($reader), '... it is not a plain old sub');
-        ok(!blessed($writer), '... it is not a plain old sub');         
-        
+        ok(!blessed($writer), '... it is not a plain old sub');
+
         is(reftype($reader), 'CODE', '... it is a plain old sub');
-        is(reftype($writer), 'CODE', '... it is a plain old sub');                
-    }    
+        is(reftype($writer), 'CODE', '... it is a plain old sub');
+    }
 
     my $attr_clone = $attr->clone();
     isa_ok($attr_clone, 'Class::MOP::Attribute');
@@ -182,20 +181,20 @@ dies_ok { Class::MOP::Attribute->name } q{... can't call name() as a class metho
     is($attr->writer, 'set_foo', '... $attr->writer == set_foo');
 
     ok(!$attr->has_accessor, '... $attr does not have an accessor');
-    
+
     is($attr->get_read_method,  'get_foo', '... $attr does not have an read method');
-    is($attr->get_write_method, 'set_foo', '... $attr does not have an write method');    
-    
+    is($attr->get_write_method, 'set_foo', '... $attr does not have an write method');
+
     {
         my $reader = $attr->get_read_method_ref;
-        my $writer = $attr->get_write_method_ref;        
-        
+        my $writer = $attr->get_write_method_ref;
+
         ok(!blessed($reader), '... it is not a plain old sub');
-        ok(!blessed($writer), '... it is not a plain old sub');           
-        
+        ok(!blessed($writer), '... it is not a plain old sub');
+
         is(reftype($reader), 'CODE', '... it is a plain old sub');
-        is(reftype($writer), 'CODE', '... it is a plain old sub');                
-    }    
+        is(reftype($writer), 'CODE', '... it is a plain old sub');
+    }
 
     my $attr_clone = $attr->clone();
     isa_ok($attr_clone, 'Class::MOP::Attribute');
@@ -227,3 +226,23 @@ dies_ok { Class::MOP::Attribute->name } q{... can't call name() as a class metho
     is($attr->builder, 'foo_builder', '... $attr->builder == foo_builder');
 
 }
+
+{
+    for my $value ({}, bless({}, 'Foo')) {
+        like( exception {
+            Class::MOP::Attribute->new('$foo', default => $value);
+        }, qr/References are not allowed as default values/ );
+    }
+}
+
+{
+    my $attr;
+    is( exception {
+        my $meth = Class::MOP::Method->wrap(sub {shift}, name => 'foo', package_name => 'bar');
+        $attr = Class::MOP::Attribute->new('$foo', default => $meth);
+    }, undef, 'Class::MOP::Methods accepted as default' );
+
+    is($attr->default(42), 42, 'passthrough for default on attribute');
+}
+
+done_testing;