Bug 6137 follow-up, moving new test to db_dependent directory

diff --git a/t/Circulation.t b/t/Circulation.t
deleted file mode 100755 (executable)
index 8fab844..0000000
--- a/t/Circulation.t
+++ /dev/null
@@ -1,110 +0,0 @@
-#!/usr/bin/perl
-
-use Test::More tests => 15;
-
-BEGIN {
-    use_ok('C4::Circulation');
-}
-
-my $CircControl = C4::Context->preference('CircControl');
-my $HomeOrHoldingBranch = C4::Context->preference('HomeOrHoldingBranch');
-
-my $item = {
-    homebranch => 'ItemHomeBranch',
-    holdingbranch => 'ItemHoldingBranch'
-};
-
-my $borrower = {
-    branchcode => 'BorrowerBranch'
-};
-
-# No userenv, PickupLibrary
-C4::Context->set_preference('CircControl', 'PickupLibrary');
-is(
-    C4::Context->preference('CircControl'),
-    'PickupLibrary',
-    'CircControl changed to PickupLibrary'
-);
-is(
-    C4::Circulation::_GetCircControlBranch($item, $borrower),
-    $item->{$HomeOrHoldingBranch},
-    '_GetCircControlBranch returned item branch (no userenv defined)'
-);
-
-# No userenv, PatronLibrary
-C4::Context->set_preference('CircControl', 'PatronLibrary');
-is(
-    C4::Context->preference('CircControl'),
-    'PatronLibrary',
-    'CircControl changed to PatronLibrary'
-);
-is(
-    C4::Circulation::_GetCircControlBranch($item, $borrower),
-    $borrower->{branchcode},
-    '_GetCircControlBranch returned borrower branch'
-);
-
-# No userenv, ItemHomeLibrary
-C4::Context->set_preference('CircControl', 'ItemHomeLibrary');
-is(
-    C4::Context->preference('CircControl'),
-    'ItemHomeLibrary',
-    'CircControl changed to ItemHomeLibrary'
-);
-is(
-    $item->{$HomeOrHoldingBranch},
-    C4::Circulation::_GetCircControlBranch($item, $borrower),
-    '_GetCircControlBranch returned item branch'
-);
-
-diag('Now, set a userenv');
-C4::Context->_new_userenv('xxx');
-C4::Context::set_userenv(0,0,0,'firstname','surname', 'CurrentBranch', 'CurrentBranchName', '', '', '');
-is(C4::Context->userenv->{branch}, 'CurrentBranch', 'userenv set');
-
-# Userenv set, PickupLibrary
-C4::Context->set_preference('CircControl', 'PickupLibrary');
-is(
-    C4::Context->preference('CircControl'),
-    'PickupLibrary',
-    'CircControl changed to PickupLibrary'
-);
-is(
-    C4::Circulation::_GetCircControlBranch($item, $borrower),
-    'CurrentBranch',
-    '_GetCircControlBranch returned current branch'
-);
-
-# Userenv set, PatronLibrary
-C4::Context->set_preference('CircControl', 'PatronLibrary');
-is(
-    C4::Context->preference('CircControl'),
-    'PatronLibrary',
-    'CircControl changed to PatronLibrary'
-);
-is(
-    C4::Circulation::_GetCircControlBranch($item, $borrower),
-    $borrower->{branchcode},
-    '_GetCircControlBranch returned borrower branch'
-);
-
-# Userenv set, ItemHomeLibrary
-C4::Context->set_preference('CircControl', 'ItemHomeLibrary');
-is(
-    C4::Context->preference('CircControl'),
-    'ItemHomeLibrary',
-    'CircControl changed to ItemHomeLibrary'
-);
-is(
-    C4::Circulation::_GetCircControlBranch($item, $borrower),
-    $item->{$HomeOrHoldingBranch},
-    '_GetCircControlBranch returned item branch'
-);
-
-# Reset initial configuration
-C4::Context->set_preference('CircControl', $CircControl);
-is(
-    C4::Context->preference('CircControl'),
-    $CircControl,
-    'CircControl reset to its initial value'
-);

