- removed suppressed tests

Author: kodeart

Tests/Integration/FileClientTest.php

@@ -27,10 +27,6 @@ public function createSimpleCache()
 
     protected function setUp(): void
     {
-        $this->skippedTests = [
-            'testSetMultipleInvalidKeys' => '',
-        ];
-
         $this->dir = vfsStream::setup();
         parent::setUp();
     }

Tests/Integration/MemcachedClientTest.php

@@ -35,21 +35,6 @@ protected function setUp(): void
 
         $this->skippedTests = [
             'testBasicUsageWithLongKey' => 'Memcached max key length is 250 chars',
-
-            'testSet' => '',
-            'testSetTtl' => '',
-            'testSetExpiredTtl' => '',
-            'testGet' => '',
-            'testDelete' => '',
-            'testClear' => '',
-
-            'testSetMultiple' => '',
-            'testSetMultipleWithIntegerArrayKey' => '',
-            'testSetMultipleTtl' => '',
-            'testSetMultipleExpiredTtl' => '',
-            'testSetMultipleWithGenerator' => '',
-            'testGetMultiple' => '',
-            'testSetMultipleInvalidKeys' => '',
         ];
     }
 }

Tests/Integration/MemoryClientTest.php

@@ -15,10 +15,6 @@ class MemoryClientTest extends SimpleCacheTest
      */
     public function createSimpleCache()
     {
-        $this->skippedTests = [
-            'testSetMultipleInvalidKeys' => '',
-        ];
-
         return simple_cache_factory('memory');
     }
 }

Tests/Integration/PredisClientTest.php

@@ -15,10 +15,6 @@ class PredisClientTest extends SimpleCacheTest
      */
     public function createSimpleCache()
     {
-        $this->skippedTests = [
-            'testSetMultipleInvalidKeys' => '',
-        ];
-
         return simple_cache_factory('predis', [
             'host' => getenv('REDIS_SERVER_HOST'),
         ]);

Tests/Integration/PredisJsonClientTest.php

@@ -16,10 +16,6 @@ class PredisJsonClientTest extends SimpleCacheTest
      */
     public function createSimpleCache()
     {
-        $this->skippedTests = [
-            'testSetMultipleInvalidKeys' => '',
-        ];
-
         return simple_cache_factory('predis', [
             'host' => getenv('REDIS_SERVER_HOST'),
             'port' => getenv('REDIS_SERVER_PORT'),

Tests/Integration/RedisClientTest.php

@@ -15,10 +15,6 @@ class RedisClientTest extends SimpleCacheTest
      */
     public function createSimpleCache()
     {
-        $this->skippedTests = [
-            'testSetMultipleInvalidKeys' => '',
-        ];
-
         return simple_cache_factory('redis', [
             'host' => getenv('REDIS_SERVER_HOST'),
         ]);

Tests/Integration/RedisJsonClientTest.php

@@ -16,10 +16,6 @@ class RedisJsonClientTest extends SimpleCacheTest
      */
     public function createSimpleCache()
     {
-        $this->skippedTests = [
-            'testSetMultipleInvalidKeys' => '',
-        ];
-
         return simple_cache_factory('redis', [
             'host' => getenv('REDIS_SERVER_HOST'),
             'serializer' => Serializer::JSON,

Tests/Integration/ShmopClientTest.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace Koded\Caching;
+
+use Cache\IntegrationTests\SimpleCacheTest;
+use Koded\Caching\Tests\Integration\SimpleCacheIntegrationTrait;
+
+class ShmopClientTest extends SimpleCacheTest
+{
+    use SimpleCacheIntegrationTrait;
+
+    public function createSimpleCache()
+    {
+        return simple_cache_factory('shmop');
+    }
+
+    protected function setup()
+    {
+        if (false === extension_loaded('shmop')) {
+            $this->markTestSkipped('shmop extension is not loaded.');
+        }
+
+        parent::setUp();
+        $this->cache->clear();
+    }
+}

Tests/Integration/SimpleCacheIntegrationTrait.php

@@ -4,29 +4,42 @@
 
 trait SimpleCacheIntegrationTrait
 {
+    protected function tearDown(): void
+    {
+        putenv('CACHE_CLIENT=');
+
+        if ($this->cache !== null) {
+            $this->cache->clear();
+        }
+
+        $this->cache = null;
+    }
+
+    /** overwritten */
+    public static function invalidKeys()
+    {
+        return self::removeColumnFromInvalidKeys();
+    }
+
+    /** overwritten */
+    public static function invalidArrayKeys()
+    {
+        return self::removeColumnFromInvalidKeys();
+    }
+
     /**
      * Data provider for invalid keys.
      * Allows ":" in the cache key name.
      *
      * @return array
      */
-    public static function invalidKeys()
+    private static function removeColumnFromInvalidKeys(): array
     {
         $keys = parent::invalidKeys();
+        unset($keys[14]);
 
-        unset($keys[14]); // allow ":" in the key name
-
-        return array_values($keys);
+        return $keys;
     }
 
-    protected function tearDown(): void
-    {
-        putenv('CACHE_CLIENT=');
-
-        if ($this->cache !== null) {
-            $this->cache->clear();
-        }
 
-        $this->cache = null;
-    }
 }

Tests/RedisWithOnlyJsonSerializerTest.php

@@ -68,7 +68,7 @@ public function test_should_store_and_retrieve_the_same_cache_item($data)
 
     protected function setUp(): void
     {
-        $this->markTestSkipped('Redis JSON serializer skipped for now...');
+//        $this->markTestSkipped('Redis JSON serializer skipped for now...');
 
         if (false === extension_loaded('redis')) {
             $this->markTestSkipped('Redis extension is not loaded.');