improve array assertions (#362)

Author: simonLeary42

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;

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()

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);

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,