X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F016_class_errors_and_edge_cases.t;h=36a1ac470cd81f27ba29dd297e74ba1a5afd78aa;hb=871e9eb5d05b8b9986b2de3f4095f65a31159c56;hp=18429c51955d28df32b4b6c4de2a4a25e897fdf2;hpb=86a4d8730cfe673db674c692f7703632b700c7c9;p=gitmo%2FClass-MOP.git

diff --git a/t/016_class_errors_and_edge_cases.t b/t/016_class_errors_and_edge_cases.t
index 18429c5..36a1ac4 100644
--- a/t/016_class_errors_and_edge_cases.t
+++ b/t/016_class_errors_and_edge_cases.t
@@ -2,175 +2,175 @@ use strict;
 use warnings;
 
 use Test::More;
-use Test::Exception;
+use Test::Fatal;
 
 use Class::MOP;
 
 {
-    dies_ok {
+    isnt( exception {
         Class::MOP::Class->initialize();
-    } '... initialize requires a name parameter';
+    }, undef, '... initialize requires a name parameter' );
 
-    dies_ok {
+    isnt( exception {
         Class::MOP::Class->initialize('');
-    } '... initialize requires a name valid parameter';
+    }, undef, '... initialize requires a name valid parameter' );
 
-    dies_ok {
+    isnt( exception {
         Class::MOP::Class->initialize(bless {} => 'Foo');
-    } '... initialize requires an unblessed parameter'
+    }, undef, '... initialize requires an unblessed parameter' );
 }
 
 {
-    dies_ok {
+    isnt( exception {
         Class::MOP::Class->_construct_class_instance();
-    } '... _construct_class_instance requires an :package parameter';
+    }, undef, '... _construct_class_instance requires an :package parameter' );
 
-    dies_ok {
+    isnt( exception {
         Class::MOP::Class->_construct_class_instance(':package' => undef);
-    } '... _construct_class_instance requires a defined :package parameter';
+    }, undef, '... _construct_class_instance requires a defined :package parameter' );
 
-    dies_ok {
+    isnt( exception {
         Class::MOP::Class->_construct_class_instance(':package' => '');
-    } '... _construct_class_instance requires a valid :package parameter';
+    }, undef, '... _construct_class_instance requires a valid :package parameter' );
 }
 
 
 {
-    dies_ok {
+    isnt( exception {
         Class::MOP::Class->create();
-    } '... create requires an package_name parameter';
+    }, undef, '... create requires an package_name parameter' );
 
-    dies_ok {
+    isnt( exception {
         Class::MOP::Class->create(undef);
-    } '... create requires a defined package_name parameter';
+    }, undef, '... create requires a defined package_name parameter' );
 
-    dies_ok {
+    isnt( exception {
         Class::MOP::Class->create('');
-    } '... create requires a valid package_name parameter';
+    }, undef, '... create requires a valid package_name parameter' );
 
-    throws_ok {
+    like( exception {
         Class::MOP::Class->create('+++');
-    } qr/^creation of \+\+\+ failed/, '... create requires a valid package_name parameter';
+    }, qr/^creation of \+\+\+ failed/, '... create requires a valid package_name parameter' );
 
 }
 
 {
-    dies_ok {
+    isnt( exception {
         Class::MOP::Class->clone_object(1);
-    } '... can only clone instances';
+    }, undef, '... can only clone instances' );
 }
 
 {
-    dies_ok {
+    isnt( exception {
         Class::MOP::Class->add_method();
-    } '... add_method dies as expected';
+    }, undef, '... add_method dies as expected' );
 
-    dies_ok {
+    isnt( exception {
         Class::MOP::Class->add_method('');
-    } '... add_method dies as expected';
+    }, undef, '... add_method dies as expected' );
 
-    dies_ok {
+    isnt( exception {
         Class::MOP::Class->add_method('foo' => 'foo');
-    } '... add_method dies as expected';
+    }, undef, '... add_method dies as expected' );
 
-    dies_ok {
+    isnt( exception {
         Class::MOP::Class->add_method('foo' => []);
-    } '... add_method dies as expected';
+    }, undef, '... add_method dies as expected' );
 }
 
 {
-    dies_ok {
+    isnt( exception {
         Class::MOP::Class->has_method();
-    } '... has_method dies as expected';
+    }, undef, '... has_method dies as expected' );
 
-    dies_ok {
+    isnt( exception {
         Class::MOP::Class->has_method('');
-    } '... has_method dies as expected';
+    }, undef, '... has_method dies as expected' );
 }
 
 {
-    dies_ok {
+    isnt( exception {
         Class::MOP::Class->get_method();
-    } '... get_method dies as expected';
+    }, undef, '... get_method dies as expected' );
 
-    dies_ok {
+    isnt( exception {
         Class::MOP::Class->get_method('');
-    } '... get_method dies as expected';
+    }, undef, '... get_method dies as expected' );
 }
 
 {
-    dies_ok {
+    isnt( exception {
         Class::MOP::Class->remove_method();
-    } '... remove_method dies as expected';
+    }, undef, '... remove_method dies as expected' );
 
-    dies_ok {
+    isnt( exception {
         Class::MOP::Class->remove_method('');
-    } '... remove_method dies as expected';
+    }, undef, '... remove_method dies as expected' );
 }
 
 {
-    dies_ok {
+    isnt( exception {
         Class::MOP::Class->find_all_methods_by_name();
-    } '... find_all_methods_by_name dies as expected';
+    }, undef, '... find_all_methods_by_name dies as expected' );
 
-    dies_ok {
+    isnt( exception {
         Class::MOP::Class->find_all_methods_by_name('');
-    } '... find_all_methods_by_name dies as expected';
+    }, undef, '... find_all_methods_by_name dies as expected' );
 }
 
 {
-    dies_ok {
+    isnt( exception {
         Class::MOP::Class->add_attribute(bless {} => 'Foo');
-    } '... add_attribute dies as expected';
+    }, undef, '... add_attribute dies as expected' );
 }
 
 
 {
-    dies_ok {
+    isnt( exception {
         Class::MOP::Class->has_attribute();
-    } '... has_attribute dies as expected';
+    }, undef, '... has_attribute dies as expected' );
 
-    dies_ok {
+    isnt( exception {
         Class::MOP::Class->has_attribute('');
-    } '... has_attribute dies as expected';
+    }, undef, '... has_attribute dies as expected' );
 }
 
 {
-    dies_ok {
+    isnt( exception {
         Class::MOP::Class->get_attribute();
-    } '... get_attribute dies as expected';
+    }, undef, '... get_attribute dies as expected' );
 
-    dies_ok {
+    isnt( exception {
         Class::MOP::Class->get_attribute('');
-    } '... get_attribute dies as expected';
+    }, undef, '... get_attribute dies as expected' );
 }
 
 {
-    dies_ok {
+    isnt( exception {
         Class::MOP::Class->remove_attribute();
-    } '... remove_attribute dies as expected';
+    }, undef, '... remove_attribute dies as expected' );
 
-    dies_ok {
+    isnt( exception {
         Class::MOP::Class->remove_attribute('');
-    } '... remove_attribute dies as expected';
+    }, undef, '... remove_attribute dies as expected' );
 }
 
 {
-    dies_ok {
+    isnt( exception {
         Class::MOP::Class->add_package_symbol();
-    } '... add_package_symbol dies as expected';
+    }, undef, '... add_package_symbol dies as expected' );
 
-    dies_ok {
+    isnt( exception {
         Class::MOP::Class->add_package_symbol('');
-    } '... add_package_symbol dies as expected';
+    }, undef, '... add_package_symbol dies as expected' );
 
-    dies_ok {
+    isnt( exception {
         Class::MOP::Class->add_package_symbol('foo');
-    } '... add_package_symbol dies as expected';
+    }, undef, '... add_package_symbol dies as expected' );
 
-    dies_ok {
+    isnt( exception {
         Class::MOP::Class->add_package_symbol('&foo');
-    } '... add_package_symbol dies as expected';
+    }, undef, '... add_package_symbol dies as expected' );
 
 #    throws_ok {
 #        Class::MOP::Class->meta->add_package_symbol('@-');
@@ -179,45 +179,45 @@ use Class::MOP;
 }
 
 {
-    dies_ok {
+    isnt( exception {
         Class::MOP::Class->has_package_symbol();
-    } '... has_package_symbol dies as expected';
+    }, undef, '... has_package_symbol dies as expected' );
 
-    dies_ok {
+    isnt( exception {
         Class::MOP::Class->has_package_symbol('');
-    } '... has_package_symbol dies as expected';
+    }, undef, '... has_package_symbol dies as expected' );
 
-    dies_ok {
+    isnt( exception {
         Class::MOP::Class->has_package_symbol('foo');
-    } '... has_package_symbol dies as expected';
+    }, undef, '... has_package_symbol dies as expected' );
 }
 
 {
-    dies_ok {
+    isnt( exception {
         Class::MOP::Class->get_package_symbol();
-    } '... get_package_symbol dies as expected';
+    }, undef, '... get_package_symbol dies as expected' );
 
-    dies_ok {
+    isnt( exception {
         Class::MOP::Class->get_package_symbol('');
-    } '... get_package_symbol dies as expected';
+    }, undef, '... get_package_symbol dies as expected' );
 
-    dies_ok {
+    isnt( exception {
         Class::MOP::Class->get_package_symbol('foo');
-    } '... get_package_symbol dies as expected';
+    }, undef, '... get_package_symbol dies as expected' );
 }
 
 {
-    dies_ok {
+    isnt( exception {
         Class::MOP::Class->remove_package_symbol();
-    } '... remove_package_symbol dies as expected';
+    }, undef, '... remove_package_symbol dies as expected' );
 
-    dies_ok {
+    isnt( exception {
         Class::MOP::Class->remove_package_symbol('');
-    } '... remove_package_symbol dies as expected';
+    }, undef, '... remove_package_symbol dies as expected' );
 
-    dies_ok {
+    isnt( exception {
         Class::MOP::Class->remove_package_symbol('foo');
-    } '... remove_package_symbol dies as expected';
+    }, undef, '... remove_package_symbol dies as expected' );
 }
 
 done_testing;