Bug 21133: Fix use statements order

Basically the idea is:
1. Undefined subroutine &C4::Items::ModZebra called at /home/vagrant/kohaclone/C4/Items.pm line 302.

=> Then use C4::Items before C4::Biblio

2. Undefined subroutine &C4::Circulation::GetItem called at /home/vagrant/kohaclone/C4/Circulation.pm line 1290

=> Then use C4::Circulation before C4::Items

And sometimes these 2 rules do not work...

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

diff --git a/t/db_dependent/Circulation/Branch.t b/t/db_dependent/Circulation/Branch.t
index c56e687..10bc52e 100644 (file)
--- a/t/db_dependent/Circulation/Branch.t
+++ b/t/db_dependent/Circulation/Branch.t
@@ -17,9 +17,9 @@
 
 use Modern::Perl;
 
-use C4::Biblio;
 use C4::Circulation;
 use C4::Items;
+use C4::Biblio;
 use C4::Context;
 
 use Koha::Patrons;

diff --git a/t/db_dependent/Circulation/Chargelostitem.t b/t/db_dependent/Circulation/Chargelostitem.t
index 658400c..7dc0fe3 100644 (file)
--- a/t/db_dependent/Circulation/Chargelostitem.t
+++ b/t/db_dependent/Circulation/Chargelostitem.t
@@ -7,9 +7,9 @@ use Test::MockModule;
 use t::lib::Mocks;
 use t::lib::TestBuilder;
 
+use C4::Circulation;
 use C4::Biblio;
 use C4::Items;
-use C4::Circulation;
 use Koha::Patrons;
 use MARC::Record;
 

diff --git a/t/db_dependent/Circulation/CheckIfIssuedToPatron.t b/t/db_dependent/Circulation/CheckIfIssuedToPatron.t
index c25f7dc..b06d0c3 100644 (file)
--- a/t/db_dependent/Circulation/CheckIfIssuedToPatron.t
+++ b/t/db_dependent/Circulation/CheckIfIssuedToPatron.t
@@ -17,20 +17,17 @@
 
 use Modern::Perl;
 
-use Test::More tests => 22;
+use Test::More tests => 21;
 use Test::MockModule;
 use t::lib::TestBuilder;
 
-use C4::Biblio;
+use C4::Circulation;
 use C4::Items;
+use C4::Biblio;
 use Koha::Library;
 use Koha::Patrons;
 use MARC::Record;
 
-BEGIN {
-    use_ok('C4::Circulation');
-}
-
 my $schema = Koha::Database->schema;
 $schema->storage->txn_begin;
 

diff --git a/t/db_dependent/Circulation/GetPendingOnSiteCheckouts.t b/t/db_dependent/Circulation/GetPendingOnSiteCheckouts.t
index d47f38a..236626c 100644 (file)
--- a/t/db_dependent/Circulation/GetPendingOnSiteCheckouts.t
+++ b/t/db_dependent/Circulation/GetPendingOnSiteCheckouts.t
@@ -21,8 +21,8 @@ use Test::More tests => 2;
 use Test::MockModule;
 use t::lib::TestBuilder;
 
-use C4::Biblio;
 use C4::Circulation;
+use C4::Biblio;
 use C4::Items;
 use C4::Members;
 

diff --git a/t/db_dependent/Circulation/IsItemIssued.t b/t/db_dependent/Circulation/IsItemIssued.t
index b175c55..ab26f0c 100644 (file)
--- a/t/db_dependent/Circulation/IsItemIssued.t
+++ b/t/db_dependent/Circulation/IsItemIssued.t
@@ -20,9 +20,9 @@ use Modern::Perl;
 use Test::More tests => 5;
 use Test::MockModule;
 
-use C4::Biblio;
 use C4::Circulation;
 use C4::Items;
+use C4::Biblio;
 use Koha::Database;
 use Koha::DateUtils;
 use Koha::Patrons;

