diff options
| author | msquare <msquare@notrademark.de> | 2016-10-09 09:40:11 +0200 |
|---|---|---|
| committer | msquare <msquare@notrademark.de> | 2016-10-09 09:40:11 +0200 |
| commit | d59b1c8812f62848acc2bf19f020abf4949e75ef (patch) | |
| tree | 1db433f283ce1fa8a16e08ffd4a58b69fb46889a | |
| parent | 1d4811cca51a00de27328d5608dbc23e46854297 (diff) | |
fix phpunit config
| -rw-r--r-- | phpunit.xml | 24 | ||||
| -rw-r--r-- | test/model/LogEntriesModelTest.php (renamed from test/model/LogEntries_model_test.php) | 4 | ||||
| -rw-r--r-- | test/model/RoomModelTest.php (renamed from test/model/Room_model_test.php) | 4 | ||||
| -rw-r--r-- | test/phpunit.xml | 14 |
4 files changed, 28 insertions, 18 deletions
diff --git a/phpunit.xml b/phpunit.xml new file mode 100644 index 00000000..5b6d97a1 --- /dev/null +++ b/phpunit.xml @@ -0,0 +1,24 @@ +<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.5/phpunit.xsd" + backupGlobals="false" + bootstrap="./includes/engelsystem_provider.php" + colors="true" + convertErrorsToExceptions="true" + convertNoticesToExceptions="true" + convertWarningsToExceptions="true" + processIsolation="false"> + <testsuites> + <testsuite name="Models"> + <directory>./test/model/</directory> + </testsuite> + </testsuites> + <filter> + <whitelist> + <directory>./include/</directory> + <directory>./public/</directory> + </whitelist> + </filter> + <php> + <const name="PHPUNIT_TESTSUITE" value="true" /> + </php> +</phpunit> diff --git a/test/model/LogEntries_model_test.php b/test/model/LogEntriesModelTest.php index cefc4177..b4cef725 100644 --- a/test/model/LogEntries_model_test.php +++ b/test/model/LogEntriesModelTest.php @@ -1,6 +1,6 @@ <?php -class LogEntries_model_test extends PHPUnit_Framework_TestCase { +class LogEntriesModelTest extends PHPUnit_Framework_TestCase { public function create_LogEntry() { LogEntry_create('test', 'test'); @@ -29,4 +29,4 @@ class LogEntries_model_test extends PHPUnit_Framework_TestCase { } } -?>
\ No newline at end of file +?> diff --git a/test/model/Room_model_test.php b/test/model/RoomModelTest.php index a36a9d9f..33e6ca37 100644 --- a/test/model/Room_model_test.php +++ b/test/model/RoomModelTest.php @@ -1,6 +1,6 @@ <?php -class Room_model_test extends PHPUnit_Framework_TestCase { +class RoomModelTest extends PHPUnit_Framework_TestCase { private $room_id = null; @@ -30,4 +30,4 @@ class Room_model_test extends PHPUnit_Framework_TestCase { } } -?>
\ No newline at end of file +?> diff --git a/test/phpunit.xml b/test/phpunit.xml deleted file mode 100644 index d6007646..00000000 --- a/test/phpunit.xml +++ /dev/null @@ -1,14 +0,0 @@ -<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.5/phpunit.xsd" - bootstrap="../includes/engelsystem_provider.php" colors="true" - convertErrorsToExceptions="true" convertNoticesToExceptions="true" - convertWarningsToExceptions="true" forceCoversAnnotation="false"> - <testsuites> - <testsuite name="Models"> - <directory>model/*</directory> - </testsuite> - </testsuites> - <php> - <const name="PHPUNIT_TESTSUITE" value="true" /> - </php> -</phpunit> |