X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F39load_namespaces_1.t;h=d1600402392dbcedd92506520180de2cbc9b4fb9;hb=b1d821deddb9183fb96810d71a046ee8abe71d13;hp=57613a1fa8e359f42d15ef5cdfb4ab36ea2f31e9;hpb=f421bf764a877932ed5da9a9187d8bfda217f790;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/39load_namespaces_1.t b/t/39load_namespaces_1.t
index 57613a1..d160040 100644
--- a/t/39load_namespaces_1.t
+++ b/t/39load_namespaces_1.t
@@ -1,13 +1,9 @@
-#!/usr/bin/perl
-
 use strict;
 use warnings;
 use Test::More;
-use FindBin;
-use lib "$FindBin::Bin/../t/lib";
-use DBICNSTest::Result::A;
 
-plan tests => 7;
+use lib qw(t/lib);
+use DBICTest; # do not remove even though it is not used
 
 my $warnings;
 eval {
@@ -16,8 +12,10 @@ eval {
     use base qw/DBIx::Class::Schema/;
     __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 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');
@@ -28,7 +26,10 @@ my $source_b = DBICNSTest->source('B');
 isa_ok($source_b, 'DBIx::Class::ResultSource::Table');
 my $rset_b   = DBICNSTest->resultset('B');
 isa_ok($rset_b, 'DBIx::Class::ResultSet');
-ok(
-   $source_b->source_name
-   eq DBICNSTest::Result::B->result_source_instance->source_name
-);
\ No newline at end of file
+
+for my $moniker (qw/A B/) {
+  my $class = "DBICNSTest::Result::$moniker";
+  ok(!defined($class->result_source_instance->source_name), "Source name of $moniker not defined");
+}
+
+done_testing;