Fixed tests for using PHPUnit via Composer

kgooris · May 2, 2014 · 79ff629 · 79ff629
1 parent cf5d31a
commit 79ff629
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 15 deletions.
diff --git a/tests/AllTests.php b/tests/AllTests.php
@@ -24,8 +24,8 @@
 error_reporting(E_ALL | E_STRICT);
 
 // include PHPUnit
-require_once 'PHPUnit/Framework/TestSuite.php';
-require_once 'PHPUnit/TextUI/TestRunner.php';
+require_once __DIR__ . '/../vendor/phpunit/phpunit/src/Framework/TestSuite.php';
+require_once __DIR__ . '/../vendor/phpunit/phpunit/src/TextUI/TestRunner.php';
 
 // include Testsuites
 require_once __DIR__ . '/Attachment/AllTests.php';

diff --git a/tests/Attachment/AllTests.php b/tests/Attachment/AllTests.php
@@ -23,8 +23,9 @@
  * @since     2010-01-03
  */
 
-require_once 'PHPUnit/Framework/TestSuite.php';
-require_once 'PHPUnit/TextUI/TestRunner.php';
+// include PHPUnit
+require_once __DIR__ . '/../../vendor/phpunit/phpunit/src/Framework/TestSuite.php';
+require_once __DIR__ . '/../../vendor/phpunit/phpunit/src/TextUI/TestRunner.php';
 
 require_once 'PMF_Attachment_Filesystem_File_VanillaTest.php';
 

diff --git a/tests/Category/AllTests.php b/tests/Category/AllTests.php
@@ -17,8 +17,9 @@
  * @since     2010-01-03
  */
 
-require_once 'PHPUnit/Framework/TestSuite.php';
-require_once 'PHPUnit/TextUI/TestRunner.php';
+// include PHPUnit
+require_once __DIR__ . '/../../vendor/phpunit/phpunit/src/Framework/TestSuite.php';
+require_once __DIR__ . '/../../vendor/phpunit/phpunit/src/TextUI/TestRunner.php';
 
 /**
  * Category_AllTests

diff --git a/tests/Database/AbstractTest.php b/tests/Database/AbstractTest.php
@@ -17,7 +17,8 @@
  * @since     2010-01-03
  */
 
-require_once 'PHPUnit/Extensions/Database/TestCase.php';
+// include PHPUnit
+require_once __DIR__ . '/../../vendor/phpunit/dbunit/PHPUnit/Extensions/Database/TestCase.php';
 require_once dirname(dirname(__DIR__)) . '/phpmyfaq/inc/PMF/Db.php';
 
 /**

diff --git a/tests/Faq/AllTests.php b/tests/Faq/AllTests.php
@@ -17,8 +17,9 @@
  * @since     2010-01-03
  */
 
-require_once 'PHPUnit/Framework/TestSuite.php';
-require_once 'PHPUnit/TextUI/TestRunner.php';
+// include PHPUnit
+require_once __DIR__ . '/../../vendor/phpunit/phpunit/src/Framework/TestSuite.php';
+require_once __DIR__ . '/../../vendor/phpunit/phpunit/src/TextUI/TestRunner.php';
 
 /**
  * Faq_AllTests

diff --git a/tests/Instance/AllTests.php b/tests/Instance/AllTests.php
@@ -17,8 +17,9 @@
  * @since     2012-04-14
  */
 
-require_once 'PHPUnit/Framework/TestSuite.php';
-require_once 'PHPUnit/TextUI/TestRunner.php';
+// include PHPUnit
+require_once __DIR__ . '/../../vendor/phpunit/phpunit/src/Framework/TestSuite.php';
+require_once __DIR__ . '/../../vendor/phpunit/phpunit/src/TextUI/TestRunner.php';
 
 require_once 'PMF_Instance_ClientTest.php';
 

diff --git a/tests/Search/AllTests.php b/tests/Search/AllTests.php
@@ -17,8 +17,9 @@
  * @since     2010-01-03
  */
 
-require_once 'PHPUnit/Framework/TestSuite.php';
-require_once 'PHPUnit/TextUI/TestRunner.php';
+// include PHPUnit
+require_once __DIR__ . '/../../vendor/phpunit/phpunit/src/Framework/TestSuite.php';
+require_once __DIR__ . '/../../vendor/phpunit/phpunit/src/TextUI/TestRunner.php';
 
 require_once 'PMF_Search_DatabaseTest.php';
 require_once 'PMF_Search_FactoryTest.php';

diff --git a/tests/Search/Database/AllTests.php b/tests/Search/Database/AllTests.php
@@ -17,8 +17,9 @@
  * @since     2010-01-03
  */
 
-require_once 'PHPUnit/Framework/TestSuite.php';
-require_once 'PHPUnit/TextUI/TestRunner.php';
+// include PHPUnit
+require_once __DIR__ . '/../../../vendor/phpunit/phpunit/src/Framework/TestSuite.php';
+require_once __DIR__ . '/../../../vendor/phpunit/phpunit/src/TextUI/TestRunner.php';
 
 require_once 'PMF_Search_Database_MysqlTest.php';
 require_once 'PMF_Search_Database_PgsqlTest.php';