yohan/SemanticScuttle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Christian Weiske 2011-04-12 09:29:59 +02:00
parent 90f29d6e67
commit bdebe6598c
18 changed files with 2 additions and 385 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
tests/AllTests.php
View File

@ -12,23 +12,15 @@
* @license GPL http://www.gnu.org/licenses/gpl.html * @license GPL http://www.gnu.org/licenses/gpl.html
* @link http://sourceforge.net/projects/semanticscuttle * @link http://sourceforge.net/projects/semanticscuttle
*/ */
if (!defined('PHPUnit_MAIN_METHOD')) {
define('PHPUnit_MAIN_METHOD', 'AllTests::main');
}
require_once 'prepare.php';
/** /**
* SemanticScuttle unit tests. * SemanticScuttle unit tests.
* *
* To launch this tests, you need PHPUnit 3. * To launch this tests, you need PHPUnit 3.
* Run them with: * Run them with:
* $ php tests/AllTests.php * $ cd tests; phpunit .
* or single files like: * or single files like:
* $ php tests/BookmarkTest.php * $ cd tests; phpunit BookmarkTest.php
*
* You also may use phpunit directly:
* $ phpunit tests/AllTests.php
* *
* @category Bookmarking * @category Bookmarking
* @package SemanticScuttle * @package SemanticScuttle
@ -40,14 +32,6 @@ require_once 'prepare.php';
*/ */
class AllTests extends PHPUnit_Framework_TestSuite class AllTests extends PHPUnit_Framework_TestSuite
{ {
public static function main()
{
require_once 'PHPUnit/TextUI/TestRunner.php';
PHPUnit_TextUI_TestRunner::run(self::suite());
}
public static function suite() public static function suite()
{ {
$suite = new AllTests(); $suite = new AllTests();
@ -74,9 +58,4 @@ class AllTests extends PHPUnit_Framework_TestSuite
{ {
} }
} }
if (PHPUnit_MAIN_METHOD == 'AllTests::main') {
AllTests::main();
}
?> ?>

25
tests/Api/ExportCsvTest.php
View File

@ -12,14 +12,8 @@
* @license GPL http://www.gnu.org/licenses/gpl.html * @license GPL http://www.gnu.org/licenses/gpl.html
* @link http://sourceforge.net/projects/semanticscuttle * @link http://sourceforge.net/projects/semanticscuttle
*/ */
require_once dirname(__FILE__) . '/../prepare.php';
require_once 'HTTP/Request2.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 * Unit tests for the SemanticScuttle csv export API
* *
@ -39,21 +33,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 * Test if authentication is required when sending no auth data
*/ */
@ -280,8 +259,4 @@ class Api_ExportCsvTest extends TestBaseApi
return $ar; return $ar;
} }
} }
if (PHPUnit_MAIN_METHOD == 'Api_ExportCsvTest::main') {
Api_ExportCsvTest::main();
}
?> ?>

25
tests/Api/PostsAddTest.php
View File

@ -12,14 +12,8 @@
* @license GPL http://www.gnu.org/licenses/gpl.html * @license GPL http://www.gnu.org/licenses/gpl.html
* @link http://sourceforge.net/projects/semanticscuttle * @link http://sourceforge.net/projects/semanticscuttle
*/ */
require_once dirname(__FILE__) . '/../prepare.php';
require_once 'HTTP/Request2.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. * Unit tests for the SemanticScuttle post addition API.
* *
@ -37,21 +31,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 * Test if authentication is required when sending no auth data
*/ */
@ -428,8 +407,4 @@ TXT;
$this->assertEquals($title2, $data['bookmarks'][0]['bTitle']); $this->assertEquals($title2, $data['bookmarks'][0]['bTitle']);
} }
} }
if (PHPUnit_MAIN_METHOD == 'Api_PostsAddTest::main') {
Api_PostsAddTest::main();
}
?> ?>

25
tests/Api/PostsDeleteTest.php
View File

