simplify test functions (#380)

Author: simonLeary42

test/functional/AccountDeletionRequestTest.php

@@ -32,7 +32,7 @@ private function getNumberAccountDeletionRequests()
     public function testRequestAccountDeletionUserHasNoGroups()
     {
         global $USER, $SQL;
-        switchUser(...getUserHasNotRequestedAccountDeletionHasNoGroups());
+        switchUser(...getBlankUser());
         $this->assertEmpty($USER->getPIGroupGIDs());
         $this->assertNumberAccountDeletionRequests(0);
         try {

test/functional/PIMemberRequestTest.php

@@ -35,7 +35,7 @@ public function testRequestMembership()
         $this->assertTrue($pi_group->exists());
         $this->assertEqualsCanonicalizing([$pi], $pi_group->getGroupMembers());
         $this->assertEqualsCanonicalizing([], $SQL->getRequests($gid));
-        switchUser(...getUserNotPiNotRequestedBecomePi());
+        switchUser(...getBlankUser());
         $uid = $USER->uid;
         $this->assertFalse($USER->isPI());
         $this->assertFalse($SQL->requestExists($uid, UnitySQL::REQUEST_BECOME_PI));

test/functional/PiBecomeRequestTest.php

@@ -35,7 +35,7 @@ private function getNumberPiBecomeRequests()
     public function testRequestBecomePi()
     {
         global $USER, $SQL;
-        switchUser(...getUserNotPiNotRequestedBecomePi());
+        switchUser(...getBlankUser());
         $this->assertFalse($USER->isPI());
         $this->assertNumberPiBecomeRequests(0);
         try {

test/phpunit-bootstrap.php

@@ -239,7 +239,8 @@ function getUserHasNotRequestedAccountDeletionHasGroup()
     return ["[email protected]", "foo", "bar", "[email protected]"];
 }
 
-function getUserHasNotRequestedAccountDeletionHasNoGroups()
+/* a blank user has no requests, no PI group, and has not requested account deletion */
+function getBlankUser()
 {
     return ["[email protected]", "foo", "bar", "[email protected]"];
 }
@@ -249,11 +250,6 @@ function getUserHasNoSshKeys()
     return ["[email protected]", "foo", "bar", "[email protected]"];
 }
 
-function getUserNotPiNotRequestedBecomePi()
-{
-    return ["[email protected]", "foo", "bar", "[email protected]"];
-}
-
 function getUserNotPiNotRequestedBecomePiRequestedAccountDeletion()
 {
     return ["[email protected]", "foo", "bar", "[email protected]"];