Rename MemoryCacheTest to MemoryCacheTestCase

diff --git a/tests/MemoryCacheTestCase.php b/tests/MemoryCacheTestCase.php
new file mode 100644 (file)
index 0000000..7563ff7
--- /dev/null
+++ b/tests/MemoryCacheTestCase.php
@@ -0,0 +1,118 @@
+<?php
+
+// Copyright (C) 2010-2024, the Friendica project
+// SPDX-FileCopyrightText: 2010-2024 the Friendica project
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
+namespace Friendica\Test;
+
+use Exception;
+use Friendica\Core\Cache\Capability\ICanCacheInMemory;
+
+abstract class MemoryCacheTestCase extends CacheTestCase
+{
+       /**
+        * @var \Friendica\Core\Cache\Capability\ICanCacheInMemory
+        */
+       protected $instance;
+
+       protected function setUp(): void
+       {
+               parent::setUp();
+
+               if (!($this->instance instanceof ICanCacheInMemory)) {
+                       throw new Exception('MemoryCacheTest unsupported');
+               }
+       }
+
+       /**
+        * @small
+        * @dataProvider dataSimple
+        */
+       public function testCompareSet($value1, $value2)
+       {
+               self::assertNull($this->instance->get('value1'));
+
+               $this->instance->add('value1', $value1);
+               $received = $this->instance->get('value1');
+               self::assertEquals($value1, $received, 'Value received from cache not equal to the original');
+
+               $this->instance->compareSet('value1', $value1, $value2);
+               $received = $this->instance->get('value1');
+               self::assertEquals($value2, $received, 'Value not overwritten by compareSet');
+       }
+
+       /**
+        * @small
+        * @dataProvider dataSimple
+        */
+       public function testNegativeCompareSet($value1, $value2)
+       {
+               self::assertNull($this->instance->get('value1'));
+
+               $this->instance->add('value1', $value1);
+               $received = $this->instance->get('value1');
+               self::assertEquals($value1, $received, 'Value received from cache not equal to the original');
+
+               $this->instance->compareSet('value1', 'wrong', $value2);
+               $received = $this->instance->get('value1');
+               self::assertNotEquals($value2, $received, 'Value was wrongly overwritten by compareSet');
+               self::assertEquals($value1, $received, 'Value was wrongly overwritten by any other value');
+       }
+
+       /**
+        * @small
+        * @dataProvider dataSimple
+        */
+       public function testCompareDelete($data)
+       {
+               self::assertNull($this->instance->get('value1'));
+
+               $this->instance->add('value1', $data);
+               $received = $this->instance->get('value1');
+               self::assertEquals($data, $received, 'Value received from cache not equal to the original');
+               $this->instance->compareDelete('value1', $data);
+               self::assertNull($this->instance->get('value1'), 'Value was not deleted by compareDelete');
+       }
+
+       /**
+        * @small
+        * @dataProvider dataSimple
+        */
+       public function testNegativeCompareDelete($data)
+       {
+               self::assertNull($this->instance->get('value1'));
+
+               $this->instance->add('value1', $data);
+               $received = $this->instance->get('value1');
+               self::assertEquals($data, $received, 'Value received from cache not equal to the original');
+               $this->instance->compareDelete('value1', 'wrong');
+               self::assertNotNull($this->instance->get('value1'), 'Value was wrongly compareDeleted');
+
+               $this->instance->compareDelete('value1', $data);
+               self::assertNull($this->instance->get('value1'), 'Value was wrongly NOT deleted by compareDelete');
+       }
+
+       /**
+        * @small
+        * @dataProvider dataSimple
+        */
+       public function testAdd($value1, $value2)
+       {
+               self::assertNull($this->instance->get('value1'));
+
+               $this->instance->add('value1', $value1);
+
+               $this->instance->add('value1', $value2);
+               $received = $this->instance->get('value1');
+               self::assertNotEquals($value2, $received, 'Value was wrongly overwritten by add');
+               self::assertEquals($value1, $received, 'Value was wrongly overwritten by any other value');
+
+               $this->instance->delete('value1');
+               $this->instance->add('value1', $value2);
+               $received = $this->instance->get('value1');
+               self::assertEquals($value2, $received, 'Value was not overwritten by add');
+               self::assertNotEquals($value1, $received, 'Value was not overwritten by any other value');
+       }
+}

diff --git a/tests/src/Core/Cache/APCuCacheTest.php b/tests/src/Core/Cache/APCuCacheTest.php
index f66930a9f62d095fbbf256fbaae4accc5b27eaa4..117c211b04140001373ef23712e4f15082c3191a 100644 (file)
--- a/tests/src/Core/Cache/APCuCacheTest.php
+++ b/tests/src/Core/Cache/APCuCacheTest.php
@@ -8,11 +8,12 @@
 namespace Friendica\Test\src\Core\Cache;
 
 use Friendica\Core\Cache\Type\APCuCache;
