From 1c49f1169f72f80480de39ab0a0e9b211e5751b2 Mon Sep 17 00:00:00 2001
From: nupplaPhil <admin@philipp.info>
Date: Sat, 18 Jan 2020 13:48:29 +0100
Subject: [PATCH] Fix tests (remove superfluous second parameter)
---
tests/Util/AppMockTrait.php | 25 +++++------------------
tests/src/Content/Text/BBCodeTest.php | 4 ++--
tests/src/Core/InstallerTest.php | 2 +-
tests/src/Core/Lock/SemaphoreLockTest.php | 4 ++--
tests/src/Core/SystemTest.php | 2 +-
tests/src/Network/CurlResultTest.php | 2 +-
6 files changed, 12 insertions(+), 27 deletions(-)
diff --git a/tests/Util/AppMockTrait.php b/tests/Util/AppMockTrait.php
index 7948f09f60..f0231b280d 100644
--- a/tests/Util/AppMockTrait.php
+++ b/tests/Util/AppMockTrait.php
@@ -54,11 +54,11 @@ trait AppMockTrait
$this->configMock = \Mockery::mock(Config\Cache\ConfigCache::class);
$this->dice->shouldReceive('create')
- ->with(Config\Cache\ConfigCache::class, [])
+ ->with(Config\Cache\ConfigCache::class)
->andReturn($this->configMock);
$this->mode = \Mockery::mock(App\Mode::class);
$this->dice->shouldReceive('create')
- ->with(App\Mode::class, [])
+ ->with(App\Mode::class)
->andReturn($this->mode);
$configModel= \Mockery::mock(\Friendica\Model\Config\Config::class);
// Disable the adapter
@@ -66,48 +66,33 @@ trait AppMockTrait
$config = new Config\JitConfiguration($this->configMock, $configModel);
$this->dice->shouldReceive('create')
- ->with(Config\IConfiguration::class, [])
+ ->with(Config\IConfiguration::class)
->andReturn($config);
// Mocking App and most used functions
$this->app = \Mockery::mock(App::class);
$this->dice->shouldReceive('create')
- ->with(App::class, [])
+ ->with(App::class)
->andReturn($this->app);
$this->app
->shouldReceive('getBasePath')
->andReturn($root->url());
- $this->app
- ->shouldReceive('getMode')
- ->andReturn($this->mode);
-
$this->profilerMock = \Mockery::mock(Profiler::class);
$this->profilerMock->shouldReceive('saveTimestamp');
$this->dice->shouldReceive('create')
- ->with(Profiler::class, [])
+ ->with(Profiler::class)
->andReturn($this->profilerMock);
$this->app
->shouldReceive('getConfigCache')
->andReturn($this->configMock);
- $this->app
- ->shouldReceive('getConfig')
- ->andReturn($config);
$this->app
->shouldReceive('getTemplateEngine')
->andReturn(new FriendicaSmartyEngine());
$this->app
->shouldReceive('getCurrentTheme')
->andReturn('Smarty3');
- $this->app
- ->shouldReceive('getProfiler')
- ->andReturn($this->profilerMock);
- $this->app
- ->shouldReceive('getBaseUrl')
- ->andReturnUsing(function () {
- return $this->configMock->get('system', 'url');
- });
DI::init($this->dice);
diff --git a/tests/src/Content/Text/BBCodeTest.php b/tests/src/Content/Text/BBCodeTest.php
index 52d01401e6..ed33306edf 100644
--- a/tests/src/Content/Text/BBCodeTest.php
+++ b/tests/src/Content/Text/BBCodeTest.php
@@ -43,13 +43,13 @@ class BBCodeTest extends MockedTest
$l10nMock = \Mockery::mock(L10n::class);
$l10nMock->shouldReceive('t')->withAnyArgs()->andReturnUsing(function ($args) { return $args; });
$this->dice->shouldReceive('create')
- ->with(L10n::class, [])
+ ->with(L10n::class)
->andReturn($l10nMock);
$baseUrlMock = \Mockery::mock(BaseURL::class);
$baseUrlMock->shouldReceive('get')->withAnyArgs()->andReturn('friendica.local');
$this->dice->shouldReceive('create')
- ->with(BaseURL::class, [])
+ ->with(BaseURL::class)
->andReturn($baseUrlMock);
}
diff --git a/tests/src/Core/InstallerTest.php b/tests/src/Core/InstallerTest.php
index dd7790e739..370373850a 100644
--- a/tests/src/Core/InstallerTest.php
+++ b/tests/src/Core/InstallerTest.php
@@ -34,7 +34,7 @@ class InstallerTest extends MockedTest
$dice = $dice->addRules(include __DIR__ . '/../../../static/dependencies.config.php');
$dice->shouldReceive('create')
- ->with(\Friendica\Core\L10n\L10n::class, [])
+ ->with(\Friendica\Core\L10n\L10n::class)
->andReturn($this->l10nMock);
DI::init($dice);
diff --git a/tests/src/Core/Lock/SemaphoreLockTest.php b/tests/src/Core/Lock/SemaphoreLockTest.php
index 089d891cab..6b4daf8874 100644
--- a/tests/src/Core/Lock/SemaphoreLockTest.php
+++ b/tests/src/Core/Lock/SemaphoreLockTest.php
@@ -19,14 +19,14 @@ class SemaphoreLockTest extends LockTest
$app = \Mockery::mock(App::class);
$app->shouldReceive('getHostname')->andReturn('friendica.local');
- $dice->shouldReceive('create')->with(App::class, [])->andReturn($app);
+ $dice->shouldReceive('create')->with(App::class)->andReturn($app);
$configMock = \Mockery::mock(JitConfiguration::class);
$configMock
->shouldReceive('get')
->with('system', 'temppath', NULL, false)
->andReturn('/tmp/');
- $dice->shouldReceive('create')->with(IConfiguration::class, [])->andReturn($configMock);
+ $dice->shouldReceive('create')->with(IConfiguration::class)->andReturn($configMock);
// @todo Because "get_temppath()" is using static methods, we have to initialize the BaseObject
DI::init($dice);
diff --git a/tests/src/Core/SystemTest.php b/tests/src/Core/SystemTest.php
index 2f01df3446..1b09eb46a8 100644
--- a/tests/src/Core/SystemTest.php
+++ b/tests/src/Core/SystemTest.php
@@ -15,7 +15,7 @@ class SystemTest extends TestCase
$baseUrl = \Mockery::mock(BaseURL::class);
$baseUrl->shouldReceive('getHostname')->andReturn('friendica.local')->once();
$dice = \Mockery::mock(Dice::class);
- $dice->shouldReceive('create')->with(BaseURL::class, [])->andReturn($baseUrl);
+ $dice->shouldReceive('create')->with(BaseURL::class)->andReturn($baseUrl);
DI::init($dice);
}
diff --git a/tests/src/Network/CurlResultTest.php b/tests/src/Network/CurlResultTest.php
index 294be6b0b2..20287c9738 100644
--- a/tests/src/Network/CurlResultTest.php
+++ b/tests/src/Network/CurlResultTest.php
@@ -22,7 +22,7 @@ class CurlResultTest extends TestCase
$logger = new NullLogger();
$dice->shouldReceive('create')
- ->with(LoggerInterface::class, [])
+ ->with(LoggerInterface::class)
->andReturn($logger);
DI::init($dice);