From 37f43b3814ce5d8f741bb79778d973e88e0b6cb8 Mon Sep 17 00:00:00 2001
From: David Maus <maus@hab.de>
Date: Mon, 24 Sep 2012 15:46:07 +0200
Subject: [PATCH] Relocate test case classes to VuFindTest\Unit namespace

---
 module/VuFind/src/VuFindTest/{ => Unit}/DbTestCase.php          | 2 +-
 module/VuFind/src/VuFindTest/{ => Unit}/TestCase.php            | 2 +-
 module/VuFind/src/VuFindTest/{ => Unit}/ViewHelperTestCase.php  | 2 +-
 module/VuFind/tests/unit-tests/src/Auth/DatabaseTest.php        | 2 +-
 module/VuFind/tests/unit-tests/src/Auth/ILSTest.php             | 2 +-
 module/VuFind/tests/unit-tests/src/Auth/LDAPTest.php            | 2 +-
 module/VuFind/tests/unit-tests/src/Auth/MultiAuthTest.php       | 2 +-
 module/VuFind/tests/unit-tests/src/Auth/SIP2Test.php            | 2 +-
 module/VuFind/tests/unit-tests/src/Auth/ShibbolethTest.php      | 2 +-
 module/VuFind/tests/unit-tests/src/Code/ISBNTest.php            | 2 +-
 module/VuFind/tests/unit-tests/src/Config/ReaderTest.php        | 2 +-
 .../tests/unit-tests/src/Config/SearchSpecsReaderTest.php       | 2 +-
 module/VuFind/tests/unit-tests/src/Cookie/ContainerTest.php     | 2 +-
 module/VuFind/tests/unit-tests/src/Date/ConverterTest.php       | 2 +-
 .../VuFind/tests/unit-tests/src/Db/Table/ChangeTrackerTest.php  | 2 +-
 module/VuFind/tests/unit-tests/src/ILS/Driver/AlephTest.php     | 2 +-
 module/VuFind/tests/unit-tests/src/ILS/Driver/AmicusTest.php    | 2 +-
 module/VuFind/tests/unit-tests/src/ILS/Driver/DAIATest.php      | 2 +-
 module/VuFind/tests/unit-tests/src/ILS/Driver/DemoTest.php      | 2 +-
 module/VuFind/tests/unit-tests/src/ILS/Driver/EvergreenTest.php | 2 +-
 module/VuFind/tests/unit-tests/src/ILS/Driver/HorizonTest.php   | 2 +-
 .../tests/unit-tests/src/ILS/Driver/HorizonXMLAPITest.php       | 2 +-
 .../VuFind/tests/unit-tests/src/ILS/Driver/InnovativeTest.php   | 2 +-
 module/VuFind/tests/unit-tests/src/ILS/Driver/KohaTest.php      | 2 +-
 module/VuFind/tests/unit-tests/src/ILS/Driver/NewGenLibTest.php | 2 +-
 module/VuFind/tests/unit-tests/src/ILS/Driver/NoILSTest.php     | 2 +-
 module/VuFind/tests/unit-tests/src/ILS/Driver/PICATest.php      | 2 +-
 module/VuFind/tests/unit-tests/src/ILS/Driver/SampleTest.php    | 2 +-
 module/VuFind/tests/unit-tests/src/ILS/Driver/SymphonyTest.php  | 2 +-
 module/VuFind/tests/unit-tests/src/ILS/Driver/UnicornTest.php   | 2 +-
 module/VuFind/tests/unit-tests/src/ILS/Driver/VirtuaTest.php    | 2 +-
 .../tests/unit-tests/src/ILS/Driver/VoyagerRestfulTest.php      | 2 +-
 module/VuFind/tests/unit-tests/src/ILS/Driver/VoyagerTest.php   | 2 +-
 module/VuFind/tests/unit-tests/src/ILS/Driver/XCNCIP2Test.php   | 2 +-
 module/VuFind/tests/unit-tests/src/ILS/Driver/XCNCIPTest.php    | 2 +-
 .../VuFind/tests/unit-tests/src/RecordDriver/SolrMarcTest.php   | 2 +-
 module/VuFind/tests/unit-tests/src/Search/Base/ParamsTest.php   | 2 +-
 module/VuFind/tests/unit-tests/src/Solr/UtilsTest.php           | 2 +-
 .../tests/unit-tests/src/Theme/Root/Helper/CitationTest.php     | 2 +-
 .../tests/unit-tests/src/Theme/Root/Helper/ResultFeedTest.php   | 2 +-
 40 files changed, 40 insertions(+), 40 deletions(-)
 rename module/VuFind/src/VuFindTest/{ => Unit}/DbTestCase.php (98%)
 rename module/VuFind/src/VuFindTest/{ => Unit}/TestCase.php (99%)
 rename module/VuFind/src/VuFindTest/{ => Unit}/ViewHelperTestCase.php (99%)

