Optimize phpunit

This commit is contained in:
Philipp 2023-02-12 14:57:55 +01:00
parent 3edc5553c6
commit 4d6c8241fc
No known key found for this signature in database
GPG Key ID: 24A7501396EB5432
2 changed files with 17 additions and 7 deletions

View File

@ -20,8 +20,6 @@
* This file is loaded by PHPUnit before any test. * This file is loaded by PHPUnit before any test.
*/ */
use Dice\Dice;
use Friendica\DI;
use PHPUnit\Framework\TestCase; use PHPUnit\Framework\TestCase;
if (!file_exists(__DIR__ . '/../vendor/autoload.php')) { if (!file_exists(__DIR__ . '/../vendor/autoload.php')) {
@ -34,8 +32,3 @@ require __DIR__ . '/../vendor/autoload.php';
if (!class_exists(TestCase::class)) { if (!class_exists(TestCase::class)) {
class_alias(\PHPUnit\Framework\TestCase::class, 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);

View File

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