Fix/Cleanup tests for DatabaseServiceProvider

3 files changed, 12 insertions, 24 deletions

diff --git a/tests/Feature/Database/DatabaseServiceProviderTest.php b/tests/Feature/Database/DatabaseServiceProviderTest.php
index d66ed25c..aa4dbc7b 100644
--- a/tests/Feature/Database/DatabaseServiceProviderTest.php
+++ b/tests/Feature/Database/DatabaseServiceProviderTest.php
@@ -2,10 +2,9 @@
 
 namespace Engelsystem\Test\Feature\Database;
 
-use Engelsystem\Application;
 use Engelsystem\Config\Config;
+use Engelsystem\Database\Database;
 use Engelsystem\Database\DatabaseServiceProvider;
-use PHPUnit\Framework\MockObject\MockObject;
 
 class DatabaseServiceProviderTest extends DatabaseTest
 {
@@ -14,27 +13,13 @@ class DatabaseServiceProviderTest extends DatabaseTest
      */
     public function testRegister()
     {
-        /** @var Config|MockObject $config */
-        $config = $this->getMockBuilder(Config::class)
-            ->getMock();
+        $this->app->instance('config', new Config([
+            'database' => $this->getDbConfig(),
+            'timezone' => 'UTC',
+        ]));
 
-        /** @var Application|MockObject $app */
-        $app = $this->getMockBuilder(Application::class)
-            ->setMethods(['get'])
-            ->getMock();
-        Application::setInstance($app);
-
-        $app->expects($this->once())
-            ->method('get')
-            ->with('config')
-            ->willReturn($config);
-
-        $config->expects($this->atLeastOnce())
-            ->method('get')
-            ->with('database')
-            ->willReturn($this->getDbConfig());
-
-        $serviceProvider = new DatabaseServiceProvider($app);
+        $serviceProvider = new DatabaseServiceProvider($this->app);
         $serviceProvider->register();
+        $this->assertTrue($this->app->has(Database::class));
     }
 }
diff --git a/tests/Feature/Database/DatabaseTest.php b/tests/Feature/Database/DatabaseTest.php
index 11df6779..0116e526 100644
--- a/tests/Feature/Database/DatabaseTest.php
+++ b/tests/Feature/Database/DatabaseTest.php
@@ -2,7 +2,7 @@
 
 namespace Engelsystem\Test\Feature\Database;
 
-use PHPUnit\Framework\TestCase;
+use Engelsystem\Test\Unit\TestCase;
 
 abstract class DatabaseTest extends TestCase
 {
diff --git a/tests/Unit/Database/DatabaseServiceProviderTest.php b/tests/Unit/Database/DatabaseServiceProviderTest.php
index c3e4c5d0..241c47b7 100644
--- a/tests/Unit/Database/DatabaseServiceProviderTest.php
+++ b/tests/Unit/Database/DatabaseServiceProviderTest.php
@@ -100,7 +100,10 @@ class DatabaseServiceProviderTest extends ServiceProviderTest
         $app = $this->getApp(['get', 'make', 'instance']);
 
         $this->setExpects($app, 'get', ['config'], $config);
-        $this->setExpects($config, 'get', ['database'], $dbConfigData, $this->atLeastOnce());
+        $config->expects($this->exactly(2))
+            ->method('get')
+            ->withConsecutive(['timezone'], ['database'])
+            ->willReturnOnConsecutiveCalls('UTC', $dbConfigData);
 
         $app->expects($this->atLeastOnce())
             ->method('make')