fix tests

Author: simonLeary42

test/functional/NewUserTest.php

@@ -3,13 +3,18 @@
 use PHPUnit\Framework\TestCase;
 use UnityWebPortal\lib\exceptions\PhpUnitNoDieException;
 use UnityWebPortal\lib\UnityGroup;
+use UnityWebPortal\lib\UnityOrg;
+use UnityWebPortal\lib\UnitySQL;
 
 class NewUserTest extends TestCase
 {
-    private function assertNumberGroupRequests(int $x)
+    private function assertRequestedPIGroup(bool $expected)
     {
         global $USER, $SQL;
-        $this->assertEquals($x, count($SQL->getRequestsByUser($USER->getUID())));
+        $this->assertEquals(
+            $expected,
+            $SQL->requestExists($USER->getUID(), UnitySQL::REQUEST_BECOME_PI)
+        );
     }
 
     private function requestGroupCreation()
@@ -45,12 +50,12 @@ private function ensureUserDoesNotExist()
     {
         global $USER, $SQL, $LDAP;
         $SQL->deleteRequestsByUser($USER->getUID());
-        $org = $USER->getOrgGroup();
-        if ($org->exists() and $org->inOrg($USER)) {
-            $org->removeUser($USER);
-            assert(!$org->inOrg($USER));
-        }
         if ($USER->exists()) {
+            $org = $USER->getOrgGroup();
+            if ($org->exists() and $org->inOrg($USER)) {
+                $org->removeUser($USER);
+                assert(!$org->inOrg($USER));
+            }
             $USER->getLDAPUser()->delete();
             assert(!$USER->exists());
         }
@@ -69,8 +74,8 @@ private function ensureUserDoesNotExist()
 
     private function ensureOrgGroupDoesNotExist()
     {
-        global $USER;
-        $org_group = $USER->getOrgGroup();
+        global $USER, $SSO, $LDAP, $SQL, $MAILER, $REDIS, $WEBHOOK;
+        $org_group = new UnityOrg($SSO["org"], $LDAP, $SQL, $MAILER, $REDIS, $WEBHOOK);
         if ($org_group->exists()) {
             $org_group->getLDAPOrgGroup()->delete();
             assert(!$org_group->exists());
@@ -97,18 +102,19 @@ private function ensurePIGroupDoesNotExist()
 
     public function testCreateUserByJoinGoup()
     {
-        global $USER, $SQL, $LDAP;
+        global $USER, $SSO, $LDAP, $SQL, $MAILER, $REDIS, $WEBHOOK;
         switchUser(...getUserIsPIHasNoMembersNoMemberRequests());
         $pi_group = $USER->getPIGroup();
         switchUser(...getNonExistentUser());
         $this->assertTrue(!$USER->exists());
-        $this->assertTrue(!$USER->getOrgGroup()->exists());
+        $newOrg = new UnityOrg($SSO["org"], $LDAP, $SQL, $MAILER, $REDIS, $WEBHOOK);
+        $this->assertTrue(!$newOrg->exists());
         $this->assertTrue($pi_group->exists());
         $this->assertTrue(!$pi_group->userExists($USER));
-        $this->assertNumberGroupRequests(0);
+        $this->assertRequestedPIGroup(false);
         try {
             $this->requestGroupMembership($pi_group->getPIUID());
-            $this->assertNumberGroupRequests(1);
+            $this->assertRequestedPIGroup(true);
 
             // $second_request_failed = false;
             // try {
@@ -117,21 +123,21 @@ public function testCreateUserByJoinGoup()
             //     $second_request_failed = true;
             // }
             // $this->assertTrue($second_request_failed);
-            $this->assertNumberGroupRequests(1);
+            $this->assertRequestedPIGroup(true);
 
             $this->cancelAllRequests();
-            $this->assertNumberGroupRequests(0);
+            $this->assertRequestedPIGroup(false);
 
             $this->requestGroupMembership($pi_group->getPIUID());
             $this->assertTrue($pi_group->requestExists($USER));
-            $this->assertNumberGroupRequests(1);
+            $this->assertRequestedPIGroup(true);
 
             $pi_group->approveUser($USER);
             $this->assertTrue(!$pi_group->requestExists($USER));
-            $this->assertNumberGroupRequests(0);
+            $this->assertRequestedPIGroup(false);
             $this->assertTrue($pi_group->userExists($USER));
             $this->assertTrue($USER->exists());
-            $this->assertTrue($USER->getOrgGroup()->exists());
+            $this->assertTrue($newOrg->exists());
 
             // $third_request_failed = false;
             // try {
@@ -140,7 +146,7 @@ public function testCreateUserByJoinGoup()
             //     $third_request_failed = true;
             // }
             // $this->assertTrue($third_request_failed);
-            $this->assertNumberGroupRequests(0);
+            $this->assertRequestedPIGroup(false);
             $this->assertTrue(!$pi_group->requestExists($USER));
         } finally {
             $this->ensureUserNotInPIGroup($pi_group);
@@ -151,15 +157,16 @@ public function testCreateUserByJoinGoup()
 
     public function testCreateUserByCreateGroup()
     {
-        global $USER, $SQL, $LDAP;
+        global $USER, $SSO, $LDAP, $SQL, $MAILER, $REDIS, $WEBHOOK;
         switchuser(...getNonExistentUser());
         $pi_group = $USER->getPIGroup();
         $this->assertTrue(!$USER->exists());
         $this->assertTrue(!$pi_group->exists());
-        $this->assertTrue(!$USER->getOrgGroup()->exists());
+        $newOrg = new UnityOrg($SSO["org"], $LDAP, $SQL, $MAILER, $REDIS, $WEBHOOK);
+        $this->assertTrue(!$newOrg->exists());
         try {
             $this->requestGroupCreation();
-            $this->assertNumberGroupRequests(1);
+            $this->assertRequestedPIGroup(true);
 
             // $second_request_failed = false;
             // try {
@@ -168,19 +175,19 @@ public function testCreateUserByCreateGroup()
             //     $second_request_failed = true;
             // }
             // $this->assertTrue($second_request_failed);
-            $this->assertNumberGroupRequests(1);
+            $this->assertRequestedPIGroup(true);
 
             $this->cancelAllRequests();
-            $this->assertNumberGroupRequests(0);
+            $this->assertRequestedPIGroup(false);
 
             $this->requestGroupCreation();
-            $this->assertNumberGroupRequests(1);
+            $this->assertRequestedPIGroup(true);
 
             $pi_group->approveGroup();
-            $this->assertNumberGroupRequests(0);
+            $this->assertRequestedPIGroup(false);
             $this->assertTrue($pi_group->exists());
             $this->assertTrue($USER->exists());
-            $this->assertTrue($USER->getOrgGroup()->exists());
+            $this->assertTrue($newOrg->exists());
 
             // $third_request_failed = false;
             // try {
@@ -189,7 +196,7 @@ public function testCreateUserByCreateGroup()
             //     $third_request_failed = true;
             // }
             // $this->assertTrue($third_request_failed);
-            $this->assertNumberGroupRequests(0);
+            $this->assertRequestedPIGroup(false);
         } finally {
             $this->ensurePIGroupDoesNotExist();
             $this->ensureUserDoesNotExist();