diff options
| author | Christian Weiske <cweiske@cweiske.de> | 2011-04-06 19:13:19 +0200 |
|---|---|---|
| committer | Christian Weiske <cweiske@cweiske.de> | 2011-04-06 19:13:19 +0200 |
| commit | 7379805565815c576723b888a20af080248222da (patch) | |
| tree | 498c98e8b6c43c2729349b7680c6a20efcfb98f3 /tests/AllTests.php | |
| parent | 1e3cd8bf6ee636a5af692b57906612d6109849cb (diff) | |
| parent | 12c77161aca2c7d76fa5154fa1f4e214106d834b (diff) | |
| download | SemanticScuttle-origin/quickform.zip SemanticScuttle-origin/quickform.tar.gz SemanticScuttle-origin/quickform.tar.bz2 | |
Merge branch 'master' into quickformorigin/quickform
Conflicts:
data/templates/bookmarks.tpl.php
data/templates/sidebar.block.search.php
data/templates/top.inc.php
doc/developers/TODO
src/SemanticScuttle/header.php
Diffstat (limited to 'tests/AllTests.php')
| -rw-r--r-- | tests/AllTests.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/AllTests.php b/tests/AllTests.php index d29de7f..4afcc6b 100644 --- a/tests/AllTests.php +++ b/tests/AllTests.php @@ -17,9 +17,6 @@ if (!defined('PHPUnit_MAIN_METHOD')) { } require_once 'prepare.php'; -require_once 'PHPUnit/Framework/TestSuite.php'; - -PHPUnit_Util_Filter::addFileToFilter(__FILE__); /** * SemanticScuttle unit tests. @@ -64,6 +61,10 @@ class AllTests extends PHPUnit_Framework_TestSuite $suite->addTestFile($tdir . '/TagTest.php'); $suite->addTestFile($tdir . '/VoteTest.php'); $suite->addTestFile($tdir . '/UserTest.php'); + $suite->addTestFile($tdir . '/Api/ExportCsvTest.php'); + $suite->addTestFile($tdir . '/Api/PostsAddTest.php'); + $suite->addTestFile($tdir . '/Api/PostsDeleteTest.php'); + $suite->addTestFile($tdir . '/Api/PostsUpdateTest.php'); return $suite; } |