From 4c895e95906c6053ac1e940673073fa4f542a4f9 Mon Sep 17 00:00:00 2001
From: Simon Leary <simon.leary42@proton.me>
Date: Fri, 14 Nov 2025 17:15:12 -0500
Subject: [PATCH] improve array assertions

---
 test/functional/PIMemberRequestTest.php | 2 +-
 test/functional/PiMemberApproveTest.php | 2 +-
 test/functional/PiMemberDenyTest.php    | 4 ++--
 test/phpunit-bootstrap.php              | 5 -----
 4 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/test/functional/PIMemberRequestTest.php b/test/functional/PIMemberRequestTest.php
index 4d8a41fa..7a913d67 100644
--- a/test/functional/PIMemberRequestTest.php
+++ b/test/functional/PIMemberRequestTest.php
@@ -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;
diff --git a/test/functional/PiMemberApproveTest.php b/test/functional/PiMemberApproveTest.php
index b59643b7..c861df13 100644
--- a/test/functional/PiMemberApproveTest.php
+++ b/test/functional/PiMemberApproveTest.php
@@ -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()
diff --git a/test/functional/PiMemberDenyTest.php b/test/functional/PiMemberDenyTest.php
index a39f5765..ad68e156 100644
--- a/test/functional/PiMemberDenyTest.php
+++ b/test/functional/PiMemberDenyTest.php
@@ -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 {
@@ -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);
diff --git a/test/phpunit-bootstrap.php b/test/phpunit-bootstrap.php
index d829b6c3..f25ae0cd 100644
--- a/test/phpunit-bootstrap.php
+++ b/test/phpunit-bootstrap.php
@@ -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,