Merge pull request #11195 from annando/issue-10966

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

diff --git a/tests/src/Core/Lock/DatabaseLockDriverTest.php b/tests/src/Core/Lock/DatabaseLockDriverTest.php
index 821b0874d7da86d292c5c0a5983c15074f0080a8..bd4cb9cc9bcece272ca0ecfe894831d916b84f7b 100644 (file)
--- a/tests/src/Core/Lock/DatabaseLockDriverTest.php
+++ b/tests/src/Core/Lock/DatabaseLockDriverTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -21,12 +21,12 @@
 
 namespace Friendica\Test\src\Core\Lock;
 
-use Friendica\Core\Lock\DatabaseLock;
-use Friendica\Factory\ConfigFactory;
+use Friendica\Core\Lock\Type\DatabaseLock;
+use Friendica\Core\Config\Factory\Config;
+use Friendica\DI;
 use Friendica\Test\DatabaseTestTrait;
 use Friendica\Test\Util\Database\StaticDatabase;
 use Friendica\Test\Util\VFSTrait;
-use Friendica\Util\ConfigFileLoader;
 use Friendica\Util\Profiler;
 use Mockery;
 use Psr\Log\NullLogger;
@@ -38,26 +38,24 @@ class DatabaseLockDriverTest extends LockTest
 
        protected $pid = 123;
 
-       protected function setUp()
+       protected function setUp(): void
        {
                $this->setUpVfsDir();
 
+               $this->setUpDb();
+
                parent::setUp();
        }
 
        protected function getInstance()
        {
-               $logger   = new NullLogger();
-               $profiler = Mockery::mock(Profiler::class);
-               $profiler->shouldReceive('saveTimestamp')->withAnyArgs()->andReturn(true);
-
-               // load real config to avoid mocking every config-entry which is related to the Database class
-               $configFactory = new ConfigFactory();
-               $loader        = new ConfigFileLoader($this->root->url());
-               $configCache   = $configFactory->createCache($loader);
+               return new DatabaseLock(DI::dba(), $this->pid);
+       }
 
-               $dba = new StaticDatabase($configCache, $profiler, $logger);
+       protected function tearDown(): void
+       {
+               $this->tearDownDb();
 
-               return new DatabaseLock($dba, $this->pid);
+               parent::tearDown();
        }
 }