use bootstrap file declared in phpunit.xml and do not include it in every single test file. also get rid of the PHPUnit_MAIN_METHOD declarations since using phpunit directly is preferred

4 files changed, 0 insertions, 100 deletions

diff --git a/tests/Api/ExportCsvTest.php b/tests/Api/ExportCsvTest.php
index 2bff8a5..681f0de 100644
--- a/tests/Api/ExportCsvTest.php
+++ b/tests/Api/ExportCsvTest.php
@@ -12,14 +12,8 @@
  * @license  GPL http://www.gnu.org/licenses/gpl.html
  * @link     http://sourceforge.net/projects/semanticscuttle
  */
-
-require_once dirname(__FILE__) . '/../prepare.php';
 require_once 'HTTP/Request2.php';
 
-if (!defined('PHPUnit_MAIN_METHOD')) {
-    define('PHPUnit_MAIN_METHOD', 'Api_ExportCsvTest::main');
-}
-
 /**
  * Unit tests for the SemanticScuttle csv export API
  *
@@ -40,21 +34,6 @@ class Api_ExportCsvTest extends TestBaseApi
 
 
     /**
-     * Used to run this test class standalone
-     *
-     * @return void
-     */
-    public static function main()
-    {
-        require_once 'PHPUnit/TextUI/TestRunner.php';
-        PHPUnit_TextUI_TestRunner::run(
-            new PHPUnit_Framework_TestSuite(__CLASS__)
-        );
-    }
-
-
-
-    /**
      * Test if authentication is required when sending no auth data
      */
     public function testAuthWithoutAuthData()
@@ -280,8 +259,4 @@ class Api_ExportCsvTest extends TestBaseApi
         return $ar;
     }
 }
-
-if (PHPUnit_MAIN_METHOD == 'Api_ExportCsvTest::main') {
-    Api_ExportCsvTest::main();
-}
 ?>
\ No newline at end of file
diff --git a/tests/Api/PostsAddTest.php b/tests/Api/PostsAddTest.php
index 1f21d04..53aa8e7 100644
--- a/tests/Api/PostsAddTest.php
+++ b/tests/Api/PostsAddTest.php
@@ -12,14 +12,8 @@
  * @license  GPL http://www.gnu.org/licenses/gpl.html
  * @link     http://sourceforge.net/projects/semanticscuttle
  */
-
-require_once dirname(__FILE__) . '/../prepare.php';
 require_once 'HTTP/Request2.php';
 
-if (!defined('PHPUnit_MAIN_METHOD')) {
-    define('PHPUnit_MAIN_METHOD', 'Api_PostsAddTest::main');
-}
-
 /**
  * Unit tests for the SemanticScuttle post addition API.
  *
@@ -38,21 +32,6 @@ class Api_PostsAddTest extends TestBaseApi
 
 
     /**
-     * Used to run this test class standalone
-     *
-     * @return void
-     */
-    public static function main()
-    {
-        require_once 'PHPUnit/TextUI/TestRunner.php';
-        PHPUnit_TextUI_TestRunner::run(
-            new PHPUnit_Framework_TestSuite(__CLASS__)
-        );
-    }
-
-
-
-    /**
      * Test if authentication is required when sending no auth data
      */
     public function testAuthWithoutAuthData()
@@ -428,8 +407,4 @@ TXT;
         $this->assertEquals($title2, $data['bookmarks'][0]['bTitle']);
     }
 }
-
-if (PHPUnit_MAIN_METHOD == 'Api_PostsAddTest::main') {
-    Api_PostsAddTest::main();
-}
 ?>
\ No newline at end of file
diff --git a/tests/Api/PostsDeleteTest.php b/tests/Api/PostsDeleteTest.php
index d9fb6cd..7ba1285 100644
--- a/tests/Api/PostsDeleteTest.php
+++ b/tests/Api/PostsDeleteTest.php
@@ -12,14 +12,8 @@
  * @license  GPL http://www.gnu.org/licenses/gpl.html
  * @link     http://sourceforge.net/projects/semanticscuttle
  */
-
-require_once dirname(__FILE__) . '/../prepare.php';
 require_once 'HTTP/Request2.php';
 
-if (!defined('PHPUnit_MAIN_METHOD')) {
-    define('PHPUnit_MAIN_METHOD', 'Api_PostsDeleteTest::main');
-}
-
 /**
  * Unit tests for the SemanticScuttle post deletion API.
  *
@@ -38,21 +32,6 @@ class Api_PostsDeleteTest extends TestBaseApi
 
 
     /**
-     * Used to run this test class standalone
-     *
-     * @return void
-     */
-    public static function main()
-    {
-        require_once 'PHPUnit/TextUI/TestRunner.php';
-        PHPUnit_TextUI_TestRunner::run(
-            new PHPUnit_Framework_TestSuite(__CLASS__)
-        );
-    }
-
-
-
-    /**
      * Test if authentication is required when sending no auth data
      */
     public function testAuthWithoutAuthData()
@@ -296,8 +275,4 @@ class Api_PostsDeleteTest extends TestBaseApi
     }
 
 }
-
-if (PHPUnit_MAIN_METHOD == 'Api_PostsDeleteTest::main') {
-    Api_PostsDeleteTest::main();
-}
 ?>
\ No newline at end of file
diff --git a/tests/Api/PostsUpdateTest.php b/tests/Api/PostsUpdateTest.php
index c497a55..51f8be2 100644
--- a/tests/Api/PostsUpdateTest.php
+++ b/tests/Api/PostsUpdateTest.php
@@ -12,14 +12,8 @@
  * @license  GPL http://www.gnu.org/licenses/gpl.html
  * @link     http://sourceforge.net/projects/semanticscuttle
  */
-
-require_once dirname(__FILE__) . '/../prepare.php';
 require_once 'HTTP/Request2.php';
 
-if (!defined('PHPUnit_MAIN_METHOD')) {
-    define('PHPUnit_MAIN_METHOD', 'Api_PostsUpdateTest::main');
-}
-
 /**
  * Unit tests for the SemanticScuttle last-update time API.
  *
@@ -38,21 +32,6 @@ class Api_PostsUpdateTest extends TestBaseApi
 
 
     /**
-     * Used to run this test class standalone
-     *
-     * @return void
-     */
-    public static function main()
-    {
-        require_once 'PHPUnit/TextUI/TestRunner.php';
-        PHPUnit_TextUI_TestRunner::run(
-            new PHPUnit_Framework_TestSuite(__CLASS__)
-        );
-    }
-
-
-
-    /**
      * Test if authentication is required when sending no auth data
      */
     public function testAuthWithoutAuthData()
@@ -128,8 +107,4 @@ class Api_PostsUpdateTest extends TestBaseApi
     }
 
 }
-
-if (PHPUnit_MAIN_METHOD == 'Api_PostsUpdateTest::main') {
-    Api_PostsUpdateTest::main();
-}
 ?>
\ No newline at end of file