Merge branch 'develop' of https://github.com/friendica/friendica into develop

[friendica.git] / tests / src / Core / Cache / MemcacheCacheDriverTest.php

diff --git a/tests/src/Core/Cache/MemcacheCacheDriverTest.php b/tests/src/Core/Cache/MemcacheCacheDriverTest.php
index 4dbd10289e717383b790b117f7ecdc83714fbbe8..62f7440033f1db0153133ac5c676eeba88ea110a 100644 (file)
--- a/tests/src/Core/Cache/MemcacheCacheDriverTest.php
+++ b/tests/src/Core/Cache/MemcacheCacheDriverTest.php
@@ -6,7 +6,10 @@ namespace Friendica\Test\src\Core\Cache;
 
 use Friendica\Core\Cache\CacheDriverFactory;
 
-class MemcachedCacheDriverTest extends CacheTest
+/**
+ * @requires extension memcache
+ */
+class MemcacheCacheDriverTest extends MemoryCacheTest
 {
        /**
         * @var \Friendica\Core\Cache\IMemoryCacheDriver
@@ -15,25 +18,14 @@ class MemcachedCacheDriverTest extends CacheTest
 
        protected function getInstance()
        {
-               if (class_exists('Memcache')) {
-                       try {
-                               $this->cache = CacheDriverFactory::create('memcache');
-                       } catch (\Exception $exception) {
-                               print "Memcache - TestCase failed: " . $exception->getMessage();
-                               throw new \Exception();
-                       }
-                       return $this->cache;
-               } else {
-                       $this->markTestSkipped('Memcache driver isn\'t available');
-                       return null;
-               }
+               $this->cache = CacheDriverFactory::create('memcache');
+               return $this->cache;
+
        }
 
        public function tearDown()
        {
-               if (class_exists('Memcache')) {
-                       $this->cache->clear();
-               }
+               $this->cache->clear(false);
                parent::tearDown();
        }
 }