Refactor ConfigMockTrait to mocked ConfigCache

tests/src/Core/Cache/ArrayCacheDriverTest.php

@@ -2,13 +2,8 @@
 
 namespace Friendica\Test\src\Core\Cache;
 
-
 use Friendica\Core\Cache\ArrayCache;
 
-/**
- * @runTestsInSeparateProcesses
- * @preserveGlobalState disabled
- */
 class ArrayCacheDriverTest extends MemoryCacheTest
 {
 	protected function getInstance()

tests/src/Core/Cache/CacheTest.php

@@ -5,7 +5,6 @@ namespace Friendica\Test\src\Core\Cache;
 use Friendica\Core\Cache\MemcachedCacheDriver;
 use Friendica\Test\MockedTest;
 use Friendica\Test\Util\AppMockTrait;
-use Friendica\Test\Util\DateTimeFormatMockTrait;
 use Friendica\Test\Util\VFSTrait;
 use Friendica\Util\PidFile;
 
@@ -13,7 +12,6 @@ abstract class CacheTest extends MockedTest
 {
 	use VFSTrait;
 	use AppMockTrait;
-	use DateTimeFormatMockTrait;
 
 	/**
 	 * @var int Start time of the mock (used for time operations)
@@ -75,19 +73,10 @@ abstract class CacheTest extends MockedTest
 			->shouldReceive('getHostname')
 			->andReturn('friendica.local');
 
-		$this->mockUtcNow($this->startTime);
-
 		parent::setUp();
 
 		$this->instance = $this->getInstance();
 
-		// Default config
-		$this->mockConfigGet('config', 'hostname', 'localhost');
-		$this->mockConfigGet('system', 'throttle_limit_day', 100);
-		$this->mockConfigGet('system', 'throttle_limit_week', 100);
-		$this->mockConfigGet('system', 'throttle_limit_month', 100);
-		$this->mockConfigGet('system', 'theme', 'system_theme');
-
 		$this->instance->clear(false);
 	}
 

tests/src/Core/Cache/DatabaseCacheDriverTest.php

@@ -16,6 +16,8 @@ class DatabaseCacheDriverTest extends CacheTest
 
 	public function setUp()
 	{
+		$this->mockUtcNow($this->startTime);
+
 		$this->mockConnected();
 		$this->mockConnect();
 

tests/src/Core/Cache/MemcacheCacheDriverTest.php

@@ -6,16 +6,21 @@ namespace Friendica\Test\src\Core\Cache;
 use Friendica\Core\Cache\CacheDriverFactory;
 
 /**
- * @runTestsInSeparateProcesses
- * @preserveGlobalState disabled
  * @requires extension memcache
  */
 class MemcacheCacheDriverTest extends MemoryCacheTest
 {
 	protected function getInstance()
 	{
-		$this->mockConfigGet('system', 'memcache_host', 'localhost', 1);
-		$this->mockConfigGet('system', 'memcache_port', 11211, 1);
+		$this->configCache
+			->shouldReceive('get')
+			->with('system', 'memcache_host', NULL)
+			->andReturn('localhost');
+
+		$this->configCache
+			->shouldReceive('get')
+			->with('system', 'memcache_port', NULL)
+			->andReturn(11211);
 
 		$this->cache = CacheDriverFactory::create('memcache');
 		return $this->cache;

tests/src/Core/Cache/MemcachedCacheDriverTest.php

@@ -6,15 +6,16 @@ namespace Friendica\Test\src\Core\Cache;
 use Friendica\Core\Cache\CacheDriverFactory;
 
 /**
- * @runTestsInSeparateProcesses
- * @preserveGlobalState disabled
  * @requires extension memcached
  */
 class MemcachedCacheDriverTest extends MemoryCacheTest
 {
 	protected function getInstance()
 	{
-		$this->mockConfigGet('system', 'memcached_hosts', [0 => 'localhost, 11211']);
+		$this->configCache
+			->shouldReceive('get')
+			->with('system', 'memcached_hosts', NULL)
+			->andReturn([0 => 'localhost, 11211']);
 
 		$this->cache = CacheDriverFactory::create('memcached');
 		return $this->cache;

tests/src/Core/Cache/RedisCacheDriverTest.php

@@ -6,16 +6,21 @@ namespace Friendica\Test\src\Core\Cache;
 use Friendica\Core\Cache\CacheDriverFactory;
 
 /**
- * @runTestsInSeparateProcesses
- * @preserveGlobalState disabled
  * @requires extension redis
  */
 class RedisCacheDriverTest extends MemoryCacheTest
 {
 	protected function getInstance()
 	{
-		$this->mockConfigGet('system', 'redis_host', 'localhost', 1);
-		$this->mockConfigGet('system', 'redis_port', null, 1);
+		$this->configCache
+			->shouldReceive('get')
+			->with('system', 'redis_host', NULL)
+			->andReturn('localhost');
+
+		$this->configCache
+			->shouldReceive('get')
+			->with('system', 'redis_port', NULL)
+			->andReturn(null);
 
 		$this->cache = CacheDriverFactory::create('redis');
 		return $this->cache;