X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F002-init.t;h=ef2f9497dd5e9efcb716d533965642b5b0d3e775;hb=7fc144c9cb90c2fc7f37fcf956f53bcefe369419;hp=040547db6cf40ea544aba1f8c0545e8a3dae2f57;hpb=a5507842e4d12755960898353407de7b0b6fd098;p=gitmo%2FMooseX-Singleton.git

diff --git a/t/002-init.t b/t/002-init.t
index 040547d..ef2f949 100644
--- a/t/002-init.t
+++ b/t/002-init.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
-use Test::More tests => 9;
-use Test::Exception;
+use Test::More;
+use Test::Fatal;
 
 my $i = 0;
 sub new_singleton_pkg {
@@ -16,13 +16,13 @@ sub new_singleton_pkg {
   return $pkg_name;
 }
 
-throws_ok { new_singleton_pkg()->instance }
+like( exception { new_singleton_pkg()->instance },
     qr/\QAttribute (number) is required/,
-    q{can't get the Singleton if requires attrs and we don't provide them};
+    q{can't get the Singleton if requires attrs and we don't provide them});
 
-throws_ok { new_singleton_pkg()->string }
+like( exception { new_singleton_pkg()->string },
     qr/\QAttribute (number) is required/,
-    q{can't call any Singleton attr reader if Singleton can't be inited};
+    q{can't call any Singleton attr reader if Singleton can't be inited});
 
 for my $pkg (new_singleton_pkg) {
     my $mst = $pkg->new( number => 5 );
@@ -36,9 +36,9 @@ for my $pkg (new_singleton_pkg) {
         "the class method, called directly, returns the given attribute value"
     );
 
-    throws_ok { $pkg->new( number => 3 ) }
+    like( exception { $pkg->new( number => 3 ) },
         qr/already/,
-        "can't make new singleton with conflicting attributes";
+        "can't make new singleton with conflicting attributes");
 
     my $second = eval { $pkg->new };
     ok( !$@, "...but a second ->new without args is okay" );
@@ -46,8 +46,23 @@ for my $pkg (new_singleton_pkg) {
     is( $second->number, 5,
         "...we get the originally inited number from it" );
 
-    throws_ok { $pkg->initialize }
+    like( exception { $pkg->initialize },
         qr/already/,
-        "...but ->initialize() is still an error";
+        "...but ->initialize() is still an error");
 }
 
+{
+    package Single;
+
+    use MooseX::Singleton;
+
+    has foo => ( is => 'ro' );
+}
+
+{
+    Single->initialize( foo => 2 );
+    ok( Single->new, 'can call ->new without any args' );
+    ok( Single->instance, 'can call ->instance without any args' );
+}
+
+done_testing;