diff options
author | Igor Scheller <igor.scheller@igorshp.de> | 2017-09-19 19:50:59 +0200 |
---|---|---|
committer | Igor Scheller <igor.scheller@igorshp.de> | 2017-09-19 20:01:09 +0200 |
commit | c57dfc631caf98df46ac014812f962863f0bfa61 (patch) | |
tree | 9d548f5159029055f1790c4bc53e4f254aafd983 | |
parent | e6ed8a30171b86b452cec21a283373fc14dd5330 (diff) |
engelsystem_provider should not be loaded in phpunit, changed dir structure
-rw-r--r-- | phpunit.xml | 9 | ||||
-rw-r--r-- | tests/Feature/Logger/EngelsystemLoggerTest.php (renamed from test/Logger/EngelsystemLoggerTest.php) | 5 | ||||
-rw-r--r-- | tests/Feature/model/LogEntriesModelTest.php (renamed from test/model/LogEntriesModelTest.php) | 5 | ||||
-rw-r--r-- | tests/Feature/model/RoomModelTest.php (renamed from test/model/RoomModelTest.php) | 5 |
4 files changed, 18 insertions, 6 deletions
diff --git a/phpunit.xml b/phpunit.xml index ee5ae3e8..e78a54f3 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -1,14 +1,11 @@ <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - bootstrap="./includes/engelsystem_provider.php" + bootstrap="./includes/autoload.php" xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.3/phpunit.xsd" colors="true" > <testsuites> - <testsuite name="Models"> - <directory>./test/model/</directory> - </testsuite> - <testsuite name="Logger"> - <directory>./test/Logger/</directory> + <testsuite name="Feature"> + <directory>./tests/Feature</directory> </testsuite> </testsuites> <filter> diff --git a/test/Logger/EngelsystemLoggerTest.php b/tests/Feature/Logger/EngelsystemLoggerTest.php index 2219cdb2..3b6572f5 100644 --- a/test/Logger/EngelsystemLoggerTest.php +++ b/tests/Feature/Logger/EngelsystemLoggerTest.php @@ -10,6 +10,11 @@ use Psr\Log\LogLevel; class EngelsystemLoggerTest extends TestCase { + public static function setUpBeforeClass() + { + require_once __DIR__ . '/../../../includes/engelsystem_provider.php'; + } + /** * @return LoggerInterface */ diff --git a/test/model/LogEntriesModelTest.php b/tests/Feature/model/LogEntriesModelTest.php index 761725c4..6d7b0ebc 100644 --- a/test/model/LogEntriesModelTest.php +++ b/tests/Feature/model/LogEntriesModelTest.php @@ -7,6 +7,11 @@ use Psr\Log\LogLevel; class LogEntriesModelTest extends TestCase { + public static function setUpBeforeClass() + { + require_once __DIR__ . '/../../../includes/engelsystem_provider.php'; + } + public function testCreateLogEntry() { LogEntries_clear_all(); diff --git a/test/model/RoomModelTest.php b/tests/Feature/model/RoomModelTest.php index 4205845b..96be84a2 100644 --- a/test/model/RoomModelTest.php +++ b/tests/Feature/model/RoomModelTest.php @@ -8,6 +8,11 @@ class RoomModelTest extends TestCase { private $room_id = null; + public static function setUpBeforeClass() + { + require_once __DIR__ . '/../../../includes/engelsystem_provider.php'; + } + public function create_Room() { $this->room_id = Room_create('test', false, true, ''); |