@ -12,14 +12,8 @@
* @license GPL http://www.gnu.org/licenses/gpl.html * @license GPL http://www.gnu.org/licenses/gpl.html
* @link http://sourceforge.net/projects/semanticscuttle * @link http://sourceforge.net/projects/semanticscuttle
*/ */
require_once dirname(__FILE__) . '/../prepare.php';
require_once 'HTTP/Request2.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. * Unit tests for the SemanticScuttle post deletion API.
* *
@ -37,21 +31,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 * Test if authentication is required when sending no auth data
*/ */
@ -296,8 +275,4 @@ class Api_PostsDeleteTest extends TestBaseApi
} }
} }
if (PHPUnit_MAIN_METHOD == 'Api_PostsDeleteTest::main') {
Api_PostsDeleteTest::main();
}
?> ?>

25
tests/Api/PostsUpdateTest.php
View File

@ -12,14 +12,8 @@
* @license GPL http://www.gnu.org/licenses/gpl.html * @license GPL http://www.gnu.org/licenses/gpl.html
* @link http://sourceforge.net/projects/semanticscuttle * @link http://sourceforge.net/projects/semanticscuttle
*/ */
require_once dirname(__FILE__) . '/../prepare.php';
require_once 'HTTP/Request2.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. * Unit tests for the SemanticScuttle last-update time API.
* *
@ -37,21 +31,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 * Test if authentication is required when sending no auth data
*/ */
@ -128,8 +107,4 @@ class Api_PostsUpdateTest extends TestBaseApi
} }
} }
if (PHPUnit_MAIN_METHOD == 'Api_PostsUpdateTest::main') {
Api_PostsUpdateTest::main();
}
?> ?>

24
tests/Bookmark2TagTest.php
View File

