Bug 16185: t/db_dependent/Reports_Guided.t is failing

[koha.git] / t / db_dependent / Holds.t

diff --git a/t/db_dependent/Holds.t b/t/db_dependent/Holds.t
index 57cb386..4ba95df 100755 (executable)
--- a/t/db_dependent/Holds.t
+++ b/t/db_dependent/Holds.t
@@ -8,16 +8,15 @@ use t::lib::TestBuilder;
 use C4::Context;
 use C4::Branch;
 
-use Test::More tests => 56;
+use Test::More tests => 60;
 use MARC::Record;
 use C4::Biblio;
 use C4::Items;
 use C4::Members;
 use C4::Calendar;
-
-use Koha::Holds;
-
+use Koha::Database;
 use Koha::DateUtils qw( dt_from_string output_pref );
+use Koha::Holds;
 
 BEGIN {
     use FindBin;
@@ -25,12 +24,11 @@ BEGIN {
     use_ok('C4::Reserves');
 }
 
-my $builder = t::lib::TestBuilder->new();
-my $dbh = C4::Context->dbh;
+my $schema  = Koha::Database->new->schema;
+$schema->storage->txn_begin;
 
-# Start transaction
-$dbh->{AutoCommit} = 0;
-$dbh->{RaiseError} = 1;
+my $builder = t::lib::TestBuilder->new();
+my $dbh     = C4::Context->dbh;
 
 # Create two random branches
 my $branch_1 = $builder->build({ source => 'Branch' })->{ branchcode };
@@ -133,12 +131,13 @@ ModReserve({
     rank          => '4',
     branchcode    => $branch_1,
     itemnumber    => $itemnumber,
-    suspend_until => C4::Dates->new("2013-01-01","iso")->output(),
+    suspend_until => output_pref( { dt => dt_from_string( "2013-01-01", "iso" ), dateonly => 1 } ),
 });
+
 $reserve = GetReserve( $reserve_id );
 ok( $reserve->{'priority'} eq '4', "Test GetReserve(), priority changed correctly" );
 ok( $reserve->{'suspend'}, "Test GetReserve(), suspend hold" );
-ok( $reserve->{'suspend_until'} eq '2013-01-01 00:00:00', "Test GetReserve(), suspend until date" );
+is( $reserve->{'suspend_until'}, '2013-01-01 00:00:00', "Test GetReserve(), suspend until date" );
 
 ToggleSuspend( $reserve_id );
 $reserve = GetReserve( $reserve_id );
@@ -146,16 +145,35 @@ ok( !$reserve->{'suspend'}, "Test ToggleSuspend(), no date" );
 
 ToggleSuspend( $reserve_id, '2012-01-01' );
 $reserve = GetReserve( $reserve_id );
-ok( $reserve->{'suspend_until'} eq '2012-01-01 00:00:00', "Test ToggleSuspend(), with date" );
+is( $reserve->{'suspend_until'}, '2012-01-01 00:00:00', "Test ToggleSuspend(), with date" );
 
 AutoUnsuspendReserves();
 $reserve = GetReserve( $reserve_id );
 ok( !$reserve->{'suspend'}, "Test AutoUnsuspendReserves()" );
 
+SuspendAll(
+    borrowernumber => $borrowernumber,
+    biblionumber   => $biblionumber,
+    suspend => 1,
+    suspend_until => '2012-01-01',
+);
+$reserve = GetReserve( $reserve_id );
+is( $reserve->{'suspend'}, 1, "Test SuspendAll()" );
+is( $reserve->{'suspend_until'}, '2012-01-01 00:00:00', "Test SuspendAll(), with date" );
+
+SuspendAll(
+    borrowernumber => $borrowernumber,
+    biblionumber   => $biblionumber,
+    suspend => 0,
+);
+$reserve = GetReserve( $reserve_id );
+is( $reserve->{'suspend'}, 0, "Test resuming with SuspendAll()" );
+is( $reserve->{'suspend_until'}, undef, "Test resuming with SuspendAll(), should have no suspend until date" );
+
 # Add a new hold for the borrower whose hold we canceled earlier, this time at the bib level
 AddReserve(
     $branch_1,
-    $borrowernumber,
+    $borrowernumbers[0],
     $biblionumber,
     my $bibitems = q{},
     my $priority,
@@ -187,19 +205,19 @@ $reserves = GetReservesFromBiblionumber({ biblionumber => $biblionumber, all_dat
 $reserve = $reserves->[1];
 AlterPriority( 'top', $reserve->{'reserve_id'} );
 $reserve = GetReserve( $reserve->{'reserve_id'} );
-ok( $reserve->{'priority'} eq '1', "Test AlterPriority(), move to top" );
+is( $reserve->{'priority'}, '1', "Test AlterPriority(), move to top" );
 
 AlterPriority( 'down', $reserve->{'reserve_id'} );
 $reserve = GetReserve( $reserve->{'reserve_id'} );
-ok( $reserve->{'priority'} eq '2', "Test AlterPriority(), move down" );
+is( $reserve->{'priority'}, '2', "Test AlterPriority(), move down" );
 
 AlterPriority( 'up', $reserve->{'reserve_id'} );
 $reserve = GetReserve( $reserve->{'reserve_id'} );
-ok( $reserve->{'priority'} eq '1', "Test AlterPriority(), move up" );
+is( $reserve->{'priority'}, '1', "Test AlterPriority(), move up" );
 
 AlterPriority( 'bottom', $reserve->{'reserve_id'} );
 $reserve = GetReserve( $reserve->{'reserve_id'} );
-ok( $reserve->{'priority'} eq '5', "Test AlterPriority(), move to bottom" );
+is( $reserve->{'priority'}, '5', "Test AlterPriority(), move to bottom" );
 
 # Regression test for bug 2394
 #
@@ -316,10 +334,10 @@ $reserve3 = GetReserve( $reserveid3 );
 is( $reserve3->{priority}, 1, "After ModReserve, the 3rd reserve becomes the first on the waiting list" );
 
 ModItem({ damaged => 1 }, $item_bibnum, $itemnumber);
-C4::Context->set_preference( 'AllowHoldsOnDamagedItems', 1 );
+t::lib::Mocks::mock_preference( 'AllowHoldsOnDamagedItems', 1 );
 ok( CanItemBeReserved( $borrowernumbers[0], $itemnumber) eq 'OK', "Patron can reserve damaged item with AllowHoldsOnDamagedItems enabled" );
 ok( defined( ( CheckReserves($itemnumber) )[1] ), "Hold can be trapped for damaged item with AllowHoldsOnDamagedItems enabled" );
-C4::Context->set_preference( 'AllowHoldsOnDamagedItems', 0 );
+t::lib::Mocks::mock_preference( 'AllowHoldsOnDamagedItems', 0 );
 ok( CanItemBeReserved( $borrowernumbers[0], $itemnumber) eq 'damaged', "Patron cannot reserve damaged item with AllowHoldsOnDamagedItems disabled" );
 ok( !defined( ( CheckReserves($itemnumber) )[1] ), "Hold cannot be trapped for damaged item with AllowHoldsOnDamagedItems disabled" );
 
@@ -391,8 +409,8 @@ is(CanItemBeReserved($borrowernumbers[0], $itemnumber), 'OK',
 
 
 # Test CancelExpiredReserves
-C4::Context->set_preference('ExpireReservesMaxPickUpDelay', 1);
-C4::Context->set_preference('ReservesMaxPickUpDelay', 1);
+t::lib::Mocks::mock_preference('ExpireReservesMaxPickUpDelay', 1);
+t::lib::Mocks::mock_preference('ReservesMaxPickUpDelay', 1);
 
 my ( $sec, $min, $hour, $mday, $mon, $year, $wday, $yday, $isdst ) = localtime(time);
 $year += 1900;
@@ -409,11 +427,11 @@ $calendar->insert_single_holiday(
 );
 $reserve_id = $reserve->{reserve_id};
 $dbh->do("UPDATE reserves SET waitingdate = DATE_SUB( NOW(), INTERVAL 5 DAY ), found = 'W', priority = 0 WHERE reserve_id = ?", undef, $reserve_id );
-C4::Context->set_preference('ExpireReservesOnHolidays', 0);
+t::lib::Mocks::mock_preference('ExpireReservesOnHolidays', 0);
 CancelExpiredReserves();
 my $count = $dbh->selectrow_array("SELECT COUNT(*) FROM reserves WHERE reserve_id = ?", undef, $reserve_id );
 is( $count, 1, "Waiting reserve beyond max pickup delay *not* canceled on holiday" );
-C4::Context->set_preference('ExpireReservesOnHolidays', 1);
+t::lib::Mocks::mock_preference('ExpireReservesOnHolidays', 1);
 CancelExpiredReserves();
 $count = $dbh->selectrow_array("SELECT COUNT(*) FROM reserves WHERE reserve_id = ?", undef, $reserve_id );
 is( $count, 0, "Waiting reserve beyond max pickup delay canceled on holiday" );