Merge 'trunk' into 'replication_dedux'

[dbsrgits/DBIx-Class.git] / t / 40resultsetmanager.t

diff --git a/t/40resultsetmanager.t b/t/40resultsetmanager.t
index dfac9b6..26707f0 100644 (file)
--- a/t/40resultsetmanager.t
+++ b/t/40resultsetmanager.t
@@ -5,14 +5,27 @@ use warnings;
 use Test::More;
 
 use lib qw(t/lib);
-use DBICTest::Extra;
 
-plan tests => 4;
+BEGIN {
+  eval { require Class::Inspector };
+  if ($@ =~ m{Can.t locate Class/Inspector.pm}) {
+    plan skip_all => "ResultSetManager requires Class::Inspector";
+  } else {
+    plan tests => 4;
+  }
+}
 
-my $schema = DBICTest::Extra->compose_connection('DB', 'foo');
+BEGIN {
+  local $SIG{__WARN__} = sub {};
+  require DBIx::Class::ResultSetManager;
+}
+
+use DBICTest::ResultSetManager; # uses Class::Inspector
+
+my $schema = DBICTest::ResultSetManager->compose_namespace('DB');
 my $rs = $schema->resultset('Foo');
 
 ok( !DB::Foo->can('bar'), 'Foo class does not have bar method' );
 ok( $rs->can('bar'), 'Foo resultset class has bar method' );
-isa_ok( $rs, 'DBICTest::Extra::Foo::_resultset', 'Foo resultset class is correct' );
-is( $rs->bar, 'good', 'bar method works' );
\ No newline at end of file
+isa_ok( $rs, 'DBICTest::ResultSetManager::Foo::_resultset', 'Foo resultset class is correct' );
+is( $rs->bar, 'good', 'bar method works' );