@ -12,11 +12,6 @@
* @license GPL http://www.gnu.org/licenses/gpl.html * @license GPL http://www.gnu.org/licenses/gpl.html
* @link http://sourceforge.net/projects/semanticscuttle * @link http://sourceforge.net/projects/semanticscuttle
*/ */
if (!defined('PHPUnit_MAIN_METHOD')) {
define('PHPUnit_MAIN_METHOD', 'Bookmark2TagTest::main');
}
require_once 'prepare.php';
/** /**
* Unit tests for the SemanticScuttle bookmark-tag combination service. * Unit tests for the SemanticScuttle bookmark-tag combination service.
@ -58,21 +53,6 @@ class Bookmark2TagTest extends TestBase
/**
* 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__)
);
}
protected function setUp() protected function setUp()
{ {
$this->us = SemanticScuttle_Service_Factory::get('User'); $this->us = SemanticScuttle_Service_Factory::get('User');
@ -628,8 +608,4 @@ class Bookmark2TagTest extends TestBase
$this->assertContains(array('tag' => 'usable', 'bCount' => '2'), $arTags); $this->assertContains(array('tag' => 'usable', 'bCount' => '2'), $arTags);
} }
} }
if (PHPUnit_MAIN_METHOD == 'Bookmark2TagTest::main') {
Bookmark2TagTest::main();
}
?> ?>

26
tests/BookmarkTest.php
View File

@ -12,11 +12,6 @@
* @license GPL http://www.gnu.org/licenses/gpl.html * @license GPL http://www.gnu.org/licenses/gpl.html
* @link http://sourceforge.net/projects/semanticscuttle * @link http://sourceforge.net/projects/semanticscuttle
*/ */
if (!defined('PHPUnit_MAIN_METHOD')) {
define('PHPUnit_MAIN_METHOD', 'BookmarkTest::main');
}
require_once 'prepare.php';
/** /**
* Unit tests for the SemanticScuttle bookmark service. * Unit tests for the SemanticScuttle bookmark service.
@ -37,22 +32,6 @@ class BookmarkTest extends TestBase
protected $tts; protected $tts;
/**
* 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__)
);
}
protected function setUp() protected function setUp()
{ {
$this->us = SemanticScuttle_Service_Factory::get('User'); $this->us = SemanticScuttle_Service_Factory::get('User');
@ -1344,10 +1323,5 @@ class BookmarkTest extends TestBase
}
if (PHPUnit_MAIN_METHOD == 'BookmarkTest::main') {
BookmarkTest::main();
} }
?> ?>

25
tests/CommonDescriptionTest.php
View File

@ -12,11 +12,6 @@
* @license GPL http://www.gnu.org/licenses/gpl.html * @license GPL http://www.gnu.org/licenses/gpl.html
* @link http://sourceforge.net/projects/semanticscuttle * @link http://sourceforge.net/projects/semanticscuttle
*/ */
if (!defined('PHPUnit_MAIN_METHOD')) {
define('PHPUnit_MAIN_METHOD', 'CommonDescriptionTest::main');
}
require_once 'prepare.php';
/** /**
* Unit tests for the SemanticScuttle common description service. * Unit tests for the SemanticScuttle common description service.
@ -39,21 +34,6 @@ class CommonDescriptionTest extends TestBase
protected $cds; protected $cds;
/**
* 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__)
);
}
protected function setUp() protected function setUp()
{ {
$this->us =SemanticScuttle_Service_Factory::get('User'); $this->us =SemanticScuttle_Service_Factory::get('User');
@ -128,9 +108,4 @@ class CommonDescriptionTest extends TestBase
} }
} }
if (PHPUnit_MAIN_METHOD == 'CommonDescriptionTest::main') {
CommonDescriptionTest::main();
}
?> ?>

27
tests/SearchHistoryTest.php
View File

@ -12,11 +12,6 @@
* @license GPL http://www.gnu.org/licenses/gpl.html * @license GPL http://www.gnu.org/licenses/gpl.html
* @link http://sourceforge.net/projects/semanticscuttle * @link http://sourceforge.net/projects/semanticscuttle
*/ */
if (!defined('PHPUnit_MAIN_METHOD')) {
define('PHPUnit_MAIN_METHOD', 'SearchHistoryTest::main');
}
require_once 'prepare.php';
/** /**
* Unit tests for the SemanticScuttle search history service. * Unit tests for the SemanticScuttle search history service.
@ -38,22 +33,6 @@ class SearchHistoryTest extends TestBase
protected $shs; protected $shs;
/**
* 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__)
);
}
/** /**
* Set up all services * Set up all services
* *
@ -391,10 +370,4 @@ class SearchHistoryTest extends TestBase
$this->assertEquals(0, $this->shs->countSearches()); $this->assertEquals(0, $this->shs->countSearches());
} }
} }
if (PHPUnit_MAIN_METHOD == 'SearchHistoryTest::main') {
SearchHistoryTest::main();
}
?> ?>

25
tests/Tag2TagTest.php
View File

@ -12,11 +12,6 @@
* @license GPL http://www.gnu.org/licenses/gpl.html * @license GPL http://www.gnu.org/licenses/gpl.html
* @link http://sourceforge.net/projects/semanticscuttle * @link http://sourceforge.net/projects/semanticscuttle
*/ */
if (!defined('PHPUnit_MAIN_METHOD')) {
define('PHPUnit_MAIN_METHOD', 'Tag2TagTest::main');
}
require_once 'prepare.php';
/** /**
* Unit tests for the SemanticScuttle tag2tag service. * Unit tests for the SemanticScuttle tag2tag service.
@ -37,22 +32,6 @@ class Tag2TagTest extends TestBase
protected $tts; protected $tts;
/**
* 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__)
);
}
protected function setUp() protected function setUp()
{ {
$this->us =SemanticScuttle_Service_Factory::get('User'); $this->us =SemanticScuttle_Service_Factory::get('User');
@ -550,8 +529,4 @@ class Tag2TagTest extends TestBase
}*/ }*/
} }
if (PHPUnit_MAIN_METHOD == 'Tag2TagTest::main') {
Tag2TagTest::main();
}
?> ?>