diff --git a/t/db_dependent/Circulation.t b/t/db_dependent/Circulation.t
new file mode 100755 (executable)
index 0000000..8fab844
--- /dev/null
+++ b/t/db_dependent/Circulation.t
@@ -0,0 +1,110 @@
+#!/usr/bin/perl
+
+use Test::More tests => 15;
+
+BEGIN {
+    use_ok('C4::Circulation');
+}
+
+my $CircControl = C4::Context->preference('CircControl');
+my $HomeOrHoldingBranch = C4::Context->preference('HomeOrHoldingBranch');
+
+my $item = {
+    homebranch => 'ItemHomeBranch',
+    holdingbranch => 'ItemHoldingBranch'
+};
+
+my $borrower = {
+    branchcode => 'BorrowerBranch'
+};
+
+# No userenv, PickupLibrary
+C4::Context->set_preference('CircControl', 'PickupLibrary');
+is(
+    C4::Context->preference('CircControl'),
+    'PickupLibrary',
+    'CircControl changed to PickupLibrary'
+);
+is(
+    C4::Circulation::_GetCircControlBranch($item, $borrower),
+    $item->{$HomeOrHoldingBranch},
+    '_GetCircControlBranch returned item branch (no userenv defined)'
+);
+
+# No userenv, PatronLibrary
+C4::Context->set_preference('CircControl', 'PatronLibrary');
+is(
+    C4::Context->preference('CircControl'),
+    'PatronLibrary',
+    'CircControl changed to PatronLibrary'
+);
+is(
+    C4::Circulation::_GetCircControlBranch($item, $borrower),
+    $borrower->{branchcode},
+    '_GetCircControlBranch returned borrower branch'
+);
+
+# No userenv, ItemHomeLibrary
+C4::Context->set_preference('CircControl', 'ItemHomeLibrary');
+is(
+    C4::Context->preference('CircControl'),
+    'ItemHomeLibrary',
+    'CircControl changed to ItemHomeLibrary'
+);
+is(
+    $item->{$HomeOrHoldingBranch},
+    C4::Circulation::_GetCircControlBranch($item, $borrower),
+    '_GetCircControlBranch returned item branch'
+);
+
+diag('Now, set a userenv');
+C4::Context->_new_userenv('xxx');
+C4::Context::set_userenv(0,0,0,'firstname','surname', 'CurrentBranch', 'CurrentBranchName', '', '', '');
+is(C4::Context->userenv->{branch}, 'CurrentBranch', 'userenv set');
+
+# Userenv set, PickupLibrary
+C4::Context->set_preference('CircControl', 'PickupLibrary');
+is(
+    C4::Context->preference('CircControl'),
+    'PickupLibrary',
+    'CircControl changed to PickupLibrary'
+);
+is(
+    C4::Circulation::_GetCircControlBranch($item, $borrower),
+    'CurrentBranch',
+    '_GetCircControlBranch returned current branch'
+);
+
+# Userenv set, PatronLibrary
+C4::Context->set_preference('CircControl', 'PatronLibrary');
+is(
+    C4::Context->preference('CircControl'),
+    'PatronLibrary',
+    'CircControl changed to PatronLibrary'
+);
+is(
+    C4::Circulation::_GetCircControlBranch($item, $borrower),
+    $borrower->{branchcode},
+    '_GetCircControlBranch returned borrower branch'
+);
+
+# Userenv set, ItemHomeLibrary
+C4::Context->set_preference('CircControl', 'ItemHomeLibrary');
+is(
+    C4::Context->preference('CircControl'),
+    'ItemHomeLibrary',
+    'CircControl changed to ItemHomeLibrary'
+);
+is(
+    C4::Circulation::_GetCircControlBranch($item, $borrower),
+    $item->{$HomeOrHoldingBranch},
+    '_GetCircControlBranch returned item branch'
+);
+
+# Reset initial configuration
+C4::Context->set_preference('CircControl', $CircControl);
+is(
+    C4::Context->preference('CircControl'),
+    $CircControl,
+    'CircControl reset to its initial value'
+);