X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F39load_namespaces_3.t;h=ebfa87db68f5650fbc793383ff8db8b8590c372b;hb=fed2c7d79d8112c3a5e3f73fa1c0f99d8588b08d;hp=f48c83828690b72b78276daab1cc17342a88c10b;hpb=c87014e8134cf934b0dc4b81186a41ee6cde4037;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/39load_namespaces_3.t b/t/39load_namespaces_3.t
index f48c838..ebfa87d 100644
--- a/t/39load_namespaces_3.t
+++ b/t/39load_namespaces_3.t
@@ -3,23 +3,24 @@
 use strict;
 use warnings;
 use Test::More;
+use Test::Exception;
+use Test::Warn;
 
-unshift(@INC, './t/lib');
+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');
@@ -33,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;