diff --git a/module/VuFind/src/VuFindTest/DbTestCase.php b/module/VuFind/src/VuFindTest/Unit/DbTestCase.php
similarity index 98%
rename from module/VuFind/src/VuFindTest/DbTestCase.php
rename to module/VuFind/src/VuFindTest/Unit/DbTestCase.php
index 99a9b9df700..4d1959da133 100644
--- a/module/VuFind/src/VuFindTest/DbTestCase.php
+++ b/module/VuFind/src/VuFindTest/Unit/DbTestCase.php
@@ -26,7 +26,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/unit_tests Wiki
  */
-namespace VuFindTest;
+namespace VuFindTest\Unit;
 
 /**
  * Abstract base class for PHPUnit database test cases.
diff --git a/module/VuFind/src/VuFindTest/TestCase.php b/module/VuFind/src/VuFindTest/Unit/TestCase.php
similarity index 99%
rename from module/VuFind/src/VuFindTest/TestCase.php
rename to module/VuFind/src/VuFindTest/Unit/TestCase.php
index 5bc2c84411a..26216e9cf1b 100644
--- a/module/VuFind/src/VuFindTest/TestCase.php
+++ b/module/VuFind/src/VuFindTest/Unit/TestCase.php
@@ -27,7 +27,7 @@
  * @link     http://vufind.org/wiki/unit_tests Wiki
  */
 
-namespace VuFindTest;
+namespace VuFindTest\Unit;
 
 /**
  * Abstract base class for PHPUnit test cases.
diff --git a/module/VuFind/src/VuFindTest/ViewHelperTestCase.php b/module/VuFind/src/VuFindTest/Unit/ViewHelperTestCase.php
similarity index 99%
rename from module/VuFind/src/VuFindTest/ViewHelperTestCase.php
rename to module/VuFind/src/VuFindTest/Unit/ViewHelperTestCase.php
index 13e9507dc67..a98a3ee44d3 100644
--- a/module/VuFind/src/VuFindTest/ViewHelperTestCase.php
+++ b/module/VuFind/src/VuFindTest/Unit/ViewHelperTestCase.php
@@ -26,7 +26,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/unit_tests Wiki
  */
