X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=tests%2Fsrc%2FCore%2FLock%2FLockTest.php;h=8fc4926b06b08293bd26377c416fb7a149812cb9;hb=c8344886fde31afe26c43669169ac1fc655eaba7;hp=c7a1664f11ac44cb43301ccfbcdeaec3d2447b7e;hpb=e80d68ba53776bed047d897f52db7e25b35a479d;p=friendica.git

diff --git a/tests/src/Core/Lock/LockTest.php b/tests/src/Core/Lock/LockTest.php
index c7a1664f11..8fc4926b06 100644
--- a/tests/src/Core/Lock/LockTest.php
+++ b/tests/src/Core/Lock/LockTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -21,6 +21,7 @@
 
 namespace Friendica\Test\src\Core\Lock;
 
+use Friendica\Core\Lock\ILock;
 use Friendica\Test\MockedTest;
 
 abstract class LockTest extends MockedTest
@@ -31,13 +32,13 @@ abstract class LockTest extends MockedTest
 	protected $startTime = 1417011228;
 
 	/**
-	 * @var \Friendica\Core\Lock\ILock
+	 * @var ILock
 	 */
 	protected $instance;
 
 	abstract protected function getInstance();
 
-	protected function setUp()
+	protected function setUp(): void
 	{
 		parent::setUp();
 
@@ -45,7 +46,7 @@ abstract class LockTest extends MockedTest
 		$this->instance->releaseAll(true);
 	}
 
