Tidy code and remove unneeded module loads

[gitmo/Moose.git] / t / 010_basics / 002_require_superclasses.t

diff --git a/t/010_basics/002_require_superclasses.t b/t/010_basics/002_require_superclasses.t
index ced023f..04cbac7 100644 (file)
--- a/t/010_basics/002_require_superclasses.t
+++ b/t/010_basics/002_require_superclasses.t
@@ -5,42 +5,65 @@ use warnings;
 
 use lib 't/lib', 'lib';
 
-use Test::More tests => 6;
+use Test::More;
+use Test::Fatal;
 
-BEGIN {
-    use_ok('Moose');           
-}
 
 {
+
     package Bar;
     use Moose;
-    
-    eval { extends 'Foo'; };
-    ::ok(!$@, '... loaded Foo superclass correctly');
+
+    ::ok ! ::exception { extends 'Foo' }, 'loaded Foo superclass correctly';
 }
 
 {
+
     package Baz;
     use Moose;
-    
-    eval { extends 'Bar'; };
-    ::ok(!$@, '... loaded (inline) Bar superclass correctly');
+
+    ::ok ! ::exception { extends 'Bar' }, 'loaded (inline) Bar superclass correctly';
 }
 
 {
+
     package Foo::Bar;
     use Moose;
-    
-    eval { extends 'Foo', 'Bar'; };
-    ::ok(!$@, '... loaded Foo and (inline) Bar superclass correctly');
+
+    ::ok ! ::exception { extends 'Foo', 'Bar' },
+    'loaded Foo and (inline) Bar superclass correctly';
 }
 
 {
+
     package Bling;
     use Moose;
-    
-    eval { extends 'No::Class'; };
-    ::ok($@, '... could not find the superclass (as expected)');
-    ::like($@, qr/^Could not load class \(No\:\:Class\) because \:/, '... and got the error we expected');
+
+    ::like ::exception { extends 'No::Class' },
+    qr{Can't locate No/Class\.pm in \@INC},
+    'correct error when superclass could not be found';
+}
+
+{
+    package Affe;
+    our $VERSION = 23;
+}
+
+{
+    package Tiger;
+    use Moose;
+
+    ::ok ! ::exception { extends 'Foo', Affe => { -version => 13 } },
+    'extends with version requirement';
+}
+
+{
+    package Birne;
+    use Moose;
+
+    ::like ::exception { extends 'Foo', Affe => { -version => 42 } },
+    qr/Affe version 42 required--this is only version 23/,
+    'extends with unsatisfied version requirement';
 }
 
+done_testing;