moove tests loader into onLoad

ShockedPlot7560 · Sep 23, 2023 · ea54151 · ea54151
1 parent eee826f
commit ea54151
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/src/PmmpUnit.php b/src/PmmpUnit.php
@@ -46,29 +46,29 @@ public function __construct(PluginLoader $loader, Server $server, PluginDescript
 		}
 
 		include_once dirname(__DIR__) . "/vendor/autoload.php";
+		parent::__construct($loader, $server, $description, $dataFolder, $file, $resourceProvider);
+	}
 
-		$unitFolder = $dataFolder . "/tests";
+	protected function onLoad() : void {
+		$unitFolder = $this->getDataFolder() . "tests";
 		if (!is_dir($unitFolder)) {
-			$server->getLogger()->warning("Unit test folder ($unitFolder) not found, creating one...");
+			$this->getLogger()->warning("Unit test folder ($unitFolder) not found, creating one...");
 			mkdir($unitFolder);
 		}
 
 		$testSuite = getenv("TEST_SUITE");
 		if ($testSuite !== false) {
 			$unitFolder .= "/" . $testSuite;
 			if (!is_dir($unitFolder)) {
-				$server->getLogger()->warning("Unit test folder ($unitFolder) not found, creating one...");
+				$this->getLogger()->warning("Unit test folder ($unitFolder) not found, creating one...");
 				mkdir($unitFolder);
 			}
 		}
 
-		$server->getLogger()->debug("Loading tests from $unitFolder");
+		$this->getLogger()->debug("Loading tests from $unitFolder");
 
 		$this->test = TestSuite::fromDirectory($unitFolder);
-		parent::__construct($loader, $server, $description, $dataFolder, $file, $resourceProvider);
-	}
 
-	protected function onLoad() : void {
 		// prevent server waiting, so we can run tests faster for CI
 		$reflectionServer = new ReflectionClass(Server::getInstance());
 		$startTimeProperty = $reflectionServer->getProperty("startTime");