Merge pull request #6678 from rabuzarus/20190217_-_fix_magicLinks_mentions

[friendica.git] / tests / src / Core / Cache / CacheTest.php

diff --git a/tests/src/Core/Cache/CacheTest.php b/tests/src/Core/Cache/CacheTest.php
index d0b357bf465dad6a77768cb9fc9ec48110b6c763..ef97f5a172214ea16ed325ca79b7ff8cb5f2d027 100644 (file)
--- a/tests/src/Core/Cache/CacheTest.php
+++ b/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)
@@ -69,25 +67,15 @@ abstract class CacheTest extends MockedTest
        protected function setUp()
        {
                $this->setUpVfsDir();
-               $configMock = \Mockery::mock('Friendica\Core\Config\ConfigCache');
-               $this->mockApp($this->root, $configMock);
+               $this->mockApp($this->root);
                $this->app
                        ->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);
        }