diff --git a/t/db_dependent/Circulation/IssuingRules/maxsuspensiondays.t b/t/db_dependent/Circulation/IssuingRules/maxsuspensiondays.t
index f02efcd..86f64fd 100644 (file)
--- a/t/db_dependent/Circulation/IssuingRules/maxsuspensiondays.t
+++ b/t/db_dependent/Circulation/IssuingRules/maxsuspensiondays.t
@@ -5,9 +5,9 @@ use MARC::Record;
 use MARC::Field;
 use C4::Context;
 
-use C4::Biblio qw( AddBiblio );
 use C4::Circulation qw( AddIssue AddReturn );
 use C4::Items qw( AddItem );
+use C4::Biblio qw( AddBiblio );
 use Koha::Database;
 use Koha::DateUtils;
 use Koha::Patron::Debarments qw( GetDebarments DelDebarment );

diff --git a/t/db_dependent/Circulation/Returns.t b/t/db_dependent/Circulation/Returns.t
index a8e4dda..50f733b 100644 (file)
--- a/t/db_dependent/Circulation/Returns.t
+++ b/t/db_dependent/Circulation/Returns.t
@@ -24,10 +24,10 @@ use Test::Warn;
 use t::lib::Mocks;
 use t::lib::TestBuilder;
 
-use C4::Biblio;
+use C4::Members;
 use C4::Circulation;
 use C4::Items;
-use C4::Members;
+use C4::Biblio;
 use Koha::Database;
 use Koha::Account::Lines;
 use Koha::DateUtils;

diff --git a/t/db_dependent/Circulation/SwitchOnSiteCheckouts.t b/t/db_dependent/Circulation/SwitchOnSiteCheckouts.t
index f76b173..506423d 100644 (file)
--- a/t/db_dependent/Circulation/SwitchOnSiteCheckouts.t
+++ b/t/db_dependent/Circulation/SwitchOnSiteCheckouts.t
@@ -18,10 +18,10 @@ use Modern::Perl;
 use Test::More tests => 10;
 use C4::Context;
 
-use C4::Biblio;
-use C4::Members;
 use C4::Circulation;
+use C4::Biblio;
 use C4::Items;
+use C4::Members;
 use C4::Context;
 
 use Koha::DateUtils qw( dt_from_string );

diff --git a/t/db_dependent/Circulation/TooMany.t b/t/db_dependent/Circulation/TooMany.t
index 193752f..a7f19db 100644 (file)
--- a/t/db_dependent/Circulation/TooMany.t
+++ b/t/db_dependent/Circulation/TooMany.t
@@ -18,10 +18,10 @@ use Modern::Perl;
 use Test::More tests => 7;
 use C4::Context;
 
-use C4::Biblio;
 use C4::Members;
-use C4::Circulation;
 use C4::Items;
+use C4::Biblio;
+use C4::Circulation;
 use C4::Context;
 
 use Koha::DateUtils qw( dt_from_string );

diff --git a/t/db_dependent/Circulation/issue.t b/t/db_dependent/Circulation/issue.t
index 6f190f0..f613f08 100644 (file)
--- a/t/db_dependent/Circulation/issue.t
+++ b/t/db_dependent/Circulation/issue.t
@@ -23,10 +23,10 @@ use DateTime::Duration;
 use t::lib::Mocks;
 use t::lib::TestBuilder;
 
-use C4::Biblio;
 use C4::Circulation;
-use C4::Context;
 use C4::Items;
+use C4::Biblio;
+use C4::Context;
 use C4::Reserves;
 use Koha::Checkouts;
 use Koha::Database;

diff --git a/t/db_dependent/Circulation/transfers.t b/t/db_dependent/Circulation/transfers.t
index 299c059..a377c93 100644 (file)
--- a/t/db_dependent/Circulation/transfers.t
+++ b/t/db_dependent/Circulation/transfers.t
@@ -16,10 +16,10 @@
 # along with Koha; if not, see <http://www.gnu.org/licenses>.
 
 use Modern::Perl;
-use C4::Biblio;
 use C4::Context;
-use C4::Items;
 use C4::Circulation;
+use C4::Biblio;
+use C4::Items;
 use Koha::Database;
 use Koha::DateUtils;
 use DateTime::Duration;

