X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F39load_namespaces_1.t;h=f7fb08ee2ca39f9190e720e32d8a2fd7e852c904;hb=f064a2abb15858bb39a141ad50391d4191988d2c;hp=dc808fd78dac7bd32246b935ce838861e8102919;hpb=ff767ddb65d32e99ed08d6d2ff7d8504ef433ad6;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/39load_namespaces_1.t b/t/39load_namespaces_1.t
index dc808fd..f7fb08e 100644
--- a/t/39load_namespaces_1.t
+++ b/t/39load_namespaces_1.t
@@ -1,23 +1,23 @@
-#!/usr/bin/perl
+BEGIN { do "./t/lib/ANFANG.pm" or die ( $@ || $! ) }
 
 use strict;
 use warnings;
 use Test::More;
-use FindBin;
-use lib "$FindBin::Bin/../t/lib";
-use DBICNSTest::Result::A;
 
-plan tests => 8;
+
+use DBICTest; # do not remove even though it is not used
 
 my $warnings;
 eval {
     local $SIG{__WARN__} = sub { $warnings .= shift };
     package DBICNSTest;
-    use base qw/DBIx::Class::Schema/;
+    use base qw/DBICTest::BaseSchema/;
     __PACKAGE__->load_namespaces;
 };
-ok(!$@) or diag $@;
-like($warnings, qr/load_namespaces found ResultSet class C with no corresponding Result class/);
+ok(!$@, 'load_namespaces doesnt die') or diag $@;
+like($warnings, qr/load_namespaces found ResultSet class 'DBICNSTest::ResultSet::C' with no corresponding Result class/, 'Found warning about extra ResultSet classes');
+
+like($warnings, qr/load_namespaces found ResultSet class 'DBICNSTest::ResultSet::D' that does not subclass DBIx::Class::ResultSet/, 'Found warning about ResultSets with incorrect subclass');
 
 my $source_a = DBICNSTest->source('A');
 isa_ok($source_a, 'DBIx::Class::ResultSource::Table');
@@ -31,5 +31,7 @@ isa_ok($rset_b, 'DBIx::Class::ResultSet');
 
 for my $moniker (qw/A B/) {
   my $class = "DBICNSTest::Result::$moniker";
-  ok(!defined($class->result_source_instance->source_name));
+  ok(!defined($class->result_source_instance->source_name), "Source name of $moniker not defined");
 }
+
+done_testing;