X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F39load_namespaces_rt41083.t;h=0e33420ead3bc0b6a98f9cdc05e0c8f50d2e22d7;hb=8b16ef4e820ac2e747bbb639614bd9405c6b735c;hp=fbd723bbeef873e2a3c8aaac0fd2ea1d067b989c;hpb=624e2bc24f18d1bab9efc2c7ea2934a325439ee2;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/39load_namespaces_rt41083.t b/t/39load_namespaces_rt41083.t
index fbd723b..0e33420 100644
--- a/t/39load_namespaces_rt41083.t
+++ b/t/39load_namespaces_rt41083.t
@@ -1,12 +1,11 @@
-#!/usr/bin/perl
+BEGIN { do "./t/lib/ANFANG.pm" or die ( $@ || $! ) }
 
 use strict;
 use warnings;
-use Test::More;
 
-use lib 't/lib';
 
-plan tests => 8;
+use DBICTest; # do not remove even though it is not used
+use Test::More tests => 8;
 
 sub _chk_warning {
   defined $_[0]?
@@ -19,6 +18,15 @@ sub _chk_extra_sources_warning {
   defined $_[0]? $_[0] !~ /$p/ : 1;
 }
 
+sub _verify_sources {
+  my @monikers = @_;
+  is_deeply (
+    [ sort DBICNSTest::RtBug41083->sources ],
+    \@monikers,
+    'List of resultsource registrations',
+  );
+}
+
 {
   my $warnings;
   eval {
@@ -26,7 +34,7 @@ sub _chk_extra_sources_warning {
     package DBICNSTest::RtBug41083;
     use base 'DBIx::Class::Schema';
     __PACKAGE__->load_namespaces(
-      result_namespace => 'Schema_A',
+      result_namespace => 'Result_A',
       resultset_namespace => 'ResultSet_A',
       default_resultset_class => 'ResultSet'
     );
@@ -35,12 +43,9 @@ sub _chk_extra_sources_warning {
   ok(!$@) or diag $@;
   ok(_chk_warning($warnings), 'expected no resultset complaint');
   ok(_chk_extra_sources_warning($warnings), 'expected no extra sources complaint') or diag($warnings);
-}
 
-is_deeply (
-  [ DBICNSTest::RtBug41083->sources ],
-  [qw/ /],
-);
+  _verify_sources (qw/A A::Sub/);
+}
 
 {
   my $warnings;
@@ -49,18 +54,12 @@ is_deeply (
     package DBICNSTest::RtBug41083;
     use base 'DBIx::Class::Schema';
     __PACKAGE__->load_namespaces(
-      result_namespace => 'Schema',
-      resultset_namespace => 'ResultSet',
       default_resultset_class => 'ResultSet'
     );
   };
   ok(!$@) or diag $@;
   ok(_chk_warning($warnings), 'expected no resultset complaint') or diag $warnings;
   ok(_chk_extra_sources_warning($warnings), 'expected no extra sources complaint') or diag($warnings);
-}
-
-is_deeply (
-  [ DBICNSTest::RtBug41083->sources ],
-  [qw/ /],
-);
 
+  _verify_sources (qw/A A::Sub Foo Foo::Sub/);
+}