Use ArraySubsetAsserts

diff --git a/tests/src/Core/Config/ConfigTest.php b/tests/src/Core/Config/ConfigTest.php
index 46dd400adb5c29b9bf737fad401d18874b0f39a4..722e766f10fbfd70420d0f42e008b70755d1f81b 100644 (file)
--- a/tests/src/Core/Config/ConfigTest.php
+++ b/tests/src/Core/Config/ConfigTest.php
@@ -21,19 +21,22 @@
 
 namespace Friendica\Test\src\Core\Config;
 
-use Friendica\Core\Config\Cache;
+use DMS\PHPUnitExtensions\ArraySubset\ArraySubsetAsserts;
 use Friendica\Core\Config\Capability\IManageConfigValues;
 use Friendica\Core\Config\Repository\Config as ConfigModel;
+use Friendica\Core\Config\ValueObject\Cache;
 use Friendica\Test\MockedTest;
 use Mockery\MockInterface;
 use Mockery;
 
 abstract class ConfigTest extends MockedTest
 {
+       use ArraySubsetAsserts;
+
        /** @var ConfigModel|MockInterface */
        protected $configModel;
 
-       /** @var \Friendica\Core\Config\ValueObject\Cache */
+       /** @var Cache */
        protected $configCache;
 
        /** @var IManageConfigValues */
@@ -61,7 +64,7 @@ abstract class ConfigTest extends MockedTest
 
                // Create the config model
                $this->configModel = Mockery::mock(ConfigModel::class);
-               $this->configCache = new \Friendica\Core\Config\ValueObject\Cache();
+               $this->configCache = new Cache();
        }
 
        /**
@@ -161,7 +164,7 @@ abstract class ConfigTest extends MockedTest
                                  ->once();
 
                $this->testedConfig = $this->getInstance();
-               self::assertInstanceOf(\Friendica\Core\Config\ValueObject\Cache::class, $this->testedConfig->getCache());
+               self::assertInstanceOf(Cache::class, $this->testedConfig->getCache());
 
                // assert config is loaded everytime
                self::assertConfig('config', $data['config']);
@@ -176,7 +179,7 @@ abstract class ConfigTest extends MockedTest
        public function testLoad(array $data, array $load)
        {
                $this->testedConfig = $this->getInstance();
-               self::assertInstanceOf(\Friendica\Core\Config\ValueObject\Cache::class, $this->testedConfig->getCache());
+               self::assertInstanceOf(Cache::class, $this->testedConfig->getCache());
 
                foreach ($load as $loadedCats) {
                        $this->testedConfig->load($loadedCats);
@@ -257,7 +260,7 @@ abstract class ConfigTest extends MockedTest
        public function testCacheLoadDouble(array $data1, array $data2, array $expect = [])
        {
                $this->testedConfig = $this->getInstance();
-               self::assertInstanceOf(\Friendica\Core\Config\ValueObject\Cache::class, $this->testedConfig->getCache());
+               self::assertInstanceOf(Cache::class, $this->testedConfig->getCache());
 
                foreach ($data1 as $cat => $data) {
                        $this->testedConfig->load($cat);
@@ -282,7 +285,7 @@ abstract class ConfigTest extends MockedTest
                $this->configModel->shouldReceive('load')->withAnyArgs()->andReturn([])->once();
 
                $this->testedConfig = $this->getInstance();
-               self::assertInstanceOf(\Friendica\Core\Config\ValueObject\Cache::class, $this->testedConfig->getCache());
+               self::assertInstanceOf(Cache::class, $this->testedConfig->getCache());
 
                self::assertEmpty($this->testedConfig->getCache()->getAll());
        }
@@ -299,7 +302,7 @@ abstract class ConfigTest extends MockedTest
                                  ->times(3);
 
                $this->testedConfig = $this->getInstance();
-               self::assertInstanceOf(\Friendica\Core\Config\ValueObject\Cache::class, $this->testedConfig->getCache());
+               self::assertInstanceOf(Cache::class, $this->testedConfig->getCache());
 
                self::assertTrue($this->testedConfig->set('test', 'it', $data));
 
@@ -317,7 +320,7 @@ abstract class ConfigTest extends MockedTest
                $this->configModel->shouldReceive('set')->with('test', 'it', $data)->andReturn(true)->once();
 
                $this->testedConfig = $this->getInstance();
-               self::assertInstanceOf(\Friendica\Core\Config\ValueObject\Cache::class, $this->testedConfig->getCache());
+               self::assertInstanceOf(Cache::class, $this->testedConfig->getCache());
 
                self::assertTrue($this->testedConfig->set('test', 'it', $data));
 
@@ -331,7 +334,7 @@ abstract class ConfigTest extends MockedTest
        public function testGetWrongWithoutDB()
        {
                $this->testedConfig = $this->getInstance();
-               self::assertInstanceOf(\Friendica\Core\Config\ValueObject\Cache::class, $this->testedConfig->getCache());
+               self::assertInstanceOf(Cache::class, $this->testedConfig->getCache());
 
                // without refresh
                self::assertNull($this->testedConfig->get('test', 'it'));
@@ -353,10 +356,10 @@ abstract class ConfigTest extends MockedTest
         */
        public function testGetWithRefresh($data)
        {
-               $this->configCache->load(['test' => ['it' => 'now']], \Friendica\Core\Config\ValueObject\Cache::SOURCE_FILE);
+               $this->configCache->load(['test' => ['it' => 'now']], Cache::SOURCE_FILE);
 
                $this->testedConfig = $this->getInstance();
-               self::assertInstanceOf(\Friendica\Core\Config\ValueObject\Cache::class, $this->testedConfig->getCache());
+               self::assertInstanceOf(Cache::class, $this->testedConfig->getCache());
 
                // without refresh
                self::assertEquals('now', $this->testedConfig->get('test', 'it'));
@@ -378,10 +381,10 @@ abstract class ConfigTest extends MockedTest
         */
        public function testDeleteWithoutDB($data)
        {
-               $this->configCache->load(['test' => ['it' => $data]], \Friendica\Core\Config\ValueObject\Cache::SOURCE_FILE);
+               $this->configCache->load(['test' => ['it' => $data]], Cache::SOURCE_FILE);
 
                $this->testedConfig = $this->getInstance();
-               self::assertInstanceOf(\Friendica\Core\Config\ValueObject\Cache::class, $this->testedConfig->getCache());
+               self::assertInstanceOf(Cache::class, $this->testedConfig->getCache());
 
                self::assertEquals($data, $this->testedConfig->get('test', 'it'));
                self::assertEquals($data, $this->testedConfig->getCache()->get('test', 'it'));
@@ -398,7 +401,7 @@ abstract class ConfigTest extends MockedTest
         */
        public function testDeleteWithDB()
        {
-               $this->configCache->load(['test' => ['it' => 'now', 'quarter' => 'true']], \Friendica\Core\Config\ValueObject\Cache::SOURCE_FILE);
+               $this->configCache->load(['test' => ['it' => 'now', 'quarter' => 'true']], Cache::SOURCE_FILE);
 
                $this->configModel->shouldReceive('delete')
                                  ->with('test', 'it')
@@ -418,7 +421,7 @@ abstract class ConfigTest extends MockedTest
                                  ->once();
 
                $this->testedConfig = $this->getInstance();
-               self::assertInstanceOf(\Friendica\Core\Config\ValueObject\Cache::class, $this->testedConfig->getCache());
+               self::assertInstanceOf(Cache::class, $this->testedConfig->getCache());
 
                // directly set the value to the cache
                $this->testedConfig->getCache()->set('test', 'it', 'now');
@@ -444,9 +447,9 @@ abstract class ConfigTest extends MockedTest
        public function testSetGetHighPrio()
        {
                $this->testedConfig = $this->getInstance();
-               self::assertInstanceOf(\Friendica\Core\Config\ValueObject\Cache::class, $this->testedConfig->getCache());
+               self::assertInstanceOf(Cache::class, $this->testedConfig->getCache());
 
-               $this->testedConfig->getCache()->set('config', 'test', 'prio', \Friendica\Core\Config\ValueObject\Cache::SOURCE_FILE);
+               $this->testedConfig->getCache()->set('config', 'test', 'prio', Cache::SOURCE_FILE);
                self::assertEquals('prio', $this->testedConfig->get('config', 'test'));
 
                // now you have to get the new variable entry because of the new set the get refresh succeed as well
@@ -460,10 +463,10 @@ abstract class ConfigTest extends MockedTest
        public function testSetGetLowPrio()
        {
                $this->testedConfig = $this->getInstance();
-               self::assertInstanceOf(\Friendica\Core\Config\ValueObject\Cache::class, $this->testedConfig->getCache());
+               self::assertInstanceOf(Cache::class, $this->testedConfig->getCache());
                self::assertEquals('it', $this->testedConfig->get('config', 'test'));
 
-               $this->testedConfig->getCache()->set('config', 'test', 'prio', \Friendica\Core\Config\ValueObject\Cache::SOURCE_ENV);
+               $this->testedConfig->getCache()->set('config', 'test', 'prio', Cache::SOURCE_ENV);
                // now you have to get the env variable entry as output, even with a new set (which failed) and a get refresh
                self::assertFalse($this->testedConfig->set('config', 'test', '123'));
                self::assertEquals('prio', $this->testedConfig->get('config', 'test', '', true));

diff --git a/tests/src/Core/InstallerTest.php b/tests/src/Core/InstallerTest.php
index 0e44f19a4285ab20639c6d6aa8ae6fd132042fa0..775125347490f344e5063804525f3ea9edcc55e1 100644 (file)
--- a/tests/src/Core/InstallerTest.php
+++ b/tests/src/Core/InstallerTest.php
@@ -23,6 +23,7 @@
 namespace Friendica\Core;
 
 use Dice\Dice;
+use DMS\PHPUnitExtensions\ArraySubset\ArraySubsetAsserts;
 use Friendica\Core\Config\ValueObject\Cache;
 use Friendica\DI;
 use Friendica\Network\HTTPClient\Capability\ICanHandleHttpResponses;
@@ -35,6 +36,7 @@ use Mockery\MockInterface;
 class InstallerTest extends MockedTest
 {
        use VFSTrait;
+       use ArraySubsetAsserts;
 
        /**
         * @var L10n|MockInterface

diff --git a/tests/src/Core/PConfig/PConfigTest.php b/tests/src/Core/PConfig/PConfigTest.php
index 1f0e89364ebcf83e3208d05632e216b5f3d2bd6b..33e538a0849f0b29093bf882e47f8cb51959fc3c 100644 (file)
--- a/tests/src/Core/PConfig/PConfigTest.php
+++ b/tests/src/Core/PConfig/PConfigTest.php
@@ -21,19 +21,22 @@
 
 namespace Friendica\Test\src\Core\PConfig;
 
-use Friendica\Core\PConfig\Cache;
+use DMS\PHPUnitExtensions\ArraySubset\ArraySubsetAsserts;
 use Friendica\Core\PConfig\Type\AbstractPConfigValues;
 use Friendica\Core\PConfig\Repository\PConfig as PConfigModel;
+use Friendica\Core\PConfig\ValueObject\Cache;
 use Friendica\Test\MockedTest;
 use Mockery;
 use Mockery\MockInterface;
 
 abstract class PConfigTest extends MockedTest
 {
+       use ArraySubsetAsserts;
+
        /** @var PConfigModel|MockInterface */
        protected $configModel;
 
-       /** @var \Friendica\Core\PConfig\ValueObject\Cache */
+       /** @var Cache */
        protected $configCache;
 
        /** @var AbstractPConfigValues */
@@ -63,7 +66,7 @@ abstract class PConfigTest extends MockedTest
 
                // Create the config model
                $this->configModel = Mockery::mock(PConfigModel::class);
-               $this->configCache = new \Friendica\Core\PConfig\ValueObject\Cache();
+               $this->configCache = new Cache();
        }
 
        /**
@@ -163,7 +166,7 @@ abstract class PConfigTest extends MockedTest
        public function testSetUp()
        {
                $this->testedConfig = $this->getInstance();
-               self::assertInstanceOf(\Friendica\Core\PConfig\ValueObject\Cache::class, $this->testedConfig->getCache());
+               self::assertInstanceOf(Cache::class, $this->testedConfig->getCache());
 
                self::assertEmpty($this->testedConfig->getCache()->getAll());
        }
@@ -174,7 +177,7 @@ abstract class PConfigTest extends MockedTest
        public function testLoad(int $uid, array $data, array $possibleCats, array $load)
        {
                $this->testedConfig = $this->getInstance();
-               self::assertInstanceOf(\Friendica\Core\PConfig\ValueObject\Cache::class, $this->testedConfig->getCache());
+               self::assertInstanceOf(Cache::class, $this->testedConfig->getCache());
 
                foreach ($load as $loadedCats) {
                        $this->testedConfig->load($uid, $loadedCats);
@@ -257,7 +260,7 @@ abstract class PConfigTest extends MockedTest
        public function testCacheLoadDouble(int $uid, array $data1, array $data2, array $expect)
        {
                $this->testedConfig = $this->getInstance();
-               self::assertInstanceOf(\Friendica\Core\PConfig\ValueObject\Cache::class, $this->testedConfig->getCache());
+               self::assertInstanceOf(Cache::class, $this->testedConfig->getCache());
 
                foreach ($data1 as $cat => $data) {
                        $this->testedConfig->load($uid, $cat);
@@ -281,7 +284,7 @@ abstract class PConfigTest extends MockedTest
        public function testSetGetWithoutDB(int $uid, $data)
        {
                $this->testedConfig = $this->getInstance();
-               self::assertInstanceOf(\Friendica\Core\PConfig\ValueObject\Cache::class, $this->testedConfig->getCache());
+               self::assertInstanceOf(Cache::class, $this->testedConfig->getCache());
 
                self::assertTrue($this->testedConfig->set($uid, 'test', 'it', $data));
 
@@ -302,7 +305,7 @@ abstract class PConfigTest extends MockedTest
                                  ->once();
 
                $this->testedConfig = $this->getInstance();
-               self::assertInstanceOf(\Friendica\Core\PConfig\ValueObject\Cache::class, $this->testedConfig->getCache());
+               self::assertInstanceOf(Cache::class, $this->testedConfig->getCache());
 
                self::assertTrue($this->testedConfig->set($uid, 'test', 'it', $data));
 
@@ -316,7 +319,7 @@ abstract class PConfigTest extends MockedTest
        public function testGetWrongWithoutDB()
        {
                $this->testedConfig = $this->getInstance();
-               self::assertInstanceOf(\Friendica\Core\PConfig\ValueObject\Cache::class, $this->testedConfig->getCache());
+               self::assertInstanceOf(Cache::class, $this->testedConfig->getCache());
 
                // without refresh
                self::assertNull($this->testedConfig->get(0, 'test', 'it'));
@@ -341,7 +344,7 @@ abstract class PConfigTest extends MockedTest
                $this->configCache->load($uid, ['test' => ['it' => 'now']]);
 
                $this->testedConfig = $this->getInstance();
-               self::assertInstanceOf(\Friendica\Core\PConfig\ValueObject\Cache::class, $this->testedConfig->getCache());
+               self::assertInstanceOf(Cache::class, $this->testedConfig->getCache());
 
                // without refresh
                self::assertEquals('now', $this->testedConfig->get($uid, 'test', 'it'));
@@ -366,7 +369,7 @@ abstract class PConfigTest extends MockedTest
                $this->configCache->load($uid, ['test' => ['it' => $data]]);
 
                $this->testedConfig = $this->getInstance();
-               self::assertInstanceOf(\Friendica\Core\PConfig\ValueObject\Cache::class, $this->testedConfig->getCache());
+               self::assertInstanceOf(Cache::class, $this->testedConfig->getCache());
 
                self::assertEquals($data, $this->testedConfig->get($uid, 'test', 'it'));
                self::assertEquals($data, $this->testedConfig->getCache()->get($uid, 'test', 'it'));
@@ -405,7 +408,7 @@ abstract class PConfigTest extends MockedTest
                                  ->once();
 
                $this->testedConfig = $this->getInstance();
-               self::assertInstanceOf(\Friendica\Core\PConfig\ValueObject\Cache::class, $this->testedConfig->getCache());
+               self::assertInstanceOf(Cache::class, $this->testedConfig->getCache());
 
                // directly set the value to the cache
                $this->testedConfig->getCache()->set($uid, 'test', 'it', 'now');
@@ -465,7 +468,7 @@ abstract class PConfigTest extends MockedTest
                $this->configCache->load($data2['uid'], $data2['data']);
 
                $this->testedConfig = $this->getInstance();
-               self::assertInstanceOf(\Friendica\Core\PConfig\ValueObject\Cache::class, $this->testedConfig->getCache());
+               self::assertInstanceOf(Cache::class, $this->testedConfig->getCache());
 
                self::assertConfig($data1['uid'], 'cat1', $data1['data']['cat1']);
                self::assertConfig($data1['uid'], 'cat2', $data1['data']['cat2']);