X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F060_compat%2F003_foreign_inheritence.t;h=0fdcb9b4563246cc8d8d7c4ed171116ceef801a5;hb=4df593bbb0e8e5cc30f3a3af0903916d74c0c030;hp=335d892e751f7d8be9d2b07ef9b9c6691070f007;hpb=e59a5c292a333cac504b65ebd4bba20b5e98d796;p=gitmo%2FMoose.git

diff --git a/t/060_compat/003_foreign_inheritence.t b/t/060_compat/003_foreign_inheritence.t
index 335d892..0fdcb9b 100644
--- a/t/060_compat/003_foreign_inheritence.t
+++ b/t/060_compat/003_foreign_inheritence.t
@@ -3,61 +3,90 @@
 use strict;
 use warnings;
 
-use Test::More tests => 5; #6;
+use Test::More;
 use Test::Exception;
 
-BEGIN {
-    use_ok('Moose');           
-}
 
 {
-	package Elk;
-	use strict;
-	use warnings;
-	
-	sub new {
-		my $class = shift;
-		bless { no_moose => "Elk" } => $class;
-	}
-	
-	sub no_moose { $_[0]->{no_moose} }
-
-	package Foo::Moose;	
-	use Moose;
-	
-	extends 'Elk';
-	
-	has 'moose' => (is => 'ro', default => 'Foo');
-	
-	sub new {
-		my $class = shift;
-		my $super = $class->SUPER::new(@_);
-		return $class->meta->new_object('__INSTANCE__' => $super, @_);
-	}
-	
-	__PACKAGE__->meta->make_immutable(debug => 0);
+
+    package Elk;
+    use strict;
+    use warnings;
+
+    sub new {
+        my $class = shift;
+        bless { no_moose => "Elk" } => $class;
+    }
+
+    sub no_moose { $_[0]->{no_moose} }
+
+    package Foo::Moose;
+    use Moose;
+
+    extends 'Elk';
+
+    has 'moose' => ( is => 'ro', default => 'Foo' );
+
+    sub new {
+        my $class = shift;
+        my $super = $class->SUPER::new(@_);
+        return $class->meta->new_object( '__INSTANCE__' => $super, @_ );
+    }
+
+    __PACKAGE__->meta->make_immutable( inline_constructor => 0, debug => 0 );
 
     package Bucket;
     use metaclass 'Class::MOP::Class';
-    
-    __PACKAGE__->meta->add_attribute('squeegee' => (accessor => 'squeegee'));
-    
+
+    __PACKAGE__->meta->add_attribute(
+        'squeegee' => ( accessor => 'squeegee' ) );
+
     package Old::Bucket::Nose;
+
     # see http://www.moosefoundation.org/moose_facts.htm
     use Moose;
-    
+
     extends 'Bucket';
 
-  # XXX FIXME subclassing meta-attrs and immutable-ing the subclass fails
+    package MyBase;
+    sub foo { }
+
+    package Custom::Meta1;
+    use base qw(Moose::Meta::Class);
+
+    package Custom::Meta2;
+    use base qw(Moose::Meta::Class);
+
+    package SubClass1;
+    use metaclass 'Custom::Meta1';
+    use Moose;
+
+    extends 'MyBase';
+
+    package SubClass2;
+    use metaclass 'Custom::Meta2';
+    use Moose;
+
+    # XXX FIXME subclassing meta-attrs and immutable-ing the subclass fails
 }
 
 my $foo_moose = Foo::Moose->new();
-isa_ok($foo_moose, 'Foo::Moose');
-isa_ok($foo_moose, 'Elk');
+isa_ok( $foo_moose, 'Foo::Moose' );
+isa_ok( $foo_moose, 'Elk' );
+
+is( $foo_moose->no_moose, 'Elk',
+    '... got the right value from the Elk method' );
+is( $foo_moose->moose, 'Foo',
+    '... got the right value from the Foo::Moose method' );
 
-is($foo_moose->no_moose, 'Elk', '... got the right value from the Elk method');
-is($foo_moose->moose, 'Foo', '... got the right value from the Foo::Moose method');
+lives_ok {
+    Old::Bucket::Nose->meta->make_immutable( debug => 0 );
+}
+'Immutability on Moose class extending Class::MOP class ok';
+
+lives_ok {
+    SubClass2->meta->superclasses('MyBase');
+}
+'Can subclass the same non-Moose class twice with different metaclasses';
 
-#lives_ok { 
-#    Old::Bucket::Nose->meta->make_immutable(debug => 0); 
-#} 'Immutability on Moose class extending Class::MOP class ok';
+done_testing;