Merge branch 'develop' of https://github.com/friendica/friendica into develop

[friendica.git] / tests / src / Database / DBATest.php

diff --git a/tests/src/Database/DBATest.php b/tests/src/Database/DBATest.php
index d6f59542f6978fb422e0f6a765ba2d8bce8a99b7..b5dbf2f2c58316531d455313e89301601ebf1f28 100644 (file)
--- a/tests/src/Database/DBATest.php
+++ b/tests/src/Database/DBATest.php
@@ -2,27 +2,29 @@
 namespace Friendica\Test\src\Database;
 
 use Dice\Dice;
-use Friendica\BaseObject;
-use Friendica\Core\Config;
+use Friendica\Database\Database;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Test\DatabaseTest;
+use Friendica\Test\Util\Database\StaticDatabase;
 
 class DBATest extends DatabaseTest
 {
-       public function setUp()
+       protected function setUp(): void
        {
                parent::setUp();
 
-               $dice = new Dice();
-               $dice = $dice->addRules(include __DIR__ . '/../../../static/dependencies.config.php');
-               BaseObject::setDependencyInjection($dice);
+               $dice = (new Dice())
+                       ->addRules(include __DIR__ . '/../../../static/dependencies.config.php')
+                       ->addRule(Database::class, ['instanceOf' => StaticDatabase::class, 'shared' => true]);
+               DI::init($dice);
 
                // Default config
-               Config::set('config', 'hostname', 'localhost');
-               Config::set('system', 'throttle_limit_day', 100);
-               Config::set('system', 'throttle_limit_week', 100);
-               Config::set('system', 'throttle_limit_month', 100);
-               Config::set('system', 'theme', 'system_theme');
+               DI::config()->set('config', 'hostname', 'localhost');
+               DI::config()->set('system', 'throttle_limit_day', 100);
+               DI::config()->set('system', 'throttle_limit_week', 100);
+               DI::config()->set('system', 'throttle_limit_month', 100);
+               DI::config()->set('system', 'theme', 'system_theme');
        }
 
        /**
@@ -30,13 +32,13 @@ class DBATest extends DatabaseTest
         */
        public function testExists() {
 
-               $this->assertTrue(DBA::exists('config', []));
-               $this->assertFalse(DBA::exists('notable', []));
+               self::assertTrue(DBA::exists('config', []));
+               self::assertFalse(DBA::exists('notable', []));
 
-               $this->assertTrue(DBA::exists('config', null));
-               $this->assertFalse(DBA::exists('notable', null));
+               self::assertTrue(DBA::exists('config', null));
+               self::assertFalse(DBA::exists('notable', null));
 
-               $this->assertTrue(DBA::exists('config', ['k' => 'hostname']));
-               $this->assertFalse(DBA::exists('config', ['k' => 'nonsense']));
+               self::assertTrue(DBA::exists('config', ['k' => 'hostname']));
+               self::assertFalse(DBA::exists('config', ['k' => 'nonsense']));
        }
 }