-namespace VuFindTest;
+namespace VuFindTest\Unit;
 
 /**
  * Abstract base class for PHPUnit database test cases.
diff --git a/module/VuFind/tests/unit-tests/src/Auth/DatabaseTest.php b/module/VuFind/tests/unit-tests/src/Auth/DatabaseTest.php
index a2d50e46472..d6b6664e902 100644
--- a/module/VuFind/tests/unit-tests/src/Auth/DatabaseTest.php
+++ b/module/VuFind/tests/unit-tests/src/Auth/DatabaseTest.php
@@ -37,7 +37,7 @@ use VuFind\Auth\Database;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-class DatabaseTest extends \VuFindTest\DbTestCase
+class DatabaseTest extends \VuFindTest\Unit\DbTestCase
 {
     protected $auth;
 
diff --git a/module/VuFind/tests/unit-tests/src/Auth/ILSTest.php b/module/VuFind/tests/unit-tests/src/Auth/ILSTest.php
index 7ad3abee3c6..0f5274b1772 100644
--- a/module/VuFind/tests/unit-tests/src/Auth/ILSTest.php
+++ b/module/VuFind/tests/unit-tests/src/Auth/ILSTest.php
@@ -37,7 +37,7 @@ use VuFind\Auth\ILS, VuFind\Db\Table\User;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-class ILSTest extends \VuFindTest\DbTestCase
+class ILSTest extends \VuFindTest\Unit\DbTestCase
 {
     protected $auth;
     protected $driver;
diff --git a/module/VuFind/tests/unit-tests/src/Auth/LDAPTest.php b/module/VuFind/tests/unit-tests/src/Auth/LDAPTest.php
index 9e99c4e0895..c95ed5efcee 100644
--- a/module/VuFind/tests/unit-tests/src/Auth/LDAPTest.php
+++ b/module/VuFind/tests/unit-tests/src/Auth/LDAPTest.php
@@ -37,7 +37,7 @@ use VuFind\Auth\LDAP, Zend\Config\Config;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-class LDAPTest extends \VuFindTest\TestCase
+class LDAPTest extends \VuFindTest\Unit\TestCase
 {
     /**
      * Get an authentication object.
diff --git a/module/VuFind/tests/unit-tests/src/Auth/MultiAuthTest.php b/module/VuFind/tests/unit-tests/src/Auth/MultiAuthTest.php
index def847cd1ee..1f65861ffef 100644
--- a/module/VuFind/tests/unit-tests/src/Auth/MultiAuthTest.php
+++ b/module/VuFind/tests/unit-tests/src/Auth/MultiAuthTest.php
@@ -37,7 +37,7 @@ use VuFind\Auth\MultiAuth, Zend\Config\Config;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-class MultiAuthTest extends \VuFindTest\TestCase
+class MultiAuthTest extends \VuFindTest\Unit\TestCase
 {
     /**
      * Get an authentication object.
diff --git a/module/VuFind/tests/unit-tests/src/Auth/SIP2Test.php b/module/VuFind/tests/unit-tests/src/Auth/SIP2Test.php
index 3495c71ce11..94b99b45bc1 100644
--- a/module/VuFind/tests/unit-tests/src/Auth/SIP2Test.php
+++ b/module/VuFind/tests/unit-tests/src/Auth/SIP2Test.php
@@ -37,7 +37,7 @@ use VuFind\Auth\SIP2, Zend\Config\Config;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-class SIP2Test extends \VuFindTest\TestCase
+class SIP2Test extends \VuFindTest\Unit\TestCase
 {
     /**
      * Get an authentication object.
diff --git a/module/VuFind/tests/unit-tests/src/Auth/ShibbolethTest.php b/module/VuFind/tests/unit-tests/src/Auth/ShibbolethTest.php
index 42f552c44fe..0041224dd6d 100644
--- a/module/VuFind/tests/unit-tests/src/Auth/ShibbolethTest.php
+++ b/module/VuFind/tests/unit-tests/src/Auth/ShibbolethTest.php
@@ -37,7 +37,7 @@ use VuFind\Auth\Shibboleth, VuFind\Db\Table\User, Zend\Config\Config;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-class ShibbolethTest extends \VuFindTest\DbTestCase
+class ShibbolethTest extends \VuFindTest\Unit\DbTestCase
 {
     /**
      * Standard setup method.
diff --git a/module/VuFind/tests/unit-tests/src/Code/ISBNTest.php b/module/VuFind/tests/unit-tests/src/Code/ISBNTest.php
index 908d518d718..db0a2e59a30 100644
--- a/module/VuFind/tests/unit-tests/src/Code/ISBNTest.php
+++ b/module/VuFind/tests/unit-tests/src/Code/ISBNTest.php
@@ -38,7 +38,7 @@ use VuFind\Code\ISBN;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/unit_tests Wiki
  */
