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 99a9b9df700157992bce79581dd2f7822495b7e5..4d1959da1330141931c1784bd710decd077bc5f7 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 5bc2c84411a9a0a4791b6f571f29d4363285fd53..26216e9cf1b9f0c134fec5820995f9f6a6153d9a 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 13e9507dc677a6b7e5f365adca79f6dd85293e6a..a98a3ee44d3f317d9bc9291632c7516900074dc2 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 a2d50e46472a7448582d0f5019e463de841ac78a..d6b6664e902984655b8f3ac20d35165700c2e5bb 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 7ad3abee3c659c1a9d74f1a51eccb32b80003278..0f5274b1772bf3317d463cf47ccaa4061393a68d 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 9e99c4e0895c8d77c7546400a18ffec367ce1f7b..c95ed5efcee5c72872443eba3879058293e55870 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 def847cd1ee9426697df4dd15388cfb5c2c79125..1f65861ffefecb2ed8ef1a1831a1f01335f340fb 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 3495c71ce11265169b8fd9813f0baa048f93a002..94b99b45bc145987fe4647ba0b78650d4fb44f04 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 42f552c44fe9e1d03287597adf89fe8a3154cfc8..0041224dd6d83ae5d216b369cbbe1150c8c86d0c 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 908d518d718a561a799e1a39007fa79856620ca6..db0a2e59a30a195dbbdb622e95224110b7189507 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 28fd43e8727e43fc1a557f9a5479690f3720e24f..5613e3b86e0fd01cf80ae160885f1146a73974d1 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 d8dd7f5cbf665ae7038cf97b21a69749e456d3db..2c92d80a68c3871325a78cf79bceda7fd1fedfc7 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 ead9aecce35df38807aeec977e57cf70b836f8f9..31e2775806098918ab369047fb5e625eaf676f5e 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 baa9c43b213fcc329e9950b360c278fe8d3ac8ab..0ea12300fc91521f829efdf3ed7d2d30b5120097 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 b42f9d715a84bdfc9ed04fc6276d4b27d47961e5..e747f84c075db865ce2608124d2e3b6e621f0e28 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 73d9336664dfdbb1f8860eeb18f9649876095a2a..5f7510e6bbc03d7b5f1c6f9d5ac0095146b1b5ee 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 18a570a9f1638bb324193455ee445b4d59047cfb..6f8dc71439c6137447ddc995d81e972489f7cf7b 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 2ea5490382976a5e4e1316cf3a3ac03569ddbb8b..28ef40ac4db8d681e01b3ee2ae2c680c8ab69a85 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 ffa2e6dc4352dbad9a8a39eb59a75cdb6d93237e..3daa86b28d37e5046e1054f39c5d473720b2333f 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 de288f5217ff678e47e8338dfd5b06b7a3d33fc5..e330742ba5ef9905526a7f5a3f577032cadf5cef 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 45c88dad0b41c1432222fa0c81bd37f0832a3a7b..7aabd5c43228110c672baf78b5c60bfb36c98e27 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 75d902b70afddee5d236e599db9186dd595bb1c0..5783891b977d0effa0196fba9fba6556b160726f 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 56897fb950f3c5ca5be180cffb54e934e8f408e8..b1f9262913203d4c92d1b7772413963349122b82 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 0654309be02d22965c5a7affa2c97e93930ffea5..a3bd403809002ffd0f6e332a5861b84d971c3d9e 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 81ec1317687ef8a1c8edd00c48f90611cf8819ea..db3cf69b1efbb6cf38d4302b1e366f43bc12422c 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 235fbdb3109cd9aa22727ea663572c1dc3929e2a..62d376fe651250a5757a45620fcc9e7de0ef55f5 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 45e9bcb7ba2bf5f971187511c0f0ab45ee967dda..1b56cb302031a4505223ba4dafe1fc53f6ee4aeb 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 ccba98cf631ee8e8b979b2ae12bc0a3b27a1c19e..f2e92fa491b5edd333c7b6f30bcc688f184408c5 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 f20dbf7d035ac3f8a9bc52d6d208e1ff1fd8378a..eb893d966bb9d52c26d261797e3286377601e34b 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 d5c6a278e173a0fdff8028b15b2bc61aad2ad5c2..dffc962b8518a4a8fcf7dbc5aedcafb2d4fc8eb3 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 2d30f41c6fe25b72294239f5bb40c58f1117f8f3..e174c99d4add9b2118e85f39a8efa9f0045540b5 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 ca9f7d089ba6c58690e703af588fd36c5da5d0c1..ddc2b84bac706a6835479012774b6e64eed211ab 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 3d50337dc1fa282a316e31e2e37bda35c2724365..292b3c3e3a6f782256213755c6b8ec5ca699a91c 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 91308c701349361602d2ec308bb8959e8ae6783c..003232ef594e4a8643d86f39fa29939e1af5dc0d 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 75a5f8aa2395e15087c411905a6a1196727e03b5..1974b6ddd46b5b1d5513da47563f89b73f7538e3 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 698ed84093f2478201c14933028d946d5473e1bc..bbc2b9b4dc897315a2c87f190da82bd9d467abba 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 8a32a8d765bdc6931a8eeee7ae07733f32737732..603a10fd7992935ba3ffc24ca7815ec4cfa3e72d 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 5ec2ea0583e49ae4380da182c8fb4e7a6b982c23..d1c1e83a1bf74ab14b2a73558dd9d9b583400e85 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 60dd4ae2e1f0ee0c87b4bcef6d5c6acc47f60e39..a36da54e01067839b2adce190d75784e4c6b2c09 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 e355f7011ef2311785bf09c7a90cabe2471dbf97..2621075043095533fe5ed1709e1817fbe4a78a8d 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