simplifying unittests (#5395)

* simplifying unittests

- use @requires instead class_exist
- define @small and @medium

* simplifying unittests

- removed unnecessary throwings

diff --git a/tests/src/Core/Cache/CacheTest.php b/tests/src/Core/Cache/CacheTest.php
index 39dc56f301444934cd407a3b7bc5e70f54177b11..105142f0b74250eb048d10a87806d10a78b3dd8c 100644 (file)
--- a/tests/src/Core/Cache/CacheTest.php
+++ b/tests/src/Core/Cache/CacheTest.php
@@ -31,6 +31,9 @@ abstract class CacheTest extends DatabaseTest
                Config::set('system', 'theme', 'system_theme');
        }
 
+       /**
+        * @small
+        */
        function testSimple() {
                $this->assertNull($this->instance->get('value1'));
 
@@ -56,6 +59,9 @@ abstract class CacheTest extends DatabaseTest
                $this->assertNull($this->instance->get('value1'));
        }
 
+       /**
+        * @small
+        */
        function testClear() {
                $value = 'ipsum lorum';
                $this->instance->set('1_value1', $value . '1');
@@ -90,6 +96,9 @@ abstract class CacheTest extends DatabaseTest
                ]);
        }
 
+       /**
+        * @medium
+        */
        function testTTL() {
                $this->assertNull($this->instance->get('value1'));
 
@@ -103,6 +112,9 @@ abstract class CacheTest extends DatabaseTest
                $this->assertNull($this->instance->get('value1'));
        }
 
