Merge 'trunk' into 'pg_unqualified_schema'

[dbsrgits/DBIx-Class.git] / t / 39load_namespaces_1.t

diff --git a/t/39load_namespaces_1.t b/t/39load_namespaces_1.t
index bd70370..f20ca8c 100644 (file)
--- a/t/39load_namespaces_1.t
+++ b/t/39load_namespaces_1.t
@@ -4,9 +4,10 @@ use strict;
 use warnings;
 use Test::More;
 
-unshift(@INC, './t/lib');
+use lib qw(t/lib);
+use DBICTest; # do not remove even though it is not used
 
-plan tests => 9;
+plan tests => 8;
 
 my $warnings;
 eval {
@@ -16,19 +17,19 @@ eval {
     __PACKAGE__->load_namespaces;
 };
 ok(!$@) or diag $@;
-like($warnings, qr/load_namespaces found ResultSet class C with no corresponding source-definition class/);
-like($warnings, qr/load_namespaces found Result class C with no corresponding source-definition class/);
+like($warnings, qr/load_namespaces found ResultSet class C with no corresponding Result class/);
 
 my $source_a = DBICNSTest->source('A');
 isa_ok($source_a, 'DBIx::Class::ResultSource::Table');
 my $rset_a   = DBICNSTest->resultset('A');
 isa_ok($rset_a, 'DBICNSTest::ResultSet::A');
-my $resclass_a    = DBICNSTest->resultset('A')->result_class;
-is($resclass_a, 'DBICNSTest::Result::A');
 
 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');
-my $resclass_b    = DBICNSTest->resultset('B')->result_class;
-is($resclass_b, 'DBICNSTest::Source::B');
+
+for my $moniker (qw/A B/) {
+  my $class = "DBICNSTest::Result::$moniker";
+  ok(!defined($class->result_source_instance->source_name));
+}