better diagnostics for exception tests

4 files changed, 40 insertions, 39 deletions

diff --git a/t/01-basic.t b/t/01-basic.t
index 966f47c..2268aef 100644
--- a/t/01-basic.t
+++ b/t/01-basic.t
@@ -6,7 +6,8 @@ use Test::Fatal;
 
 use Package::Stash;
 
-ok(exception { Package::Stash->name }, q{... can't call name() as a class method});
+like(exception { Package::Stash->name }, qr/Can't call name as a class method/,
+   q{... can't call name() as a class method});
 
 {
     package Foo;
@@ -22,9 +23,9 @@ ok(!defined($Foo::{foo}), '... the %foo slot has not been created yet');
 ok(!$foo_stash->has_package_symbol('%foo'), '... the object agrees');
 ok(!defined($Foo::{foo}), '... checking doesn\' vivify');
 
-ok(!exception {
+is(exception {
     $foo_stash->add_package_symbol('%foo' => { one => 1 });
-}, '... created %Foo::foo successfully');
+}, undef, '... created %Foo::foo successfully');
 
 # ... scalar should NOT be created here
 
@@ -63,9 +64,9 @@ $foo->{two} = 2;
 
 ok(!defined($Foo::{bar}), '... the @bar slot has not been created yet');
 
-ok(!exception {
+is(exception {
     $foo_stash->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_stash->has_package_symbol('@bar'), '... the meta agrees');
@@ -89,9 +90,9 @@ ok(!$foo_stash->has_package_symbol('&bar'), '... CODE shouldnt have been created
 
 ok(!defined($Foo::{baz}), '... the $baz slot has not been created yet');
 
-ok(!exception {
+is(exception {
     $foo_stash->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_stash->has_package_symbol('$baz'), '... the meta agrees');
@@ -115,9 +116,9 @@ is(${$foo_stash->get_package_symbol('$baz')}, 10, '... got the right value back'
 
 ok(!defined($Foo::{funk}), '... the &funk slot has not been created yet');
 
-ok(!exception {
+is(exception {
     $foo_stash->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_stash->has_package_symbol('&funk'), '... the meta agrees');
@@ -139,23 +140,23 @@ is(Foo->funk(), 'Foo::funk', '... got the right value from the function');
 my $ARRAY = [ 1, 2, 3 ];
 my $CODE = sub { "Foo::foo" };
 
-ok(!exception {
+is(exception {
     $foo_stash->add_package_symbol('@foo' => $ARRAY);
-}, '... created @Foo::foo successfully');
+}, undef, '... created @Foo::foo successfully');
 
 ok($foo_stash->has_package_symbol('@foo'), '... the @foo slot was added successfully');
 is($foo_stash->get_package_symbol('@foo'), $ARRAY, '... got the right values for @Foo::foo');
 
-ok(!exception {
+is(exception {
     $foo_stash->add_package_symbol('&foo' => $CODE);
-}, '... created &Foo::foo successfully');
+}, undef, '... created &Foo::foo successfully');
 
 ok($foo_stash->has_package_symbol('&foo'), '... the meta agrees');
 is($foo_stash->get_package_symbol('&foo'), $CODE, '... got the right value for &Foo::foo');
 
-ok(!exception {
+is(exception {
     $foo_stash->add_package_symbol('$foo' => 'Foo::foo');
-}, '... created $Foo::foo successfully');
+}, undef, '... created $Foo::foo successfully');
 
 ok($foo_stash->has_package_symbol('$foo'), '... the meta agrees');
 my $SCALAR = $foo_stash->get_package_symbol('$foo');
@@ -166,9 +167,9 @@ is($$SCALAR, 'Foo::foo', '... got the right scalar value back');
     is(${'Foo::foo'}, 'Foo::foo', '... got the right value from the scalar');
 }
 
-ok(!exception {
+is(exception {
     $foo_stash->remove_package_symbol('%foo');
-}, '... removed %Foo::foo successfully');
+}, undef, '... removed %Foo::foo successfully');
 
 ok(!$foo_stash->has_package_symbol('%foo'), '... the %foo slot was removed successfully');
 ok($foo_stash->has_package_symbol('@foo'), '... the @foo slot still exists');
@@ -187,9 +188,9 @@ is($foo_stash->get_package_symbol('$foo'), $SCALAR, '... got the right value for
     ok(defined(${"Foo::foo"}), '... the $foo slot has NOT been removed');
 }
 
-ok(!exception {
+is(exception {
     $foo_stash->remove_package_symbol('&foo');
-}, '... removed &Foo::foo successfully');
+}, undef, '... removed &Foo::foo successfully');
 
 ok(!$foo_stash->has_package_symbol('&foo'), '... the &foo slot no longer exists');
 
@@ -207,9 +208,9 @@ is($foo_stash->get_package_symbol('$foo'), $SCALAR, '... got the right value for
     ok(defined(${"Foo::foo"}), '... the $foo slot has NOT been removed');
 }
 
-ok(!exception {
+is(exception {
     $foo_stash->remove_package_symbol('$foo');
-}, '... removed $Foo::foo successfully');
+}, undef, '... removed $Foo::foo successfully');
 
 ok(!$foo_stash->has_package_symbol('$foo'), '... the $foo slot no longer exists');
 
@@ -227,26 +228,26 @@ is($foo_stash->get_package_symbol('@foo'), $ARRAY, '... got the right values for
 
 # check some errors
 
-ok(exception {
+like(exception {
     $foo_stash->add_package_symbol('@bar', {})
-}, "can't initialize a slot with the wrong type of value");
+}, qr/HASH.*is not of type ARRAY/, "can't initialize a slot with the wrong type of value");
 
-ok(exception {
+like(exception {
     $foo_stash->add_package_symbol('bar', [])
-}, "can't initialize a slot with the wrong type of value");
+}, qr/ARRAY.*is not of type IO/, "can't initialize a slot with the wrong type of value");
 
-ok(exception {
+like(exception {
     $foo_stash->add_package_symbol('$bar', sub { })
-}, "can't initialize a slot with the wrong type of value");
+}, qr/CODE.*is not of type SCALAR/, "can't initialize a slot with the wrong type of value");
 
 {
     package Bar;
     open *foo, '<', $0;
 }
 
-ok(exception {
+like(exception {
     $foo_stash->add_package_symbol('$bar', *Bar::foo{IO})
-}, "can't initialize a slot with the wrong type of value");
+}, qr/IO.*is not of type SCALAR/, "can't initialize a slot with the wrong type of value");
 
 # check compile time manipulation
 
diff --git a/t/02-extension.t b/t/02-extension.t
index 1ac20c0..18d87ea 100644
--- a/t/02-extension.t
+++ b/t/02-extension.t
@@ -40,9 +40,9 @@ isa_ok($foo_stash, 'Package::Stash');
 ok(!defined($Foo::{foo}), '... the %foo slot has not been created yet');
 ok(!$foo_stash->has_package_symbol('%foo'), '... the foo_stash agrees');
 
-ok(!exception {
+is(exception {
     $foo_stash->add_package_symbol('%foo' => { one => 1 });
-}, '... the %foo symbol is created succcessfully');
+}, undef, '... the %foo symbol is created succcessfully');
 
 ok(!defined($Foo::{foo}), '... the %foo slot has not been created in the actual Foo package');
 ok($foo_stash->has_package_symbol('%foo'), '... the foo_stash agrees');
@@ -56,17 +56,17 @@ is($foo, $foo_stash->get_package_symbol('%foo'), '... our %foo is the same as th
 
 ok(!defined($Foo::{bar}), '... the @bar slot has not been created yet');
 
-ok(!exception {
+is(exception {
     $foo_stash->add_package_symbol('@bar' => [ 1, 2, 3 ]);
-}, '... created @Foo::bar successfully');
+}, undef, '... created @Foo::bar successfully');
 
 ok(!defined($Foo::{bar}), '... the @bar slot has still not been created');
 
 ok(!defined($Foo::{baz}), '... the %baz slot has not been created yet');
 
-ok(!exception {
+is(exception {
     $foo_stash->add_package_symbol('%baz');
-}, '... created %Foo::baz successfully');
+}, undef, '... created %Foo::baz successfully');
 
 ok(!defined($Foo::{baz}), '... the %baz slot has still not been created');
 
diff --git a/t/03-io.t b/t/03-io.t
index 147b745..8b6e69d 100644
--- a/t/03-io.t
+++ b/t/03-io.t
@@ -40,9 +40,9 @@ use Package::Stash;
 
 {
     my $stash = Package::Stash->new('Baz');
-    ok(!exception {
+    is(exception {
         $stash->add_package_symbol('baz', *Foo::foo{IO});
-    }, "can add an IO symbol");
+    }, undef, "can add an IO symbol");
     ok($stash->has_package_symbol('baz'), "has baz");
     is($stash->get_package_symbol('baz'), *Foo::foo{IO}, "got the right baz");
 }
diff --git a/t/06-addsub.t b/t/06-addsub.t
index e8445f7..4fa1e8c 100644
--- a/t/06-addsub.t
+++ b/t/06-addsub.t
@@ -15,9 +15,9 @@ my $foo_stash = Package::Stash->new('Foo');
 
 ok(!defined($Foo::{funk}), '... the &funk slot has not been created yet');
 
-ok(!exception {
+is(exception {
     $foo_stash->add_package_symbol('&funk' => sub { "Foo::funk", __LINE__ });
-}, '... created &Foo::funk successfully');
+}, undef, '... created &Foo::funk successfully');
 
 ok(defined($Foo::{funk}), '... the &funk slot was created successfully');