Rearranged test suite -- moved ResultFeedTest to integration tests since this...

Rearranged test suite -- moved ResultFeedTest to integration tests since this relies on live Solr instance.

build.xml

@@ -60,13 +60,13 @@
   </target>
 
   <!-- PHPUnit -->
-  <target name="phpunit" description="Run unit tests">
-    <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 name="phpunit" description="Run tests">
+    <exec dir="${srcdir}/module/VuFind/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>
 
   <!-- PHPUnit without logging output -->
-  <target name="phpunitfast" description="Run unit tests">
-    <exec dir="${srcdir}/module/VuFind/tests/unit-tests" command="VUFIND_LOCAL_DIR=${srcdir}/local phpunit -dzend.enable_gc=0" passthru="true" checkreturn="true" />
+  <target name="phpunitfast" description="Run tests">
+    <exec dir="${srcdir}/module/VuFind/tests" command="VUFIND_LOCAL_DIR=${srcdir}/local phpunit -dzend.enable_gc=0" passthru="true" checkreturn="true" />
   </target>
 
   <!-- Install and Activate VuFind -->

module/VuFind/tests/unit-tests/bootstrap.php → module/VuFind/tests/bootstrap.php

@@ -10,7 +10,7 @@ define('VUFIND_PHPUNIT_RUNNING', 1);
 define('VUFIND_PHPUNIT_MODULE_PATH', __DIR__);
 
 // Define path to application directory
-defined('APPLICATION_PATH') || define('APPLICATION_PATH', realpath(dirname(__DIR__) . '/../../..'));
+defined('APPLICATION_PATH') || define('APPLICATION_PATH', realpath(dirname(__DIR__) . '/../..'));
 
 // Define application environment
 defined('APPLICATION_ENV')
@@ -51,7 +51,7 @@ $serviceManager->get('ModuleManager')->loadModules();
 $loader = Zend\Loader\AutoloaderFactory::getRegisteredAutoloader(
     Zend\Loader\AutoloaderFactory::STANDARD_AUTOLOADER
 );
-$loader->registerNamespace('VuFindTest', __DIR__ . '/../../src/VuFindTest');
+$loader->registerNamespace('VuFindTest', __DIR__ . '/../src/VuFindTest');
 
 // Use output buffering -- some tests involve HTTP headers and will fail if there is output.
 ob_start();
\ No newline at end of file

module/VuFind/tests/unit-tests/src/Theme/Root/Helper/ResultFeedTest.php → module/VuFind/tests/integration-tests/src/Theme/Root/Helper/ResultFeedTest.php

@@ -25,7 +25,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     http://vufind.org/wiki/unit_tests Wiki
  */
-namespace VuFind\Test\Theme\Root\Helper;
+namespace VuFind\IntegrationTest\Theme\Root\Helper;
 use VuFind\Theme\Root\Helper\ResultFeed;
 
 /**

module/VuFind/tests/unit-tests/phpunit.xml → module/VuFind/tests/phpunit.xml

 <phpunit bootstrap="./bootstrap.php" backupGlobals="false">
   <testsuites>
-    <testsuite name="VuFind">
-      <directory>src</directory>
+    <testsuite name="VuFindUnit">
+      <directory>unit-tests/src</directory>
+    </testsuite>
+    <testsuite name="VuFindIntegration">
+      <directory>integration-tests/src</directory>
     </testsuite>
   </testsuites>
 
   <filter>
     <whitelist addUncoveredFilesFromWhitelist="true">
-      <directory suffix=".php">../../src</directory>
+      <directory suffix=".php">../src</directory>
     </whitelist>
   </filter>
 </phpunit>