+use Friendica\Test\MemoryCacheTestCase;
 
 /**
  * @group APCU
  */
-class APCuCacheTest extends MemoryCacheTest
+class APCuCacheTest extends MemoryCacheTestCase
 {
        protected function setUp(): void
        {

diff --git a/tests/src/Core/Cache/ArrayCacheTest.php b/tests/src/Core/Cache/ArrayCacheTest.php
index ee82f6ef57c3be13447f90377a2f433eedd9ecaf..967cb07bce17ebca147c22bb197899527c591f59 100644 (file)
--- a/tests/src/Core/Cache/ArrayCacheTest.php
+++ b/tests/src/Core/Cache/ArrayCacheTest.php
@@ -8,8 +8,9 @@
 namespace Friendica\Test\src\Core\Cache;
 
 use Friendica\Core\Cache\Type\ArrayCache;
+use Friendica\Test\MemoryCacheTestCase;
 
-class ArrayCacheTest extends MemoryCacheTest
+class ArrayCacheTest extends MemoryCacheTestCase
 {
        protected function getInstance()
        {

diff --git a/tests/src/Core/Cache/MemcacheCacheTest.php b/tests/src/Core/Cache/MemcacheCacheTest.php
index f5ac4dafb6be985901e1dea69e4e42a2024223ce..abd073f4838abc0b6a120c99e3ab6554742c90aa 100644 (file)
--- a/tests/src/Core/Cache/MemcacheCacheTest.php
+++ b/tests/src/Core/Cache/MemcacheCacheTest.php
@@ -10,13 +10,14 @@ namespace Friendica\Test\src\Core\Cache;
 use Exception;
 use Friendica\Core\Cache\Type\MemcacheCache;
 use Friendica\Core\Config\Capability\IManageConfigValues;
+use Friendica\Test\MemoryCacheTestCase;
 use Mockery;
 
 /**
  * @requires extension memcache
  * @group MEMCACHE
  */
-class MemcacheCacheTest extends MemoryCacheTest
+class MemcacheCacheTest extends MemoryCacheTestCase
 {
        protected function getInstance()
        {

diff --git a/tests/src/Core/Cache/MemcachedCacheTest.php b/tests/src/Core/Cache/MemcachedCacheTest.php
index e191347cf70fd3066f0f45e41142d2c9b9a83e81..f3b6107b5be6f8ed56cc6195ad8698bd19c4234d 100644 (file)
--- a/tests/src/Core/Cache/MemcachedCacheTest.php
+++ b/tests/src/Core/Cache/MemcachedCacheTest.php
@@ -10,6 +10,7 @@ namespace Friendica\Test\src\Core\Cache;
 use Exception;
 use Friendica\Core\Cache\Type\MemcachedCache;
 use Friendica\Core\Config\Capability\IManageConfigValues;
+use Friendica\Test\MemoryCacheTestCase;
 use Mockery;
 use Psr\Log\NullLogger;
 
@@ -17,7 +18,7 @@ use Psr\Log\NullLogger;
  * @requires extension memcached
  * @group MEMCACHED
  */
-class MemcachedCacheTest extends MemoryCacheTest
+class MemcachedCacheTest extends MemoryCacheTestCase
 {
        protected function getInstance()
        {

diff --git a/tests/src/Core/Cache/MemoryCacheTest.php b/tests/src/Core/Cache/MemoryCacheTest.php
deleted file mode 100644 (file)
index e6c82d3..0000000
--- a/tests/src/Core/Cache/MemoryCacheTest.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-
-// Copyright (C) 2010-2024, the Friendica project
-// SPDX-FileCopyrightText: 2010-2024 the Friendica project
-//
-// SPDX-License-Identifier: AGPL-3.0-or-later
-
-namespace Friendica\Test\src\Core\Cache;
-
-use Exception;
-use Friendica\Core\Cache\Capability\ICanCacheInMemory;
-use Friendica\Test\CacheTestCase;
-
-abstract class MemoryCacheTest extends CacheTestCase
-{
-       /**
-        * @var \Friendica\Core\Cache\Capability\ICanCacheInMemory
-        */
-       protected $instance;
-
-       protected function setUp(): void
-       {
-               parent::setUp();
-
-               if (!($this->instance instanceof ICanCacheInMemory)) {
-                       throw new Exception('MemoryCacheTest unsupported');
-               }
-       }
-
-       /**
-        * @small
-        * @dataProvider dataSimple
-        */
-       public function testCompareSet($value1, $value2)
-       {
-               self::assertNull($this->instance->get('value1'));
-
-               $this->instance->add('value1', $value1);
-               $received = $this->instance->get('value1');
-               self::assertEquals($value1, $received, 'Value received from cache not equal to the original');
-
-               $this->instance->compareSet('value1', $value1, $value2);
-               $received = $this->instance->get('value1');
-               self::assertEquals($value2, $received, 'Value not overwritten by compareSet');
-       }
-
-       /**
-        * @small
-        * @dataProvider dataSimple
-        */
-       public function testNegativeCompareSet($value1, $value2)
-       {
-               self::assertNull($this->instance->get('value1'));
-
-               $this->instance->add('value1', $value1);
-               $received = $this->instance->get('value1');
-               self::assertEquals($value1, $received, 'Value received from cache not equal to the original');
-
-               $this->instance->compareSet('value1', 'wrong', $value2);
-               $received = $this->instance->get('value1');
-               self::assertNotEquals($value2, $received, 'Value was wrongly overwritten by compareSet');
-               self::assertEquals($value1, $received, 'Value was wrongly overwritten by any other value');
-       }
-
-       /**
-        * @small
-        * @dataProvider dataSimple
-        */
-       public function testCompareDelete($data)
-       {
-               self::assertNull($this->instance->get('value1'));
-
-               $this->instance->add('value1', $data);
-               $received = $this->instance->get('value1');
-               self::assertEquals($data, $received, 'Value received from cache not equal to the original');
-               $this->instance->compareDelete('value1', $data);
-               self::assertNull($this->instance->get('value1'), 'Value was not deleted by compareDelete');
-       }
-
-       /**
-        * @small
-        * @dataProvider dataSimple
-        */
-       public function testNegativeCompareDelete($data)
-       {
-               self::assertNull($this->instance->get('value1'));
-
-               $this->instance->add('value1', $data);
-               $received = $this->instance->get('value1');
-               self::assertEquals($data, $received, 'Value received from cache not equal to the original');
-               $this->instance->compareDelete('value1', 'wrong');
-               self::assertNotNull($this->instance->get('value1'), 'Value was wrongly compareDeleted');
-
-               $this->instance->compareDelete('value1', $data);
-               self::assertNull($this->instance->get('value1'), 'Value was wrongly NOT deleted by compareDelete');
-       }
-
-       /**
-        * @small
-        * @dataProvider dataSimple
-        */
-       public function testAdd($value1, $value2)
-       {
-               self::assertNull($this->instance->get('value1'));
-
-               $this->instance->add('value1', $value1);
-
-               $this->instance->add('value1', $value2);
-               $received = $this->instance->get('value1');
-               self::assertNotEquals($value2, $received, 'Value was wrongly overwritten by add');
-               self::assertEquals($value1, $received, 'Value was wrongly overwritten by any other value');
-
-               $this->instance->delete('value1');
-               $this->instance->add('value1', $value2);
-               $received = $this->instance->get('value1');
-               self::assertEquals($value2, $received, 'Value was not overwritten by add');
-               self::assertNotEquals($value1, $received, 'Value was not overwritten by any other value');
-       }
-}

diff --git a/tests/src/Core/Cache/RedisCacheTest.php b/tests/src/Core/Cache/RedisCacheTest.php
index db1bf3f70b239a69832e6905570b87c46bad3cdf..6169171f40eaeace3bdda24aefb80a86c85753fc 100644 (file)
--- a/tests/src/Core/Cache/RedisCacheTest.php
+++ b/tests/src/Core/Cache/RedisCacheTest.php
@@ -10,13 +10,14 @@ namespace Friendica\Test\src\Core\Cache;
 use Exception;
 use Friendica\Core\Cache\Type\RedisCache;
 use Friendica\Core\Config\Capability\IManageConfigValues;
+use Friendica\Test\MemoryCacheTestCase;
 use Mockery;
 
 /**
  * @requires extension redis
  * @group REDIS
  */
-class RedisCacheTest extends MemoryCacheTest
+class RedisCacheTest extends MemoryCacheTestCase
 {
        protected function getInstance()
        {
@@ -44,7 +45,7 @@ class RedisCacheTest extends MemoryCacheTest
                        ->andReturn(null);
 
                try {
-                       $this->cache = new \Friendica\Core\Cache\Type\RedisCache($host, $configMock);
+                       $this->cache = new RedisCache($host, $configMock);
                } catch (Exception $e) {
                        static::markTestSkipped('Redis is not available. Failure: ' . $e->getMessage());
                }