More refactoring, prefetch

[dbsrgits/DBIx-Class.git] / t / 06relationship.t

diff --git a/t/06relationship.t b/t/06relationship.t
index b395599..ec6b3aa 100644 (file)
--- a/t/06relationship.t
+++ b/t/06relationship.t
@@ -7,12 +7,12 @@ use lib qw(t/lib);
 use_ok('DBICTest');
 
 # has_a test
-my $cd = DBICTest::CD->retrieve(4);
+my $cd = DBICTest::CD->find(4);
 my ($artist) = $cd->search_related('artist');
 is($artist->name, 'Random Boy Band', 'has_a search_related ok');
 
 # has_many test with an order_by clause defined
-$artist = DBICTest::Artist->retrieve(1);
+$artist = DBICTest::Artist->find(1);
 is( ($artist->search_related('cds'))[1]->title, 'Spoonful of bees', 'has_many search_related with order_by ok' );
 
 # search_related with additional abstract query
@@ -59,15 +59,14 @@ $cd = $artist->find_or_create_related( 'cds', {
   year => 2006,
 } );
 is( $cd->title, 'Greatest Hits', 'find_or_create_related new record ok' );
-my @cds = $artist->search_related('cds');
+@cds = $artist->search_related('cds');
 is( ($artist->search_related('cds'))[4]->title, 'Greatest Hits', 'find_or_create_related new record search ok' );
 
 SKIP: {
-    skip 'Need to add delete_related', 1;
+    #skip 'Need to add delete_related', 1;
     # delete_related
-    ($cd) = DBICTest::CD->search( title => 'Greatest Hits' );
-    $artist->delete_related( cds => $cd );
-    is( DBICTest::CD->search( title => 'Greatest Hits' ), undef, 'delete_related ok' );
+    $artist->delete_related( cds => { title => 'Greatest Hits' });
+    cmp_ok( DBICTest::CD->search( title => 'Greatest Hits' ), '==', 0, 'delete_related ok' );
 };
 
 # try to add a bogus relationship using the wrong cols