diff --git a/t/db_dependent/CourseReserves.t b/t/db_dependent/CourseReserves.t
index 8c47e59..2dabc67 100755 (executable)
--- a/t/db_dependent/CourseReserves.t
+++ b/t/db_dependent/CourseReserves.t
@@ -23,10 +23,10 @@ use Koha::Database;
 use t::lib::TestBuilder;
 
 BEGIN {
+    use_ok('C4::Items', qw(AddItem));
     use_ok('C4::Biblio');
-    use_ok('C4::Context');
     use_ok('C4::CourseReserves', qw/:all/);
-    use_ok('C4::Items', qw(AddItem));
+    use_ok('C4::Context');
     use_ok('MARC::Field');
     use_ok('MARC::Record');
 }

diff --git a/t/db_dependent/Holds.t b/t/db_dependent/Holds.t
index 93fe745..3c5fd1e 100755 (executable)
--- a/t/db_dependent/Holds.t
+++ b/t/db_dependent/Holds.t
@@ -7,21 +7,22 @@ use t::lib::TestBuilder;
 
 use C4::Context;
 
-use Test::More tests => 55;
+use Test::More tests => 54;
 use MARC::Record;
-use C4::Biblio;
+use Koha::Patrons;
 use C4::Items;
+use C4::Biblio;
+use C4::Reserves;
 use C4::Calendar;
+
 use Koha::Database;
 use Koha::DateUtils qw( dt_from_string output_pref );
 use Koha::Biblios;
 use Koha::Holds;
-use Koha::Patrons;
 
 BEGIN {
     use FindBin;
     use lib $FindBin::Bin;
-    use_ok('C4::Reserves');
 }
 
 my $schema  = Koha::Database->new->schema;

diff --git a/t/db_dependent/Holds/DisallowHoldIfItemsAvailable.t b/t/db_dependent/Holds/DisallowHoldIfItemsAvailable.t
index 1a9edd8..a5237d9 100755 (executable)
--- a/t/db_dependent/Holds/DisallowHoldIfItemsAvailable.t
+++ b/t/db_dependent/Holds/DisallowHoldIfItemsAvailable.t
@@ -3,8 +3,8 @@
 use Modern::Perl;
 
 use C4::Context;
-use C4::Items;
 use C4::Circulation;
+use C4::Items;
 use Koha::IssuingRule;
 
 use Test::More tests => 6;

diff --git a/t/db_dependent/Holds/LocalHoldsPriority.t b/t/db_dependent/Holds/LocalHoldsPriority.t
index f107e71..af914d6 100755 (executable)
--- a/t/db_dependent/Holds/LocalHoldsPriority.t
+++ b/t/db_dependent/Holds/LocalHoldsPriority.t
@@ -7,10 +7,11 @@ use C4::Context;
 
 use Test::More tests => 6;
 use MARC::Record;
+
+use Koha::Patrons;
 use C4::Biblio;
 use C4::Items;
 use Koha::Database;
-use Koha::Patrons;
 
 use t::lib::TestBuilder;
 

diff --git a/t/db_dependent/Holds/RevertWaitingStatus.t b/t/db_dependent/Holds/RevertWaitingStatus.t
index 4df597f..9877e68 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::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;

diff --git a/t/db_dependent/Items.t b/t/db_dependent/Items.t
index ef09873..92151d6 100755 (executable)
--- a/t/db_dependent/Items.t
+++ b/t/db_dependent/Items.t
@@ -20,7 +20,9 @@ use Modern::Perl;
 use Data::Dumper;
 
 use MARC::Record;
+use C4::Items;
 use C4::Biblio;
+use Koha::Items;
 use Koha::Database;
 use Koha::DateUtils qw( dt_from_string );
 use Koha::Library;
@@ -31,15 +33,10 @@ use Koha::Caches;
 use t::lib::Mocks;
 use t::lib::TestBuilder;
 
-use Test::More tests => 14;
+use Test::More tests => 12;
 
 use Test::Warn;
 
-BEGIN {
-    use_ok('C4::Items');
-    use_ok('Koha::Items');
-}
-
 my $schema = Koha::Database->new->schema;
 my $location = 'My Location';
 