-class ISBNTest extends \VuFindTest\TestCase
+class ISBNTest extends \VuFindTest\Unit\TestCase
 {
     /**
      * Test Valid ISBN-10.
diff --git a/module/VuFind/tests/unit-tests/src/Config/ReaderTest.php b/module/VuFind/tests/unit-tests/src/Config/ReaderTest.php
index 28fd43e8727..5613e3b86e0 100644
--- a/module/VuFind/tests/unit-tests/src/Config/ReaderTest.php
+++ b/module/VuFind/tests/unit-tests/src/Config/ReaderTest.php
@@ -38,7 +38,7 @@ use VuFind\Config\Reader;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/unit_tests Wiki
  */
-class ReaderTest extends \VuFindTest\TestCase
+class ReaderTest extends \VuFindTest\Unit\TestCase
 {
     /**
      * Test basic config.ini loading.
diff --git a/module/VuFind/tests/unit-tests/src/Config/SearchSpecsReaderTest.php b/module/VuFind/tests/unit-tests/src/Config/SearchSpecsReaderTest.php
index d8dd7f5cbf6..2c92d80a68c 100644
--- a/module/VuFind/tests/unit-tests/src/Config/SearchSpecsReaderTest.php
+++ b/module/VuFind/tests/unit-tests/src/Config/SearchSpecsReaderTest.php
@@ -38,7 +38,7 @@ use VuFind\Config\SearchSpecsReader;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/unit_tests Wiki
  */
-class SearchSpecsReaderTest extends \VuFindTest\TestCase
+class SearchSpecsReaderTest extends \VuFindTest\Unit\TestCase
 {
     /**
      * Test loading of a YAML file.
diff --git a/module/VuFind/tests/unit-tests/src/Cookie/ContainerTest.php b/module/VuFind/tests/unit-tests/src/Cookie/ContainerTest.php
index ead9aecce35..31e27758060 100644
--- a/module/VuFind/tests/unit-tests/src/Cookie/ContainerTest.php
+++ b/module/VuFind/tests/unit-tests/src/Cookie/ContainerTest.php
@@ -37,7 +37,7 @@ use VuFind\Cookie\Container;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/unit_tests Wiki
  */
-class ContainerTest extends \VuFindTest\TestCase
+class ContainerTest extends \VuFindTest\Unit\TestCase
 {
     protected $ns;
 
diff --git a/module/VuFind/tests/unit-tests/src/Date/ConverterTest.php b/module/VuFind/tests/unit-tests/src/Date/ConverterTest.php
index baa9c43b213..0ea12300fc9 100644
--- a/module/VuFind/tests/unit-tests/src/Date/ConverterTest.php
+++ b/module/VuFind/tests/unit-tests/src/Date/ConverterTest.php
@@ -38,7 +38,7 @@ use VuFind\Date\Converter, VuFind\Exception\Date as DateException,
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-class ConverterTest extends \VuFindTest\TestCase
+class ConverterTest extends \VuFindTest\Unit\TestCase
 {
     protected $savedDateFormat = null;
     protected $savedTimeFormat = null;
diff --git a/module/VuFind/tests/unit-tests/src/Db/Table/ChangeTrackerTest.php b/module/VuFind/tests/unit-tests/src/Db/Table/ChangeTrackerTest.php
index b42f9d715a8..e747f84c075 100644
--- a/module/VuFind/tests/unit-tests/src/Db/Table/ChangeTrackerTest.php
+++ b/module/VuFind/tests/unit-tests/src/Db/Table/ChangeTrackerTest.php
@@ -37,7 +37,7 @@ use VuFind\Db\Table\ChangeTracker;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/unit_tests Wiki
  */
-class ChangeTrackerTest extends \VuFindTest\DbTestCase
+class ChangeTrackerTest extends \VuFindTest\Unit\DbTestCase
 {
     /**
      * Test change tracking
diff --git a/module/VuFind/tests/unit-tests/src/ILS/Driver/AlephTest.php b/module/VuFind/tests/unit-tests/src/ILS/Driver/AlephTest.php
index 73d9336664d..5f7510e6bbc 100644
--- a/module/VuFind/tests/unit-tests/src/ILS/Driver/AlephTest.php
+++ b/module/VuFind/tests/unit-tests/src/ILS/Driver/AlephTest.php
@@ -37,7 +37,7 @@ use VuFind\ILS\Driver\Aleph;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-class AlephTest extends \VuFindTest\TestCase
+class AlephTest extends \VuFindTest\Unit\TestCase
 {
     protected $driver;
 
diff --git a/module/VuFind/tests/unit-tests/src/ILS/Driver/AmicusTest.php b/module/VuFind/tests/unit-tests/src/ILS/Driver/AmicusTest.php
index 18a570a9f16..6f8dc71439c 100644
--- a/module/VuFind/tests/unit-tests/src/ILS/Driver/AmicusTest.php
+++ b/module/VuFind/tests/unit-tests/src/ILS/Driver/AmicusTest.php
@@ -37,7 +37,7 @@ use VuFind\ILS\Driver\Amicus;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-class AmicusTest extends \VuFindTest\TestCase
+class AmicusTest extends \VuFindTest\Unit\TestCase
 {
     protected $driver;
 
diff --git a/module/VuFind/tests/unit-tests/src/ILS/Driver/DAIATest.php b/module/VuFind/tests/unit-tests/src/ILS/Driver/DAIATest.php
index 2ea54903829..28ef40ac4db 100644
--- a/module/VuFind/tests/unit-tests/src/ILS/Driver/DAIATest.php
+++ b/module/VuFind/tests/unit-tests/src/ILS/Driver/DAIATest.php
@@ -37,7 +37,7 @@ use VuFind\ILS\Driver\DAIA;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-class DAIATest extends \VuFindTest\TestCase
+class DAIATest extends \VuFindTest\Unit\TestCase
 {
     protected $driver;
 
diff --git a/module/VuFind/tests/unit-tests/src/ILS/Driver/DemoTest.php b/module/VuFind/tests/unit-tests/src/ILS/Driver/DemoTest.php
index ffa2e6dc435..3daa86b28d3 100644
--- a/module/VuFind/tests/unit-tests/src/ILS/Driver/DemoTest.php
+++ b/module/VuFind/tests/unit-tests/src/ILS/Driver/DemoTest.php
@@ -37,7 +37,7 @@ use VuFind\ILS\Driver\Demo;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-class DemoTest extends \VuFindTest\TestCase
+class DemoTest extends \VuFindTest\Unit\TestCase
 {
     protected $driver;
 
diff --git a/module/VuFind/tests/unit-tests/src/ILS/Driver/EvergreenTest.php b/module/VuFind/tests/unit-tests/src/ILS/Driver/EvergreenTest.php
index de288f5217f..e330742ba5e 100644
--- a/module/VuFind/tests/unit-tests/src/ILS/Driver/EvergreenTest.php
+++ b/module/VuFind/tests/unit-tests/src/ILS/Driver/EvergreenTest.php
@@ -37,7 +37,7 @@ use VuFind\ILS\Driver\Evergreen;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-class EvergreenTest extends \VuFindTest\TestCase
+class EvergreenTest extends \VuFindTest\Unit\TestCase
 {
     protected $driver;
 
diff --git a/module/VuFind/tests/unit-tests/src/ILS/Driver/HorizonTest.php b/module/VuFind/tests/unit-tests/src/ILS/Driver/HorizonTest.php
index 45c88dad0b4..7aabd5c4322 100644
--- a/module/VuFind/tests/unit-tests/src/ILS/Driver/HorizonTest.php
+++ b/module/VuFind/tests/unit-tests/src/ILS/Driver/HorizonTest.php
@@ -37,7 +37,7 @@ use VuFind\ILS\Driver\Horizon;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-class HorizonTest extends \VuFindTest\TestCase
+class HorizonTest extends \VuFindTest\Unit\TestCase
 {
     protected $driver;
 
diff --git a/module/VuFind/tests/unit-tests/src/ILS/Driver/HorizonXMLAPITest.php b/module/VuFind/tests/unit-tests/src/ILS/Driver/HorizonXMLAPITest.php
index 75d902b70af..5783891b977 100644
--- a/module/VuFind/tests/unit-tests/src/ILS/Driver/HorizonXMLAPITest.php
+++ b/module/VuFind/tests/unit-tests/src/ILS/Driver/HorizonXMLAPITest.php
@@ -37,7 +37,7 @@ use VuFind\ILS\Driver\HorizonXMLAPI;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-class HorizonXMLAPITest extends \VuFindTest\TestCase
+class HorizonXMLAPITest extends \VuFindTest\Unit\TestCase
 {
     protected $driver;
 
diff --git a/module/VuFind/tests/unit-tests/src/ILS/Driver/InnovativeTest.php b/module/VuFind/tests/unit-tests/src/ILS/Driver/InnovativeTest.php
index 56897fb950f..b1f92629132 100644
--- a/module/VuFind/tests/unit-tests/src/ILS/Driver/InnovativeTest.php
+++ b/module/VuFind/tests/unit-tests/src/ILS/Driver/InnovativeTest.php
@@ -37,7 +37,7 @@ use VuFind\ILS\Driver\Innovative;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-class InnovativeTest extends \VuFindTest\TestCase
+class InnovativeTest extends \VuFindTest\Unit\TestCase
 {
     protected $driver;
 
diff --git a/module/VuFind/tests/unit-tests/src/ILS/Driver/KohaTest.php b/module/VuFind/tests/unit-tests/src/ILS/Driver/KohaTest.php
index 0654309be02..a3bd4038090 100644
--- a/module/VuFind/tests/unit-tests/src/ILS/Driver/KohaTest.php
+++ b/module/VuFind/tests/unit-tests/src/ILS/Driver/KohaTest.php
@@ -37,7 +37,7 @@ use VuFind\ILS\Driver\Koha;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-class KohaTest extends \VuFindTest\TestCase
+class KohaTest extends \VuFindTest\Unit\TestCase
 {
     protected $driver;
 
diff --git a/module/VuFind/tests/unit-tests/src/ILS/Driver/NewGenLibTest.php b/module/VuFind/tests/unit-tests/src/ILS/Driver/NewGenLibTest.php
index 81ec1317687..db3cf69b1ef 100644
--- a/module/VuFind/tests/unit-tests/src/ILS/Driver/NewGenLibTest.php
+++ b/module/VuFind/tests/unit-tests/src/ILS/Driver/NewGenLibTest.php
@@ -37,7 +37,7 @@ use VuFind\ILS\Driver\NewGenLib;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-class NewGenLibTest extends \VuFindTest\TestCase
+class NewGenLibTest extends \VuFindTest\Unit\TestCase
 {
     protected $driver;
 
diff --git a/module/VuFind/tests/unit-tests/src/ILS/Driver/NoILSTest.php b/module/VuFind/tests/unit-tests/src/ILS/Driver/NoILSTest.php
index 235fbdb3109..62d376fe651 100644
--- a/module/VuFind/tests/unit-tests/src/ILS/Driver/NoILSTest.php
+++ b/module/VuFind/tests/unit-tests/src/ILS/Driver/NoILSTest.php
@@ -37,7 +37,7 @@ use VuFind\ILS\Driver\NoILS;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-class NoILSTest extends \VuFindTest\TestCase
+class NoILSTest extends \VuFindTest\Unit\TestCase
 {
     protected $driver;
 
diff --git a/module/VuFind/tests/unit-tests/src/ILS/Driver/PICATest.php b/module/VuFind/tests/unit-tests/src/ILS/Driver/PICATest.php
index 45e9bcb7ba2..1b56cb30203 100644
--- a/module/VuFind/tests/unit-tests/src/ILS/Driver/PICATest.php
+++ b/module/VuFind/tests/unit-tests/src/ILS/Driver/PICATest.php
@@ -37,7 +37,7 @@ use VuFind\ILS\Driver\PICA;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-class PICATest extends \VuFindTest\TestCase
+class PICATest extends \VuFindTest\Unit\TestCase
 {
     protected $driver;
 
diff --git a/module/VuFind/tests/unit-tests/src/ILS/Driver/SampleTest.php b/module/VuFind/tests/unit-tests/src/ILS/Driver/SampleTest.php
index ccba98cf631..f2e92fa491b 100644
--- a/module/VuFind/tests/unit-tests/src/ILS/Driver/SampleTest.php
+++ b/module/VuFind/tests/unit-tests/src/ILS/Driver/SampleTest.php
@@ -37,7 +37,7 @@ use VuFind\ILS\Driver\Sample;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-class SampleTest extends \VuFindTest\TestCase
+class SampleTest extends \VuFindTest\Unit\TestCase
 {
     protected $driver;
 
diff --git a/module/VuFind/tests/unit-tests/src/ILS/Driver/SymphonyTest.php b/module/VuFind/tests/unit-tests/src/ILS/Driver/SymphonyTest.php
index f20dbf7d035..eb893d966bb 100644
--- a/module/VuFind/tests/unit-tests/src/ILS/Driver/SymphonyTest.php
+++ b/module/VuFind/tests/unit-tests/src/ILS/Driver/SymphonyTest.php
@@ -37,7 +37,7 @@ use VuFind\ILS\Driver\Symphony;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-class SymphonyTest extends \VuFindTest\TestCase
+class SymphonyTest extends \VuFindTest\Unit\TestCase
 {
     protected $driver;
 
diff --git a/module/VuFind/tests/unit-tests/src/ILS/Driver/UnicornTest.php b/module/VuFind/tests/unit-tests/src/ILS/Driver/UnicornTest.php
index d5c6a278e17..dffc962b851 100644
--- a/module/VuFind/tests/unit-tests/src/ILS/Driver/UnicornTest.php
+++ b/module/VuFind/tests/unit-tests/src/ILS/Driver/UnicornTest.php
@@ -37,7 +37,7 @@ use VuFind\ILS\Driver\Unicorn;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-class UnicornTest extends \VuFindTest\TestCase
+class UnicornTest extends \VuFindTest\Unit\TestCase
 {
     protected $driver;
 
diff --git a/module/VuFind/tests/unit-tests/src/ILS/Driver/VirtuaTest.php b/module/VuFind/tests/unit-tests/src/ILS/Driver/VirtuaTest.php
index 2d30f41c6fe..e174c99d4ad 100644
--- a/module/VuFind/tests/unit-tests/src/ILS/Driver/VirtuaTest.php
+++ b/module/VuFind/tests/unit-tests/src/ILS/Driver/VirtuaTest.php
@@ -37,7 +37,7 @@ use VuFind\ILS\Driver\Virtua;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-class VirtuaTest extends \VuFindTest\TestCase
+class VirtuaTest extends \VuFindTest\Unit\TestCase
 {
     protected $driver;
 
diff --git a/module/VuFind/tests/unit-tests/src/ILS/Driver/VoyagerRestfulTest.php b/module/VuFind/tests/unit-tests/src/ILS/Driver/VoyagerRestfulTest.php
index ca9f7d089ba..ddc2b84bac7 100644
--- a/module/VuFind/tests/unit-tests/src/ILS/Driver/VoyagerRestfulTest.php
+++ b/module/VuFind/tests/unit-tests/src/ILS/Driver/VoyagerRestfulTest.php
@@ -37,7 +37,7 @@ use VuFind\ILS\Driver\VoyagerRestful;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-class VoyagerRestfulTest extends \VuFindTest\TestCase
+class VoyagerRestfulTest extends \VuFindTest\Unit\TestCase
 {
     protected $driver;
 
diff --git a/module/VuFind/tests/unit-tests/src/ILS/Driver/VoyagerTest.php b/module/VuFind/tests/unit-tests/src/ILS/Driver/VoyagerTest.php
index 3d50337dc1f..292b3c3e3a6 100644
--- a/module/VuFind/tests/unit-tests/src/ILS/Driver/VoyagerTest.php
+++ b/module/VuFind/tests/unit-tests/src/ILS/Driver/VoyagerTest.php
@@ -37,7 +37,7 @@ use VuFind\ILS\Driver\Voyager;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-class VoyagerTest extends \VuFindTest\TestCase
+class VoyagerTest extends \VuFindTest\Unit\TestCase
 {
     protected $driver;
 
diff --git a/module/VuFind/tests/unit-tests/src/ILS/Driver/XCNCIP2Test.php b/module/VuFind/tests/unit-tests/src/ILS/Driver/XCNCIP2Test.php
index 91308c70134..003232ef594 100644
--- a/module/VuFind/tests/unit-tests/src/ILS/Driver/XCNCIP2Test.php
+++ b/module/VuFind/tests/unit-tests/src/ILS/Driver/XCNCIP2Test.php
@@ -37,7 +37,7 @@ use VuFind\ILS\Driver\XCNCIP2;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-class XCNCIP2Test extends \VuFindTest\TestCase
+class XCNCIP2Test extends \VuFindTest\Unit\TestCase
 {
     protected $driver;
 
diff --git a/module/VuFind/tests/unit-tests/src/ILS/Driver/XCNCIPTest.php b/module/VuFind/tests/unit-tests/src/ILS/Driver/XCNCIPTest.php
index 75a5f8aa239..1974b6ddd46 100644
--- a/module/VuFind/tests/unit-tests/src/ILS/Driver/XCNCIPTest.php
+++ b/module/VuFind/tests/unit-tests/src/ILS/Driver/XCNCIPTest.php
@@ -37,7 +37,7 @@ use VuFind\ILS\Driver\XCNCIP;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://www.vufind.org  Main Page
  */
-class XCNCIPTest extends \VuFindTest\TestCase
+class XCNCIPTest extends \VuFindTest\Unit\TestCase
 {
     protected $driver;
 
diff --git a/module/VuFind/tests/unit-tests/src/RecordDriver/SolrMarcTest.php b/module/VuFind/tests/unit-tests/src/RecordDriver/SolrMarcTest.php
index 698ed84093f..bbc2b9b4dc8 100644
--- a/module/VuFind/tests/unit-tests/src/RecordDriver/SolrMarcTest.php
+++ b/module/VuFind/tests/unit-tests/src/RecordDriver/SolrMarcTest.php
@@ -39,7 +39,7 @@ namespace VuFind\Test\RecordDriver;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/unit_tests Wiki
  */
-class SolrMarcTest extends \VuFindTest\TestCase
+class SolrMarcTest extends \VuFindTest\Unit\TestCase
 {
     /**
      * Test a record that used to be known to cause problems because of the way
diff --git a/module/VuFind/tests/unit-tests/src/Search/Base/ParamsTest.php b/module/VuFind/tests/unit-tests/src/Search/Base/ParamsTest.php
index 8a32a8d765b..603a10fd799 100644
--- a/module/VuFind/tests/unit-tests/src/Search/Base/ParamsTest.php
+++ b/module/VuFind/tests/unit-tests/src/Search/Base/ParamsTest.php
@@ -38,7 +38,7 @@ namespace VuFindTest\Search\Base;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/unit_tests Wiki
  */
-class ParamsTest extends \VuFindTest\TestCase
+class ParamsTest extends \VuFindTest\Unit\TestCase
 {
     /**
      * Test a record that used to be known to cause problems because of the way
diff --git a/module/VuFind/tests/unit-tests/src/Solr/UtilsTest.php b/module/VuFind/tests/unit-tests/src/Solr/UtilsTest.php
index 5ec2ea0583e..d1c1e83a1bf 100644
--- a/module/VuFind/tests/unit-tests/src/Solr/UtilsTest.php
+++ b/module/VuFind/tests/unit-tests/src/Solr/UtilsTest.php
@@ -37,7 +37,7 @@ use VuFind\Solr\Utils;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/unit_tests Wiki
  */
-class UtilsTest extends \VuFindTest\TestCase
+class UtilsTest extends \VuFindTest\Unit\TestCase
 {
     /**
      * Test capitalizeBooleans functionality.
diff --git a/module/VuFind/tests/unit-tests/src/Theme/Root/Helper/CitationTest.php b/module/VuFind/tests/unit-tests/src/Theme/Root/Helper/CitationTest.php
index 60dd4ae2e1f..a36da54e010 100644
--- a/module/VuFind/tests/unit-tests/src/Theme/Root/Helper/CitationTest.php
+++ b/module/VuFind/tests/unit-tests/src/Theme/Root/Helper/CitationTest.php
@@ -37,7 +37,7 @@ use VuFind\Theme\Root\Helper\Citation;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/unit_tests Wiki
  */
-class CitationTest extends \VuFindTest\ViewHelperTestCase
+class CitationTest extends \VuFindTest\Unit\ViewHelperTestCase
 {
     /** Sample citations -- each element of this array contains three elements --
      * the raw input data and the expected apa/mla output citations.
diff --git a/module/VuFind/tests/unit-tests/src/Theme/Root/Helper/ResultFeedTest.php b/module/VuFind/tests/unit-tests/src/Theme/Root/Helper/ResultFeedTest.php
index e355f7011ef..26210750430 100644
--- a/module/VuFind/tests/unit-tests/src/Theme/Root/Helper/ResultFeedTest.php
+++ b/module/VuFind/tests/unit-tests/src/Theme/Root/Helper/ResultFeedTest.php
@@ -37,7 +37,7 @@ use VuFind\Theme\Root\Helper\ResultFeed;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/unit_tests Wiki
  */
-class ResultFeedTest extends \VuFindTest\ViewHelperTestCase
+class ResultFeedTest extends \VuFindTest\Unit\ViewHelperTestCase
 {
     /**
      * Get plugins to register to support view helper being tested
-- 
GitLab