26
tests/TagTest.php
View File

@ -12,11 +12,6 @@
* @license GPL http://www.gnu.org/licenses/gpl.html * @license GPL http://www.gnu.org/licenses/gpl.html
* @link http://sourceforge.net/projects/semanticscuttle * @link http://sourceforge.net/projects/semanticscuttle
*/ */
if (!defined('PHPUnit_MAIN_METHOD')) {
define('PHPUnit_MAIN_METHOD', 'TagTest::main');
}
require_once 'prepare.php';
/** /**
* Unit tests for the SemanticScuttle tag service. * Unit tests for the SemanticScuttle tag service.
@ -34,22 +29,6 @@ class TagTest extends TestBase
protected $ts; protected $ts;
/**
* 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__)
);
}
protected function setUp() protected function setUp()
{ {
$this->ts =SemanticScuttle_Service_Factory::get('Tag'); $this->ts =SemanticScuttle_Service_Factory::get('Tag');
@ -109,9 +88,4 @@ class TagTest extends TestBase
} }
} }
if (PHPUnit_MAIN_METHOD == 'TagTest::main') {
TagTest::main();
}
?> ?>

23
tests/TagsCacheTest.php
View File

@ -12,11 +12,6 @@
* @license GPL http://www.gnu.org/licenses/gpl.html * @license GPL http://www.gnu.org/licenses/gpl.html
* @link http://sourceforge.net/projects/semanticscuttle * @link http://sourceforge.net/projects/semanticscuttle
*/ */
if (!defined('PHPUnit_MAIN_METHOD')) {
define('PHPUnit_MAIN_METHOD', 'TagsCacheTest::main');
}
require_once 'prepare.php';
/** /**
* Unit tests for the SemanticScuttle tags cache service. * Unit tests for the SemanticScuttle tags cache service.
@ -38,19 +33,6 @@ class TagsCacheTest extends PHPUnit_Framework_TestCase
/**
* 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__)
);
}
protected function setUp() protected function setUp()
{ {
$this->us =SemanticScuttle_Service_Factory::get('User'); $this->us =SemanticScuttle_Service_Factory::get('User');
@ -207,9 +189,4 @@ class TagsCacheTest extends PHPUnit_Framework_TestCase
$this->assertEquals(array(), $tcs->getSynonyms('d', 1)); $this->assertEquals(array(), $tcs->getSynonyms('d', 1));
} }
} }
if (PHPUnit_MAIN_METHOD == 'TagsCacheTest::main') {
TagsCacheTest::main();
}
?> ?>

2
tests/UserArrayTest.php
View File

@ -11,8 +11,6 @@
* @link http://sourceforge.net/projects/semanticscuttle * @link http://sourceforge.net/projects/semanticscuttle
*/ */
require_once 'prepare.php';
/** /**
* Unit tests for the SemanticScuttle user array model. * Unit tests for the SemanticScuttle user array model.
* *

29
tests/UserTest.php
View File

@ -12,11 +12,6 @@
* @license GPL http://www.gnu.org/licenses/gpl.html * @license GPL http://www.gnu.org/licenses/gpl.html
* @link http://sourceforge.net/projects/semanticscuttle * @link http://sourceforge.net/projects/semanticscuttle
*/ */
if (!defined('PHPUnit_MAIN_METHOD')) {
define('PHPUnit_MAIN_METHOD', 'UserTest::main');
}
require_once 'prepare.php';
/** /**
* Unit tests for the SemanticScuttle user service. * Unit tests for the SemanticScuttle user service.
@ -31,24 +26,6 @@ require_once 'prepare.php';
*/ */
class UserTest extends TestBase class UserTest extends TestBase
{ {
/**
* 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__)
);
}
protected function setUp() protected function setUp()
{ {
$this->us = SemanticScuttle_Service_Factory::get('User'); $this->us = SemanticScuttle_Service_Factory::get('User');
@ -200,10 +177,4 @@ class UserTest extends TestBase
} }
} }
if (PHPUnit_MAIN_METHOD == 'UserTest::main') {
UserTest::main();
}
?> ?>

25
tests/VoteTest.php
View File

@ -10,11 +10,6 @@
* @license GPL http://www.gnu.org/licenses/gpl.html * @license GPL http://www.gnu.org/licenses/gpl.html
* @link http://sourceforge.net/projects/semanticscuttle * @link http://sourceforge.net/projects/semanticscuttle
*/ */
if (!defined('PHPUnit_MAIN_METHOD')) {
define('PHPUnit_MAIN_METHOD', 'VoteTest::main');
}
require_once 'prepare.php';
/** /**
* Unit tests for the SemanticScuttle voting system. * Unit tests for the SemanticScuttle voting system.
@ -43,21 +38,6 @@ class VoteTest extends TestBase
/**
* 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('VoteTest')
);
}
public function setUp() public function setUp()
{ {
$GLOBALS['enableVoting'] = true; $GLOBALS['enableVoting'] = true;
@ -553,9 +533,4 @@ class VoteTest extends TestBase
} }
}//class VoteTest extends TestBase }//class VoteTest extends TestBase
if (PHPUnit_MAIN_METHOD == 'VoteTest::main') {
VoteTest::main();
}
?> ?>

26
tests/ajax/GetAdminLinkedTagsTest.php
View File

@ -12,14 +12,8 @@
* @license GPL http://www.gnu.org/licenses/gpl.html * @license GPL http://www.gnu.org/licenses/gpl.html
* @link http://sourceforge.net/projects/semanticscuttle * @link http://sourceforge.net/projects/semanticscuttle
*/ */
require_once dirname(__FILE__) . '/../prepare.php';
require_once 'HTTP/Request2.php'; require_once 'HTTP/Request2.php';
if (!defined('PHPUnit_MAIN_METHOD')) {
define('PHPUnit_MAIN_METHOD', 'ajax_GetAdminLinkedTagsTest::main');
}
/** /**
* Unit tests for the ajax linked admin tags script * Unit tests for the ajax linked admin tags script
* *
@ -34,22 +28,6 @@ class ajax_GetAdminLinkedTagsTest extends TestBaseApi
protected $urlPart = 'ajax/getadminlinkedtags.php'; protected $urlPart = 'ajax/getadminlinkedtags.php';
/**
* 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__)
);
}
/** /**
* Verify that we get the configured root tags if * Verify that we get the configured root tags if
* we do not pass any parameters * we do not pass any parameters
@ -139,8 +117,4 @@ class ajax_GetAdminLinkedTagsTest extends TestBaseApi
$this->assertEquals('adminsubtag', $data[0]->data->title); $this->assertEquals('adminsubtag', $data[0]->data->title);
} }
} }
if (PHPUnit_MAIN_METHOD == 'ajax_GetAdminLinkedTagsTest::main') {
ajax_GetAdminLinkedTagsTest::main();
}
?> ?>

2
tests/ajax/GetAdminTagsTest.php
View File

@ -12,8 +12,6 @@
* @license GPL http://www.gnu.org/licenses/gpl.html * @license GPL http://www.gnu.org/licenses/gpl.html
* @link http://sourceforge.net/projects/semanticscuttle * @link http://sourceforge.net/projects/semanticscuttle
*/ */
require_once dirname(__FILE__) . '/../prepare.php';
require_once 'HTTP/Request2.php'; require_once 'HTTP/Request2.php';
/** /**

2
tests/ajax/GetContactTagsTest.php
View File

@ -12,8 +12,6 @@
* @license GPL http://www.gnu.org/licenses/gpl.html * @license GPL http://www.gnu.org/licenses/gpl.html
* @link http://sourceforge.net/projects/semanticscuttle * @link http://sourceforge.net/projects/semanticscuttle
*/ */
require_once dirname(__FILE__) . '/../prepare.php';
require_once 'HTTP/Request2.php'; require_once 'HTTP/Request2.php';
/** /**