Moose::Meta::Role no longer uses subname

[gitmo/Moose.git] / t / 040_type_constraints / 022_custom_type_errors.t

diff --git a/t/040_type_constraints/022_custom_type_errors.t b/t/040_type_constraints/022_custom_type_errors.t
index 6970806..c3599b4 100644 (file)
--- a/t/040_type_constraints/022_custom_type_errors.t
+++ b/t/040_type_constraints/022_custom_type_errors.t
@@ -3,16 +3,13 @@
 use strict;
 use warnings;
 
-use Test::More tests => 10;
+use Test::More tests => 9;
 use Test::Exception;
 
 {
     package Animal;
     use Moose;
-
-    BEGIN {
-        ::use_ok("Moose::Util::TypeConstraints");
-    }
+    use Moose::Util::TypeConstraints;
 
     subtype 'Natural' => as 'Int' => where { $_ > 0 } =>
         message {"This number ($_) is not a positive integer!"};
@@ -35,11 +32,11 @@ lives_ok { my $spider = Animal->new( leg_count => 8 ) }
 
 throws_ok { my $fern = Animal->new( leg_count => 0 ) }
 qr/This number \(0\) is not less than ten!/,
-    "gave custom supertype error message on new";
+    'gave custom supertype error message on new';
 
 throws_ok { my $centipede = Animal->new( leg_count => 30 ) }
 qr/This number \(30\) is not less than ten!/,
-    "gave custom subtype error message on new";
+    'gave custom subtype error message on new';
 
 my $chimera;
 lives_ok { $chimera = Animal->new( leg_count => 4 ) }
@@ -47,15 +44,16 @@ lives_ok { $chimera = Animal->new( leg_count => 4 ) }
 
 throws_ok { $chimera->leg_count(0) }
 qr/This number \(0\) is not less than ten!/,
-    "gave custom supertype error message on set_value";
+    'gave custom supertype error message on set to 0';
 
 throws_ok { $chimera->leg_count(16) }
 qr/This number \(16\) is not less than ten!/,
-    "gave custom subtype error message on set_value";
+    'gave custom subtype error message on set to 16';
+
+my $gimp = eval { Animal->new() };
+is( $@, '', '... no errors thrown, value is good' );
 
-my $gimp;
-lives_ok { my $gimp = Animal->new() } '... no errors thrown, value is good';
 throws_ok { $gimp->leg_count }
 qr/This number \(0\) is not less than ten!/,
-    "gave custom supertype error message on set_value";
+    'gave custom supertype error message on lazy set to 0';