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\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);
- $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);
+ ->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();
}
}
/**
- * 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->assertFalse($this->instance->release('test', false));
$this->assertTrue(file_exists($file));
}
public function testMissingFileOverriding()
{
$file = get_temppath() . '/test.sem';
+ touch($file);
$this->assertTrue(file_exists($file));
- $this->assertFalse($this->instance->releaseLock('test', true));
+ $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'));
+ }
}