Merge pull request #8072 from nupplaphil/task/Cache_to_DI

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

diff --git a/tests/src/Core/Lock/SemaphoreLockTest.php b/tests/src/Core/Lock/SemaphoreLockTest.php
index dd696d4aefa1f84b6bb228692ef0d3c004597b70..089d891cab0dfebfcca32e2eb6187d2753f99634 100644 (file)
--- 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);
+                       ->andReturn('/tmp/');
+               $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();
        }
@@ -43,14 +46,16 @@ class SemaphoreLockTest extends LockTest
        }
 
        /**
-        * 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));
        }
 
@@ -64,9 +69,24 @@ class SemaphoreLockTest extends LockTest
        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'));
+       }
 }