From e15e86362585f5d00d118653232584ed0920e533 Mon Sep 17 00:00:00 2001
From: Igor Scheller <igor.scheller@igorshp.de>
Date: Tue, 31 Oct 2017 14:23:23 +0100
Subject: Added tests for base_path and config_path

---
 .../DatabaseServiceProviderConnectionTest.php      |  2 +-
 tests/Feature/Logger/EngelsystemLoggerTest.php     |  2 +-
 tests/Feature/Model/LogEntriesModelTest.php        | 38 +++++++++++++++++++
 tests/Feature/Model/RoomModelTest.php              | 40 ++++++++++++++++++++
 tests/Feature/model/LogEntriesModelTest.php        | 38 -------------------
 tests/Feature/model/RoomModelTest.php              | 40 --------------------
 tests/Unit/ApplicationTest.php                     |  2 +-
 tests/Unit/Config/ConfigServiceProviderTest.php    |  2 +-
 tests/Unit/Config/ConfigTest.php                   |  2 +-
 .../Unit/Database/DatabaseServiceProviderTest.php  |  2 +-
 .../Exceptions/ExceptionsServiceProviderTest.php   |  2 +-
 tests/Unit/HelpersTest.php                         | 43 +++++++++++++++++++++-
 tests/Unit/Logger/LoggerServiceProviderTest.php    |  2 +-
 tests/Unit/Renderer/HtmlEngineTest.php             |  2 +-
 .../Unit/Renderer/RendererServiceProviderTest.php  |  2 +-
 tests/Unit/Renderer/RendererTest.php               |  6 ++-
 tests/Unit/Routing/RoutingServiceProviderTest.php  |  2 +-
 tests/Unit/Routing/UrlGeneratorTest.php            |  2 +-
 18 files changed, 136 insertions(+), 93 deletions(-)
 create mode 100644 tests/Feature/Model/LogEntriesModelTest.php
 create mode 100644 tests/Feature/Model/RoomModelTest.php
 delete mode 100644 tests/Feature/model/LogEntriesModelTest.php
 delete mode 100644 tests/Feature/model/RoomModelTest.php

(limited to 'tests')

diff --git a/tests/Feature/Database/DatabaseServiceProviderConnectionTest.php b/tests/Feature/Database/DatabaseServiceProviderConnectionTest.php
index dd1ce729..636fba2e 100644
--- a/tests/Feature/Database/DatabaseServiceProviderConnectionTest.php
+++ b/tests/Feature/Database/DatabaseServiceProviderConnectionTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Engelsystem\Test\Database;
+namespace Engelsystem\Test\Feature\Database;
 
 use Engelsystem\Application;
 use Engelsystem\Config\Config;
diff --git a/tests/Feature/Logger/EngelsystemLoggerTest.php b/tests/Feature/Logger/EngelsystemLoggerTest.php
index 63a01318..9f502198 100644
--- a/tests/Feature/Logger/EngelsystemLoggerTest.php
+++ b/tests/Feature/Logger/EngelsystemLoggerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Engelsystem\Test\Logger;
+namespace Engelsystem\Test\Feature\Logger;
 
 use Engelsystem\Logger\EngelsystemLogger;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/Feature/Model/LogEntriesModelTest.php b/tests/Feature/Model/LogEntriesModelTest.php