+       /**
+        * @small
+        */
        function testDifferentTypesInCache() {
                // String test
                $value = "foobar";

diff --git a/tests/src/Core/Cache/MemcacheCacheDriverTest.php b/tests/src/Core/Cache/MemcacheCacheDriverTest.php
index 5ed0a3a2e5dd24f6a53393019dd10b57985cad65..62f7440033f1db0153133ac5c676eeba88ea110a 100644 (file)
--- a/tests/src/Core/Cache/MemcacheCacheDriverTest.php
+++ b/tests/src/Core/Cache/MemcacheCacheDriverTest.php
@@ -6,6 +6,9 @@ namespace Friendica\Test\src\Core\Cache;
 
 use Friendica\Core\Cache\CacheDriverFactory;
 
+/**
+ * @requires extension memcache
+ */
 class MemcacheCacheDriverTest extends MemoryCacheTest
 {
        /**
@@ -15,24 +18,14 @@ class MemcacheCacheDriverTest extends MemoryCacheTest
 
        protected function getInstance()
        {
-               if (class_exists('Memcache')) {
-                       try {
-                               $this->cache = CacheDriverFactory::create('memcache');
-                       } catch (\Exception $exception) {
-                               throw new \Exception("Memcache - TestCase failed: " . $exception->getMessage(), $exception->getCode(), $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(false);
-               }
+               $this->cache->clear(false);
                parent::tearDown();
        }
 }

diff --git a/tests/src/Core/Cache/MemcachedCacheDriverTest.php b/tests/src/Core/Cache/MemcachedCacheDriverTest.php
index 4872546b54c735fee5a3eeedf8eb774c292fa0b0..5a07814a383760618ff4ddf9f6e316288119be30 100644 (file)
--- a/tests/src/Core/Cache/MemcachedCacheDriverTest.php
+++ b/tests/src/Core/Cache/MemcachedCacheDriverTest.php
@@ -6,6 +6,9 @@ namespace Friendica\Test\src\Core\Cache;
 
 use Friendica\Core\Cache\CacheDriverFactory;
 
+/**
+ * @requires extension memcached
+ */
 class MemcachedCacheDriverTest extends MemoryCacheTest
 {
        /**
@@ -15,24 +18,13 @@ class MemcachedCacheDriverTest extends MemoryCacheTest
 
        protected function getInstance()
        {
-               if (class_exists('Memcached')) {
-                       try {
-                               $this->cache = CacheDriverFactory::create('memcached');
-                       } catch (\Exception $exception) {
-                               throw new \Exception("Memcached - TestCase failed: " . $exception->getMessage(), $exception->getCode(), $exception);
-                       }
-                       return $this->cache;
-               } else {
-                       $this->markTestSkipped('Memcached driver isn\'t available');
-                       return null;
-               }
+               $this->cache = CacheDriverFactory::create('memcached');
+               return $this->cache;
        }
 
        public function tearDown()
        {
-               if (class_exists('Memcached')) {
-                       $this->cache->clear(false);
-               }
+               $this->cache->clear(false);
                parent::tearDown();
        }
 }

diff --git a/tests/src/Core/Cache/MemoryCacheTest.php b/tests/src/Core/Cache/MemoryCacheTest.php
index 670df2fe187ee52d4d5f811226cd9276adb5fc30..0f3f6192b232baddca9f797529e32e5384c31364 100644 (file)
--- a/tests/src/Core/Cache/MemoryCacheTest.php
+++ b/tests/src/Core/Cache/MemoryCacheTest.php
@@ -19,6 +19,9 @@ abstract class MemoryCacheTest extends CacheTest
                }
        }
 
+       /**
+        * @small
+        */
        function testCompareSet() {
                $this->assertNull($this->instance->get('value1'));
 
@@ -33,6 +36,9 @@ abstract class MemoryCacheTest extends CacheTest
                $this->assertEquals($newValue, $received, 'Value not overwritten by compareSet');
        }
 
+       /**
+        * @small
+        */
        function testNegativeCompareSet() {
                $this->assertNull($this->instance->get('value1'));
 
@@ -48,6 +54,9 @@ abstract class MemoryCacheTest extends CacheTest
                $this->assertEquals($value, $received, 'Value was wrongly overwritten by any other value');
        }
 
+       /**
+        * @small
+        */
        function testCompareDelete() {
                $this->assertNull($this->instance->get('value1'));
 
@@ -59,6 +68,9 @@ abstract class MemoryCacheTest extends CacheTest
                $this->assertNull($this->instance->get('value1'), 'Value was not deleted by compareDelete');
        }
 
+       /**
+        * @small
+        */
        function testNegativeCompareDelete() {
                $this->assertNull($this->instance->get('value1'));
 
@@ -73,6 +85,9 @@ abstract class MemoryCacheTest extends CacheTest
                $this->assertNull($this->instance->get('value1'), 'Value was wrongly NOT deleted by compareDelete');
        }
 
+       /**
+        * @small
+        */
        function testAdd() {
                $this->assertNull($this->instance->get('value1'));
 

diff --git a/tests/src/Core/Cache/RedisCacheDriverTest.php b/tests/src/Core/Cache/RedisCacheDriverTest.php
index 158534602a32921669eddeb7c75c80aa1b223e0b..460c1184ba47b5d2c684c8996b9424c43edd69de 100644 (file)
--- a/tests/src/Core/Cache/RedisCacheDriverTest.php
+++ b/tests/src/Core/Cache/RedisCacheDriverTest.php
@@ -6,6 +6,9 @@ namespace Friendica\Test\src\Core\Cache;
 
 use Friendica\Core\Cache\CacheDriverFactory;
 
+/**
+ * @requires extension redis
+ */
 class RedisCacheDriverTest extends MemoryCacheTest
 {
        /**
@@ -15,24 +18,13 @@ class RedisCacheDriverTest extends MemoryCacheTest
 
        protected function getInstance()
        {
-               if (class_exists('Redis')) {
-                       try {
-                               $this->cache = CacheDriverFactory::create('redis');
-                       } catch (\Exception $exception) {
-                               throw new \Exception("Redis - TestCase failed: " . $exception->getMessage(), $exception->getCode(), $exception);
-                       }
-                       return $this->cache;
-               } else {
-                       $this->markTestSkipped('Redis driver isn\'t available');
-                       return null;
-               }
+               $this->cache = CacheDriverFactory::create('redis');
+               return $this->cache;
        }
 
        public function tearDown()
        {
-               if (class_exists('Redis')) {
-                       $this->cache->clear(false);
-               }
+               $this->cache->clear(false);
                parent::tearDown();
        }
 }

diff --git a/tests/src/Core/Lock/LockTest.php b/tests/src/Core/Lock/LockTest.php
index 79ee023bd8b98b88e5208828c6d7d7d53f2bd0f5..5663a26af1a9d5c6cb00fc68003a2e7ad1c5b695 100644 (file)
--- a/tests/src/Core/Lock/LockTest.php
+++ b/tests/src/Core/Lock/LockTest.php
@@ -30,12 +30,18 @@ abstract class LockTest extends DatabaseTest
                Config::set('system', 'theme', 'system_theme');
        }
 
+       /**
+        * @small
+        */
        public function testLock() {
                $this->instance->acquireLock('foo', 1);
                $this->assertTrue($this->instance->isLocked('foo'));
                $this->assertFalse($this->instance->isLocked('bar'));
        }
 
+       /**
+        * @small
+        */
        public function testDoubleLock() {
                $this->instance->acquireLock('foo', 1);
                $this->assertTrue($this->instance->isLocked('foo'));
@@ -43,6 +49,9 @@ abstract class LockTest extends DatabaseTest
                $this->assertTrue($this->instance->acquireLock('foo', 1));
        }
 
+       /**
+        * @small
+        */
        public function testReleaseLock() {
                $this->instance->acquireLock('foo', 1);
                $this->assertTrue($this->instance->isLocked('foo'));
@@ -50,6 +59,9 @@ abstract class LockTest extends DatabaseTest
                $this->assertFalse($this->instance->isLocked('foo'));
        }
 
+       /**
+        * @small
+        */
        public function testReleaseAll() {
                $this->instance->acquireLock('foo', 1);
                $this->instance->acquireLock('bar', 1);
@@ -66,6 +78,9 @@ abstract class LockTest extends DatabaseTest
                $this->assertFalse($this->instance->isLocked('nice'));
        }
 
+       /**
+        * @small
+        */
        public function testReleaseAfterUnlock() {
                $this->instance->acquireLock('foo', 1);
                $this->instance->acquireLock('bar', 1);
@@ -83,6 +98,9 @@ abstract class LockTest extends DatabaseTest
                $this->assertFalse($this->instance->isLocked('nice'));
        }
 
+       /**
+        * @medium
+        */
        function testLockTTL() {
 
                // TODO [nupplaphil] - Because of the Datetime-Utils for the database, we have to wait a FULL second between the checks to invalidate the db-locks/cache

diff --git a/tests/src/Core/Lock/MemcacheCacheLockDriverTest.php b/tests/src/Core/Lock/MemcacheCacheLockDriverTest.php
index 67ccdb57d231860142844beb914386348d1ee3b3..c54cf9c59941ab4ce79441d2a9a9b4218bee58e5 100644 (file)
--- a/tests/src/Core/Lock/MemcacheCacheLockDriverTest.php
+++ b/tests/src/Core/Lock/MemcacheCacheLockDriverTest.php
@@ -7,6 +7,9 @@ namespace Friendica\Test\src\Core\Lock;
 use Friendica\Core\Cache\CacheDriverFactory;
 use Friendica\Core\Lock\CacheLockDriver;
 
+/**
+ * @requires extension Memcache
+ */
 class MemcacheCacheLockDriverTest extends LockTest
 {
        /**
@@ -16,25 +19,13 @@ class MemcacheCacheLockDriverTest extends LockTest
 
        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 new CacheLockDriver($this->cache);
-               } else {
-                       $this->markTestSkipped('Memcache driver isn\'t available');
-                       return null;
-               }
+               $this->cache = CacheDriverFactory::create('memcache');
+               return new CacheLockDriver($this->cache);
        }
 
        public function tearDown()
        {
-               if (class_exists('Memcache')) {
-                       $this->cache->clear();
-               }
+               $this->cache->clear();
                parent::tearDown();
        }
 }

diff --git a/tests/src/Core/Lock/MemcachedCacheLockDriverTest.php b/tests/src/Core/Lock/MemcachedCacheLockDriverTest.php
index e08358ce38a7fc867855607574d85e9b536bfc07..27886261b2591080ed94a7c0bfc5438520fa38c6 100644 (file)
--- a/tests/src/Core/Lock/MemcachedCacheLockDriverTest.php
+++ b/tests/src/Core/Lock/MemcachedCacheLockDriverTest.php
@@ -7,6 +7,9 @@ namespace Friendica\Test\src\Core\Lock;
 use Friendica\Core\Cache\CacheDriverFactory;
 use Friendica\Core\Lock\CacheLockDriver;
 
+/**
+ * @requires extension memcached
+ */
 class MemcachedCacheLockDriverTest extends LockTest
 {
        /**
@@ -16,25 +19,13 @@ class MemcachedCacheLockDriverTest extends LockTest
 
        protected function getInstance()
        {
-               if (class_exists('Memcached')) {
-                       try {
-                               $this->cache = CacheDriverFactory::create('memcached');
-                       } catch (\Exception $exception) {
-                               print "Memcached - TestCase failed: " . $exception->getMessage();
-                               throw new \Exception();
-                       }
-                       return new CacheLockDriver($this->cache);
-               } else {
-                       $this->markTestSkipped('Memcached driver isn\'t available');
-                       return null;
-               }
+               $this->cache = CacheDriverFactory::create('memcached');
+               return new CacheLockDriver($this->cache);
        }
 
        public function tearDown()
        {
-               if (class_exists('Memcached')) {
-                       $this->cache->clear();
-               }
+               $this->cache->clear();
                parent::tearDown();
        }
 }

diff --git a/tests/src/Core/Lock/RedisCacheLockDriverTest.php b/tests/src/Core/Lock/RedisCacheLockDriverTest.php
index 82d9b50def7aa8706b83a38d2303e62fc203ae4d..eaafbf4e443007e505c55f474f7a8c67a978d232 100644 (file)
--- a/tests/src/Core/Lock/RedisCacheLockDriverTest.php
+++ b/tests/src/Core/Lock/RedisCacheLockDriverTest.php
@@ -7,6 +7,9 @@ namespace Friendica\Test\src\Core\Lock;
 use Friendica\Core\Cache\CacheDriverFactory;
 use Friendica\Core\Lock\CacheLockDriver;
 
+/**
+ * @requires extension redis
+ */
 class RedisCacheLockDriverTest extends LockTest
 {
        /**
@@ -16,25 +19,14 @@ class RedisCacheLockDriverTest extends LockTest
 
        protected function getInstance()
        {
-               if (class_exists('Redis')) {
-                       try {
-                               $this->cache = CacheDriverFactory::create('redis');
-                       } catch (\Exception $exception) {
-                               print "Redis - TestCase failed: " . $exception->getMessage();
-                               throw new \Exception();
-                       }
-                       return new CacheLockDriver($this->cache);
-               } else {
-                       $this->markTestSkipped('Redis driver isn\'t available');
-                       return null;
-               }
+               $this->cache = CacheDriverFactory::create('redis');
+               return new CacheLockDriver($this->cache);
+
        }
 
        public function tearDown()
        {
-               if (class_exists('Redis')) {
-                       $this->cache->clear();
-               }
+               $this->cache->clear();
                parent::tearDown();
        }
 }