From 89e051a18e9158ea6788f2634921145e69611828 Mon Sep 17 00:00:00 2001
From: Nullpointer <mikeschulze.lpz@kabelmail.de>
Date: Wed, 17 Apr 2024 12:49:08 +0200
Subject: [PATCH] GD-86: Fixes space in folder name prevents tests from running
 (#88)

# Why
https://github.com/MikeSchulze/gdUnit4Net/issues/86

# What
* fixed the arguments that include paths by surrounding by quotes.
* set working directory to project path
* use current working directory to set the `--path .` argument
* introduce package version properties to centralize the API versions
* bump adapter version to v1.1.1
---
 PackageVersions.props                     |  2 ++
 api/gdUnit4Api.csproj                     |  4 ++--
 example/exampleProject.csproj             |  2 +-
 testadapter/gdUnit4TestAdapter.csproj     |  4 ++--
 testadapter/src/execution/TestExecutor.cs | 14 ++++++++++----
 5 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/PackageVersions.props b/PackageVersions.props
index 949a9169..4fcdc61a 100644
--- a/PackageVersions.props
+++ b/PackageVersions.props
@@ -5,5 +5,7 @@
     <MicrosoftSdkVersion>17.9.0</MicrosoftSdkVersion>
     <MicrosoftCodeAnalysisCSharpVersion>4.9.2</MicrosoftCodeAnalysisCSharpVersion>
     <MoqVersion>4.18.4</MoqVersion>
+    <GdUnitAPIVersion>4.2.3</GdUnitAPIVersion>
+    <GdUnitTestAdapterVersion>1.1.1</GdUnitTestAdapterVersion>
   </PropertyGroup>
 </Project>
diff --git a/api/gdUnit4Api.csproj b/api/gdUnit4Api.csproj
index 90130ee2..271e8516 100644
--- a/api/gdUnit4Api.csproj
+++ b/api/gdUnit4Api.csproj
@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <Title>gdUnit4Api</Title>
-    <Version>4.2.3</Version>
+    <Version>$(GdUnitAPIVersion)</Version>
     <Description>
       GdUnit4 API is the C# extention to enable GdUnit4 to run/write unit tests in C#.
     </Description>
@@ -34,7 +34,7 @@
     <IsPackable>true</IsPackable>
     <PackageProjectUrl>https://github.com/MikeSchulze/gdUnit4Net</PackageProjectUrl>
     <PackageId>gdUnit4.api</PackageId>
-    <PackageVersion>4.2.3</PackageVersion>
+    <PackageVersion>$(GdUnitAPIVersion)</PackageVersion>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <PackageReleaseNotes>GdUnit4 API release candidate.</PackageReleaseNotes>
diff --git a/example/exampleProject.csproj b/example/exampleProject.csproj
index 85d9ca72..6e5d514f 100644
--- a/example/exampleProject.csproj
+++ b/example/exampleProject.csproj
@@ -18,6 +18,6 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftSdkVersion)" />
     <PackageReference Include="gdUnit4.api" Version="4.2.*" />
-    <PackageReference Include="gdUnit4.test.adapter" Version="1.*-*" />
+    <PackageReference Include="gdUnit4.test.adapter" Version="1.*" />
   </ItemGroup>
 </Project>
diff --git a/testadapter/gdUnit4TestAdapter.csproj b/testadapter/gdUnit4TestAdapter.csproj
index 12f34ea5..851c1fba 100644
--- a/testadapter/gdUnit4TestAdapter.csproj
+++ b/testadapter/gdUnit4TestAdapter.csproj
@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <Title>gdUnit4TestAdapter</Title>
-    <Version>1.1.0</Version>
+    <Version>$(GdUnitTestAdapterVersion)</Version>
     <Description>
       GdUnit4 Test Adapter is the test adapter to run GdUnit4 tests in C#.
     </Description>
@@ -33,7 +33,7 @@
     <IsPackable>true</IsPackable>
     <PackageProjectUrl>https://github.com/MikeSchulze/gdUnit4Net</PackageProjectUrl>
     <PackageId>gdUnit4.test.adapter</PackageId>
-    <PackageVersion>1.1.0</PackageVersion>
+    <PackageVersion>$(GdUnitTestAdapterVersion)</PackageVersion>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <PackageReleaseNotes>GdUnit4 Test Adapter beta.</PackageReleaseNotes>
diff --git a/testadapter/src/execution/TestExecutor.cs b/testadapter/src/execution/TestExecutor.cs
index c1d2dd11..67b5e858 100644
--- a/testadapter/src/execution/TestExecutor.cs
+++ b/testadapter/src/execution/TestExecutor.cs
@@ -48,9 +48,13 @@ public void Run(IFrameworkHandle frameworkHandle, IRunContext runContext, IEnume
 
         var workingDirectory = LookupGodotProjectPath(groupedTests.First().Key);
         _ = workingDirectory ?? throw new InvalidOperationException($"Cannot determine the godot.project! The workingDirectory is not set");
-        InstallTestRunnerAndBuild(frameworkHandle, workingDirectory);
 
-        frameworkHandle.SendMessage(TestMessageLevel.Informational, @$"Run tests -------->");
+        if (Directory.Exists(workingDirectory))
+        {
+            Directory.SetCurrentDirectory(workingDirectory);
+            frameworkHandle.SendMessage(TestMessageLevel.Informational, "Current directory set to: " + Directory.GetCurrentDirectory());
+        }
+        InstallTestRunnerAndBuild(frameworkHandle, workingDirectory);
         var configName = WriteTestRunnerConfig(groupedTests);
         var debugArg = runContext.IsBeingDebugged ? "-d" : "";
 
@@ -62,7 +66,9 @@ public void Run(IFrameworkHandle frameworkHandle, IRunContext runContext, IEnume
         //    }) == false)
         //    : testCases;
         var testRunnerScene = "res://gdunit4_testadapter/TestAdapterRunner.tscn";//Path.Combine(workingDirectory, @$"{temp_test_runner_dir}/TestRunner.tscn");
-        var processStartInfo = new ProcessStartInfo(@$"{GodotBin}", @$"{debugArg} --path {workingDirectory} {testRunnerScene} --testadapter --configfile='{configName}' {gdUnit4Settings.Parameters}")
+        var arguments = $"{debugArg} --path . {testRunnerScene} --testadapter --configfile=\"{configName}\" {gdUnit4Settings.Parameters}";
+        frameworkHandle.SendMessage(TestMessageLevel.Informational, @$"Run with args {arguments}");
+        var processStartInfo = new ProcessStartInfo(@$"{GodotBin}", arguments)
         {
             StandardOutputEncoding = Encoding.Default,
             RedirectStandardOutput = true,
@@ -114,7 +120,7 @@ private void InstallTestRunnerAndBuild(IFrameworkHandle frameworkHandle, string
         }
         frameworkHandle.SendMessage(TestMessageLevel.Informational, "Install GdUnit4 TestRunner");
         InstallTestRunnerClasses(destinationFolderPath);
-        var processStartInfo = new ProcessStartInfo(@$"{GodotBin}", @$"--path {workingDirectory} --headless --build-solutions --quit-after 20")
+        var processStartInfo = new ProcessStartInfo(@$"{GodotBin}", @$"--path . --headless --build-solutions --quit-after 20")
         {
             RedirectStandardOutput = false,
             RedirectStandardError = false,