X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fsearch%2Fpreserve_original_rs.t;h=abb654404b4cece48118d6bb24ca61849625d43b;hb=95da0f23897e2dc2292462546c06ff604bebeefd;hp=15fdb8d8800c25845ec0215b205b50caeb283a41;hpb=1887cd9f0db6e10e4659fa770b064e2bf25bc0b3;p=dbsrgits%2FDBIx-Class-Historic.git

diff --git a/t/search/preserve_original_rs.t b/t/search/preserve_original_rs.t
index 15fdb8d..abb6544 100644
--- 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;