Merge branch 'stable'

[gitmo/Class-MOP.git] / t / 043_instance_metaclass_incompat.t

diff --git a/t/043_instance_metaclass_incompat.t b/t/043_instance_metaclass_incompat.t
index 3e64164..8439120 100644 (file)
--- a/t/043_instance_metaclass_incompat.t
+++ b/t/043_instance_metaclass_incompat.t
@@ -1,22 +1,18 @@
-#!/usr/bin/perl
-
 use strict;
 use warnings;
 
-use Test::More tests => 7;
+use Test::More;
 
-BEGIN {
-    use_ok('metaclass');    
-}
+use metaclass;
 
 # meta classes
-{   
+{
     package Foo::Meta::Instance;
-    use base 'Class::MOP::Instance';    
-    
+    use base 'Class::MOP::Instance';
+
     package Bar::Meta::Instance;
-    use base 'Class::MOP::Instance';    
-    
+    use base 'Class::MOP::Instance';
+
     package FooBar::Meta::Instance;
     use base 'Foo::Meta::Instance', 'Bar::Meta::Instance';
 }
@@ -47,7 +43,7 @@ $@ = undef;
 eval {
     package Bar::Bar;
     use base 'Bar';
-    metaclass->import('instance_metaclass' => 'Foo::Meta::Instance');    
+    metaclass->import('instance_metaclass' => 'Foo::Meta::Instance');
 };
 ok($@, '... Bar::Bar.meta => Foo::Meta is not compatible') || diag $@;
 
@@ -55,7 +51,7 @@ $@ = undef;
 eval {
     package FooBar;
     use base 'Foo';
-    metaclass->import('instance_metaclass' => 'FooBar::Meta::Instance');    
+    metaclass->import('instance_metaclass' => 'FooBar::Meta::Instance');
 };
 ok(!$@, '... FooBar.meta => FooBar::Meta is compatible') || diag $@;
 
@@ -63,8 +59,8 @@ $@ = undef;
 eval {
     package FooBar2;
     use base 'Bar';
-    metaclass->import('instance_metaclass' => 'FooBar::Meta::Instance');    
+    metaclass->import('instance_metaclass' => 'FooBar::Meta::Instance');
 };
 ok(!$@, '... FooBar2.meta => FooBar::Meta is compatible') || diag $@;
 
-
+done_testing;