Optimize phpunit

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 7dc3c9868e2f6852f29545b97d3ce35e2150010c..9f7c1c3f9195f0df55ee744b0f3c6144e85600d1 100644 (file)
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -20,8 +20,6 @@
  * This file is loaded by PHPUnit before any test.
  */
 
-use Dice\Dice;
-use Friendica\DI;
 use PHPUnit\Framework\TestCase;
 
 if (!file_exists(__DIR__ . '/../vendor/autoload.php')) {
@@ -34,8 +32,3 @@ require __DIR__ . '/../vendor/autoload.php';
 if (!class_exists(TestCase::class)) {
        class_alias(\PHPUnit\Framework\TestCase::class, TestCase::class);
 }
-
-$dice = new Dice();
-$dice = $dice->addRules(include  __DIR__ . '/../static/dependencies.config.php');
-
-DI::init($dice);

diff --git a/tests/src/Console/ServerBlockConsoleTest.php b/tests/src/Console/ServerBlockConsoleTest.php
index 2ea1a66696b2762f9ba3d1cf49da88c2f29ccd0e..e8d75863c31760025c227d0f17cf18abb2c9cdf7 100644 (file)
--- a/tests/src/Console/ServerBlockConsoleTest.php
+++ b/tests/src/Console/ServerBlockConsoleTest.php
@@ -21,8 +21,10 @@
 
 namespace Friendica\Test\src\Console;
 
+use Dice\Dice;
 use Friendica\Console\ServerBlock;
 use Friendica\Core\Config\Capability\IManageConfigValues;
+use Friendica\DI;
 use Friendica\Moderation\DomainPatternBlocklist;
 use Mockery;
 
@@ -78,6 +80,11 @@ CONS;
         */
        public function testAddBlockedServer()
        {
+               $dice = new Dice();
+               $dice = $dice->addRules(include  __DIR__ . '/../../../static/dependencies.config.php');
+
+               DI::init($dice, true);
+
                $this->blocklistMock
                        ->shouldReceive('addPattern')
                        ->with('testme.now', 'I like it!')
@@ -98,6 +105,11 @@ CONS;
         */
        public function testUpdateBlockedServer()
        {
+               $dice = new Dice();
+               $dice = $dice->addRules(include  __DIR__ . '/../../../static/dependencies.config.php');
+
+               DI::init($dice, true);
+
                $this->blocklistMock
                        ->shouldReceive('addPattern')
                        ->with('pod.ordoevangelistarum.com', 'Other reason')
@@ -118,6 +130,11 @@ CONS;
         */
        public function testRemoveBlockedServer()
        {
+               $dice = new Dice();
+               $dice = $dice->addRules(include  __DIR__ . '/../../../static/dependencies.config.php');
+
+               DI::init($dice, true);
+
                $this->blocklistMock
                        ->shouldReceive('removePattern')
                        ->with('pod.ordoevangelistarum.com')