From fb00f8fa4c3f882cc491e553a60f7bc4c3de0aee Mon Sep 17 00:00:00 2001 From: Chris Cormack Date: Fri, 23 Mar 2012 08:32:38 +1300 Subject: [PATCH] Bug 5549 : Fixing the test to only run if the test data exists Content-Type: text/plain; charset="utf-8" Signed-off-by: Liz Rea test passes after the patch. Win. --- t/db_dependent/rollingloans.t | 26 +++++++++++++++++--------- 1 files changed, 17 insertions(+), 9 deletions(-) diff --git a/t/db_dependent/rollingloans.t b/t/db_dependent/rollingloans.t index af9e454..55fa58b 100644 --- a/t/db_dependent/rollingloans.t +++ b/t/db_dependent/rollingloans.t @@ -5,6 +5,7 @@ use 5.010; use C4::Context; use C4::Circulation; use C4::Members; +use C4::Items; use Test::More tests => 8; C4::Context->_new_userenv(1234567); @@ -17,18 +18,25 @@ my $test_item_fic = '502326000402'; my $test_item_24 = '502326000404'; my $test_item_48 = '502326000403'; -for my $item_barcode ( $test_item_fic, $test_item_24, $test_item_48) { - my $duedate = try_issue($test_patron, $item_barcode); - isa_ok($duedate, 'DateTime'); - if ($item_barcode eq $test_item_fic) { - is($duedate->hour(), 23, "daily loan hours = 23"); - is($duedate->minute(), 59, "daily loan mins = 59"); +my $borrower1 = GetMember(cardnumber => $test_patron); +my $item1 = GetItem (undef,$test_item_fic); + +SKIP: { + skip 'Missing test borrower or item, skipping tests', 8 + unless ( defined $borrower1 && defined $item1 ); + + for my $item_barcode ( $test_item_fic, $test_item_24, $test_item_48 ) { + my $duedate = try_issue( $test_patron, $item_barcode ); + isa_ok( $duedate, 'DateTime' ); + if ( $item_barcode eq $test_item_fic ) { + is( $duedate->hour(), 23, "daily loan hours = 23" ); + is( $duedate->minute(), 59, "daily loan mins = 59" ); + } + my $ret_ok = try_return($item_barcode); + is( $ret_ok, 1, 'Return succeeded' ); } - my $ret_ok = try_return($item_barcode); - is($ret_ok, 1, 'Return succeeded'); } - sub try_issue { my ($cardnumber, $item ) = @_; my $issuedate = '2011-05-16'; -- 1.7.2.5