Some cosmetic fixes in ANFANG

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

diff --git a/t/39load_namespaces_rt41083.t b/t/39load_namespaces_rt41083.t
index fbd723b..f59d597 100644 (file)
--- 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,14 +18,23 @@ 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 {
     local $SIG{__WARN__} = sub { $warnings .= shift };
     package DBICNSTest::RtBug41083;
-    use base 'DBIx::Class::Schema';
+    use base 'DBICTest::BaseSchema';
     __PACKAGE__->load_namespaces(
-      result_namespace => 'Schema_A',
+      result_namespace => 'Result_A',
       resultset_namespace => 'ResultSet_A',
       default_resultset_class => 'ResultSet'
     );
@@ -35,32 +43,23 @@ 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;
   eval {
     local $SIG{__WARN__} = sub { $warnings .= shift };
     package DBICNSTest::RtBug41083;
-    use base 'DBIx::Class::Schema';
+    use base 'DBICTest::BaseSchema';
     __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/);
+}