Update Unit Tests, refactor tool, make easier to test locally

Author: sunnamed434

.github/actions/project-build/run-command-for-every-tests-project.ps1

@@ -14,15 +14,30 @@ $projectPath = $args[0]
 $projectName = Split-Path -Path $projectPath -Leaf
 $testsFolderPath = Join-Path -Path $projectPath -ChildPath "../tests"
 $global:exitCode = 0
-
 $commandToExecute = $args[1]
+$allowNoTests = $args.Count -ge 3 -and $args[2] -eq "--allow-no-tests"
+
+$testsFound = @(
+    Get-ChildItem -Path $testsFolderPath -Directory -Recurse |
+    Where-Object { $_.Name -match "^$projectName.*Tests$" }
+)
+
+if ($testsFound.Count -eq 0) {
+    if ($allowNoTests) {
+        Write-Host "No test projects found for project '$projectName', but skipping due to --allow-no-tests flag."
+        exit 0
+    }
+    else {
+        Write-Host "No test projects found for project '$projectName'."
+        exit 1
+    }
+}
 
-Get-ChildItem -Path $testsFolderPath -Directory -Recurse `
-| Where-Object { $_.Name -match "^$projectName.*Tests$" } `
-| ForEach-Object {
-    $testsProjectName = $_.Name
+foreach ($testProject in $testsFound) {
+    $testsProjectName = $testProject.Name
     $testsProjectPath = Join-Path -Path $testsFolderPath -ChildPath $testsProjectName
     Write-Host "Tests project found: $testsProjectPath. Executing a command: $commandToExecute"
+
     try {
         bash -c "PROJECT_PATH=$testsProjectPath && $commandToExecute"
         if ($LASTEXITCODE -ne 0) {
@@ -39,6 +54,7 @@ Get-ChildItem -Path $testsFolderPath -Directory -Recurse `
 if ($global:exitCode -ne 0) {
     Write-Host "`nOne or more test commands failed."
     exit $global:exitCode
-} else {
+}
+else {
     Write-Host "`nAll test projects executed successfully."
 }

src/UnturnedRedistUpdateTool/GameInfoParser.cs

@@ -3,19 +3,32 @@
 
 namespace UnturnedRedistUpdateTool;
 
-public class GameInfoParser
+public static class GameInfoParser
 {
-    public async Task<(string Version, string BuildId)> ParseAsync(string unturnedPath, string steamappsPath, string appId)
+    public static string FindAppManifestFile(string unturnedPath, string appId)
     {
-        var node = JsonNode.Parse(await File.ReadAllTextAsync(Path.Combine(unturnedPath, "Status.json")))!["Game"]!;
-        var version = $"3.{node["Major_Version"]}.{node["Minor_Version"]}.{node["Patch_Version"]}";
-        var appmanifestFileName = $"appmanifest_{appId}.acf";
-        var appmanifestFilePath = Path.Combine(steamappsPath, appmanifestFileName);
-        if (!File.Exists(appmanifestFilePath))
+        string[] possiblePath =
+        [
+            Path.Combine(unturnedPath, "steamapps", $"appmanifest_{appId}.acf"), // inside of Unturned folder
+            Path.GetFullPath(Path.Combine(unturnedPath, "..", "..", $"appmanifest_{appId}.acf")) // outside of unturned folder
+        ];
+        var appdataPath = possiblePath.FirstOrDefault(File.Exists);
+        if (appdataPath == null)
+        {
+            throw new FileNotFoundException($"Required file is not found. Searched: {unturnedPath}", $"appmanifest_{appId}.acf");
+        }
+        return appdataPath;
+    }
+    public static async Task<(string Version, string BuildId)> ParseAsync(string unturnedPath, string appManifestPath)
+    {
+        var statusFilePath = Path.Combine(unturnedPath, "Status.json");
+        if (!File.Exists(statusFilePath))
         {
-            throw new FileNotFoundException("Required file is not found", appmanifestFilePath);
+            throw new FileNotFoundException("Status file is not found", statusFilePath);
         }
-        await using var file = File.OpenRead(appmanifestFilePath);
+        var node = JsonNode.Parse(await File.ReadAllTextAsync(statusFilePath))!["Game"]!;
+        var version = $"3.{node["Major_Version"]}.{node["Minor_Version"]}.{node["Patch_Version"]}";
+        await using var file = File.OpenRead(appManifestPath);
         var kv = KVSerializer.Create(KVSerializationFormat.KeyValues1Text);
         var obj = kv.Deserialize(file);
         var buildId = obj["buildid"].ToString();

src/UnturnedRedistUpdateTool/Program.cs

@@ -11,6 +11,13 @@ private static async Task<int> Main(string[] args)
 
         AssertPlatformSupported();
 
+#if DEBUG
+        if (args.Length == 0)
+        {
+            args = [@"C:\Me\Apps\Steam\steamapps\common\Unturned", Path.Combine(AppContext.BaseDirectory, "TempRedist", "Client"), "304930", "--force"];
+        }
+#endif
+
         if (args.Length < 3)
         {
             Console.WriteLine("Wrong usage. Correct usage: UnturnedRedistUpdateTool.exe <unturned_path> <redist_path> <app_id> [args]");
@@ -50,26 +57,16 @@ private static async Task<int> Main(string[] args)
 
         Console.WriteLine("Preparing to run tool...");
 
-        var steamappsDirectory = Path.Combine(unturnedPath, "steamapps");
-        if (!Directory.Exists(steamappsDirectory))
-        {
-            Console.WriteLine($"steamapps Directory not found: \"{steamappsDirectory}\"");
-            return 1;
-        }
+        var appManifestPath = GameInfoParser.FindAppManifestFile(unturnedPath, appId);
+
         var unturnedDataPath = GetUnturnedDataDirectoryName();
         var managedDirectory = Path.Combine(unturnedDataPath, "Managed");
         if (!Directory.Exists(managedDirectory))
         {
             Console.WriteLine($"Unturned Managed Directory not found: \"{managedDirectory}\"");
             return 1;
         }
-        const string statusFileName = "Status.json";
-        var statusFilePath = Path.Combine(unturnedPath, statusFileName);
-        if (!File.Exists(statusFilePath))
-        {
-            throw new FileNotFoundException("Status file is not found", statusFilePath);
-        }
-        var (newVersion, buildId) = await new GameInfoParser().ParseAsync(unturnedPath, steamappsDirectory, appId);
+        var (newVersion, buildId) = await GameInfoParser.ParseAsync(unturnedPath, appManifestPath);
         if (string.IsNullOrWhiteSpace(newVersion))
         {
             Console.WriteLine("New Game Version is not found");