new file mode 100644
index 00000000..2678dcb5
--- /dev/null
+++ b/tests/Feature/Model/LogEntriesModelTest.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace Engelsystem\Test\Feature\Model;
+
+use PHPUnit\Framework\TestCase;
+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();
+        $count = count(LogEntries());
+        $this->assertNotFalse(LogEntry_create(LogLevel::WARNING, 'test_LogEntry_create'));
+
+        // There should be one more log entry now
+        $this->assertEquals(count(LogEntries()), $count + 1);
+    }
+
+    public function testClearAllLogEntries()
+    {
+        LogEntry_create(LogLevel::WARNING, 'test');
+        $this->assertTrue(count(LogEntries()) > 0);
+
+        $this->assertNotFalse(LogEntries_clear_all());
+        $this->assertCount(0, LogEntries());
+    }
+
+    public function tearDown()
+    {
+        LogEntries_clear_all();
+    }
+}
diff --git a/tests/Feature/Model/RoomModelTest.php b/tests/Feature/Model/RoomModelTest.php
new file mode 100644
index 00000000..20b9e34d
--- /dev/null
+++ b/tests/Feature/Model/RoomModelTest.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace Engelsystem\Test\Feature\Model;
+
+use PHPUnit\Framework\TestCase;
+
+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, '');
+    }
+
+    public function test_Room()
+    {
+        $this->create_Room();
+
+        $room = Room($this->room_id);
+
+        $this->assertNotFalse($room);
+        $this->assertNotNull($room);
+        $this->assertEquals($room['Name'], 'test');
+
+        $this->assertNull(Room(-1));
+    }
+
+    public function tearDown()
+    {
+        if ($this->room_id != null) {
+            Room_delete($this->room_id);
+        }
+    }
+}
diff --git a/tests/Feature/model/LogEntriesModelTest.php b/tests/Feature/model/LogEntriesModelTest.php
deleted file mode 100644
index 6d7b0ebc..00000000
--- a/tests/Feature/model/LogEntriesModelTest.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-namespace Engelsystem\Test;
-
-use PHPUnit\Framework\TestCase;
-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();
-        $count = count(LogEntries());
-        $this->assertNotFalse(LogEntry_create(LogLevel::WARNING, 'test_LogEntry_create'));
-
-        // There should be one more log entry now
-        $this->assertEquals(count(LogEntries()), $count + 1);
-    }
-
-    public function testClearAllLogEntries()
-    {
-        LogEntry_create(LogLevel::WARNING, 'test');
-        $this->assertTrue(count(LogEntries()) > 0);
-
-        $this->assertNotFalse(LogEntries_clear_all());
-        $this->assertCount(0, LogEntries());
-    }
-
-    public function tearDown()
-    {
-        LogEntries_clear_all();
-    }
-}
diff --git a/tests/Feature/model/RoomModelTest.php b/tests/Feature/model/RoomModelTest.php
deleted file mode 100644
index 96be84a2..00000000
--- a/tests/Feature/model/RoomModelTest.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-namespace Engelsystem\Test;
-
-use PHPUnit\Framework\TestCase;
-
-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, '');
-    }
-
-    public function test_Room()
-    {
-        $this->create_Room();
-
-        $room = Room($this->room_id);
-
-        $this->assertNotFalse($room);
-        $this->assertNotNull($room);
-        $this->assertEquals($room['Name'], 'test');
-
-        $this->assertNull(Room(-1));
-    }
-
-    public function tearDown()
-    {
-        if ($this->room_id != null) {
-            Room_delete($this->room_id);
-        }
-    }
-}
diff --git a/tests/Unit/ApplicationTest.php b/tests/Unit/ApplicationTest.php
index 78310134..f58483ea 100644
--- a/tests/Unit/ApplicationTest.php
+++ b/tests/Unit/ApplicationTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Engelsystem\Test\Config;
+namespace Engelsystem\Test\Unit;
 
 use Engelsystem\Application;
 use Engelsystem\Config\Config;
diff --git a/tests/Unit/Config/ConfigServiceProviderTest.php b/tests/Unit/Config/ConfigServiceProviderTest.php
index 96ac8704..ab6fa67f 100644
--- a/tests/Unit/Config/ConfigServiceProviderTest.php
+++ b/tests/Unit/Config/ConfigServiceProviderTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Engelsystem\Test\Config;
+namespace Engelsystem\Test\Unit\Config;
 
 use Engelsystem\Application;
 use Engelsystem\Config\Config;
diff --git a/tests/Unit/Config/ConfigTest.php b/tests/Unit/Config/ConfigTest.php
index ce11ebd6..043599fd 100644
--- a/tests/Unit/Config/ConfigTest.php
+++ b/tests/Unit/Config/ConfigTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Engelsystem\Test\Config;
+namespace Engelsystem\Test\Unit\Config;
 
 use Engelsystem\Config\Config;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/Unit/Database/DatabaseServiceProviderTest.php b/tests/Unit/Database/DatabaseServiceProviderTest.php
