@@ -, +, @@ --- t/db_dependent/Circulation/Branch.t | 2 +- t/db_dependent/Circulation/Chargelostitem.t | 2 +- t/db_dependent/Circulation/CheckIfIssuedToPatron.t | 9 +++------ t/db_dependent/Circulation/GetPendingOnSiteCheckouts.t | 2 +- t/db_dependent/Circulation/IsItemIssued.t | 2 +- t/db_dependent/Circulation/IssuingRules/maxsuspensiondays.t | 2 +- t/db_dependent/Circulation/Returns.t | 4 ++-- t/db_dependent/Circulation/SwitchOnSiteCheckouts.t | 4 ++-- t/db_dependent/Circulation/TooMany.t | 4 ++-- t/db_dependent/Circulation/issue.t | 4 ++-- t/db_dependent/Circulation/transfers.t | 4 ++-- t/db_dependent/CourseReserves.t | 4 ++-- t/db_dependent/Holds.t | 9 +++++---- t/db_dependent/Holds/DisallowHoldIfItemsAvailable.t | 2 +- t/db_dependent/Holds/LocalHoldsPriority.t | 3 ++- t/db_dependent/Holds/RevertWaitingStatus.t | 12 +++++------- t/db_dependent/Items.t | 9 +++------ t/db_dependent/Items/AutomaticItemModificationByAge.t | 2 +- t/db_dependent/Items/DelItem.t | 7 ++----- t/db_dependent/Koha/Biblios.t | 2 +- t/db_dependent/Koha/Object.t | 3 ++- t/db_dependent/Koha/Patrons.t | 4 +--- t/db_dependent/Labels/t_Batch.t | 2 +- t/db_dependent/Members/GetAllIssues.t | 2 +- t/db_dependent/Members/IssueSlip.t | 2 +- t/db_dependent/Patron/Borrower_Discharge.t | 4 ++-- t/db_dependent/Reserves.t | 2 +- t/db_dependent/RotatingCollections.t | 4 ++-- t/db_dependent/ShelfBrowser.t | 2 +- t/db_dependent/api/v1/holds.t | 2 +- 30 files changed, 53 insertions(+), 63 deletions(-) --- a/t/db_dependent/Circulation/Branch.t +++ a/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; --- a/t/db_dependent/Circulation/Chargelostitem.t +++ a/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; --- a/t/db_dependent/Circulation/CheckIfIssuedToPatron.t +++ a/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; --- a/t/db_dependent/Circulation/GetPendingOnSiteCheckouts.t +++ a/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; --- a/t/db_dependent/Circulation/IsItemIssued.t +++ a/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; --- a/t/db_dependent/Circulation/IssuingRules/maxsuspensiondays.t +++ a/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 ); --- a/t/db_dependent/Circulation/Returns.t +++ a/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; --- a/t/db_dependent/Circulation/SwitchOnSiteCheckouts.t +++ a/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 ); --- a/t/db_dependent/Circulation/TooMany.t +++ a/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 ); --- a/t/db_dependent/Circulation/issue.t +++ a/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; --- a/t/db_dependent/Circulation/transfers.t +++ a/t/db_dependent/Circulation/transfers.t @@ -16,10 +16,10 @@ # along with Koha; if not, see . 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; --- a/t/db_dependent/CourseReserves.t +++ a/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'); } --- a/t/db_dependent/Holds.t +++ a/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; --- a/t/db_dependent/Holds/DisallowHoldIfItemsAvailable.t +++ a/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; --- a/t/db_dependent/Holds/LocalHoldsPriority.t +++ a/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; --- a/t/db_dependent/Holds/RevertWaitingStatus.t +++ a/t/db_dependent/Holds/RevertWaitingStatus.t @@ -16,20 +16,18 @@ # along with Koha; if not, see . 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; --- a/t/db_dependent/Items.t +++ a/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'; --- a/t/db_dependent/Items/AutomaticItemModificationByAge.t +++ a/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; --- a/t/db_dependent/Items/DelItem.t +++ a/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; --- a/t/db_dependent/Koha/Biblios.t +++ a/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 ); --- a/t/db_dependent/Koha/Object.t +++ a/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; --- a/t/db_dependent/Koha/Patrons.t +++ a/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; --- a/t/db_dependent/Labels/t_Batch.t +++ a/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 { --- a/t/db_dependent/Members/GetAllIssues.t +++ a/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; --- a/t/db_dependent/Members/IssueSlip.t +++ a/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; --- a/t/db_dependent/Patron/Borrower_Discharge.t +++ a/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; --- a/t/db_dependent/Reserves.t +++ a/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; --- a/t/db_dependent/RotatingCollections.t +++ a/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( --- a/t/db_dependent/ShelfBrowser.t +++ a/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; --- a/t/db_dependent/api/v1/holds.t +++ a/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(); --