X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F012_package_variables.t;h=bcf960ae6e9fec2fa6b45265690e278598130ba4;hb=871e9eb5d05b8b9986b2de3f4095f65a31159c56;hp=98d62cf99790c628f575e47e36a79611c4197f98;hpb=8371f3de4e9525ab751008dca4a89e6df65345a6;p=gitmo%2FClass-MOP.git

diff --git a/t/012_package_variables.t b/t/012_package_variables.t
index 98d62cf..bcf960a 100644
--- a/t/012_package_variables.t
+++ b/t/012_package_variables.t
@@ -2,7 +2,7 @@ use strict;
 use warnings;
 
 use Test::More;
-use Test::Exception;
+use Test::Fatal;
 
 use Class::MOP;
 
@@ -24,9 +24,9 @@ we call all the methods through Class::MOP::Class.
 ok(!defined($Foo::{foo}), '... the %foo slot has not been created yet');
 ok(!Foo->meta->has_package_symbol('%foo'), '... the meta agrees');
 
-lives_ok {
+is( exception {
     Foo->meta->add_package_symbol('%foo' => { one => 1 });
-} '... created %Foo::foo successfully';
+}, undef, '... created %Foo::foo successfully' );
 
 # ... scalar should NOT be created here
 
@@ -65,9 +65,9 @@ $foo->{two} = 2;
 
 ok(!defined($Foo::{bar}), '... the @bar slot has not been created yet');
 
-lives_ok {
+is( exception {
     Foo->meta->add_package_symbol('@bar' => [ 1, 2, 3 ]);
-} '... created @Foo::bar successfully';
+}, undef, '... created @Foo::bar successfully' );
 
 ok(defined($Foo::{bar}), '... the @bar slot was created successfully');
 ok(Foo->meta->has_package_symbol('@bar'), '... the meta agrees');
@@ -91,9 +91,9 @@ ok(!Foo->meta->has_package_symbol('&bar'), '... CODE shouldnt have been created
 
 ok(!defined($Foo::{baz}), '... the $baz slot has not been created yet');
 
-lives_ok {
+is( exception {
     Foo->meta->add_package_symbol('$baz' => 10);
-} '... created $Foo::baz successfully';
+}, undef, '... created $Foo::baz successfully' );
 
 ok(defined($Foo::{baz}), '... the $baz slot was created successfully');
 ok(Foo->meta->has_package_symbol('$baz'), '... the meta agrees');
@@ -117,9 +117,9 @@ is(${Foo->meta->get_package_symbol('$baz')}, 10, '... got the right value back')
 
 ok(!defined($Foo::{funk}), '... the &funk slot has not been created yet');
 
-lives_ok {
+is( exception {
     Foo->meta->add_package_symbol('&funk' => sub { "Foo::funk" });
-} '... created &Foo::funk successfully';
+}, undef, '... created &Foo::funk successfully' );
 
 ok(defined($Foo::{funk}), '... the &funk slot was created successfully');
 ok(Foo->meta->has_package_symbol('&funk'), '... the meta agrees');
@@ -141,23 +141,23 @@ is(Foo->funk(), 'Foo::funk', '... got the right value from the function');
 my $ARRAY = [ 1, 2, 3 ];
 my $CODE = sub { "Foo::foo" };
 
-lives_ok {
+is( exception {
     Foo->meta->add_package_symbol('@foo' => $ARRAY);
-} '... created @Foo::foo successfully';
+}, undef, '... created @Foo::foo successfully' );
 
 ok(Foo->meta->has_package_symbol('@foo'), '... the @foo slot was added successfully');
 is(Foo->meta->get_package_symbol('@foo'), $ARRAY, '... got the right values for @Foo::foo');
 
-lives_ok {
+is( exception {
     Foo->meta->add_package_symbol('&foo' => $CODE);
-} '... created &Foo::foo successfully';
+}, undef, '... created &Foo::foo successfully' );
 
 ok(Foo->meta->has_package_symbol('&foo'), '... the meta agrees');
 is(Foo->meta->get_package_symbol('&foo'), $CODE, '... got the right value for &Foo::foo');
 
-lives_ok {
+is( exception {
     Foo->meta->add_package_symbol('$foo' => 'Foo::foo');
-} '... created $Foo::foo successfully';
+}, undef, '... created $Foo::foo successfully' );
 
 ok(Foo->meta->has_package_symbol('$foo'), '... the meta agrees');
 my $SCALAR = Foo->meta->get_package_symbol('$foo');
@@ -168,9 +168,9 @@ is($$SCALAR, 'Foo::foo', '... got the right scalar value back');
     is(${'Foo::foo'}, 'Foo::foo', '... got the right value from the scalar');
 }
 
-lives_ok {
+is( exception {
     Foo->meta->remove_package_symbol('%foo');
-} '... removed %Foo::foo successfully';
+}, undef, '... removed %Foo::foo successfully' );
 
 ok(!Foo->meta->has_package_symbol('%foo'), '... the %foo slot was removed successfully');
 ok(Foo->meta->has_package_symbol('@foo'), '... the @foo slot still exists');
@@ -189,9 +189,9 @@ is(Foo->meta->get_package_symbol('$foo'), $SCALAR, '... got the right value for
     ok(defined(${"Foo::foo"}), '... the $foo slot has NOT been removed');
 }
 
-lives_ok {
+is( exception {
     Foo->meta->remove_package_symbol('&foo');
-} '... removed &Foo::foo successfully';
+}, undef, '... removed &Foo::foo successfully' );
 
 ok(!Foo->meta->has_package_symbol('&foo'), '... the &foo slot no longer exists');
 
@@ -209,9 +209,9 @@ is(Foo->meta->get_package_symbol('$foo'), $SCALAR, '... got the right value for
     ok(defined(${"Foo::foo"}), '... the $foo slot has NOT been removed');
 }
 
-lives_ok {
+is( exception {
     Foo->meta->remove_package_symbol('$foo');
-} '... removed $Foo::foo successfully';
+}, undef, '... removed $Foo::foo successfully' );
 
 ok(!Foo->meta->has_package_symbol('$foo'), '... the $foo slot no longer exists');