Bug 17600: Standardize our EXPORT_OK

[srvgit] / t / db_dependent / rollingloans.t

diff --git a/t/db_dependent/rollingloans.t b/t/db_dependent/rollingloans.t
old mode 100644 (file)
new mode 100755 (executable)
index 0ac7e6c..f72fa9f
--- a/t/db_dependent/rollingloans.t
+++ b/t/db_dependent/rollingloans.t
@@ -2,10 +2,11 @@
 
 use Modern::Perl;
 use C4::Context;
-use C4::Circulation;
+use C4::Circulation qw( CanBookBeIssued AddIssue AddReturn );
 use C4::Members;
 use C4::Items;
 use Koha::DateUtils;
+use Koha::Libraries;
 use Koha::Patrons;
 use t::lib::TestBuilder;
 use t::lib::Mocks qw(mock_preference);
@@ -15,9 +16,11 @@ use Test::More tests => 8;
 my $schema = Koha::Database->new->schema;
 $schema->storage->txn_begin;
 
-C4::Context->_new_userenv(1234567);
-C4::Context->set_userenv(91, 'CLIstaff', '23529001223661', 'CPL',
-                         'CPL', 'CPL', '', 'cc@cscnet.co.uk');
+my $builder = t::lib::TestBuilder->new;
+$builder->build({ source => 'Branch', value => { branchcode => 'CPL' } })
+    unless Koha::Libraries->find('CPL');
+
+t::lib::Mocks::mock_userenv({ branchcode => 'CPL' });
 
 t::lib::Mocks::mock_preference('BlockReturnOfWithdrawnItems',0);
 my $test_patron = '23529001223651';
@@ -25,26 +28,22 @@ my $test_item_fic = '502326000402';
 my $test_item_24 = '502326000404';
 my $test_item_48 = '502326000403';
 
-my $builder = t::lib::TestBuilder->new;
 my $borrower1 = $builder->build_object({ class => 'Koha::Patrons', value => { cardnumber => $test_patron } });
-my $item1 = $builder->build_object({
-    class => 'Koha::Items',
-    value => {
+my $item1 = $builder->build_sample_item(
+    {
         barcode => $test_item_fic,
     }
-});
-my $item2 = $builder->build_object({
-    class => 'Koha::Items',
-    value => {
+);
+my $item2 = $builder->build_sample_item(
+    {
         barcode => $test_item_24,
     }
-});
-my $item3 = $builder->build_object({
-    class => 'Koha::Items',
-    value => {
+);
+my $item3 = $builder->build_sample_item(
+    {
         barcode => $test_item_48,
     }
-});
+);
 
 SKIP: {
     skip 'Missing test borrower or item, skipping tests', 8