diff options
| author | msquare <msquare@notrademark.de> | 2016-11-09 17:43:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-09 17:43:56 +0100 |
| commit | d43eb41d25d0d5c0509417247030dd6c21118cf6 (patch) | |
| tree | 2c3f78bf8fbd4215e70af7dbc2ce30cfef674816 /test | |
| parent | d5d2acc7d80920eef5f0ed779a3738a12d5db348 (diff) | |
| parent | 22520532c78b3a032aec6ececb7623ba094da8de (diff) | |
Merge pull request #274 from engelsystem/task-164-shift-view
Task 164 shift view
Diffstat (limited to 'test')
| -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 |
3 files changed, 4 insertions, 18 deletions
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> |