Merge pull request #7376 from annando/contact-update

[friendica.git] / tests / src / Core / Config / PConfigurationTest.php

diff --git a/tests/src/Core/Config/PConfigurationTest.php b/tests/src/Core/Config/PConfigurationTest.php
index 0259944147a1c7670b15ab18cc3468fc1041eaca..f2f1857a69b9667daed508d061f05b26bcd92a12 100644 (file)
--- a/tests/src/Core/Config/PConfigurationTest.php
+++ b/tests/src/Core/Config/PConfigurationTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Friendica\Test\Core\Config;
+namespace Friendica\Test\src\Core\Config;
 
 use Friendica\Core\Config\Adapter\IPConfigAdapter;
-use Friendica\Core\Config\Cache\ConfigCache;
+use Friendica\Core\Config\Cache\PConfigCache;
 use Friendica\Core\Config\PConfiguration;
 use Friendica\Test\MockedTest;
 
@@ -29,7 +29,7 @@ class PConfigurationTest extends MockedTest
        public function testCacheLoad()
        {
                $uid = 234;
-               $configCache = new ConfigCache();
+               $configCache = new PConfigCache();
                $configAdapter = \Mockery::mock(IPConfigAdapter::class);
                $configAdapter->shouldReceive('isConnected')->andReturn(true)->twice();
                // expected loading
@@ -51,7 +51,7 @@ class PConfigurationTest extends MockedTest
        public function testCacheLoadDouble()
        {
                $uid = 234;
-               $configCache = new ConfigCache();
+               $configCache = new PConfigCache();
                $configAdapter = \Mockery::mock(IPConfigAdapter::class);
                $configAdapter->shouldReceive('isConnected')->andReturn(true)->times(4);
                // expected loading
@@ -77,7 +77,7 @@ class PConfigurationTest extends MockedTest
        public function testSetGetWithoutDB($data)
        {
                $uid = 234;
-               $configCache = new ConfigCache();
+               $configCache = new PConfigCache();
                $configAdapter = \Mockery::mock(IPConfigAdapter::class);
                $configAdapter->shouldReceive('isConnected')->andReturn(false)->times(2);
 
@@ -95,7 +95,7 @@ class PConfigurationTest extends MockedTest
        public function testSetGetWithDB($data)
        {
                $uid = 234;
-               $configCache = new ConfigCache();
+               $configCache = new PConfigCache();
                $configAdapter = \Mockery::mock(IPConfigAdapter::class);
                $configAdapter->shouldReceive('isConnected')->andReturn(true)->times(2);
                $configAdapter->shouldReceive('isLoaded')->with($uid, 'test', 'it')->andReturn(true)->once();
@@ -114,7 +114,7 @@ class PConfigurationTest extends MockedTest
        public function testGetWrongWithoutDB()
        {
                $uid = 234;
-               $configCache = new ConfigCache();
+               $configCache = new PConfigCache();
                $configAdapter = \Mockery::mock(IPConfigAdapter::class);
                $configAdapter->shouldReceive('isConnected')->andReturn(false)->times(3);
 
@@ -137,7 +137,7 @@ class PConfigurationTest extends MockedTest
        public function testGetWithRefresh($data)
        {
                $uid = 234;
-               $configCache = new ConfigCache();
+               $configCache = new PConfigCache();
                $configAdapter = \Mockery::mock(IPConfigAdapter::class);
                $configAdapter->shouldReceive('isConnected')->andReturn(true)->times(4);
                $configAdapter->shouldReceive('isLoaded')->with($uid, 'test', 'it')->andReturn(false)->once();
@@ -145,7 +145,7 @@ class PConfigurationTest extends MockedTest
                $configAdapter->shouldReceive('isLoaded')->with($uid, 'test', 'it')->andReturn(true)->twice();
                $configAdapter->shouldReceive('get')->with($uid, 'test', 'it')->andReturn($data)->once();
                $configAdapter->shouldReceive('isLoaded')->with($uid, 'test', 'not')->andReturn(false)->once();
-               $configAdapter->shouldReceive('get')->with($uid, 'test', 'not')->andReturn('!<unset>!')->once();
+               $configAdapter->shouldReceive('get')->with($uid, 'test', 'not')->andReturn(null)->once();
 
                $configuration = new PConfiguration($configCache, $configAdapter);
 
@@ -168,12 +168,12 @@ class PConfigurationTest extends MockedTest
        public function testGetWithoutLoaded($data)
        {
                $uid = 234;
-               $configCache = new ConfigCache();
+               $configCache = new PConfigCache();
                $configAdapter = \Mockery::mock(IPConfigAdapter::class);
                $configAdapter->shouldReceive('isConnected')->andReturn(true)->times(3);
 
                $configAdapter->shouldReceive('isLoaded')->with($uid, 'test', 'it')->andReturn(false)->once();
-               $configAdapter->shouldReceive('get')->with($uid, 'test', 'it')->andReturn('!<unset>!')->once();
+               $configAdapter->shouldReceive('get')->with($uid, 'test', 'it')->andReturn(null)->once();
 
                $configAdapter->shouldReceive('isLoaded')->with($uid, 'test', 'it')->andReturn(false)->once();
                $configAdapter->shouldReceive('get')->with($uid, 'test', 'it')->andReturn($data)->once();
@@ -199,7 +199,7 @@ class PConfigurationTest extends MockedTest
        public function testDeleteWithoutDB($data)
        {
                $uid = 234;
-               $configCache = new ConfigCache();
+               $configCache = new PConfigCache();
                $configAdapter = \Mockery::mock(IPConfigAdapter::class);
                $configAdapter->shouldReceive('isConnected')->andReturn(false)->times(4);
 
@@ -218,7 +218,7 @@ class PConfigurationTest extends MockedTest
        public function testDeleteWithDB()
        {
                $uid = 234;
-               $configCache = new ConfigCache();
+               $configCache = new PConfigCache();
                $configAdapter = \Mockery::mock(IPConfigAdapter::class);
                $configAdapter->shouldReceive('isConnected')->andReturn(true)->times(6);
                $configAdapter->shouldReceive('set')->with($uid, 'test', 'it', 'now')->andReturn(false)->once();