From: Hypolite Petovan Date: Mon, 1 May 2023 01:14:13 +0000 (-0400) Subject: Rename tests/src/Util/AclFormatter file to match class name X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=018930b9077d87fe6a47feb2d2a384c7f1e52fe8;p=friendica.git Rename tests/src/Util/AclFormatter file to match class name --- diff --git a/tests/src/Util/ACLFormaterTest.php b/tests/src/Util/ACLFormaterTest.php deleted file mode 100644 index afbf435d85..0000000000 --- a/tests/src/Util/ACLFormaterTest.php +++ /dev/null @@ -1,192 +0,0 @@ -. - * - */ - -namespace Friendica\Test\src\Util; - -use Friendica\Model\Group; -use Friendica\Util\ACLFormatter; -use PHPUnit\Framework\TestCase; - -/** - * ACLFormatter utility testing class - */ -class ACLFormatterTest extends TestCase -{ - public function assertAcl($text, array $assert = []) - { - $aclFormatter = new ACLFormatter(); - - $acl = $aclFormatter->expand($text); - - self::assertEquals($assert, $acl); - - self::assertMergeable($acl); - } - - public function assertMergeable(array $aclOne, array $aclTwo = []) - { - self::assertTrue(is_array($aclOne)); - self::assertTrue(is_array($aclTwo)); - - $aclMerged = array_unique(array_merge($aclOne, $aclTwo)); - self::assertTrue(is_array($aclMerged)); - - return $aclMerged; - } - - public function dataExpand() - { - return [ - 'normal' => [ - 'input' => '<1><2><3><' . Group::FOLLOWERS . '><' . Group::MUTUALS . '>', - 'assert' => ['1', '2', '3', Group::FOLLOWERS, Group::MUTUALS], - ], - 'nigNumber' => [ - 'input' => '<1><' . PHP_INT_MAX . '><15>', - 'assert' => ['1', (string)PHP_INT_MAX, '15'], - ], - 'string' => [ - 'input' => '<1><279012>', - 'assert' => ['1', '279012'], - ], - 'space' => [ - 'input' => '<1><279 012><32>', - 'assert' => ['1', '32'], - ], - 'empty' => [ - 'input' => '', - 'assert' => [], - ], - /// @todo should there be an exception? - 'noBrackets' => [ - 'input' => 'According to documentation, that\'s invalid. ', //should be invalid - 'assert' => [], - ], - /// @todo should there be an exception? - 'justOneBracket' => [ - 'input' => ' [], - ], - /// @todo should there be an exception? - 'justOneBracket2' => [ - 'input' => 'Another invalid> string', //should be invalid - 'assert' => [], - ], - /// @todo should there be an exception? - 'closeOnly' => [ - 'input' => 'Another> invalid> string>', //should be invalid - 'assert' => [], - ], - /// @todo should there be an exception? - 'openOnly' => [ - 'input' => ' [], - ], - /// @todo should there be an exception? - 'noMatching1' => [ - 'input' => ' invalid ', //should be invalid - 'assert' => [], - ], - 'emptyMatch' => [ - 'input' => '<1><><3>', - 'assert' => ['1', '3'], - ], - ]; - } - - /** - * @dataProvider dataExpand - */ - public function testExpand($input, array $assert) - { - self::assertAcl($input, $assert); - } - - /** - * Test nullable expand (=> no ACL set) - */ - public function testExpandNull() - { - $aclFormatter = new ACLFormatter(); - - $allow_people = $aclFormatter->expand(); - $allow_groups = $aclFormatter->expand(); - - self::assertEmpty($aclFormatter->expand(null)); - self::assertEmpty($aclFormatter->expand()); - - $recipients = array_unique(array_merge($allow_people, $allow_groups)); - self::assertEmpty($recipients); - } - - public function dataAclToString() - { - return [ - 'empty' => [ - 'input' => '', - 'assert' => '', - ], - 'string' => [ - 'input' => '1,2,3,4', - 'assert' => '<1><2><3><4>', - ], - 'array' => [ - 'input' => [1, 2, 3, 4], - 'assert' => '<1><2><3><4>', - ], - 'invalid' => [ - 'input' => [1, 'a', 3, 4], - 'assert' => '<1><3><4>', - ], - 'invalidString' => [ - 'input' => 'a,bsd23,4', - 'assert' => '<4>', - ], - /** @see https://github.com/friendica/friendica/pull/7787 */ - 'bug-7778-angle-brackets' => [ - 'input' => ["<40195>"], - 'assert' => "<40195>", - ], - Group::FOLLOWERS => [ - 'input' => [Group::FOLLOWERS, 1], - 'assert' => '<' . Group::FOLLOWERS . '><1>', - ], - Group::MUTUALS => [ - 'input' => [Group::MUTUALS, 1], - 'assert' => '<' . Group::MUTUALS . '><1>', - ], - 'wrong-angle-brackets' => [ - 'input' => ["","<123>"], - 'assert' => "<123>", - ], - ]; - } - - /** - * @dataProvider dataAclToString - */ - public function testAclToString($input, string $assert) - { - $aclFormatter = new ACLFormatter(); - - self::assertEquals($assert, $aclFormatter->toString($input)); - } -} diff --git a/tests/src/Util/ACLFormatterTest.php b/tests/src/Util/ACLFormatterTest.php new file mode 100644 index 0000000000..afbf435d85 --- /dev/null +++ b/tests/src/Util/ACLFormatterTest.php @@ -0,0 +1,192 @@ +. + * + */ + +namespace Friendica\Test\src\Util; + +use Friendica\Model\Group; +use Friendica\Util\ACLFormatter; +use PHPUnit\Framework\TestCase; + +/** + * ACLFormatter utility testing class + */ +class ACLFormatterTest extends TestCase +{ + public function assertAcl($text, array $assert = []) + { + $aclFormatter = new ACLFormatter(); + + $acl = $aclFormatter->expand($text); + + self::assertEquals($assert, $acl); + + self::assertMergeable($acl); + } + + public function assertMergeable(array $aclOne, array $aclTwo = []) + { + self::assertTrue(is_array($aclOne)); + self::assertTrue(is_array($aclTwo)); + + $aclMerged = array_unique(array_merge($aclOne, $aclTwo)); + self::assertTrue(is_array($aclMerged)); + + return $aclMerged; + } + + public function dataExpand() + { + return [ + 'normal' => [ + 'input' => '<1><2><3><' . Group::FOLLOWERS . '><' . Group::MUTUALS . '>', + 'assert' => ['1', '2', '3', Group::FOLLOWERS, Group::MUTUALS], + ], + 'nigNumber' => [ + 'input' => '<1><' . PHP_INT_MAX . '><15>', + 'assert' => ['1', (string)PHP_INT_MAX, '15'], + ], + 'string' => [ + 'input' => '<1><279012>', + 'assert' => ['1', '279012'], + ], + 'space' => [ + 'input' => '<1><279 012><32>', + 'assert' => ['1', '32'], + ], + 'empty' => [ + 'input' => '', + 'assert' => [], + ], + /// @todo should there be an exception? + 'noBrackets' => [ + 'input' => 'According to documentation, that\'s invalid. ', //should be invalid + 'assert' => [], + ], + /// @todo should there be an exception? + 'justOneBracket' => [ + 'input' => ' [], + ], + /// @todo should there be an exception? + 'justOneBracket2' => [ + 'input' => 'Another invalid> string', //should be invalid + 'assert' => [], + ], + /// @todo should there be an exception? + 'closeOnly' => [ + 'input' => 'Another> invalid> string>', //should be invalid + 'assert' => [], + ], + /// @todo should there be an exception? + 'openOnly' => [ + 'input' => ' [], + ], + /// @todo should there be an exception? + 'noMatching1' => [ + 'input' => ' invalid ', //should be invalid + 'assert' => [], + ], + 'emptyMatch' => [ + 'input' => '<1><><3>', + 'assert' => ['1', '3'], + ], + ]; + } + + /** + * @dataProvider dataExpand + */ + public function testExpand($input, array $assert) + { + self::assertAcl($input, $assert); + } + + /** + * Test nullable expand (=> no ACL set) + */ + public function testExpandNull() + { + $aclFormatter = new ACLFormatter(); + + $allow_people = $aclFormatter->expand(); + $allow_groups = $aclFormatter->expand(); + + self::assertEmpty($aclFormatter->expand(null)); + self::assertEmpty($aclFormatter->expand()); + + $recipients = array_unique(array_merge($allow_people, $allow_groups)); + self::assertEmpty($recipients); + } + + public function dataAclToString() + { + return [ + 'empty' => [ + 'input' => '', + 'assert' => '', + ], + 'string' => [ + 'input' => '1,2,3,4', + 'assert' => '<1><2><3><4>', + ], + 'array' => [ + 'input' => [1, 2, 3, 4], + 'assert' => '<1><2><3><4>', + ], + 'invalid' => [ + 'input' => [1, 'a', 3, 4], + 'assert' => '<1><3><4>', + ], + 'invalidString' => [ + 'input' => 'a,bsd23,4', + 'assert' => '<4>', + ], + /** @see https://github.com/friendica/friendica/pull/7787 */ + 'bug-7778-angle-brackets' => [ + 'input' => ["<40195>"], + 'assert' => "<40195>", + ], + Group::FOLLOWERS => [ + 'input' => [Group::FOLLOWERS, 1], + 'assert' => '<' . Group::FOLLOWERS . '><1>', + ], + Group::MUTUALS => [ + 'input' => [Group::MUTUALS, 1], + 'assert' => '<' . Group::MUTUALS . '><1>', + ], + 'wrong-angle-brackets' => [ + 'input' => ["","<123>"], + 'assert' => "<123>", + ], + ]; + } + + /** + * @dataProvider dataAclToString + */ + public function testAclToString($input, string $assert) + { + $aclFormatter = new ACLFormatter(); + + self::assertEquals($assert, $aclFormatter->toString($input)); + } +}