From 4d6c8241fc4e4a84e2018323b243139402f65730 Mon Sep 17 00:00:00 2001 From: Philipp Date: Sun, 12 Feb 2023 14:57:55 +0100 Subject: [PATCH] Optimize phpunit --- tests/bootstrap.php | 7 ------- tests/src/Console/ServerBlockConsoleTest.php | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/tests/bootstrap.php b/tests/bootstrap.php index 7dc3c9868e..9f7c1c3f91 100644 --- 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 2ea1a66696..e8d75863c3 100644 --- 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')