From 2da49caf078279eb7d3b9129f7e5aed06f7a32bc Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Sat, 11 Oct 2014 22:11:15 +0200 Subject: [PATCH] Bug 12803: tidy up some tests --- t/db_dependent/HoldsQueue.t | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/t/db_dependent/HoldsQueue.t b/t/db_dependent/HoldsQueue.t index 6fc6771..a73eac1 100755 --- a/t/db_dependent/HoldsQueue.t +++ b/t/db_dependent/HoldsQueue.t @@ -307,15 +307,14 @@ C4::Calendar->new( branchcode => 'MPL' )->insert_single_holiday( ); C4::HoldsQueue::CreateQueue(); $holds_queue = $dbh->selectall_arrayref("SELECT * FROM tmp_holdsqueue", { Slice => {} }); -ok( @$holds_queue == 1, "Holds not filled with items from closed libraries" ); +is( scalar( @$holds_queue ), 1, "Holds not filled with items from closed libraries" ); C4::Context->set_preference('HoldsQueueSkipClosed', 0); $dbh->do("DELETE FROM default_circ_rules"); $dbh->do("INSERT INTO default_circ_rules ( holdallowed ) VALUES ( 2 )"); C4::HoldsQueue::CreateQueue(); $holds_queue = $dbh->selectall_arrayref("SELECT * FROM tmp_holdsqueue", { Slice => {} }); -ok( @$holds_queue == 3, "Holds queue filling correct number for holds for default holds policy 'from any library'" ); -#warn "HOLDS QUEUE: " . Data::Dumper::Dumper( $holds_queue ); +is( scalar( @$holds_queue ), 3, "Holds queue filling correct number for holds for default holds policy 'from any library'" ); # Test skipping hold picks for closed libraries without transport cost matrix # At this point in the test, we have 3 rows in the holds queue @@ -325,7 +324,7 @@ ok( @$holds_queue == 3, "Holds queue filling correct number for holds for defaul C4::Context->set_preference( 'HoldsQueueSkipClosed', 1 ); C4::HoldsQueue::CreateQueue(); $holds_queue = $dbh->selectall_arrayref("SELECT * FROM tmp_holdsqueue", { Slice => {} }); -ok( @$holds_queue == 2, "Holds not filled with items from closed libraries" ); +is( scalar( @$holds_queue ), 2, "Holds not filled with items from closed libraries" ); # Cleanup $dbh->rollback; -- 2.1.0