index d61f5ae7..61848c35 100644
--- a/tests/Unit/Database/DatabaseServiceProviderTest.php
+++ b/tests/Unit/Database/DatabaseServiceProviderTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Engelsystem\Test\Database;
+namespace Engelsystem\Test\Unit\Database;
 
 use Engelsystem\Config\Config;
 use Engelsystem\Database\DatabaseServiceProvider;
diff --git a/tests/Unit/Exceptions/ExceptionsServiceProviderTest.php b/tests/Unit/Exceptions/ExceptionsServiceProviderTest.php
index fc48d39e..9c943d52 100644
--- a/tests/Unit/Exceptions/ExceptionsServiceProviderTest.php
+++ b/tests/Unit/Exceptions/ExceptionsServiceProviderTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Engelsystem\Test\Exceptions;
+namespace Engelsystem\Test\Unit\Exceptions;
 
 use Engelsystem\Exceptions\ExceptionsServiceProvider;
 use Engelsystem\Exceptions\Handler as ExceptionHandler;
diff --git a/tests/Unit/HelpersTest.php b/tests/Unit/HelpersTest.php
index 9ec824af..0a8d5d2b 100644
--- a/tests/Unit/HelpersTest.php
+++ b/tests/Unit/HelpersTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Engelsystem\Test\Config;
+namespace Engelsystem\Test\Unit;
 
 use Engelsystem\Application;
 use Engelsystem\Config\Config;
@@ -9,6 +9,7 @@ use Engelsystem\Http\Request;
 use Engelsystem\Renderer\Renderer;
 use Engelsystem\Routing\UrlGenerator;
 use PHPUnit\Framework\TestCase;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
 use Symfony\Component\HttpFoundation\Session\Session;
 
 class HelpersTest extends TestCase
@@ -28,6 +29,25 @@ class HelpersTest extends TestCase
         $this->assertEquals($class, app('some.name'));
     }
 
+    /**
+     * @covers \base_path()
+     */
+    public function testBasePath()
+    {
+        /** @var MockObject|Application $app */
+        $app = $this->getMockBuilder(Container::class)
+            ->getMock();
+        Application::setInstance($app);
+
+        $app->expects($this->atLeastOnce())
+            ->method('get')
+            ->with('path')
+            ->willReturn('/foo/bar');
+
+        $this->assertEquals('/foo/bar', base_path());
+        $this->assertEquals('/foo/bar/bla-foo.conf', base_path('bla-foo.conf'));
+    }
+
     /**
      * @covers \config
      */
@@ -53,6 +73,25 @@ class HelpersTest extends TestCase
         $this->assertEquals(['user' => 'FooBar'], config('mail'));
     }
 
+    /**
+     * @covers \config_path()
+     */
+    public function testConfigPath()
+    {
+        /** @var MockObject|Application $app */
+        $app = $this->getMockBuilder(Container::class)
+            ->getMock();
+        Application::setInstance($app);
+
+        $app->expects($this->atLeastOnce())
+            ->method('get')
+            ->with('path.config')
+            ->willReturn('/foo/conf');
+
+        $this->assertEquals('/foo/conf', config_path());
+        $this->assertEquals('/foo/conf/bar.php', config_path('bar.php'));
+    }
+
     /**
      * @covers \env
      */
