From bfd9af0e58a5f66bc0432949ec60d8d3caab4089 Mon Sep 17 00:00:00 2001 From: Tomas Cohen Arazi Date: Wed, 1 Nov 2017 16:29:54 -0300 Subject: [PATCH] Bug 7317: (QA followup) Get rid of warnings from the tests Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart --- Koha/Illrequest.pm | 19 +++++++++++----- t/db_dependent/Illrequests.t | 44 ++++++++++++++++++------------------ 2 files changed, 35 insertions(+), 28 deletions(-) diff --git a/Koha/Illrequest.pm b/Koha/Illrequest.pm index 488fa46cd6..5f6ee12a45 100644 --- a/Koha/Illrequest.pm +++ b/Koha/Illrequest.pm @@ -611,7 +611,8 @@ sub backend_create { backend => $self->_backend->name } }; - } elsif ( $params->{stage} eq 'copyrightclearance' ) { + } elsif ( defined $params->{stage} + && $params->{stage} eq 'copyrightclearance' ) { $params->{stage} = 'init'; } @@ -690,9 +691,13 @@ sub getLimits { my ( $self, $params ) = @_; my $limits = $self->_config->getLimitRules($params->{type}); - return $limits->{$params->{value}} - || $limits->{default} - || { count => -1, method => 'active' }; + if ( defined $params->{value} + && defined $limits->{$params->{value}} ) { + return $limits->{$params->{value}}; + } + else { + return $limits->{default} || { count => -1, method => 'active' }; + } } =head3 getPrefix @@ -884,8 +889,10 @@ EOF } elsif ( 'draft' eq $params->{stage} ) { # Create the to header my $to = $params->{partners}; - $to =~ s/^\x00//; # Strip leading NULLs - $to =~ s/\x00/; /; # Replace others with '; ' + if ( defined $to ) { + $to =~ s/^\x00//; # Strip leading NULLs + $to =~ s/\x00/; /; # Replace others with '; ' + } die "No target email addresses found. Either select at least one partner or check your ILL partner library records." if ( !$to ); # Create the from, replyto and sender headers my $from = $branch->branchemail; diff --git a/t/db_dependent/Illrequests.t b/t/db_dependent/Illrequests.t index 688d6d2881..fd5772fd4c 100644 --- a/t/db_dependent/Illrequests.t +++ b/t/db_dependent/Illrequests.t @@ -220,20 +220,20 @@ subtest 'Backend testing (mocks)' => sub { # the Dummy plugin installed. load_backend & available_backends don't # currently have tests as a result. + t::lib::Mocks->mock_config('interlibrary_loans', { backend_dir => 'a_dir' } ); my $backend = Test::MockObject->new; $backend->set_isa('Koha::Illbackends::Mock'); $backend->set_always('name', 'Mock'); my $patron = $builder->build({ source => 'Borrower' }); - my $illrq = $builder->build({ - source => 'Illrequest', + my $illrq = $builder->build_object({ + class => 'Koha::Illrequests', value => { borrowernumber => $patron->{borrowernumber} } }); - my $illrq_obj = Koha::Illrequests->find($illrq->{illrequest_id}); - $illrq_obj->_backend($backend); + $illrq->_backend($backend); - isa_ok($illrq_obj->_backend, 'Koha::Illbackends::Mock', + isa_ok($illrq->_backend, 'Koha::Illbackends::Mock', "OK accessing mocked backend."); # _backend_capability tests: @@ -245,15 +245,15 @@ subtest 'Backend testing (mocks)' => sub { # functionality, such as unmediated in the BLDSS backend (also see # bugzilla 18837). $backend->set_always('capabilities', undef); - is($illrq_obj->_backend_capability('Test'), 0, + is($illrq->_backend_capability('Test'), 0, "0 returned on Mock not implementing capabilities."); $backend->set_always('capabilities', 0); - is($illrq_obj->_backend_capability('Test'), 0, + is($illrq->_backend_capability('Test'), 0, "0 returned on Mock not implementing Test capability."); $backend->set_always('capabilities', sub { return 'bar'; } ); - is($illrq_obj->_backend_capability('Test'), 'bar', + is($illrq->_backend_capability('Test'), 'bar', "'bar' returned on Mock implementing Test capability."); # metadata test: we need to be sure that we return the arbitrary values @@ -270,10 +270,10 @@ subtest 'Backend testing (mocks)' => sub { ); is_deeply( - $illrq_obj->metadata, + $illrq->metadata, { - ID => $illrq_obj->illrequest_id, - Title => $illrq_obj->patron->borrowernumber + ID => $illrq->illrequest_id, + Title => $illrq->patron->borrowernumber }, "Test metadata." ); @@ -282,7 +282,7 @@ subtest 'Backend testing (mocks)' => sub { # No backend graph extension $backend->set_always('status_graph', {}); - is_deeply($illrq_obj->capabilities('COMP'), + is_deeply($illrq->capabilities('COMP'), { prev_actions => [ 'REQ' ], id => 'COMP', @@ -293,10 +293,10 @@ subtest 'Backend testing (mocks)' => sub { ui_method_icon => 'fa-check', }, "Dummy status graph for COMP."); - is($illrq_obj->capabilities('UNKNOWN'), undef, + is($illrq->capabilities('UNKNOWN'), undef, "Dummy status graph for UNKNOWN."); - is_deeply($illrq_obj->capabilities(), - $illrq_obj->_core_status_graph, + is_deeply($illrq->capabilities(), + $illrq->_core_status_graph, "Dummy full status graph."); # Simple backend graph extension $backend->set_always('status_graph', @@ -307,18 +307,18 @@ subtest 'Backend testing (mocks)' => sub { next_actions => [ 'REQ' ], }, }); - is_deeply($illrq_obj->capabilities('QER'), + is_deeply($illrq->capabilities('QER'), { prev_actions => [ 'REQ' ], id => 'QER', next_actions => [ 'REQ' ], }, "Simple status graph for QER."); - is($illrq_obj->capabilities('UNKNOWN'), undef, + is($illrq->capabilities('UNKNOWN'), undef, "Simple status graph for UNKNOWN."); - is_deeply($illrq_obj->capabilities(), - $illrq_obj->_status_graph_union( - $illrq_obj->_core_status_graph, + is_deeply($illrq->capabilities(), + $illrq->_status_graph_union( + $illrq->_core_status_graph, { QER => { prev_actions => [ 'REQ' ], @@ -333,7 +333,7 @@ subtest 'Backend testing (mocks)' => sub { # No backend graph extension $backend->set_always('status_graph', {}); - is($illrq_obj->custom_capability('unknown', {}), 0, + is($illrq->custom_capability('unknown', {}), 0, "Unknown candidate."); # Simple backend graph extension @@ -348,7 +348,7 @@ subtest 'Backend testing (mocks)' => sub { }); $backend->mock('identity', sub { my ( $self, $params ) = @_; return $params->{other}; }); - is($illrq_obj->custom_capability('identity', { test => 1 })->{test}, 1, + is($illrq->custom_capability('identity', { test => 1, method => 'blah' })->{test}, 1, "Resolve identity custom_capability"); $schema->storage->txn_rollback; -- 2.39.5