diff --git a/t/db_dependent/Items/AutomaticItemModificationByAge.t b/t/db_dependent/Items/AutomaticItemModificationByAge.t
index b93c626..17172be 100644 (file)
--- a/t/db_dependent/Items/AutomaticItemModificationByAge.t
+++ b/t/db_dependent/Items/AutomaticItemModificationByAge.t
@@ -7,9 +7,9 @@ use MARC::Field;
 use DateTime;
 use DateTime::Duration;
 
+use C4::Items;
 use C4::Biblio;
 use C4::Context;
-use C4::Items;
 use Koha::DateUtils;
 use t::lib::TestBuilder;
 

diff --git a/t/db_dependent/Items/DelItem.t b/t/db_dependent/Items/DelItem.t
index 2880f11..03f1f58 100644 (file)
--- a/t/db_dependent/Items/DelItem.t
+++ b/t/db_dependent/Items/DelItem.t
@@ -1,15 +1,12 @@
 use Modern::Perl;
 
 use MARC::Record;
+use C4::Items;
 use C4::Biblio;
 
 use t::lib::TestBuilder;
 
-use Test::More tests => 7;
-
-BEGIN {
-    use_ok('C4::Items');
-}
+use Test::More tests => 6;
 
 my $schema = Koha::Database->schema;
 $schema->storage->txn_begin;

diff --git a/t/db_dependent/Koha/Biblios.t b/t/db_dependent/Koha/Biblios.t
index 17ab937..e92ae41 100644 (file)
--- a/t/db_dependent/Koha/Biblios.t
+++ b/t/db_dependent/Koha/Biblios.t
@@ -22,8 +22,8 @@ use Modern::Perl;
 use Test::More tests => 5;
 use Test::Exception;
 
-use C4::Biblio;
 use C4::Items;
+use C4::Biblio;
 use C4::Reserves;
 
 use Koha::DateUtils qw( dt_from_string output_pref );

diff --git a/t/db_dependent/Koha/Object.t b/t/db_dependent/Koha/Object.t
index abb0d74..746a0e8 100755 (executable)
--- a/t/db_dependent/Koha/Object.t
+++ b/t/db_dependent/Koha/Object.t
@@ -23,8 +23,9 @@ use Test::Warn;
 use DateTime;
 
 use C4::Context;
-use C4::Biblio; # AddBiblio
 use C4::Circulation; # AddIssue
+use C4::Biblio; # AddBiblio
+
 use Koha::Database;
 use Koha::DateUtils qw( dt_from_string );
 use Koha::Libraries;

diff --git a/t/db_dependent/Koha/Patrons.t b/t/db_dependent/Koha/Patrons.t
index 6a96622..8df1dea 100644 (file)
--- a/t/db_dependent/Koha/Patrons.t
+++ b/t/db_dependent/Koha/Patrons.t
@@ -26,10 +26,8 @@ use Time::Fake;
 use DateTime;
 use JSON;
 
-use C4::Biblio;
-use C4::Circulation;
-
 use C4::Circulation;
+use C4::Biblio;
 
 use Koha::Holds;
 use Koha::Patrons;

diff --git a/t/db_dependent/Labels/t_Batch.t b/t/db_dependent/Labels/t_Batch.t
index ed8c8e8..4992946 100644 (file)
--- a/t/db_dependent/Labels/t_Batch.t
+++ b/t/db_dependent/Labels/t_Batch.t
@@ -27,8 +27,8 @@ use MARC::Field;
 use t::lib::TestBuilder;
 
 use C4::Context;
-use C4::Biblio;
 use C4::Items;
