From df36eed9f961eb88defaa738e25614be35fe103a Mon Sep 17 00:00:00 2001
From: Demian Katz <demian.katz@villanova.edu>
Date: Wed, 12 Feb 2020 08:33:38 -0500
Subject: [PATCH] Fix module-level PHPUnit configurations.
---
.../VuFindAdmin/tests/unit-tests/phpunit.xml | 8 +++++++
module/VuFindApi/tests/unit-tests/phpunit.xml | 8 +++++++
.../tests/unit-tests/bootstrap.php | 21 -----------------
.../tests/unit-tests/phpunit.xml | 6 +----
.../tests/unit-tests/phpunit.xml | 8 +++++++
.../tests/unit-tests/bootstrap.php | 23 -------------------
.../VuFindSearch/tests/unit-tests/phpunit.xml | 6 +----
.../tests/unit-tests/bootstrap.php | 21 -----------------
.../VuFindTheme/tests/unit-tests/phpunit.xml | 6 +----
9 files changed, 27 insertions(+), 80 deletions(-)
create mode 100644 module/VuFindAdmin/tests/unit-tests/phpunit.xml
create mode 100644 module/VuFindApi/tests/unit-tests/phpunit.xml
delete mode 100644 module/VuFindConsole/tests/unit-tests/bootstrap.php
create mode 100644 module/VuFindDevTools/tests/unit-tests/phpunit.xml
delete mode 100644 module/VuFindSearch/tests/unit-tests/bootstrap.php
delete mode 100644 module/VuFindTheme/tests/unit-tests/bootstrap.php
diff --git a/module/VuFindAdmin/tests/unit-tests/phpunit.xml b/module/VuFindAdmin/tests/unit-tests/phpunit.xml
new file mode 100644
index 00000000000..ded91aaf829
--- /dev/null
+++ b/module/VuFindAdmin/tests/unit-tests/phpunit.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<phpunit bootstrap="../../../VuFind/tests/bootstrap.php">
+ <testsuites>
+ <testsuite name="VuFindAdmin">
+ <directory>src</directory>
+ </testsuite>
+ </testsuites>
+</phpunit>
diff --git a/module/VuFindApi/tests/unit-tests/phpunit.xml b/module/VuFindApi/tests/unit-tests/phpunit.xml
new file mode 100644
index 00000000000..477b0376cfc
--- /dev/null
+++ b/module/VuFindApi/tests/unit-tests/phpunit.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<phpunit bootstrap="../../../VuFind/tests/bootstrap.php">
+ <testsuites>
+ <testsuite name="VuFindApi">
+ <directory>src</directory>
+ </testsuite>
+ </testsuites>
+</phpunit>
diff --git a/module/VuFindConsole/tests/unit-tests/bootstrap.php b/module/VuFindConsole/tests/unit-tests/bootstrap.php
deleted file mode 100644
index d63f479a605..00000000000
--- a/module/VuFindConsole/tests/unit-tests/bootstrap.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-/**
- * Search subsystem PHPUnit bootstrap.
- *
- * @author David Maus <maus@hab.de>
- * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @copyright Copyright (C) Villanova University 2011
- */
-require_once'Zend/Loader/AutoloaderFactory.php';
-\Zend\Loader\AutoloaderFactory::factory(
- [
- 'Zend\Loader\StandardAutoloader' => [
- 'namespaces' => [
- 'VuFindConsole' => realpath(__DIR__ . '/../../src/VuFindConsole'),
- 'VuFindTest' => realpath(__DIR__ . '/src/VuFindTest'),
- ],
- 'autoregister_zf' => true
- ]
- ]
-);
diff --git a/module/VuFindConsole/tests/unit-tests/phpunit.xml b/module/VuFindConsole/tests/unit-tests/phpunit.xml
index c3eb7bfac23..89f88214e8c 100644
--- a/module/VuFindConsole/tests/unit-tests/phpunit.xml
+++ b/module/VuFindConsole/tests/unit-tests/phpunit.xml
@@ -1,12 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<phpunit bootstrap="bootstrap.php"
- strict="true">
+<phpunit bootstrap="../../../VuFind/tests/bootstrap.php">
<testsuites>
<testsuite name="VuFindConsole">
<directory>src</directory>
</testsuite>
</testsuites>
- <php>
- <includePath>../../../../vendor/zendframework/zendframework/library</includePath>
- </php>
</phpunit>
diff --git a/module/VuFindDevTools/tests/unit-tests/phpunit.xml b/module/VuFindDevTools/tests/unit-tests/phpunit.xml
new file mode 100644
index 00000000000..7b540e68c81
--- /dev/null
+++ b/module/VuFindDevTools/tests/unit-tests/phpunit.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<phpunit bootstrap="../../../VuFind/tests/bootstrap.php">
+ <testsuites>
+ <testsuite name="VuFindDevTools">
+ <directory>src</directory>
+ </testsuite>
+ </testsuites>
+</phpunit>
diff --git a/module/VuFindSearch/tests/unit-tests/bootstrap.php b/module/VuFindSearch/tests/unit-tests/bootstrap.php
deleted file mode 100644
index 4246ed53344..00000000000
--- a/module/VuFindSearch/tests/unit-tests/bootstrap.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-/**
- * Search subsystem PHPUnit bootstrap.
- *
- * @author David Maus <maus@hab.de>
- * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @copyright Copyright (C) Villanova University 2011
- */
-require_once'Zend/Loader/AutoloaderFactory.php';
-\Zend\Loader\AutoloaderFactory::factory(
- [
- 'Zend\Loader\StandardAutoloader' => [
- 'namespaces' => [
- 'VuFindSearch' => realpath(__DIR__ . '/../../src/VuFindSearch'),
- 'VuFindTest' => realpath(__DIR__ . '/src/VuFindTest'),
- ],
- 'autoregister_zf' => true
- ]
- ]
-);
-
-define('PHPUNIT_SEARCH_FIXTURES', realpath(__DIR__ . '/fixtures'));
diff --git a/module/VuFindSearch/tests/unit-tests/phpunit.xml b/module/VuFindSearch/tests/unit-tests/phpunit.xml
index d02b07e2e4a..a3ceb08d21f 100644
--- a/module/VuFindSearch/tests/unit-tests/phpunit.xml
+++ b/module/VuFindSearch/tests/unit-tests/phpunit.xml
@@ -1,12 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<phpunit bootstrap="bootstrap.php"
- strict="true">
+<phpunit bootstrap="../../../VuFind/tests/bootstrap.php">
<testsuites>
<testsuite name="VuFindSearch">
<directory>src</directory>
</testsuite>
</testsuites>
- <php>
- <includePath>../../../../vendor/zendframework/zendframework/library</includePath>
- </php>
</phpunit>
diff --git a/module/VuFindTheme/tests/unit-tests/bootstrap.php b/module/VuFindTheme/tests/unit-tests/bootstrap.php
deleted file mode 100644
index 26c6bf5d5ba..00000000000
--- a/module/VuFindTheme/tests/unit-tests/bootstrap.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-/**
- * Search subsystem PHPUnit bootstrap.
- *
- * @author David Maus <maus@hab.de>
- * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @copyright Copyright (C) Villanova University 2011
- */
-require_once 'Zend/Loader/AutoloaderFactory.php';
-\Zend\Loader\AutoloaderFactory::factory(
- [
- 'Zend\Loader\StandardAutoloader' => [
- 'namespaces' => [
- 'VuFindTheme' => realpath(__DIR__ . '/../../src/VuFindTheme'),
- 'VuFindTest' => realpath(__DIR__ . '/src/VuFindTest'),
- ],
- 'autoregister_zf' => true
- ]
- ]
-);
diff --git a/module/VuFindTheme/tests/unit-tests/phpunit.xml b/module/VuFindTheme/tests/unit-tests/phpunit.xml
index 55ee799fff4..4155e641489 100644
--- a/module/VuFindTheme/tests/unit-tests/phpunit.xml
+++ b/module/VuFindTheme/tests/unit-tests/phpunit.xml
@@ -1,12 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<phpunit bootstrap="bootstrap.php"
- strict="true">
+<phpunit bootstrap="../../../VuFind/tests/bootstrap.php">
<testsuites>
<testsuite name="VuFindTheme">
<directory>src</directory>
</testsuite>
</testsuites>
- <php>
- <includePath>../../../../vendor/zendframework/zendframework/library</includePath>
- </php>
</phpunit>
--
GitLab