From: Dave Rolsky Date: Sun, 5 Apr 2009 20:31:08 +0000 (-0500) Subject: Tidy this test file X-Git-Tag: 0.73_01~5^2~1 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=8b8fa50d4ffa47908130bb45fe6c5a78431c5f2a;p=gitmo%2FMoose.git Tidy this test file --- diff --git a/t/060_compat/003_foreign_inheritence.t b/t/060_compat/003_foreign_inheritence.t index d0acaa1..1086699 100644 --- a/t/060_compat/003_foreign_inheritence.t +++ b/t/060_compat/003_foreign_inheritence.t @@ -9,41 +9,44 @@ use Test::Exception; { - 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( 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'; package MyBase; @@ -65,21 +68,25 @@ use Test::Exception; use metaclass 'Custom::Meta2'; use Moose; - # XXX FIXME subclassing meta-attrs and immutable-ing the subclass fails + # 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 { - 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'; +} +'Can subclass the same non-Moose class twice with different metaclasses';