a few tests

diff --git a/t/lib/RunTests.pm b/t/lib/RunTests.pm
index 2036de02cd54e660fbf5f004073d3e20ac62f681..cce65e02bda418cf5fbfcbb5dfda6e0686f19639 100644 (file)
--- a/t/lib/RunTests.pm
+++ b/t/lib/RunTests.pm
@@ -5,8 +5,11 @@ use Exporter 'import'; # gives you Exporter's import() method directly
 use strict;
 use Test::More; 
 
+
 sub run_tests{
     my $schema = shift;
+
+    plan tests => 24;
     
     my $dvd_rs = $schema->resultset( 'Dvd' );
     my $user_rs = $schema->resultset( 'User' );
@@ -23,19 +26,18 @@ sub run_tests{
         id => undef,
             name => 'Test name 2',
             viewings => [ { user_id => $owner->id } ],
-            owner => { id => $owner->id },
+            owner => { id => $another_owner->id },
     };
     
     my $new_dvd = $dvd_rs->recursive_update( $updates );
 #    my $new_dvd = $dvd_rs->create( $updates );
   
-    ok ( $new_dvd->isa( 'DBSchema::Result::Dvd' ), 'Dvd created' );
     is ( $dvd_rs->count, $initial_dvd_count + 1, 'Dvd created' );
     is ( $schema->resultset( 'User' )->count, $initial_user_count, "No new user created" );
     is ( $new_dvd->name, 'Test name 2', 'Dvd name set' );
-    is ( $new_dvd->owner->id, $owner->id, 'Owner set' );
+    is ( $new_dvd->owner->id, $another_owner->id, 'Owner set' );
     is ( $new_dvd->viewings->count, 1, 'Viewing created' );
-;    
+    
     # creating new records
     my $updates = {
         id => undef,
@@ -112,6 +114,8 @@ sub run_tests{
     };
     
     my $user = $user_rs->recursive_update( $updates );
+    is ( $schema->resultset( 'User' )->count, $initial_user_count + 2, "New user created" );
+    is ( $dvd_rs->count, $initial_dvd_count + 4, 'Dvds created' );
     my %owned_dvds = map { $_->name => $_ } $user->owned_dvds;
     is( scalar keys %owned_dvds, 2, 'Has many relations created' );
     ok( $owned_dvds{'temp name 1'}, 'Name in a has_many related record saved' );

diff --git a/t/pg.t b/t/pg.t
index 58ce12494c7b694827751545f4cd04d41980d7ff..7a2294d69ae8631094ec6d887a9e3c198cb52d39 100644 (file)
--- a/t/pg.t
+++ b/t/pg.t
@@ -10,8 +10,6 @@ my ($dsn, $user, $pass) = @ENV{map { "DBICTEST_PG_${_}" } qw/DSN USER PASS/};
 plan skip_all => 'Set $ENV{DBICTEST_PG_DSN}, _USER and _PASS to run this test'
  . ' (note: creates and tables!)' unless ($dsn && $user);
 
-plan tests => 19;
-
 my $schema = DBSchema::get_test_schema( $dsn, $user, $pass );
 
 run_tests( $schema );

diff --git a/t/sqlite.t b/t/sqlite.t
index ae617b6683058cc4cbfe458d4aa661001e10ee7f..4517ccffa3bb17724c15f39d2005bc8a810dc7cf 100644 (file)
--- a/t/sqlite.t
+++ b/t/sqlite.t
@@ -4,7 +4,6 @@ use lib 't/lib';
 use DBSchema;
 use RunTests;
 use Test::More;
-plan tests => 23;
 
 my $schema = DBSchema::get_test_schema();
 run_tests( $schema );

diff --git a/t/var/dvdzbr.db b/t/var/dvdzbr.db
index 6baf0116432b697306a4036b80177541bd649fd2..bac7b17abeec4cedd13cbebb9b52c3d7253f4e5c 100644 (file)
Binary files a/t/var/dvdzbr.db and b/t/var/dvdzbr.db differ