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

[mo at dev.catalyst.perl.org]

Author: mo
Date: 2009-08-21 12:19:07 +0000 (Fri, 21 Aug 2009)
New Revision: 7360

Modified:
   DBIx-Class/0.08/branches/prefetch/t/76select.t
   DBIx-Class/0.08/branches/prefetch/t/prefetch/multiple_hasmany.t
Log:
test fixes

Modified: DBIx-Class/0.08/branches/prefetch/t/76select.t
===================================================================
--- DBIx-Class/0.08/branches/prefetch/t/76select.t	2009-08-21 09:22:51 UTC (rev 7359)
+++ DBIx-Class/0.08/branches/prefetch/t/76select.t	2009-08-21 12:19:07 UTC (rev 7360)
@@ -9,7 +9,7 @@
 
 my $schema = DBICTest->init_schema();
 
-plan tests => 24;
+plan tests => 23;
 
 my $rs = $schema->resultset('CD')->search({},
     {
@@ -165,34 +165,19 @@
   }
 );
 
-is_deeply (
-  $sub_rs->single,
-  {
-    artist => 1,
-    track_position => 2,
-    tracks =>
-      {
-        trackid => 17,
-        title => 'Apiary',
-      },
-  },
-  'columns/select/as fold properly on sub-searches',
-);
-
-TODO: {
-  local $TODO = "Multi-collapsing still doesn't work right - HRI should be getting an arrayref, not an individual hash";
-  is_deeply (
+is_deeply(
     $sub_rs->single,
     {
-      artist => 1,
-      track_position => 2,
-      tracks => [
-        {
-          trackid => 17,
-          title => 'Apiary',
-        },
-      ],
+        artist         => 1,
+        track_position => 2,
+        tracks         => [
+            {
+                trackid => 17,
+                title   => 'Apiary',
+            },
+        ],
     },
     'columns/select/as fold properly on sub-searches',
-  );
-}
+);
+
+

Modified: DBIx-Class/0.08/branches/prefetch/t/prefetch/multiple_hasmany.t
===================================================================
--- DBIx-Class/0.08/branches/prefetch/t/prefetch/multiple_hasmany.t	2009-08-21 09:22:51 UTC (rev 7359)
+++ DBIx-Class/0.08/branches/prefetch/t/prefetch/multiple_hasmany.t	2009-08-21 12:19:07 UTC (rev 7360)
@@ -143,6 +143,7 @@
 }
 
 $rs->reset;
+use Data::Dumper;
 diag Dumper [
   "\n$query",
   "\n$tb",