+use C4::Biblio;
 use Koha::Libraries;
 
 BEGIN {

diff --git a/t/db_dependent/Members/GetAllIssues.t b/t/db_dependent/Members/GetAllIssues.t
index 21701cb..bffd0cb 100644 (file)
--- a/t/db_dependent/Members/GetAllIssues.t
+++ b/t/db_dependent/Members/GetAllIssues.t
@@ -22,10 +22,10 @@ use Test::MockModule;
 
 use t::lib::TestBuilder;
 
+use C4::Circulation;
 use C4::Biblio;
 use C4::Items;
 use C4::Members;
-use C4::Circulation;
 use Koha::Libraries;
 use Koha::Patrons;
 use MARC::Record;

diff --git a/t/db_dependent/Members/IssueSlip.t b/t/db_dependent/Members/IssueSlip.t
index cbf3a72..0dee8d9 100644 (file)
--- a/t/db_dependent/Members/IssueSlip.t
+++ b/t/db_dependent/Members/IssueSlip.t
@@ -24,10 +24,10 @@ use Test::MockModule;
 use Test::MockTime qw( set_fixed_time );
 use t::lib::TestBuilder;
 
+use C4::Circulation;
 use C4::Biblio;
 use C4::Items;
 use C4::Members;
-use C4::Circulation;
 
 use Koha::DateUtils qw( dt_from_string output_pref );
 use Koha::Library;

diff --git a/t/db_dependent/Patron/Borrower_Discharge.t b/t/db_dependent/Patron/Borrower_Discharge.t
index d43b49e..ffd3370 100644 (file)
--- a/t/db_dependent/Patron/Borrower_Discharge.t
+++ b/t/db_dependent/Patron/Borrower_Discharge.t
@@ -19,10 +19,10 @@ use Test::More tests => 19;
 use Test::Warn;
 use MARC::Record;
 
-use C4::Biblio qw( AddBiblio );
 use C4::Circulation qw( AddIssue AddReturn );
-use C4::Context;
 use C4::Items qw( AddItem );
+use C4::Biblio qw( AddBiblio );
+use C4::Context;
 
 use Koha::Patrons;
 use Koha::Patron::Discharge;

diff --git a/t/db_dependent/Reserves.t b/t/db_dependent/Reserves.t
index 0b12de6..a458e8d 100755 (executable)
--- a/t/db_dependent/Reserves.t
+++ b/t/db_dependent/Reserves.t
@@ -27,9 +27,9 @@ use t::lib::TestBuilder;
 use MARC::Record;
 use DateTime::Duration;
 
-use C4::Biblio;
 use C4::Circulation;
 use C4::Items;
+use C4::Biblio;
 use C4::Members;
 use C4::Reserves;
 use Koha::Caches;

diff --git a/t/db_dependent/RotatingCollections.t b/t/db_dependent/RotatingCollections.t
index 9c46b33..e00410c 100644 (file)
--- a/t/db_dependent/RotatingCollections.t
+++ b/t/db_dependent/RotatingCollections.t
@@ -17,13 +17,13 @@
 
 use Modern::Perl;
 
-use Test::More tests => 52;
+use Test::More tests => 51;
 use C4::Context;
+use C4::RotatingCollections;
 use C4::Biblio;
 use Koha::Library;
 
 BEGIN {
-    use_ok('C4::RotatingCollections');
 }
 
 can_ok(

diff --git a/t/db_dependent/ShelfBrowser.t b/t/db_dependent/ShelfBrowser.t
index de01139..f4dd9b9 100644 (file)
--- a/t/db_dependent/ShelfBrowser.t
+++ b/t/db_dependent/ShelfBrowser.t
@@ -6,9 +6,9 @@ use List::Util qw( shuffle );
 use MARC::Field;
 use MARC::Record;
 
-use C4::Biblio;
 use C4::Context;
 use C4::Items;
+use C4::Biblio;
 use Koha::Database;
 
 use t::lib::TestBuilder;

diff --git a/t/db_dependent/api/v1/holds.t b/t/db_dependent/api/v1/holds.t
index b3e3678..1e00be1 100644 (file)
--- a/t/db_dependent/api/v1/holds.t
+++ b/t/db_dependent/api/v1/holds.t
@@ -25,6 +25,7 @@ use t::lib::Mocks;
 use DateTime;
 
 use C4::Context;
+use Koha::Patrons;
 use C4::Reserves;
 use C4::Items;
 
@@ -33,7 +34,6 @@ use Koha::DateUtils;
 use Koha::Biblios;
 use Koha::Biblioitems;
 use Koha::Items;
-use Koha::Patrons;
 
 my $schema  = Koha::Database->new->schema;
 my $builder = t::lib::TestBuilder->new();