bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Add tests & remove unused method

Browse source
This commit is contained in:
Philipp Holzer 2021-10-31 13:58:52 +01:00
parent 71cdbcfc24
commit 130f97717d
Signed by: nupplaPhil
GPG key ID: 24A7501396EB5432
2 changed files with 25 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/Security/PermissionSet/Repository/PermissionSet.php
View file

@ -55,22 +55,6 @@ class PermissionSet extends BaseRepository
$this->aclFormatter = $aclFormatter; $this->aclFormatter = $aclFormatter;
} }
/**
* replaces the PUBLIC id for the public permissionSet
* (no need to create the default permission set over and over again)
*
* @param $condition
*/
private function checkPublicSelect(&$condition)
{
if (empty($condition['allow_cid']) &&
empty($condition['allow_gid']) &&
empty($condition['deny_cid']) &&
empty($condition['deny_gid'])) {
$condition['uid'] = self::PUBLIC;
}
}
/** /**
* @param array $condition * @param array $condition
* @param array $params * @param array $params

26
tests/src/Security/PermissionSet/Repository/PermissionSetTest.php
View file

@ -4,6 +4,7 @@ namespace Friendica\Test\src\Security\PermissionSet\Repository;
use Friendica\Database\Database; use Friendica\Database\Database;
use Friendica\Security\PermissionSet\Collection\PermissionSets; use Friendica\Security\PermissionSet\Collection\PermissionSets;
use Friendica\Security\PermissionSet\Exception\PermissionSetNotFoundException;
use Friendica\Security\PermissionSet\Repository\PermissionSet as PermissionSetRepository; use Friendica\Security\PermissionSet\Repository\PermissionSet as PermissionSetRepository;
use Friendica\Security\PermissionSet\Entity\PermissionSet; use Friendica\Security\PermissionSet\Entity\PermissionSet;
use Friendica\Security\PermissionSet\Factory\PermissionSet as PermissionSetFactory; use Friendica\Security\PermissionSet\Factory\PermissionSet as PermissionSetFactory;
@ -198,7 +199,6 @@ class PermissionSetTest extends FixtureTest
/** @var Database $db */ /** @var Database $db */
$db = $this->dice->create(Database::class); $db = $this->dice->create(Database::class);
foreach ($inputPermissionSets as $inputPermissionSet) { foreach ($inputPermissionSets as $inputPermissionSet) {
$db->insert('permissionset', $inputPermissionSet); $db->insert('permissionset', $inputPermissionSet);
} }
@ -209,4 +209,28 @@ class PermissionSetTest extends FixtureTest
self::assertEqualPermissionSets($assertion['output'], $permissionSets); self::assertEqualPermissionSets($assertion['output'], $permissionSets);
} }
} }
public function testSelectOneByIdInvalid()
{
self::expectException(PermissionSetNotFoundException::class);
self::expectExceptionMessage('PermissionSet with id -1 for user 42 doesn\'t exist.');
$this->repository->selectOneById(-1, 42);
}
/**
* @dataProvider dataSet
*/
public function testSelectOneById(array $inputPermissionSets, array $assertions)
{
/** @var Database $db */
$db = $this->dice->create(Database::class);
foreach ($inputPermissionSets as $inputPermissionSet) {
$db->insert('permissionset', $inputPermissionSet);
$id = $db->lastInsertId();
self::assertInstanceOf(PermissionSet::class, $this->repository->selectOneById($id, $inputPermissionSet['uid']));
}
}
} }