X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=tests%2Fsrc%2FCore%2FConsole%2FConfigConsoleTest.php;h=c8deda55557e9da8a4962119bfbc62beb26099aa;hb=c150cf4e584101bd894d06b9bf4b3a2c2245e5bf;hp=4ee34917d8a5d9a77fec70dfd6d659218655ea7b;hpb=82f713cb7fbc45f108e811a425c81c11c3b094d2;p=friendica.git

diff --git a/tests/src/Core/Console/ConfigConsoleTest.php b/tests/src/Core/Console/ConfigConsoleTest.php
index 4ee34917d8..c8deda5555 100644
--- a/tests/src/Core/Console/ConfigConsoleTest.php
+++ b/tests/src/Core/Console/ConfigConsoleTest.php
@@ -2,6 +2,7 @@
 
 namespace Friendica\Test\src\Core\Console;
 
+use Friendica\App\Mode;
 use Friendica\Core\Console\Config;
 
 /**
@@ -15,13 +16,15 @@ class ConfigConsoleTest extends ConsoleTest
 	{
 		parent::setUp();
 
+		$this->mockApp($this->root);
+
 		\Mockery::getConfiguration()->setConstantsMap([
-			'Friendica\App\Mode' => [
+			Mode::class => [
 				'DBCONFIGAVAILABLE' => 0
 			]
 		]);
 
-		$mode = \Mockery::mock('Friendica\App\Mode');
+		$mode = \Mockery::mock(Mode::class);
 		$mode
 			->shouldReceive('has')
 			->andReturn(true);
@@ -32,7 +35,17 @@ class ConfigConsoleTest extends ConsoleTest
 	}
 
 	function testSetGetKeyValue() {
-		$this->mockConfigSet('config', 'test', 'now', 1);
+		$this->configMock
+			->shouldReceive('set')
+			->with('config', 'test', 'now')
+			->andReturn(true)
+			->once();
+		$this->configMock
+			->shouldReceive('get')
+			->with('config', 'test')
+			->andReturn('now')
+			->twice();
+
 		$console = new Config($this->consoleArgv);
 		$console->setArgument(0, 'config');
 		$console->setArgument(1, 'test');
@@ -40,14 +53,24 @@ class ConfigConsoleTest extends ConsoleTest
 		$txt = $this->dumpExecute($console);
 		$this->assertEquals("config.test <= now\n", $txt);
 
-		$this->mockConfigGet('config', 'test', 'now', 1);
+		$this->configMock
+			->shouldReceive('get')
+			->with('config', 'test')
+			->andReturn('now')
+			->once();
+
 		$console = new Config($this->consoleArgv);
 		$console->setArgument(0, 'config');
 		$console->setArgument(1, 'test');
 		$txt = $this->dumpExecute($console);
 		$this->assertEquals("config.test => now\n", $txt);
 
-		$this->mockConfigGet('config', 'test', null, 1);
+		$this->configMock
+			->shouldReceive('get')
+			->with('config', 'test')
+			->andReturn(null)
+			->once();
+
 		$console = new Config($this->consoleArgv);
 		$console->setArgument(0, 'config');
 		$console->setArgument(1, 'test');
@@ -57,7 +80,11 @@ class ConfigConsoleTest extends ConsoleTest
 
 	function testSetArrayValue() {
 		$testArray = [1, 2, 3];
-		$this->mockConfigGet('config', 'test', $testArray, 1);
+		$this->configMock
+			->shouldReceive('get')
+			->with('config', 'test')
+			->andReturn($testArray)
+			->once();
 
 		$console = new Config($this->consoleArgv);
 		$console->setArgument(0, 'config');
@@ -81,7 +108,11 @@ class ConfigConsoleTest extends ConsoleTest
 	}
 
 	function testVerbose() {
-		$this->mockConfigGet('test', 'it', 'now', 1);
+		$this->configMock
+			->shouldReceive('get')
+			->with('test', 'it')
+			->andReturn('now')
+			->once();
 		$console = new Config($this->consoleArgv);
 		$console->setArgument(0, 'test');
 		$console->setArgument(1, 'it');
@@ -105,7 +136,16 @@ CONF;
 	}
 
 	function testUnableToSet() {
-		$this->mockConfigSet('test', 'it', 'now', 1, false);
+		$this->configMock
+			->shouldReceive('set')
+			->with('test', 'it', 'now')
+			->andReturn(false)
+			->once();
+		$this->configMock
+			->shouldReceive('get')
+			->with('test', 'it')
+			->andReturn(NULL)
+			->once();
 		$console = new Config();
 		$console->setArgument(0, 'test');
 		$console->setArgument(1, 'it');