From 02362c7d1030ffc3c7779ec5275424c46d455d7c Mon Sep 17 00:00:00 2001
From: David Maus <dmaus@ictsoc.de>
Date: Sat, 15 Sep 2012 17:23:36 +0200
Subject: [PATCH] Relocated PHPUnit configuration of core unit tests
---
build.xml | 2 +-
{tests => module/VuFind/tests/unit-tests}/bootstrap.php | 3 +--
{tests => module/VuFind/tests/unit-tests}/phpunit.xml | 4 ++--
3 files changed, 4 insertions(+), 5 deletions(-)
rename {tests => module/VuFind/tests/unit-tests}/bootstrap.php (94%)
rename {tests => module/VuFind/tests/unit-tests}/phpunit.xml (67%)
diff --git a/build.xml b/build.xml
index 199fc42dc67..f58a7cd3013 100644
--- a/build.xml
+++ b/build.xml
@@ -61,7 +61,7 @@
<!-- PHPUnit -->
<target name="phpunit" description="Run unit tests">
- <exec dir="${srcdir}/tests" command="VUFIND_LOCAL_DIR=${srcdir}/local phpunit -dzend.enable_gc=0 --log-junit ${builddir}/reports/phpunit.xml --coverage-clover ${builddir}/reports/coverage/clover.xml --coverage-html ${builddir}/reports/coverage/" passthru="true" checkreturn="true" />
+ <exec dir="${srcdir}/module/VuFind/tests/unit-tests" command="VUFIND_LOCAL_DIR=${srcdir}/local phpunit -dzend.enable_gc=0 --log-junit ${builddir}/reports/phpunit.xml --coverage-clover ${builddir}/reports/coverage/clover.xml --coverage-html ${builddir}/reports/coverage/" passthru="true" checkreturn="true" />
</target>
<!-- Install and Activate VuFind -->
diff --git a/tests/bootstrap.php b/module/VuFind/tests/unit-tests/bootstrap.php
similarity index 94%
rename from tests/bootstrap.php
rename to module/VuFind/tests/unit-tests/bootstrap.php
index 92d5d924987..e0c28084e2c 100644
--- a/tests/bootstrap.php
+++ b/module/VuFind/tests/unit-tests/bootstrap.php
@@ -7,8 +7,7 @@ use Zend\Mvc\Service\ServiceManagerConfig;
define('VUFIND_PHPUNIT_RUNNING', 1);
// Define path to application directory
-defined('APPLICATION_PATH')
- || define('APPLICATION_PATH', dirname(__DIR__));
+defined('APPLICATION_PATH') || define('APPLICATION_PATH', realpath(dirname(__DIR__) . '/../../..'));
// Define application environment
defined('APPLICATION_ENV')
diff --git a/tests/phpunit.xml b/module/VuFind/tests/unit-tests/phpunit.xml
similarity index 67%
rename from tests/phpunit.xml
rename to module/VuFind/tests/unit-tests/phpunit.xml
index 78b63f11402..3db2ab8d431 100644
--- a/tests/phpunit.xml
+++ b/module/VuFind/tests/unit-tests/phpunit.xml
@@ -1,13 +1,13 @@
<phpunit bootstrap="./bootstrap.php" backupGlobals="false">
<testsuites>
<testsuite name="VuFind">
- <directory>../module/VuFind/tests</directory>
+ <directory>src</directory>
</testsuite>
</testsuites>
<filter>
<whitelist addUncoveredFilesFromWhitelist="true">
- <directory suffix=".php">../module/VuFind/src</directory>
+ <directory suffix=".php">../../src</directory>
</whitelist>
</filter>
</phpunit>
--
GitLab