-	protected function tearDown()
+	protected function tearDown(): void
 	{
 		$this->instance->releaseAll(true);
 		parent::tearDown();
@@ -56,10 +57,10 @@ abstract class LockTest extends MockedTest
 	 */
 	public function testLock()
 	{
-		$this->assertFalse($this->instance->isLocked('foo'));
-		$this->assertTrue($this->instance->acquire('foo', 1));
-		$this->assertTrue($this->instance->isLocked('foo'));
-		$this->assertFalse($this->instance->isLocked('bar'));
+		self::assertFalse($this->instance->isLocked('foo'));
+		self::assertTrue($this->instance->acquire('foo', 1));
+		self::assertTrue($this->instance->isLocked('foo'));
+		self::assertFalse($this->instance->isLocked('bar'));
 	}
 
 	/**
@@ -67,11 +68,11 @@ abstract class LockTest extends MockedTest
 	 */
 	public function testDoubleLock()
 	{
-		$this->assertFalse($this->instance->isLocked('foo'));
-		$this->assertTrue($this->instance->acquire('foo', 1));
-		$this->assertTrue($this->instance->isLocked('foo'));
+		self::assertFalse($this->instance->isLocked('foo'));
+		self::assertTrue($this->instance->acquire('foo', 1));
+		self::assertTrue($this->instance->isLocked('foo'));
 		// We already locked it
-		$this->assertTrue($this->instance->acquire('foo', 1));
+		self::assertTrue($this->instance->acquire('foo', 1));
 	}
 
 	/**
@@ -79,11 +80,11 @@ abstract class LockTest extends MockedTest
 	 */
 	public function testReleaseLock()
 	{
-		$this->assertFalse($this->instance->isLocked('foo'));
-		$this->assertTrue($this->instance->acquire('foo', 1));
-		$this->assertTrue($this->instance->isLocked('foo'));
+		self::assertFalse($this->instance->isLocked('foo'));
+		self::assertTrue($this->instance->acquire('foo', 1));
+		self::assertTrue($this->instance->isLocked('foo'));
 		$this->instance->release('foo');
-		$this->assertFalse($this->instance->isLocked('foo'));
+		self::assertFalse($this->instance->isLocked('foo'));
 	}
 
 	/**
@@ -91,19 +92,19 @@ abstract class LockTest extends MockedTest
 	 */
 	public function testReleaseAll()
 	{
-		$this->assertTrue($this->instance->acquire('foo', 1));
-		$this->assertTrue($this->instance->acquire('bar', 1));
-		$this->assertTrue($this->instance->acquire('nice', 1));
+		self::assertTrue($this->instance->acquire('foo', 1));
+		self::assertTrue($this->instance->acquire('bar', 1));
+		self::assertTrue($this->instance->acquire('nice', 1));
 
-		$this->assertTrue($this->instance->isLocked('foo'));
-		$this->assertTrue($this->instance->isLocked('bar'));
-		$this->assertTrue($this->instance->isLocked('nice'));
+		self::assertTrue($this->instance->isLocked('foo'));
+		self::assertTrue($this->instance->isLocked('bar'));
+		self::assertTrue($this->instance->isLocked('nice'));
 
-		$this->assertTrue($this->instance->releaseAll());
+		self::assertTrue($this->instance->releaseAll());
 
-		$this->assertFalse($this->instance->isLocked('foo'));
-		$this->assertFalse($this->instance->isLocked('bar'));
-		$this->assertFalse($this->instance->isLocked('nice'));
+		self::assertFalse($this->instance->isLocked('foo'));
+		self::assertFalse($this->instance->isLocked('bar'));
+		self::assertFalse($this->instance->isLocked('nice'));
 	}
 
 	/**
@@ -111,23 +112,23 @@ abstract class LockTest extends MockedTest
 	 */
 	public function testReleaseAfterUnlock()
 	{
-		$this->assertFalse($this->instance->isLocked('foo'));
-		$this->assertFalse($this->instance->isLocked('bar'));
-		$this->assertFalse($this->instance->isLocked('nice'));
-		$this->assertTrue($this->instance->acquire('foo', 1));
-		$this->assertTrue($this->instance->acquire('bar', 1));
-		$this->assertTrue($this->instance->acquire('nice', 1));
+		self::assertFalse($this->instance->isLocked('foo'));
+		self::assertFalse($this->instance->isLocked('bar'));
+		self::assertFalse($this->instance->isLocked('nice'));
+		self::assertTrue($this->instance->acquire('foo', 1));
+		self::assertTrue($this->instance->acquire('bar', 1));
+		self::assertTrue($this->instance->acquire('nice', 1));
 
-		$this->assertTrue($this->instance->release('foo'));
+		self::assertTrue($this->instance->release('foo'));
 
-		$this->assertFalse($this->instance->isLocked('foo'));
-		$this->assertTrue($this->instance->isLocked('bar'));
-		$this->assertTrue($this->instance->isLocked('nice'));
+		self::assertFalse($this->instance->isLocked('foo'));
+		self::assertTrue($this->instance->isLocked('bar'));
+		self::assertTrue($this->instance->isLocked('nice'));
 
-		$this->assertTrue($this->instance->releaseAll());
+		self::assertTrue($this->instance->releaseAll());
 
-		$this->assertFalse($this->instance->isLocked('bar'));
-		$this->assertFalse($this->instance->isLocked('nice'));
+		self::assertFalse($this->instance->isLocked('bar'));
+		self::assertFalse($this->instance->isLocked('nice'));
 	}
 
 	/**
@@ -135,11 +136,11 @@ abstract class LockTest extends MockedTest
 	 */
 	public function testReleaseWitTTL()
 	{
-		$this->assertFalse($this->instance->isLocked('test'));
-		$this->assertTrue($this->instance->acquire('test', 1, 10));
-		$this->assertTrue($this->instance->isLocked('test'));
-		$this->assertTrue($this->instance->release('test'));
-		$this->assertFalse($this->instance->isLocked('test'));
+		self::assertFalse($this->instance->isLocked('test'));
+		self::assertTrue($this->instance->acquire('test', 1, 10));
+		self::assertTrue($this->instance->isLocked('test'));
+		self::assertTrue($this->instance->release('test'));
+		self::assertFalse($this->instance->isLocked('test'));
 	}
 
 	/**
@@ -147,19 +148,19 @@ abstract class LockTest extends MockedTest
 	 */
 	public function testGetLocks()
 	{
-		$this->assertTrue($this->instance->acquire('foo', 1));
-		$this->assertTrue($this->instance->acquire('bar', 1));
-		$this->assertTrue($this->instance->acquire('nice', 1));
+		self::assertTrue($this->instance->acquire('foo', 1));
+		self::assertTrue($this->instance->acquire('bar', 1));
+		self::assertTrue($this->instance->acquire('nice', 1));
 
-		$this->assertTrue($this->instance->isLocked('foo'));
-		$this->assertTrue($this->instance->isLocked('bar'));
-		$this->assertTrue($this->instance->isLocked('nice'));
+		self::assertTrue($this->instance->isLocked('foo'));
+		self::assertTrue($this->instance->isLocked('bar'));
+		self::assertTrue($this->instance->isLocked('nice'));
 
 		$locks = $this->instance->getLocks();
 
-		$this->assertContains('foo', $locks);
-		$this->assertContains('bar', $locks);
-		$this->assertContains('nice', $locks);
+		self::assertContains('foo', $locks);
+		self::assertContains('bar', $locks);
+		self::assertContains('nice', $locks);
 	}
 
 	/**
@@ -167,47 +168,47 @@ abstract class LockTest extends MockedTest
 	 */
 	public function testGetLocksWithPrefix()
 	{
-		$this->assertTrue($this->instance->acquire('foo', 1));
-		$this->assertTrue($this->instance->acquire('test1', 1));
-		$this->assertTrue($this->instance->acquire('test2', 1));
+		self::assertTrue($this->instance->acquire('foo', 1));
+		self::assertTrue($this->instance->acquire('test1', 1));
+		self::assertTrue($this->instance->acquire('test2', 1));
 
-		$this->assertTrue($this->instance->isLocked('foo'));
-		$this->assertTrue($this->instance->isLocked('test1'));
-		$this->assertTrue($this->instance->isLocked('test2'));
+		self::assertTrue($this->instance->isLocked('foo'));
+		self::assertTrue($this->instance->isLocked('test1'));
+		self::assertTrue($this->instance->isLocked('test2'));
 
 		$locks = $this->instance->getLocks('test');
 
-		$this->assertContains('test1', $locks);
-		$this->assertContains('test2', $locks);
-		$this->assertNotContains('foo', $locks);
+		self::assertContains('test1', $locks);
+		self::assertContains('test2', $locks);
+		self::assertNotContains('foo', $locks);
 	}
 
 	/**
 	 * @medium
 	 */
-	function testLockTTL()
+	public function testLockTTL()
 	{
-		$this->markTestSkipped('taking too much time without mocking');
+		static::markTestSkipped('taking too much time without mocking');
 
-		$this->assertFalse($this->instance->isLocked('foo'));
-		$this->assertFalse($this->instance->isLocked('bar'));
+		self::assertFalse($this->instance->isLocked('foo'));
+		self::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->assertTrue($this->instance->acquire('foo', 2, 1));
-		$this->assertTrue($this->instance->acquire('bar', 2, 3));
+		self::assertTrue($this->instance->acquire('foo', 2, 1));
+		self::assertTrue($this->instance->acquire('bar', 2, 3));
 
-		$this->assertTrue($this->instance->isLocked('foo'));
-		$this->assertTrue($this->instance->isLocked('bar'));
+		self::assertTrue($this->instance->isLocked('foo'));
+		self::assertTrue($this->instance->isLocked('bar'));
 
 		sleep(2);
 
-		$this->assertFalse($this->instance->isLocked('foo'));
-		$this->assertTrue($this->instance->isLocked('bar'));
+		self::assertFalse($this->instance->isLocked('foo'));
+		self::assertTrue($this->instance->isLocked('bar'));
 
 		sleep(2);
 
-		$this->assertFalse($this->instance->isLocked('foo'));
-		$this->assertFalse($this->instance->isLocked('bar'));
+		self::assertFalse($this->instance->isLocked('foo'));
+		self::assertFalse($this->instance->isLocked('bar'));
 	}
 
 	/**
@@ -215,7 +216,7 @@ abstract class LockTest extends MockedTest
 	 */
 	public function testReleaseLockWithoutLock()
 	{
-		$this->assertFalse($this->instance->isLocked('wrongLock'));
-		$this->assertFalse($this->instance->release('wrongLock'));
+		self::assertFalse($this->instance->isLocked('wrongLock'));
+		self::assertFalse($this->instance->release('wrongLock'));
 	}
 }