Remove confusing code introduced in 8fc4291e

[dbsrgits/DBIx-Class.git] / t / resultset / rowparser_internals.t

diff --git a/t/resultset/rowparser_internals.t b/t/resultset/rowparser_internals.t
index 9d38e90..0ad3107 100644 (file)
--- a/t/resultset/rowparser_internals.t
+++ b/t/resultset/rowparser_internals.t
@@ -1,20 +1,14 @@
+BEGIN { do "./t/lib/ANFANG.pm" or die ( $@ || $! ) }
+
 use strict;
 use warnings;
 
 use Test::More;
-use lib qw(t/lib);
+
 use DBICTest;
 use B::Deparse;
 use DBIx::Class::_Util 'perlstring';
 
-# globally set for the rest of test
-# the rowparser maker does not order its hashes by default for the miniscule
-# speed gain. But it does not disable sorting either - for this test
-# everything will be ordered nicely, and the hash randomization of 5.18
-# will not trip up anything
-use Data::Dumper;
-$Data::Dumper::Sortkeys = 1;
-
 my $schema = DBICTest->init_schema(no_deploy => 1);
 my $infmap = [qw/
   single_track.cd.artist.name
@@ -349,10 +343,10 @@ is_same_src (
 
       # prefetch data of single_track (placed in root)
       ( (! defined($cur_row_data->[1]) ) ? $collapse_idx[0]{$cur_row_ids{4}}{$cur_row_ids{5}}{single_track} = undef : do {
-        ( $collapse_idx[0]{$cur_row_ids{4}}{$cur_row_ids{5}}{single_track} //= $collapse_idx[1]{$cur_row_ids{1}}{$cur_row_ids{4}}{$cur_row_ids{5}} ),
+        ( $collapse_idx[0]{$cur_row_ids{4}}{$cur_row_ids{5}}{single_track} //= $collapse_idx[1]{$cur_row_ids{1}}{$cur_row_ids{4}}{$cur_row_ids{5}} = {} ),
 
         # prefetch data of cd (placed in single_track)
-        ( $collapse_idx[1]{$cur_row_ids{1}}{$cur_row_ids{4}}{$cur_row_ids{5}}{cd} //= $collapse_idx[2]{$cur_row_ids{1}}{$cur_row_ids{4}}{$cur_row_ids{5}} ),
+        ( $collapse_idx[1]{$cur_row_ids{1}}{$cur_row_ids{4}}{$cur_row_ids{5}}{cd} //= $collapse_idx[2]{$cur_row_ids{1}}{$cur_row_ids{4}}{$cur_row_ids{5}} = {} ),
 
         # prefetch data of artist ( placed in single_track->cd)
         ( $collapse_idx[2]{$cur_row_ids{1}}{$cur_row_ids{4}}{$cur_row_ids{5}}{artist} //= $collapse_idx[3]{$cur_row_ids{1}}{$cur_row_ids{4}}{$cur_row_ids{5}} = { artistid => $cur_row_data->[1] } ),
@@ -793,7 +787,7 @@ is_same_src (
 
         ( $collapse_idx[0]{$cur_row_ids{10}}{single_track} //= ($collapse_idx[1]{$cur_row_ids{0}} = { trackid => $$cur_row_data[0] }) ),
 
-        ( $collapse_idx[1]{$cur_row_ids{0}}{cd} //= $collapse_idx[2]{$cur_row_ids{0}} ),
+        ( $collapse_idx[1]{$cur_row_ids{0}}{cd} //= $collapse_idx[2]{$cur_row_ids{0}} = {} ),
 
         ( $collapse_idx[2]{$cur_row_ids{0}}{artist} //= ($collapse_idx[3]{$cur_row_ids{0}} = { artistid => $$cur_row_data[6] }) ),
 
@@ -888,7 +882,7 @@ done_testing;
 my $deparser;
 sub is_same_src { SKIP: {
 
-  skip "Skipping comparison of unicode-posioned source", 1
+  skip "Skipping comparison of unicode-poisoned source", 1
     if DBIx::Class::_ENV_::STRESSTEST_UTF8_UPGRADE_GENERATED_COLLAPSER_SOURCE;
 
   $deparser ||= B::Deparse->new;
@@ -897,7 +891,7 @@ sub is_same_src { SKIP: {
   my ($got, $expect) = @_;
 
   skip "Not testing equality of source containing defined-or operator on this perl $]", 1
-    if ($] < 5.010 and$expect =~ m!\Q//=!);
+    if ( "$]" < 5.010 and $expect =~ m!\Q//=! );
 
   $expect =~ s/__NBC__/perlstring($DBIx::Class::ResultSource::RowParser::Util::null_branch_class)/ge;