From 81122bfc3baf69b3e96179867aee166aaf571f5f Mon Sep 17 00:00:00 2001 From: Philipp Date: Mon, 18 Oct 2021 20:50:53 +0200 Subject: [PATCH] Fix tests --- .../Depository/ProfileFieldTest.php | 35 ++++--------------- .../Depository/PermissionSetTest.php | 26 ++++---------- 2 files changed, 14 insertions(+), 47 deletions(-) diff --git a/tests/src/Profile/ProfileField/Depository/ProfileFieldTest.php b/tests/src/Profile/ProfileField/Depository/ProfileFieldTest.php index 2194bc5232..87ea6ca9c5 100644 --- a/tests/src/Profile/ProfileField/Depository/ProfileFieldTest.php +++ b/tests/src/Profile/ProfileField/Depository/ProfileFieldTest.php @@ -2,20 +2,17 @@ namespace Friendica\Test\src\Profile\ProfileField\Depository; -use Dice\Dice; -use Friendica\Database\Database; use Friendica\Profile\ProfileField\Collection\ProfileFields; use Friendica\Profile\ProfileField\Depository\ProfileField as ProfileFieldDepository; -use Friendica\Profile\ProfileField\Entity\ProfileField; use Friendica\Profile\ProfileField\Exception\ProfileFieldPersistenceException; use Friendica\Profile\ProfileField\Factory\ProfileField as ProfileFieldFactory; use Friendica\Security\PermissionSet\Depository\PermissionSet; use Friendica\Security\PermissionSet\Factory\PermissionSet as PermissionSetFactory; use Friendica\Security\PermissionSet\Depository\PermissionSet as PermissionSetDepository; -use Friendica\Test\DatabaseTest; -use Friendica\Test\Util\Database\StaticDatabase; +use Friendica\Test\FixtureTest; +use Friendica\DI; -class ProfileFieldTest extends DatabaseTest +class ProfileFieldTest extends FixtureTest { /** @var ProfileFieldDepository */ private $depository; @@ -25,22 +22,15 @@ class ProfileFieldTest extends DatabaseTest private $permissionSetFactory; /** @var PermissionSetDepository */ private $permissionSetDepository; - /** @var Database */ - private $dba; public function setUp(): void { parent::setUp(); - $dice = (new Dice()) - ->addRules(include __DIR__ . '/../../../../../static/dependencies.config.php') - ->addRule(Database::class, ['instanceOf' => StaticDatabase::class, 'shared' => true]); - - $this->depository = $dice->create(ProfileFieldDepository::class); - $this->factory = $dice->create(ProfileFieldFactory::class); - $this->permissionSetFactory = $dice->create(PermissionSetFactory::class); - $this->permissionSetDepository = $dice->create(PermissionSetDepository::class); - $this->dba = $dice->create(Database::class); + $this->depository = DI::profileField(); + $this->factory = DI::profileFieldFactory(); + $this->permissionSetFactory = DI::permissionSetFactory(); + $this->permissionSetDepository = DI::permissionSet(); } /** @@ -51,8 +41,6 @@ class ProfileFieldTest extends DatabaseTest self::expectExceptionMessage('PermissionSet needs to be saved first.'); self::expectException(ProfileFieldPersistenceException::class); - $this->loadFixture(__DIR__ . '/../../../../datasets/api.fixture.php', $this->dba); - $profileField = $this->factory->createFromValues(42, 0, 'public', 'value', $this->permissionSetFactory->createFromString(42, '', '<~>')); self::assertEquals($profileField->uid, $profileField->permissionSet->uid); @@ -65,8 +53,6 @@ class ProfileFieldTest extends DatabaseTest */ public function testSaveNew() { - $this->loadFixture(__DIR__ . '/../../../../datasets/api.fixture.php', $this->dba); - $profileField = $this->factory->createFromValues(42, 0, 'public', 'value', $this->permissionSetDepository->save($this->permissionSetFactory->createFromString(42, '', '<~>'))); self::assertEquals($profileField->uid, $profileField->permissionSet->uid); @@ -76,7 +62,6 @@ class ProfileFieldTest extends DatabaseTest self::assertNotNull($savedProfileField->id); self::assertNull($profileField->id); - /** @var ProfileField $selectedProfileField */ $selectedProfileField = $this->depository->selectOneById($savedProfileField->id); self::assertEquals($savedProfileField, $selectedProfileField); @@ -90,8 +75,6 @@ class ProfileFieldTest extends DatabaseTest */ public function testUpdateOrder() { - $this->loadFixture(__DIR__ . '/../../../../datasets/api.fixture.php', $this->dba); - $profileField = $this->factory->createFromValues(42, 0, 'public', 'value', $this->permissionSetDepository->save($this->permissionSetFactory->createFromString(42, '', '<~>'))); self::assertEquals($profileField->uid, $profileField->permissionSet->uid); @@ -101,7 +84,6 @@ class ProfileFieldTest extends DatabaseTest self::assertNotNull($savedProfileField->id); self::assertNull($profileField->id); - /** @var ProfileField $selectedProfileField */ $selectedProfileField = $this->depository->selectOneById($savedProfileField->id); self::assertEquals($savedProfileField, $selectedProfileField); @@ -126,8 +108,6 @@ class ProfileFieldTest extends DatabaseTest */ public function testUpdate() { - $this->loadFixture(__DIR__ . '/../../../../datasets/api.fixture.php', $this->dba); - $profileField = $this->factory->createFromValues(42, 0, 'public', 'value', $this->permissionSetDepository->save($this->permissionSetFactory->createFromString(42, '', '<~>'))); self::assertEquals($profileField->uid, $profileField->permissionSet->uid); @@ -137,7 +117,6 @@ class ProfileFieldTest extends DatabaseTest self::assertNotNull($savedProfileField->id); self::assertNull($profileField->id); - /** @var ProfileField $selectedProfileField */ $selectedProfileField = $this->depository->selectOneById($savedProfileField->id); self::assertEquals($savedProfileField, $selectedProfileField); diff --git a/tests/src/Security/PermissionSet/Depository/PermissionSetTest.php b/tests/src/Security/PermissionSet/Depository/PermissionSetTest.php index 51ed993902..596b1e6c15 100644 --- a/tests/src/Security/PermissionSet/Depository/PermissionSetTest.php +++ b/tests/src/Security/PermissionSet/Depository/PermissionSetTest.php @@ -2,40 +2,32 @@ namespace Friendica\Test\src\Security\PermissionSet\Depository; -use Dice\Dice; -use Friendica\Database\Database; use Friendica\Security\PermissionSet\Depository\PermissionSet as PermissionSetDepository; +use Friendica\Security\PermissionSet\Entity\PermissionSet; use Friendica\Security\PermissionSet\Factory\PermissionSet as PermissionSetFactory; -use Friendica\Test\DatabaseTest; -use Friendica\Test\Util\Database\StaticDatabase; +use Friendica\Test\FixtureTest; +use Friendica\DI; -class PermissionSetTest extends DatabaseTest +class PermissionSetTest extends FixtureTest { /** @var PermissionSetDepository */ private $depository; /** @var PermissionSetFactory */ private $factory; - /** @var Database */ - private $dba; public function setUp(): void { parent::setUp(); - $dice = (new Dice()) - ->addRules(include __DIR__ . '/../../../../../static/dependencies.config.php') - ->addRule(Database::class, ['instanceOf' => StaticDatabase::class, 'shared' => true]); - - $this->depository = $dice->create(PermissionSetDepository::class); - $this->factory = $dice->create(PermissionSetFactory::class); - $this->dba = $dice->create(Database::class); + $this->depository = DI::permissionSet(); + $this->factory = DI::permissionSetFactory(); } public function testSelectOneByIdPublic() { $permissionSet = $this->depository->selectPublicForUser(1); - $this->assertInstanceOf(\Friendica\Security\PermissionSet\Entity\PermissionSet::class, $permissionSet); + $this->assertInstanceOf(PermissionSet::class, $permissionSet); self::assertEmpty($permissionSet->allow_cid); self::assertEmpty($permissionSet->allow_gid); self::assertEmpty($permissionSet->deny_cid); @@ -49,8 +41,6 @@ class PermissionSetTest extends DatabaseTest */ public function testSaving() { - $this->loadFixture(__DIR__ . '/../../../../datasets/api.fixture.php', $this->dba); - $permissionSet = $this->factory->createFromString(42, '', '<~>'); $permissionSet = $this->depository->selectOrCreate($permissionSet); @@ -70,7 +60,5 @@ class PermissionSetTest extends DatabaseTest $permissionSetSavedSelected = $this->depository->selectOneById($savedPermissionSet->id, 42); self::assertEquals($savedPermissionSet, $permissionSetSavedSelected); - - $this->dba->delete('permissionset', ['1=1']); } }