1 files changed, 27 insertions, 43 deletions

diff --git a/t/24-nonmoose-moose-nonmoose.t b/t/24-nonmoose-moose-nonmoose.t
index ef0ce88..b9ae100 100644
--- a/t/24-nonmoose-moose-nonmoose.t
+++ b/t/24-nonmoose-moose-nonmoose.t
@@ -2,6 +2,7 @@
 use strict;
 use warnings;
 use Test::More tests => 32;
+use Test::Moose;
 
 package Foo;
 
@@ -54,46 +55,29 @@ package Bar::Moose::Sub;
 use base 'Bar::Moose';
 
 package main;
-my $foo = Foo::Moose::Sub->new(name => 'foomoosesub', foo2 => 'FOO2');
-isa_ok($foo, 'Foo');
-isa_ok($foo, 'Foo::Moose');
-is($foo->foo, 'foomoosesub', 'got name from nonmoose constructor');
-is($foo->foo2, 'FOO2', 'got attribute value from moose constructor');
-$foo = Foo::Moose->new(name => 'foomoosesub', foo2 => 'FOO2');
-isa_ok($foo, 'Foo');
-isa_ok($foo, 'Foo::Moose');
-is($foo->foo, 'foomoosesub', 'got name from nonmoose constructor');
-is($foo->foo2, 'FOO2', 'got attribute value from moose constructor');
-Foo::Moose->meta->make_immutable;
-$foo = Foo::Moose::Sub->new(name => 'foomoosesub', foo2 => 'FOO2');
-isa_ok($foo, 'Foo');
-isa_ok($foo, 'Foo::Moose');
-is($foo->foo, 'foomoosesub', 'got name from nonmoose constructor (immutable)');
-is($foo->foo2, 'FOO2', 'got attribute value from moose constructor (immutable)');
-$foo = Foo::Moose->new(name => 'foomoosesub', foo2 => 'FOO2');
-isa_ok($foo, 'Foo');
-isa_ok($foo, 'Foo::Moose');
-is($foo->foo, 'foomoosesub', 'got name from nonmoose constructor (immutable)');
-is($foo->foo2, 'FOO2', 'got attribute value from moose constructor (immutable)');
-
-my $bar = Bar::Moose::Sub->new(name => 'barmoosesub', bar2 => 'BAR2');
-isa_ok($bar, 'Bar');
-isa_ok($bar, 'Bar::Moose');
-is($bar->bar, 'barmoosesub', 'got name from nonmoose constructor');
-is($bar->bar2, 'BAR2', 'got attribute value from moose constructor');
-$bar = Bar::Moose->new(name => 'barmoosesub', bar2 => 'BAR2');
-isa_ok($bar, 'Bar');
-isa_ok($bar, 'Bar::Moose');
-is($bar->bar, 'barmoosesub', 'got name from nonmoose constructor');
-is($bar->bar2, 'BAR2', 'got attribute value from moose constructor');
-Bar::Moose->meta->make_immutable;
-$bar = Bar::Moose::Sub->new(name => 'barmoosesub', bar2 => 'BAR2');
-isa_ok($bar, 'Bar');
-isa_ok($bar, 'Bar::Moose');
-is($bar->bar, 'barmoosesub', 'got name from nonmoose constructor (immutable)');
-is($bar->bar2, 'BAR2', 'got attribute value from moose constructor (immutable)');
-$bar = Bar::Moose->new(name => 'barmoosesub', bar2 => 'BAR2');
-isa_ok($bar, 'Bar');
-isa_ok($bar, 'Bar::Moose');
-is($bar->bar, 'barmoosesub', 'got name from nonmoose constructor (immutable)');
-is($bar->bar2, 'BAR2', 'got attribute value from moose constructor (immutable)');
+
+with_immutable {
+    my $foo = Foo::Moose::Sub->new(name => 'foomoosesub', foo2 => 'FOO2');
+    isa_ok($foo, 'Foo');
+    isa_ok($foo, 'Foo::Moose');
+    is($foo->foo, 'foomoosesub', 'got name from nonmoose constructor');
+    is($foo->foo2, 'FOO2', 'got attribute value from moose constructor');
+    $foo = Foo::Moose->new(name => 'foomoosesub', foo2 => 'FOO2');
+    isa_ok($foo, 'Foo');
+    isa_ok($foo, 'Foo::Moose');
+    is($foo->foo, 'foomoosesub', 'got name from nonmoose constructor');
+    is($foo->foo2, 'FOO2', 'got attribute value from moose constructor');
+} 'Foo::Moose';
+
+with_immutable {
+    my $bar = Bar::Moose::Sub->new(name => 'barmoosesub', bar2 => 'BAR2');
+    isa_ok($bar, 'Bar');
+    isa_ok($bar, 'Bar::Moose');
+    is($bar->bar, 'barmoosesub', 'got name from nonmoose constructor');
+    is($bar->bar2, 'BAR2', 'got attribute value from moose constructor');
+    $bar = Bar::Moose->new(name => 'barmoosesub', bar2 => 'BAR2');
+    isa_ok($bar, 'Bar');
+    isa_ok($bar, 'Bar::Moose');
+    is($bar->bar, 'barmoosesub', 'got name from nonmoose constructor');
+    is($bar->bar2, 'BAR2', 'got attribute value from moose constructor');
+} 'Bar::Moose';