[Bast-commits] r7992 - in DBIx-Class/0.08/branches/prefetch/t: . inflate

[ribasushi at dev.catalyst.perl.org]

Author: ribasushi
Date: 2009-11-30 09:07:49 +0000 (Mon, 30 Nov 2009)
New Revision: 7992

Modified:
   DBIx-Class/0.08/branches/prefetch/t/76select.t
   DBIx-Class/0.08/branches/prefetch/t/inflate/hri.t
Log:
When no collapsing is requested HRI structures must always be hashrefs, not AoH as it is with a collapsed multi prefetch, roll the tests back to reflect this

Modified: DBIx-Class/0.08/branches/prefetch/t/76select.t
===================================================================
--- DBIx-Class/0.08/branches/prefetch/t/76select.t	2009-11-30 00:26:39 UTC (rev 7991)
+++ DBIx-Class/0.08/branches/prefetch/t/76select.t	2009-11-30 09:07:49 UTC (rev 7992)
@@ -168,12 +168,10 @@
     {
         artist         => 1,
         track_position => 2,
-        tracks         => [
-            {
-                trackid => 17,
-                title   => 'Apiary',
-            },
-        ],
+        tracks         => {
+          trackid => 17,
+          title   => 'Apiary',
+        },
     },
     'columns/select/as fold properly on sub-searches',
 );

Modified: DBIx-Class/0.08/branches/prefetch/t/inflate/hri.t
===================================================================
--- DBIx-Class/0.08/branches/prefetch/t/inflate/hri.t	2009-11-30 00:26:39 UTC (rev 7991)
+++ DBIx-Class/0.08/branches/prefetch/t/inflate/hri.t	2009-11-30 09:07:49 UTC (rev 7992)
@@ -30,7 +30,7 @@
 
 sub check_cols_of {
     my ($dbic_obj, $datahashref) = @_;
-    
+
     foreach my $col (keys %$datahashref) {
         # plain column
         if (not ref ($datahashref->{$col}) ) {
@@ -112,8 +112,8 @@
     my $datahashref = $hashrefinf[$index];
 
     is ($track->cd->artist->name, $datahashref->{name}, 'Brought back correct artist');
-    for my $col (keys %{$datahashref->{cds}[0]{tracks}[0]}) {
-        is ($track->get_column ($col), $datahashref->{cds}[0]{tracks}[0]{$col}, "Correct track '$col'");
+    for my $col (keys %{$datahashref->{cds}{tracks}}) {
+        is ($track->get_column ($col), $datahashref->{cds}{tracks}{$col}, "Correct track '$col'");
     }
 }