tests should cleanup after themselves

Author: simonLeary42

resources/lib/UnitySQL.php

@@ -283,6 +283,18 @@ public function accDeletionRequestExists($uid)
         return count($stmt->fetchAll()) > 0;
     }
 
+    public function deleteAccountDeletionRequest($uid)
+    {
+        if (!$this->accDeletionRequestExists($requestor, $dest)) {
+            return;
+        }
+        $stmt = $this->conn->prepare(
+            "DELETE FROM " . self::TABLE_ACCOUNT_DELETION_REQUESTS . " WHERE uid=:uid"
+        );
+        $stmt->bindParam(":uid", $uid);
+        $stmt->execute();
+    }
+
     public function getSiteVar($name)
     {
         $stmt = $this->conn->prepare(

test/functional/AccountDeletionRequestTest.php

@@ -49,7 +49,7 @@ public function testRequestAccountDeletionUserHasNoGroups()
             );
             $this->assertNumberAccountDeletionRequests(1);
         } finally {
-            $SQL->removeRequest($USER->getUID());
+            $SQL->deleteAccountDeletionRequest($USER->getUID());
             $this->assertNumberAccountDeletionRequests(0);
         }
     }
@@ -68,7 +68,7 @@ public function testRequestAccountDeletionUserHasGroup()
             );
             $this->assertNumberAccountDeletionRequests(0);
         } finally {
-            $SQL->removeRequest($USER->getUID());
+            $SQL->deleteAccountDeletionRequest($USER->getUID());
             $this->assertNumberAccountDeletionRequests(0);
         }
     }

test/functional/PiBecomeRequestTest.php

@@ -35,18 +35,21 @@ public function testRequestBecomePi()
     {
         global $USER, $SQL;
         switchUser(...getUserNotPiNotRequestedBecomePi());
-        error_log(json_encode($SQL->getConn()->prepare("select * from requests"))->execute()->fetchAll());
         $this->assertFalse($USER->isPI());
         $this->assertNumberPiBecomeRequests(0);
-        post(
-            __DIR__ . "/../../webroot/panel/account.php",
-            ["form_type" => "pi_request"]
-        );
-        $this->assertNumberPiBecomeRequests(1);
-        post(
-            __DIR__ . "/../../webroot/panel/account.php",
-            ["form_type" => "pi_request"]
-        );
-        $this->assertNumberPiBecomeRequests(1);
+        try {
+            post(
+                __DIR__ . "/../../webroot/panel/account.php",
+                ["form_type" => "pi_request"]
+            );
+            $this->assertNumberPiBecomeRequests(1);
+            post(
+                __DIR__ . "/../../webroot/panel/account.php",
+                ["form_type" => "pi_request"]
+            );
+            $this->assertNumberPiBecomeRequests(1);
+        } finally {
+            $SQL->removeRequest($USER->getUID());
+        }
     }
 }