X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=tests%2Fsrc%2FCore%2FLock%2FSemaphoreLockTest.php;h=089d891cab0dfebfcca32e2eb6187d2753f99634;hb=b8f85f0484fbb1f37e9cae2f4cf98f9349fda099;hp=52c5aaa5b88cb7b48653de9b9b20538cde588c64;hpb=48caf55cff0f1ab0f0941f32461fcae37dcd6f59;p=friendica.git

diff --git a/tests/src/Core/Lock/SemaphoreLockTest.php b/tests/src/Core/Lock/SemaphoreLockTest.php
index 52c5aaa5b8..089d891cab 100644
--- a/tests/src/Core/Lock/SemaphoreLockTest.php
+++ b/tests/src/Core/Lock/SemaphoreLockTest.php
@@ -4,29 +4,32 @@ namespace Friendica\Test\src\Core\Lock;
 
 use Dice\Dice;
 use Friendica\App;
-use Friendica\BaseObject;
-use Friendica\Core\Config\Configuration;
+use Friendica\Core\Config\IConfiguration;
+use Friendica\Core\Config\JitConfiguration;
 use Friendica\Core\Lock\SemaphoreLock;
+use Friendica\DI;
+use Mockery\MockInterface;
 
 class SemaphoreLockTest extends LockTest
 {
 	public function setUp()
 	{
+		/** @var MockInterface|Dice $dice */
 		$dice = \Mockery::mock(Dice::class)->makePartial();
 
 		$app = \Mockery::mock(App::class);
 		$app->shouldReceive('getHostname')->andReturn('friendica.local');
-		$dice->shouldReceive('create')->with(App::class)->andReturn($app);
+		$dice->shouldReceive('create')->with(App::class, [])->andReturn($app);
 
-		$configMock = \Mockery::mock(Configuration::class);
+		$configMock = \Mockery::mock(JitConfiguration::class);
 		$configMock
 			->shouldReceive('get')
 			->with('system', 'temppath', NULL, false)
 			->andReturn('/tmp/');
-		$dice->shouldReceive('create')->with(Configuration::class)->andReturn($configMock);
+		$dice->shouldReceive('create')->with(IConfiguration::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();
 	}
@@ -41,4 +44,49 @@ class SemaphoreLockTest extends LockTest
 		// Semaphore doesn't work with TTL
 		return true;
 	}
+
+	/**
+	 * 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->release('test', false));
+		$this->assertTrue(file_exists($file));
+	}
+
+	/**
+	 * Test overriding semaphore release with already set semaphore
+	 * 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);
+
+		$this->assertTrue(file_exists($file));
+		$this->assertFalse($this->instance->release('test', true));
+		$this->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->assertTrue($this->instance->acquire('test'));
+		$this->assertTrue($this->instance->isLocked('test'));
+		$this->assertTrue($this->instance->release('test'));
+	}
 }