Delete basicrels tests. Modify run tests to use new syntax. Remove helperrels test...

[dbsrgits/DBIx-Class.git] / t / run / 20unique.tl

diff --git a/t/run/20unique.tl b/t/run/20unique.tl
index 8b6ce3e..9d7634c 100644 (file)
--- a/t/run/20unique.tl
+++ b/t/run/20unique.tl
@@ -1,7 +1,13 @@
-sub run_tests {
-my $schema = shift;
+use strict;
+use warnings;  
 
-plan tests => 30;
+use Test::More;
+use lib qw(t/lib);
+use DBICTest;
+
+my $schema = DBICTest::init_schema();
+
+plan tests => 34;
 
 my $artistid = 1;
 my $title    = 'UNIQUE Constraint';
@@ -24,7 +30,13 @@ is($cd2->get_column('artist'), $cd1->get_column('artist'), 'find by specific key
 is($cd2->title, $cd1->title, 'title is correct');
 is($cd2->year, $cd1->year, 'year is correct');
 
-my $cd3 = $schema->resultset('CD')->update_or_create(
+my $cd3 = $schema->resultset('CD')->find($artistid, $title, { key => 'artist_title' });
+
+is($cd3->get_column('artist'), $cd1->get_column('artist'), 'find by specific key, ordered columns: artist is correct');
+is($cd3->title, $cd1->title, 'title is correct');
+is($cd3->year, $cd1->year, 'year is correct');
+
+my $cd4 = $schema->resultset('CD')->update_or_create(
   {
     artist => $artistid,
     title  => $title,
@@ -32,13 +44,13 @@ my $cd3 = $schema->resultset('CD')->update_or_create(
   },
 );
 
-ok(! $cd3->is_changed, 'update_or_create without key: row is clean');
-is($cd3->cdid, $cd2->cdid, 'cdid is correct');
-is($cd3->get_column('artist'), $cd2->get_column('artist'), 'artist is correct');
-is($cd3->title, $cd2->title, 'title is correct');
-is($cd3->year, 2007, 'updated year is correct');
+ok(! $cd4->is_changed, 'update_or_create without key: row is clean');
+is($cd4->cdid, $cd2->cdid, 'cdid is correct');
+is($cd4->get_column('artist'), $cd2->get_column('artist'), 'artist is correct');
+is($cd4->title, $cd2->title, 'title is correct');
+is($cd4->year, 2007, 'updated year is correct');
 
-my $cd4 = $schema->resultset('CD')->update_or_create(
+my $cd5 = $schema->resultset('CD')->update_or_create(
   {
     artist => $artistid,
     title  => $title,
@@ -47,13 +59,13 @@ my $cd4 = $schema->resultset('CD')->update_or_create(
   { key => 'artist_title' }
 );
 
-ok(! $cd4->is_changed, 'update_or_create by specific key: row is clean');
-is($cd4->cdid, $cd2->cdid, 'cdid is correct');
-is($cd4->get_column('artist'), $cd2->get_column('artist'), 'artist is correct');
-is($cd4->title, $cd2->title, 'title is correct');
-is($cd4->year, 2007, 'updated year is correct');
+ok(! $cd5->is_changed, 'update_or_create by specific key: row is clean');
+is($cd5->cdid, $cd2->cdid, 'cdid is correct');
+is($cd5->get_column('artist'), $cd2->get_column('artist'), 'artist is correct');
+is($cd5->title, $cd2->title, 'title is correct');
+is($cd5->year, 2007, 'updated year is correct');
 
-my $cd5 = $schema->resultset('CD')->update_or_create(
+my $cd6 = $schema->resultset('CD')->update_or_create(
   {
     cdid   => $cd2->cdid,
     artist => 1,
@@ -63,13 +75,13 @@ my $cd5 = $schema->resultset('CD')->update_or_create(
   { key => 'primary' }
 );
 
-ok(! $cd5->is_changed, 'update_or_create by PK: row is clean');
-is($cd5->cdid, $cd2->cdid, 'cdid is correct');
-is($cd5->get_column('artist'), $cd2->get_column('artist'), 'artist is correct');
-is($cd5->title, $cd2->title, 'title is correct');
-is($cd5->year, 2005, 'updated year is correct');
+ok(! $cd6->is_changed, 'update_or_create by PK: row is clean');
+is($cd6->cdid, $cd2->cdid, 'cdid is correct');
+is($cd6->get_column('artist'), $cd2->get_column('artist'), 'artist is correct');
+is($cd6->title, $cd2->title, 'title is correct');
+is($cd6->year, 2005, 'updated year is correct');
 
-my $cd6 = $schema->resultset('CD')->find_or_create(
+my $cd7 = $schema->resultset('CD')->find_or_create(
   {
     artist => $artistid,
     title  => $title,
@@ -78,13 +90,13 @@ my $cd6 = $schema->resultset('CD')->find_or_create(
   { key => 'artist_title' }
 );
 
-is($cd6->cdid, $cd1->cdid, 'find or create by specific key: cdid is correct');
-is($cd6->get_column('artist'), $cd1->get_column('artist'), 'artist is correct');
-is($cd6->title, $cd1->title, 'title is correct');
-is($cd6->year, $cd1->year, 'year is correct');
+is($cd7->cdid, $cd1->cdid, 'find_or_create by specific key: cdid is correct');
+is($cd7->get_column('artist'), $cd1->get_column('artist'), 'artist is correct');
+is($cd7->title, $cd1->title, 'title is correct');
+is($cd7->year, $cd1->year, 'year is correct');
 
 my $artist = $schema->resultset('Artist')->find($artistid);
-my $cd7 = $artist->find_or_create_related('cds',
+my $cd8 = $artist->find_or_create_related('cds',
   {
     artist => $artistid,
     title  => $title,
@@ -93,12 +105,12 @@ my $cd7 = $artist->find_or_create_related('cds',
   { key => 'artist_title' }
 );
 
-is($cd7->cdid, $cd1->cdid, 'find or create related by specific key: cdid is correct');
-is($cd7->get_column('artist'), $cd1->get_column('artist'), 'artist is correct');
-is($cd7->title, $cd1->title, 'title is correct');
-is($cd7->year, $cd1->year, 'year is correct');
+is($cd8->cdid, $cd1->cdid, 'find_or_create related by specific key: cdid is correct');
+is($cd8->get_column('artist'), $cd1->get_column('artist'), 'artist is correct');
+is($cd8->title, $cd1->title, 'title is correct');
+is($cd8->year, $cd1->year, 'year is correct');
 
-my $cd8 = $artist->update_or_create_related('cds',
+my $cd9 = $artist->update_or_create_related('cds',
   {
     artist => $artistid,
     title  => $title,
@@ -107,11 +119,9 @@ my $cd8 = $artist->update_or_create_related('cds',
   { key => 'artist_title' }
 );
 
-is($cd8->cdid, $cd1->cdid, 'update or create related by specific key: cdid is correct');
-is($cd8->get_column('artist'), $cd1->get_column('artist'), 'artist is correct');
-is($cd8->title, $cd1->title, 'title is correct');
-is($cd8->year, 2021, 'year is correct');
-
-}
+ok(! $cd9->is_changed, 'update_or_create by specific key: row is clean');
+is($cd9->cdid, $cd1->cdid, 'cdid is correct');
+is($cd9->get_column('artist'), $cd1->get_column('artist'), 'artist is correct');
+is($cd9->title, $cd1->title, 'title is correct');
+is($cd9->year, 2021, 'year is correct');
 
-1;