X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=tests%2Fsrc%2FCore%2FLock%2FSemaphoreLockTest.php;h=87d8b2cd2f59595eeed51422037e92a2f5caa01a;hb=e6c054c27602a3acadac3c423273bdf748fcee27;hp=dd696d4aefa1f84b6bb228692ef0d3c004597b70;hpb=c803dcb6c5f808ac8f962e9bd5e631a91655cbc7;p=friendica.git

diff --git a/tests/src/Core/Lock/SemaphoreLockTest.php b/tests/src/Core/Lock/SemaphoreLockTest.php
index dd696d4aef..87d8b2cd2f 100644
--- a/tests/src/Core/Lock/SemaphoreLockTest.php
+++ b/tests/src/Core/Lock/SemaphoreLockTest.php
@@ -1,32 +1,55 @@
 <?php
+/**
+ * @copyright Copyright (C) 2010-2021, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
 
 namespace Friendica\Test\src\Core\Lock;
 
 use Dice\Dice;
 use Friendica\App;
-use Friendica\BaseObject;
-use Friendica\Core\Config\Configuration;
+use Friendica\Core\Config\IConfig;
+use Friendica\Core\Config\JitConfig;
 use Friendica\Core\Lock\SemaphoreLock;
+use Friendica\DI;
+use Mockery;
+use Mockery\MockInterface;
 
 class SemaphoreLockTest extends LockTest
 {
-	public function setUp()
+	protected function setUp(): void
 	{
-		$dice = \Mockery::mock(Dice::class)->makePartial();
+		/** @var MockInterface|Dice $dice */
+		$dice = Mockery::mock(Dice::class)->makePartial();
 
-		$app = \Mockery::mock(App::class);
+		$app = Mockery::mock(App::class);
 		$app->shouldReceive('getHostname')->andReturn('friendica.local');
 		$dice->shouldReceive('create')->with(App::class)->andReturn($app);
 
-		$configMock = \Mockery::mock(Configuration::class);
+		$configMock = Mockery::mock(JitConfig::class);
 		$configMock
 			->shouldReceive('get')
-			->with('system', 'temppath', NULL, false)
-			->andReturn('/tmp');
-		$dice->shouldReceive('create')->with(Configuration::class)->andReturn($configMock);
+			->with('system', 'temppath')
+			->andReturn('/tmp/');
+		$dice->shouldReceive('create')->with(IConfig::class)->andReturn($configMock);
 
 		// @todo Because "get_temppath()" is using static methods, we have to initialize the BaseObject
-		BaseObject::setDependencyInjection($dice);
+		DI::init($dice);
 
 		parent::setUp();
 	}
@@ -36,22 +59,26 @@ class SemaphoreLockTest extends LockTest
 		return new SemaphoreLock();
 	}
 
-	function testLockTTL()
+	/**
+	 * @doesNotPerformAssertions
+	 */
+	public function testLockTTL()
 	{
-		// Semaphore doesn't work with TTL
-		return true;
+		self::markTestSkipped("Semaphore doesn't work with TTL");
 	}
 
 	/**
-	 * Test if semaphore locking works even for
+	 * Test if semaphore locking works even when trying to release locks, where the file exists
+	 * but it shouldn't harm locking
 	 */
 	public function testMissingFileNotOverriding()
 	{
 		$file = get_temppath() . '/test.sem';
+		touch($file);
 
-		$this->assertTrue(file_exists($file));
-		$this->assertFalse($this->instance->releaseLock('test', false));
-		$this->assertTrue(file_exists($file));
+		self::assertTrue(file_exists($file));
+		self::assertFalse($this->instance->release('test', false));
+		self::assertTrue(file_exists($file));
 	}
 
 	/**
@@ -59,14 +86,30 @@ class SemaphoreLockTest extends LockTest
 	 * This test proves that semaphore locks cannot get released by other instances except themselves
 	 *
 	 * Check for Bug https://github.com/friendica/friendica/issues/7298#issuecomment-521996540
+	 *
 	 * @see https://github.com/friendica/friendica/issues/7298#issuecomment-521996540
 	 */
 	public function testMissingFileOverriding()
 	{
 		$file = get_temppath() . '/test.sem';
+		touch($file);
+
+		self::assertTrue(file_exists($file));
+		self::assertFalse($this->instance->release('test', true));
+		self::assertTrue(file_exists($file));
+	}
+
+	/**
+	 * Test acquire lock even the semaphore file exists, but isn't used
+	 */
+	public function testOverrideSemFile()
+	{
+		$file = get_temppath() . '/test.sem';
+		touch($file);
 
-		$this->assertTrue(file_exists($file));
-		$this->assertFalse($this->instance->releaseLock('test', true));
-		$this->assertTrue(file_exists($file));
+		self::assertTrue(file_exists($file));
+		self::assertTrue($this->instance->acquire('test'));
+		self::assertTrue($this->instance->isLocked('test'));
+		self::assertTrue($this->instance->release('test'));
 	}
 }