Rename *CacheDriver to *Cache because they don't act as driver anymore

[friendica.git] / tests / Util / AppMockTrait.php

diff --git a/tests/Util/AppMockTrait.php b/tests/Util/AppMockTrait.php
index dd0df0570ab574fee447aa6409e83abc4d904d95..f9b026979cbdef989567538d4585374e31ae8526 100644 (file)
--- a/tests/Util/AppMockTrait.php
+++ b/tests/Util/AppMockTrait.php
@@ -2,6 +2,7 @@
 
 namespace Friendica\Test\Util;
 
+use Dice\Dice;
 use Friendica\App;
 use Friendica\BaseObject;
 use Friendica\Core\Config;
@@ -35,26 +36,44 @@ trait AppMockTrait
         */
        protected $mode;
 
+       /**
+        * @var MockInterface|Dice The dependency injection library
+        */
+       protected $dice;
+
        /**
         * Mock the App
         *
         * @param vfsStreamDirectory $root The root directory
-        * @param Config\Cache\ConfigCache $configCache
+        * @param bool $raw If true, no config mocking will be done
         */
-       public function mockApp(vfsStreamDirectory $root, $configCache = null, $raw = false)
+       public function mockApp(vfsStreamDirectory $root, $raw = false)
        {
-               $this->configMock = \Mockery::mock(Config\Cache\IConfigCache::class);
+               $this->dice = \Mockery::mock(Dice::class)->makePartial();
+               $this->dice = $this->dice->addRules(include __DIR__ . '/../../static/dependencies.config.php');
+
+               $this->configMock = \Mockery::mock(Config\Cache\ConfigCache::class);
+               $this->dice->shouldReceive('create')
+                          ->with(Config\Cache\ConfigCache::class)
+                          ->andReturn($this->configMock);
                $this->mode = \Mockery::mock(App\Mode::class);
-               $configAdapterMock = \Mockery::mock(Config\Adapter\IConfigAdapter::class);
+               $this->dice->shouldReceive('create')
+                          ->with(App\Mode::class)
+                          ->andReturn($this->mode);
+               $configModel= \Mockery::mock(\Friendica\Model\Config\Config::class);
                // Disable the adapter
-               $configAdapterMock->shouldReceive('isConnected')->andReturn(false);
+               $configModel->shouldReceive('isConnected')->andReturn(false);
 
-               $config = new Config\Configuration((isset($configCache) ? $configCache : $this->configMock), $configAdapterMock);
-               // Initialize empty Config
-               Config::init($config);
+               $config = new Config\JitConfiguration($this->configMock, $configModel);
+               $this->dice->shouldReceive('create')
+                          ->with(Config\Configuration::class)
+                          ->andReturn($config);
 
                // Mocking App and most used functions
                $this->app = \Mockery::mock(App::class);
+               $this->dice->shouldReceive('create')
+                          ->with(App::class)
+                          ->andReturn($this->app);
                $this->app
                        ->shouldReceive('getBasePath')
                        ->andReturn($root->url());
@@ -65,10 +84,16 @@ trait AppMockTrait
 
                $this->profilerMock = \Mockery::mock(Profiler::class);
                $this->profilerMock->shouldReceive('saveTimestamp');
+               $this->dice->shouldReceive('create')
+                          ->with(Profiler::class)
+                          ->andReturn($this->profilerMock);
 
                $this->app
                        ->shouldReceive('getConfigCache')
-                       ->andReturn((isset($configCache) ? $configCache : $this->configMock));
+                       ->andReturn($this->configMock);
+               $this->app
+                       ->shouldReceive('getConfig')
+                       ->andReturn($config);
                $this->app
                        ->shouldReceive('getTemplateEngine')
                        ->andReturn(new FriendicaSmartyEngine());
@@ -84,12 +109,15 @@ trait AppMockTrait
                                return $this->configMock->get('system', 'url');
                        });
 
-               BaseObject::setApp($this->app);
+               BaseObject::setDependencyInjection($this->dice);
 
                if ($raw) {
                        return;
                }
 
+               $this->configMock
+                       ->shouldReceive('has')
+                       ->andReturn(true);
                $this->configMock
                        ->shouldReceive('get')
                        ->with('database', 'hostname')