X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F39load_namespaces_rt41083.t;h=258429031a6f94f8d7ec433e429795b987f1f317;hb=3f6a394fe6ffd511796085e22d2651ef04ea70ef;hp=861658e9969a975935823b239e7a239639f96242;hpb=4cf8bfe6f4ccae8e0c26081f1f8f2ebd88e7ec99;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/39load_namespaces_rt41083.t b/t/39load_namespaces_rt41083.t
index 861658e..2584290 100644
--- a/t/39load_namespaces_rt41083.t
+++ b/t/39load_namespaces_rt41083.t
@@ -1,31 +1,9 @@
-#!/usr/bin/perl
-
 use strict;
 use warnings;
-use Test::More skip_all => 'Postponed until after 0.08100';
 
 use lib 't/lib';
-
-=begin
-
-How did this get back here? The test is borked, there is a branch with
-the correct test and a tentative fix - branches/subclassed_rsset
-
-Make sure to nuke this file when merging, it is only left here to make
-merging of the above branch easier.
-
-
-ribasushi
-
-
-=cut
-
-
-__END__
-
-
-
-plan tests => 15;
+use DBICTest; # do not remove even though it is not used
+use Test::More tests => 8;
 
 sub _chk_warning {
   defined $_[0]?
@@ -45,16 +23,6 @@ sub _verify_sources {
     \@monikers,
     'List of resultsource registrations',
   );
-
-  my %seen_rc;
-  for my $m (@monikers) {
-    my $src = DBICNSTest::RtBug41083->source ($m);
-    my $rc = $src->result_class;
-
-    ok ( (++$seen_rc{$rc} == 1), "result_class of $m is unique")
-      || diag "Source: $m, result_class: $rc";
-    like ($rc, qr/:: $m $/x, 'result_class matches moniker');
-  }
 }
 
 {
@@ -64,7 +32,7 @@ sub _verify_sources {
     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'
     );
@@ -84,8 +52,6 @@ sub _verify_sources {
     package DBICNSTest::RtBug41083;
     use base 'DBIx::Class::Schema';
     __PACKAGE__->load_namespaces(
-      result_namespace => 'Schema',
-      resultset_namespace => 'ResultSet',
       default_resultset_class => 'ResultSet'
     );
   };