X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F39load_namespaces_3.t;h=f4fa3860b152f4a97ed01d214292a6c3913c0b59;hb=8464d1a46a485fbecfb42f74b9b741cbc2534a78;hp=b066d648f6a959fd9aa252a5333003c508b30eec;hpb=f017c022afdd0b519a1be5eb749de6a1180c015f;p=dbsrgits%2FDBIx-Class.git diff --git a/t/39load_namespaces_3.t b/t/39load_namespaces_3.t index b066d64..f4fa386 100644 --- a/t/39load_namespaces_3.t +++ b/t/39load_namespaces_3.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 => 10; +plan tests => 7; my $warnings; eval { @@ -14,28 +15,22 @@ eval { package DBICNSTestOther; use base qw/DBIx::Class::Schema/; __PACKAGE__->load_namespaces( - source_namespace => [ '+DBICNSTest::Src', '+DBICNSTest::OtherSrc' ], + result_namespace => [ '+DBICNSTest::Rslt', '+DBICNSTest::OtherRslt' ], resultset_namespace => '+DBICNSTest::RSet', - result_namespace => '+DBICNSTest::Res' ); }; 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 = DBICNSTestOther->source('A'); isa_ok($source_a, 'DBIx::Class::ResultSource::Table'); my $rset_a = DBICNSTestOther->resultset('A'); isa_ok($rset_a, 'DBICNSTest::RSet::A'); -my $resclass_a = DBICNSTestOther->resultset('A')->result_class; -is($resclass_a, 'DBICNSTest::Res::A'); my $source_b = DBICNSTestOther->source('B'); isa_ok($source_b, 'DBIx::Class::ResultSource::Table'); my $rset_b = DBICNSTestOther->resultset('B'); isa_ok($rset_b, 'DBIx::Class::ResultSet'); -my $resclass_b = DBICNSTestOther->resultset('B')->result_class; -is($resclass_b, 'DBICNSTest::Src::B'); my $source_d = DBICNSTestOther->source('D'); isa_ok($source_d, 'DBIx::Class::ResultSource::Table');