X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fp5-DBIx-Class-ResultSet-RecursiveUpdate;a=blobdiff_plain;f=t%2Flib%2FRunTests.pm;h=f34f6b25a6d91c23fc14e0833c31eb23706fc94c;hp=7121ed27add86d4f6c6a1bfc5634582d63c63af0;hb=e589cf208847323ebac6def8aa65075d6c253016;hpb=882e0965d8ecbf0320905b794bbbdbc7cc3582f7 diff --git a/t/lib/RunTests.pm b/t/lib/RunTests.pm index 7121ed2..f34f6b2 100644 --- a/t/lib/RunTests.pm +++ b/t/lib/RunTests.pm @@ -3,6 +3,7 @@ package RunTests; use Exporter 'import'; # gives you Exporter's import() method directly @EXPORT = qw(run_tests); use strict; +use warnings; use Test::More; use Test::Warn; use DBIx::Class::ResultSet::RecursiveUpdate; @@ -10,7 +11,7 @@ use DBIx::Class::ResultSet::RecursiveUpdate; sub run_tests { my $schema = shift; - plan tests => 51; + plan tests => 55; my $dvd_rs = $schema->resultset('Dvd'); my $user_rs = $schema->resultset('User'); @@ -41,55 +42,88 @@ sub run_tests { } ); - my $u = $user_rs->find( $dvd_rs->find( 1 )->owner->id ); + $u = $user_rs->find( $dvd_rs->find( 1 )->owner->id ); is( $u->username, 'bbb', 'fixed_fields 0.21+ api ok' ); - # try to create with a not existing rel - $updates = { - name => 'Test for nonexisting rel', - username => 'nonexisting_rel', - password => 'whatever', - nonexisting => { foo => 'bar' }, - }; + { -# for future use when we switch from warn to throw_exception -# eval { $user_rs->recursive_update($updates); }; -# like( -# $@, -# qr/No such column, relationship, many-to-many helper accessor or generic accessor 'nonexisting'/, -# 'nonexisting column, accessor, relationship fails' -# ); - warning_is { - my $user = $user_rs->recursive_update($updates); + # try to create with a not existing rel + my $updates = { + name => 'Test for nonexisting rel', + username => 'nonexisting_rel', + password => 'whatever', + nonexisting => { foo => 'bar' }, + }; + + warning_like { + my $user = $user_rs->recursive_update($updates); + } + qr/No such column, relationship, many-to-many helper accessor or generic accessor 'nonexisting'/, + 'nonexisting column, accessor, relationship warns'; + $expected_user_count++; + is( $user_rs->count, $expected_user_count, 'User created' ); + + # for future use when we switch from warn to throw_exception + # eval { $user_rs->recursive_update($updates); }; + # like( + # $@, + # qr/No such column, relationship, many-to-many helper accessor or generic accessor 'nonexisting'/, + # 'nonexisting column, accessor, relationship fails' + # ); } - "No such column, relationship, many-to-many helper accessor or generic accessor 'nonexisting'", - 'nonexisting column, accessor, relationship warns'; - $expected_user_count++; - is( $user_rs->count, $expected_user_count, 'User created' ); - # try to create with a not existing rel but suppressed warning - $updates = { - name => 'Test for nonexisting rel with suppressed warning', - username => 'suppressed_nonexisting_rel', - password => 'whatever', - nonexisting => { foo => 'bar' }, - }; + { + + # try to create with a not existing rel but suppressed warning + my $updates = { + name => 'Test for nonexisting rel with suppressed warning', + username => 'suppressed_nonexisting_rel', + password => 'whatever', + nonexisting => { foo => 'bar' }, + }; + + warning_is { + my $user = + $user_rs->recursive_update( $updates, + { unknown_params_ok => 1 } ); + } + "", + "nonexisting column, accessor, relationship doesn't warn with unknown_params_ok"; + $expected_user_count++; + is( $user_rs->count, $expected_user_count, 'User created' ); + } + + { + + # try to create with a not existing rel, suppressed warning but storage debugging + my $updates = { + name => 'Test for nonexisting rel with suppressed warning but storage debugging', + username => 'suppressed_nonexisting_rel_with_storage_debug', + password => 'whatever', + nonexisting => { foo => 'bar' }, + }; + + my $debug = $user_rs->result_source->storage->debug; + $user_rs->result_source->storage->debug(1); - warning_is { - my $user = - $user_rs->recursive_update( $updates, - { unknown_params_ok => 1 } ); + warning_like { + my $user = + $user_rs->recursive_update( $updates, + { unknown_params_ok => 1 } ); + } + qr/No such column, relationship, many-to-many helper accessor or generic accessor 'nonexisting'/, + "nonexisting column, accessor, relationship doesn't warn with unknown_params_ok"; + $expected_user_count++; + is( $user_rs->count, $expected_user_count, 'User created' ); + + $user_rs->result_source->storage->debug($debug); } - "", - "nonexisting column, accessor, relationship doesn't warn with unknown_params_ok"; - $expected_user_count++; - is( $user_rs->count, $expected_user_count, 'User created' ); # creating new record linked to some old record $updates = { name => 'Test name 2', viewings => [ { user_id => $owner->id } ], - owner => { id => $another_owner->id }, + owner => { id => $another_owner->id }, }; my $new_dvd = $dvd_rs->recursive_update($updates); @@ -104,8 +138,6 @@ sub run_tests { # creating new records $updates = { - - #aaaa => undef, tags => [ '2', { id => '3' } ], name => 'Test name', owner => $owner, @@ -156,10 +188,9 @@ TODO: { my $num_of_users = $user_rs->count; $updates = { id => $dvd->dvd_id, # id instead of dvd_id - #aaaa => undef, name => undef, tags => [], - 'owner' => $another_owner->id, + owner => $another_owner->id, current_borrower => { username => 'new name a', name => 'new name a', @@ -174,7 +205,7 @@ TODO: { is( $schema->resultset('User')->count, $expected_user_count, "No new user created" ); is( $dvd_updated->name, undef, 'Dvd name deleted' ); - is( $dvd_updated->owner->id, $another_owner->id, 'Owner updated' ); + is( $dvd_updated->get_column('owner'), $another_owner->id, 'Owner updated' ); is( $dvd_updated->current_borrower->name, 'new name a', 'Related record modified' ); is( $dvd_updated->tags->count, 0, 'Tags deleted' ); @@ -183,6 +214,11 @@ TODO: { 'might_have record changed' ); + my $dvd_with_tags = $dvd_rs->recursive_update({ id => $dvd->dvd_id, tags => [1, 2] }); + is_deeply( [ map { $_->id } $dvd_with_tags->tags ], [ 1, 2 ], 'Tags set' ); + my $dvd_without_tags = $dvd_rs->recursive_update({ id => $dvd->dvd_id, tags => undef }); + is( $dvd_without_tags->tags->count, 0, 'Tags deleted when m2m accessor set to undef' ); + $new_dvd->update( { name => 'New Test Name' } ); $updates = { id => $new_dvd->dvd_id, # id instead of dvd_id @@ -275,7 +311,7 @@ TODO: { ); is( $user->borrowed_dvds->count, 1, 'if_not_submitted delete' ); - @tags = $schema->resultset('Tag')->search(); + @tags = $schema->resultset('Tag')->all; $dvd_updated = DBIx::Class::ResultSet::RecursiveUpdate::Functions::recursive_update( resultset => $schema->resultset('Dvd'),