Minor test cleanups

diff --git a/t/39load_namespaces_3.t b/t/39load_namespaces_3.t
index f4fa386..ebfa87d 100644 (file)
--- a/t/39load_namespaces_3.t
+++ b/t/39load_namespaces_3.t
@@ -3,24 +3,24 @@
 use strict;
 use warnings;
 use Test::More;
+use Test::Exception;
+use Test::Warn;
 
 use lib qw(t/lib);
 use DBICTest; # do not remove even though it is not used
 
-plan tests => 7;
-
-my $warnings;
-eval {
-    local $SIG{__WARN__} = sub { $warnings .= shift };
-    package DBICNSTestOther;
-    use base qw/DBIx::Class::Schema/;
-    __PACKAGE__->load_namespaces(
-        result_namespace => [ '+DBICNSTest::Rslt', '+DBICNSTest::OtherRslt' ],
-        resultset_namespace => '+DBICNSTest::RSet',
-    );
-};
-ok(!$@) or diag $@;
-like($warnings, qr/load_namespaces found ResultSet class C with no corresponding Result class/);
+lives_ok (sub {
+  warnings_exist ( sub {
+      package DBICNSTestOther;
+      use base qw/DBIx::Class::Schema/;
+      __PACKAGE__->load_namespaces(
+          result_namespace => [ '+DBICNSTest::Rslt', '+DBICNSTest::OtherRslt' ],
+          resultset_namespace => '+DBICNSTest::RSet',
+      );
+    },
+    qr/load_namespaces found ResultSet class C with no corresponding Result class/,
+  );
+});
 
 my $source_a = DBICNSTestOther->source('A');
 isa_ok($source_a, 'DBIx::Class::ResultSource::Table');
@@ -34,3 +34,5 @@ isa_ok($rset_b, 'DBIx::Class::ResultSet');
 
 my $source_d = DBICNSTestOther->source('D');
 isa_ok($source_d, 'DBIx::Class::ResultSource::Table');
+
+done_testing;

diff --git a/t/51threads.t b/t/51threads.t
index 4cb7bec..6d94aa5 100644 (file)
--- a/t/51threads.t
+++ b/t/51threads.t
@@ -1,6 +1,9 @@
 use strict;
 use warnings;
+
 use Test::More;
+use Test::Exception;
+
 use Config;
 
 # README: If you set the env var to a number greater than 10,
@@ -38,7 +41,7 @@ my $schema = DBICTest::Schema->connection($dsn, $user, $pass, { AutoCommit => 1,
 
 my $parent_rs;
 
-eval {
+lives_ok (sub {
     my $dbh = $schema->storage->dbh;
 
     {
@@ -52,8 +55,7 @@ eval {
 
     $parent_rs = $schema->resultset('CD')->search({ year => 1901 });
     $parent_rs->next;
-};
-ok(!$@) or diag "Creation eval failed: $@";
+}, 'populate successfull');
 
 my @children;
 while(@children < $num_children) {

diff --git a/t/746sybase.t b/t/746sybase.t
index 441a258..6a75029 100644 (file)
--- a/t/746sybase.t
+++ b/t/746sybase.t
@@ -569,12 +569,10 @@ SQL
     $row->update({ amount => undef });
   } 'updated a money value to NULL';
 
-  my $null_amount = eval { $rs->find($row->id)->amount };
-  ok(
-    (($null_amount == undef) && (not $@)),
-    'updated money value to NULL round-trip'
-  );
-  diag $@ if $@;
+  lives_ok {
+    my $null_amount = $rs->find($row->id)->amount;
+    is ($null_amount, undef, 'updated money value to NULL round-trip');
+  };
 
 # Test computed columns and timestamps
   $schema->storage->dbh_do (sub {