@@ -146,7 +185,7 @@ class HelpersTest extends TestCase
     /**
      * @param string $alias
      * @param object $object
-     * @return Application|\PHPUnit_Framework_MockObject_MockObject
+     * @return Application|MockObject
      */
     protected function getAppMock($alias, $object)
     {
diff --git a/tests/Unit/Logger/LoggerServiceProviderTest.php b/tests/Unit/Logger/LoggerServiceProviderTest.php
index 66f63cf4..cef95d5b 100644
--- a/tests/Unit/Logger/LoggerServiceProviderTest.php
+++ b/tests/Unit/Logger/LoggerServiceProviderTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Engelsystem\Test\Logger;
+namespace Engelsystem\Test\Unit\Logger;
 
 use Engelsystem\Logger\EngelsystemLogger;
 use Engelsystem\Logger\LoggerServiceProvider;
diff --git a/tests/Unit/Renderer/HtmlEngineTest.php b/tests/Unit/Renderer/HtmlEngineTest.php
index 0b317b72..8c262932 100644
--- a/tests/Unit/Renderer/HtmlEngineTest.php
+++ b/tests/Unit/Renderer/HtmlEngineTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Engelsystem\Test\Config;
+namespace Engelsystem\Test\Unit\Renderer;
 
 use Engelsystem\Renderer\HtmlEngine;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/Unit/Renderer/RendererServiceProviderTest.php b/tests/Unit/Renderer/RendererServiceProviderTest.php
index f9044d8b..3826da7e 100644
--- a/tests/Unit/Renderer/RendererServiceProviderTest.php
+++ b/tests/Unit/Renderer/RendererServiceProviderTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Engelsystem\Test\Logger;
+namespace Engelsystem\Test\Unit\Renderer;
 
 use Engelsystem\Renderer\EngineInterface;
 use Engelsystem\Renderer\HtmlEngine;
diff --git a/tests/Unit/Renderer/RendererTest.php b/tests/Unit/Renderer/RendererTest.php
index b0238078..969ced7f 100644
--- a/tests/Unit/Renderer/RendererTest.php
+++ b/tests/Unit/Renderer/RendererTest.php
@@ -1,10 +1,11 @@
 <?php
 
-namespace Engelsystem\Test\Config;
+namespace Engelsystem\Test\Unit\Renderer;
 
 use Engelsystem\Renderer\EngineInterface;
 use Engelsystem\Renderer\Renderer;
 use PHPUnit\Framework\TestCase;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
 use Psr\Log\LoggerInterface;
 
 class RendererTest extends TestCase
@@ -13,6 +14,7 @@ class RendererTest extends TestCase
     {
         $renderer = new Renderer();
 
+        /** @var MockObject|EngineInterface $nullRenderer */
         $nullRenderer = $this->getMockForAbstractClass(EngineInterface::class);
 
         $nullRenderer->expects($this->atLeastOnce())
@@ -20,6 +22,7 @@ class RendererTest extends TestCase
             ->willReturn(false);
         $renderer->addRenderer($nullRenderer);
 
+        /** @var MockObject|EngineInterface $mockRenderer */
         $mockRenderer = $this->getMockForAbstractClass(EngineInterface::class);
 
         $mockRenderer->expects($this->atLeastOnce())
@@ -42,6 +45,7 @@ class RendererTest extends TestCase
     {
         $renderer = new Renderer();
 
+        /** @var MockObject|LoggerInterface $loggerMock */
         $loggerMock = $this->getMockForAbstractClass(LoggerInterface::class);
         $loggerMock
             ->expects($this->once())
diff --git a/tests/Unit/Routing/RoutingServiceProviderTest.php b/tests/Unit/Routing/RoutingServiceProviderTest.php
index bb2a1d65..dd9441eb 100644
--- a/tests/Unit/Routing/RoutingServiceProviderTest.php
+++ b/tests/Unit/Routing/RoutingServiceProviderTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Engelsystem\Test\Routing;
+namespace Engelsystem\Test\Unit\Routing;
 
 use Engelsystem\Routing\RoutingServiceProvider;
 use Engelsystem\Routing\UrlGenerator;
diff --git a/tests/Unit/Routing/UrlGeneratorTest.php b/tests/Unit/Routing/UrlGeneratorTest.php
index fc23520a..6da59a4f 100644
--- a/tests/Unit/Routing/UrlGeneratorTest.php
+++ b/tests/Unit/Routing/UrlGeneratorTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Engelsystem\Test\Config;
+namespace Engelsystem\Test\Unit\Routing;
 
 use Engelsystem\Application;
 use Engelsystem\Container\Container;
-- 
cgit v1.2.3-54-g00ecf