Merge pull request #6079 from annando/issue-dir-15

[friendica.git] / tests / src / Core / Lock / LockTest.php

diff --git a/tests/src/Core/Lock/LockTest.php b/tests/src/Core/Lock/LockTest.php
index dafbd74a6ff19d1bc1371f6d9cf42ee76b19e19f..a7bbea265f1a9fb9caf8e80ab3cc01b215864cb5 100644 (file)
--- a/tests/src/Core/Lock/LockTest.php
+++ b/tests/src/Core/Lock/LockTest.php
@@ -2,10 +2,9 @@
 
 namespace Friendica\Test\src\Core\Lock;
 
-use Friendica\App;
+use Friendica\BaseObject;
 use Friendica\Core\Config;
 use Friendica\Test\DatabaseTest;
-use PHPUnit\Framework\TestCase;
 
 abstract class LockTest extends DatabaseTest
 {
@@ -18,13 +17,12 @@ abstract class LockTest extends DatabaseTest
 
        protected function setUp()
        {
-               global $a;
                parent::setUp();
                $this->instance = $this->getInstance();
+               $this->instance->releaseAll();
 
                // Reusable App object
-               $this->app = new App(__DIR__.'/../');
-               $a = $this->app;
+               $this->app = BaseObject::getApp();
 
                // Default config
                Config::set('config', 'hostname', 'localhost');
@@ -34,30 +32,51 @@ abstract class LockTest extends DatabaseTest
                Config::set('system', 'theme', 'system_theme');
        }
 
+       protected function tearDown()
+       {
+               parent::tearDown();
+               $this->instance->releaseAll();
+       }
+
+       /**
+        * @small
+        */
        public function testLock() {
-               $this->instance->acquireLock('foo', 1);
+               $this->assertFalse($this->instance->isLocked('foo'));
+               $this->assertTrue($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->assertFalse($this->instance->isLocked('foo'));
+               $this->assertTrue($this->instance->acquireLock('foo', 1));
                $this->assertTrue($this->instance->isLocked('foo'));
                // We already locked it
                $this->assertTrue($this->instance->acquireLock('foo', 1));
        }
 
+       /**
+        * @small
+        */
        public function testReleaseLock() {
-               $this->instance->acquireLock('foo', 1);
+               $this->assertFalse($this->instance->isLocked('foo'));
+               $this->assertTrue($this->instance->acquireLock('foo', 1));
                $this->assertTrue($this->instance->isLocked('foo'));
                $this->instance->releaseLock('foo');
                $this->assertFalse($this->instance->isLocked('foo'));
        }
 
+       /**
+        * @small
+        */
        public function testReleaseAll() {
-               $this->instance->acquireLock('foo', 1);
-               $this->instance->acquireLock('bar', 1);
-               $this->instance->acquireLock('nice', 1);
+               $this->assertTrue($this->instance->acquireLock('foo', 1));
+               $this->assertTrue($this->instance->acquireLock('bar', 1));
+               $this->assertTrue($this->instance->acquireLock('nice', 1));
 
                $this->assertTrue($this->instance->isLocked('foo'));
                $this->assertTrue($this->instance->isLocked('bar'));
@@ -70,10 +89,16 @@ 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);
-               $this->instance->acquireLock('nice', 1);
+               $this->assertFalse($this->instance->isLocked('foo'));
+               $this->assertFalse($this->instance->isLocked('bar'));
+               $this->assertFalse($this->instance->isLocked('nice'));
+               $this->assertTrue($this->instance->acquireLock('foo', 1));
+               $this->assertTrue($this->instance->acquireLock('bar', 1));
+               $this->assertTrue($this->instance->acquireLock('nice', 1));
 
                $this->instance->releaseLock('foo');
 
@@ -87,11 +112,16 @@ abstract class LockTest extends DatabaseTest
                $this->assertFalse($this->instance->isLocked('nice'));
        }
 
+       /**
+        * @medium
+        */
        function testLockTTL() {
+               $this->assertFalse($this->instance->isLocked('foo'));
+               $this->assertFalse($this->instance->isLocked('bar'));
 
                // 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
-               $this->instance->acquireLock('foo', 1, 1);
-               $this->instance->acquireLock('bar', 1, 3);
+               $this->assertTrue($this->instance->acquireLock('foo', 2, 1));
+               $this->assertTrue($this->instance->acquireLock('bar', 2, 3));
 
                $this->assertTrue($this->instance->isLocked('foo'));
                $this->assertTrue($this->instance->isLocked('bar'));