Bug 24545: Fix license statements

[koha-ffzg.git] / t / db_dependent / Holds / RevertWaitingStatus.t

diff --git a/t/db_dependent/Holds/RevertWaitingStatus.t b/t/db_dependent/Holds/RevertWaitingStatus.t
index 146adb8..41a22e9 100755 (executable)
--- a/t/db_dependent/Holds/RevertWaitingStatus.t
+++ b/t/db_dependent/Holds/RevertWaitingStatus.t
@@ -16,20 +16,18 @@
 # along with Koha; if not, see <http://www.gnu.org/licenses>.
 
 use Modern::Perl;
-
-use t::lib::Mocks;
-use C4::Context;
-
 use Test::More tests => 3;
 use MARC::Record;
-use C4::Biblio;
-use C4::Items;
-use C4::Members;
-use C4::Reserves;
 
 use Koha::Libraries;
+use Koha::Patrons;
+use C4::Context;
+use C4::Items;
+use C4::Biblio;
+use C4::Reserves;
 
 use t::lib::TestBuilder;
+use t::lib::Mocks;
 
 my $schema = Koha::Database->schema;
 $schema->storage->txn_begin;
@@ -44,20 +42,11 @@ my $branchcode = $builder->build( { source => 'Branch' } )->{branchcode};
 my $itemtype = $builder->build(
     { source => 'Itemtype', value => { notforloan => undef } } )->{itemtype};
 
-local $SIG{__WARN__} = sub { warn $_[0] unless $_[0] =~ /redefined/ };
-*C4::Context::userenv = \&Mock_userenv;
-
-sub Mock_userenv {
-    my $userenv = { flags => 1, id => '1', branch => $branchcode };
-    return $userenv;
-}
+t::lib::Mocks::mock_userenv({ flags => 1, userid => '1', branchcode => $branchcode });
 
 my $borrowers_count = 3;
 
-# Create a biblio instance
-my ( $bibnum, $title, $bibitemnum ) = create_helper_biblio();
-
-# Create an item
+my $biblio = $builder->build_sample_biblio();
 my $item_barcode = 'my_barcode';
 my ( $item_bibnum, $item_bibitemnum, $itemnumber ) = AddItem(
     {   homebranch    => $branchcode,
@@ -65,43 +54,36 @@ my ( $item_bibnum, $item_bibitemnum, $itemnumber ) = AddItem(
         barcode       => $item_barcode,
         itype         => $itemtype
     },
-    $bibnum
+    $biblio->biblionumber,
 );
 
 # Create some borrowers
 my $patron_category = $builder->build({ source => 'Category' });
 my @borrowernumbers;
 foreach my $i ( 1 .. $borrowers_count ) {
-    my $borrowernumber = AddMember(
+    my $borrowernumber = Koha::Patron->new({
         firstname    => 'my firstname',
         surname      => 'my surname ' . $i,
         categorycode => $patron_category->{categorycode},
         branchcode   => $branchcode,
-    );
+    })->store->borrowernumber;
     push @borrowernumbers, $borrowernumber;
 }
 
-my $biblionumber = $bibnum;
-
 # Create five item level holds
 foreach my $borrowernumber (@borrowernumbers) {
     AddReserve(
-        $branchcode,
-        $borrowernumber,
-        $biblionumber,
-        my $bibitems   = q{},
-        my $priority,
-        my $resdate,
-        my $expdate,
-        my $notes = q{},
-        $title,
-        my $checkitem,
-        my $found,
+        {
+            branchcode     => $branchcode,
+            borrowernumber => $borrowernumber,
+            biblionumber   => $biblio->biblionumber,
+        }
     );
 }
 
 ModReserveAffect( $itemnumber, $borrowernumbers[0] );
-C4::Circulation::AddIssue( GetMember( borrowernumber => $borrowernumbers[1] ),
+my $patron = Koha::Patrons->find( $borrowernumbers[1] )->unblessed;
+C4::Circulation::AddIssue( $patron,
     $item_barcode, my $datedue, my $cancelreserve = 'revert' );
 
 my $priorities = $dbh->selectall_arrayref(
@@ -111,14 +93,3 @@ ok( $priorities->[0]->[0] == 1, 'First hold has a priority of 1' );
 ok( $priorities->[1]->[0] == 2, 'Second hold has a priority of 2' );
 
 $schema->storage->txn_rollback;
-
-# Helper method to set up a Biblio.
-sub create_helper_biblio {
-    my $bib   = MARC::Record->new();
-    my $title = 'Silence in the library';
-    $bib->append_fields(
-        MARC::Field->new( '100', ' ', ' ', a => 'Moffat, Steven' ),
-        MARC::Field->new( '245', ' ', ' ', a => $title ),
-    );
-    return ( $bibnum, $title, $bibitemnum ) = AddBiblio( $bib, '' );
-}