X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F010_basics%2F002_require_superclasses.t;h=ad09165db571059bef8b135db001483b8293a83c;hb=53a4d826caec4b82f5b23e0bc0a4e8e2f44243b9;hp=28b52e0aa9c8e120fdbd4eed677c07932e582a8e;hpb=7ff5653479c2bfc0794635f7fbade9bfe7bb2381;p=gitmo%2FMoose.git

diff --git a/t/010_basics/002_require_superclasses.t b/t/010_basics/002_require_superclasses.t
index 28b52e0..ad09165 100644
--- a/t/010_basics/002_require_superclasses.t
+++ b/t/010_basics/002_require_superclasses.t
@@ -5,40 +5,65 @@ use warnings;
 
 use lib 't/lib', 'lib';
 
-use Test::More tests => 5;
-
+use Test::More;
+use Test::Exception;
 
 
 {
+
     package Bar;
     use Moose;
-    
-    eval { extends 'Foo'; };
-    ::ok(!$@, '... loaded Foo superclass correctly');
+
+    ::lives_ok { extends 'Foo' } 'loaded Foo superclass correctly';
 }
 
 {
+
     package Baz;
     use Moose;
-    
-    eval { extends 'Bar'; };
-    ::ok(!$@, '... loaded (inline) Bar superclass correctly');
+
+    ::lives_ok { extends 'Bar' } 'loaded (inline) Bar superclass correctly';
 }
 
 {
+
     package Foo::Bar;
     use Moose;
-    
-    eval { extends 'Foo', 'Bar'; };
-    ::ok(!$@, '... loaded Foo and (inline) Bar superclass correctly');
+
+    ::lives_ok { 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');
+
+    ::throws_ok { 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;
+
+    ::lives_ok { extends 'Foo', Affe => { -version => 13 } }
+    'extends with version requirement';
+}
+
+{
+    package Birne;
+    use Moose;
+
+    ::throws_ok { extends 'Foo', Affe => { -version => 42 } }
+    qr/Affe version 42 required--this is only version 23/,
+    'extends with unsatisfied version requirement';
 }
 
+done_testing;