Retire DBIC/SqlMakerTest.pm now that SQLA::Test provides the same function

[dbsrgits/DBIx-Class.git] / t / search / preserve_original_rs.t

diff --git a/t/search/preserve_original_rs.t b/t/search/preserve_original_rs.t
index 15fdb8d..abb6544 100644 (file)
--- a/t/search/preserve_original_rs.t
+++ b/t/search/preserve_original_rs.t
@@ -5,11 +5,9 @@ use Test::More;
 use Test::Exception;
 
 use lib qw(t/lib);
-use DBICTest;
-use DBIC::SqlMakerTest;
-use DBIC::DebugObj;
+use DBICTest ':DiffSQL';
 
-use Storable qw/dclone/;
+use Storable 'dclone';
 
 my $schema = DBICTest->init_schema();
 
@@ -96,7 +94,14 @@ for my $s (qw/a2a artw cd artw_back/) {
   is ($fresh->count({ cdid => 1}), 1 );
   is ($fresh->count_rs({ cdid => 1})->next, 1 );
 
-  ok (! exists $fresh->{_attrs}{_sqlmaker_select_args}, 'select args did not leak through' );
+  ok (! exists $fresh->{cursor}, 'Still no cursor on fresh rs');
+  ok (! exists $fresh->{_attrs}{_last_sqlmaker_alias_map}, 'aliasmap did not leak through' );
+
+  my $n = $fresh->next;
+
+  # check that we are not testing for deprecated slotnames
+  ok ($fresh->{cursor}, 'Cursor at expected slot after fire');
+  ok (exists $fresh->{_attrs}{_last_sqlmaker_alias_map}, 'aliasmap at expected slot after fire' );
 }
 
 done_testing;