Skip to content

improve array assertions #362

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
simonLeary42 merged 1 commit into from
Nov 14, 2025
Merged

improve array assertions #362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion test/functional/PIMemberRequestTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public function testRequestMembership()
$gid = $pi_group->gid;
$this->assertTrue($USER->isPI());
$this->assertTrue($pi_group->exists());
$this->assertTrue(arraysAreEqualUnOrdered([$pi], $pi_group->getGroupMembers()));
$this->assertEqualsCanonicalizing([$pi], $pi_group->getGroupMembers());
$this->assertEquals([], $SQL->getRequests($gid));
switchUser(...getUserNotPiNotRequestedBecomePi());
$uid = $USER->uid;
Expand Down
2 changes: 1 addition & 1 deletion test/functional/PiMemberApproveTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ private function requestJoinPI(string $gid)

private function assertGroupMembers(UnityGroup $group, array $members)
{
$this->assertTrue(arraysAreEqualUnOrdered($members, $group->getGroupMemberUIDs()));
$this->assertEqualsCanonicalizing($members, $group->getGroupMemberUIDs());
}

public function testApproveRequest()
Expand Down
4 changes: 2 additions & 2 deletions test/functional/PiMemberDenyTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public function testDenyRequest()
$pi = $USER;
$piGroup = $USER->getPIGroup();
$this->assertTrue($piGroup->exists());
$this->assertTrue(arraysAreEqualUnOrdered([$pi->uid], $piGroup->getGroupMemberUIDs()));
$this->assertEqualsCanonicalizing([$pi->uid], $piGroup->getGroupMemberUIDs());
$this->assertEmpty($piGroup->getRequests());
$requestedUser = new UnityUser(self::$requestUid, $LDAP, $SQL, $MAILER, $REDIS, $WEBHOOK);
try {
Expand All @@ -46,7 +46,7 @@ public function testDenyRequest()

$piGroup->denyUser($requestedUser);
$this->assertEmpty($piGroup->getRequests());
$this->assertTrue(arraysAreEqualUnOrdered([$pi->uid], $piGroup->getGroupMemberUIDs()));
$this->assertEqualsCanonicalizing([$pi->uid], $piGroup->getGroupMemberUIDs());
$this->assertFalse($piGroup->memberExists($requestedUser));
} finally {
$SQL->removeRequest(self::$requestUid, $piGroup->gid);
Expand Down
5 changes: 0 additions & 5 deletions test/phpunit-bootstrap.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,6 @@
mbConvertEncoding("Hello, World!", "UTF-16"),
];

function arraysAreEqualUnOrdered(array $a, array $b): bool
{
return array_diff($a, $b) == [] && array_diff($b, $a) == [];
}

function switchUser(
string $eppn,
string $given_name,
Expand Down