test en cake fixes

Author: Yannis-S-Standaert

Aikido.Zen.Test/AgentInfoHelperTests.cs

@@ -10,7 +10,7 @@ public class AgentInfoHelperTests
         private string _originalAzureValue;
 
         [SetUp]
-        public void Setup()
+        public void Setup ()
         {
             // Store original environment variables
             _originalBlockingValue = Environment.GetEnvironmentVariable("AIKIDO_BLOCK");
@@ -19,7 +19,7 @@ public void Setup()
         }
 
         [TearDown]
-        public void Cleanup()
+        public void Cleanup ()
         {
             // Restore original environment variables
             SetEnvironmentVariable("AIKIDO_BLOCK", _originalBlockingValue);
@@ -28,7 +28,7 @@ public void Cleanup()
         }
 
         [Test]
-        public void GetInfo_ShouldReturnValidAgentInfo()
+        public void GetInfo_ShouldReturnValidAgentInfo ()
         {
             // Act
             var agentInfo = AgentInfoHelper.GetInfo();
@@ -39,7 +39,7 @@ public void GetInfo_ShouldReturnValidAgentInfo()
                 // Basic properties
                 Assert.That(agentInfo.Hostname, Is.EqualTo(Environment.MachineName));
                 Assert.That(agentInfo.Library, Is.EqualTo("firewall-dotnet"));
-                Assert.That(agentInfo.Version, Is.EqualTo(typeof(AgentInfoHelper).Assembly.GetName().Version!.ToString()));
+                Assert.That(agentInfo.Version, Is.EqualTo(AgentInfoHelper.CleanVersion(typeof(AgentInfoHelper).Assembly.GetName().Version!.ToString())));
                 Assert.That(agentInfo.IpAddress, Is.Not.Null);
 
                 // OS Info
@@ -53,7 +53,7 @@ public void GetInfo_ShouldReturnValidAgentInfo()
         }
 
         [Test]
-        public void GetInfo_ServerlessDetection_AWS()
+        public void GetInfo_ServerlessDetection_AWS ()
         {
             // Arrange
             SetEnvironmentVariable("AWS_LAMBDA_FUNCTION_NAME", "test-function");
@@ -66,7 +66,7 @@ public void GetInfo_ServerlessDetection_AWS()
         }
 
         [Test]
-        public void GetInfo_ServerlessDetection_Azure()
+        public void GetInfo_ServerlessDetection_Azure ()
         {
             // Arrange
             SetEnvironmentVariable("WEBSITE_INSTANCE_ID", "test-instance");
@@ -79,7 +79,7 @@ public void GetInfo_ServerlessDetection_Azure()
         }
 
         [Test]
-        public void GetInfo_NotServerless_WhenNoServerlessEnvironmentVariables()
+        public void GetInfo_NotServerless_WhenNoServerlessEnvironmentVariables ()
         {
             // Arrange
             SetEnvironmentVariable("AWS_LAMBDA_FUNCTION_NAME", null);
@@ -93,7 +93,7 @@ public void GetInfo_NotServerless_WhenNoServerlessEnvironmentVariables()
         }
 
         [Test]
-        public void GetInfo_PlatformArchitecture_Core()
+        public void GetInfo_PlatformArchitecture_Core ()
         {
             // This test is environment-dependent
             if (Environment.Version.Major >= 5)
@@ -107,7 +107,7 @@ public void GetInfo_PlatformArchitecture_Core()
         }
 
         [Test]
-        public void GetInfo_PlatformArchitecture_Framework()
+        public void GetInfo_PlatformArchitecture_Framework ()
         {
             // This test is environment-dependent
             if (Environment.Version.Major < 5)
@@ -120,7 +120,7 @@ public void GetInfo_PlatformArchitecture_Framework()
             }
         }
 
-        private void SetEnvironmentVariable(string variable, string value)
+        private void SetEnvironmentVariable (string variable, string value)
         {
             if (value == null)
             {
@@ -133,7 +133,7 @@ private void SetEnvironmentVariable(string variable, string value)
         }
 
         [Test]
-        public void CleanVersion_ShouldRemoveBuildNumber()
+        public void CleanVersion_ShouldRemoveBuildNumber ()
         {
             var version = "1.2.3+4";
             var otherVersion = "1.2.3.0";
@@ -144,15 +144,15 @@ public void CleanVersion_ShouldRemoveBuildNumber()
         }
 
         [Test]
-        public void CleanVersion_ShouldRemovePrereleaseVersion()
+        public void CleanVersion_ShouldRemovePrereleaseVersion ()
         {
             var version = "1.2.3-alpha";
             var cleanedVersion = AgentInfoHelper.CleanVersion(version);
             Assert.That(cleanedVersion, Is.EqualTo("1.2.3"));
         }
 
         [Test]
-        public void CleanVersion_ShouldRemoveBuildNumberAndPrereleaseVersion()
+        public void CleanVersion_ShouldRemoveBuildNumberAndPrereleaseVersion ()
         {
             var version = "1.2.3+4-alpha";
             var cleanedVersion = AgentInfoHelper.CleanVersion(version);

build.cake

@@ -6,6 +6,15 @@
 var target = Argument("target", "Default");
 var configuration = Argument("configuration", "Release");
 var framework = Argument("framework", "");
+var sdkVersion = "";
+if (!string.IsNullOrEmpty(framework))
+{
+    var parts = framework.Split('.');
+    if (parts.Length >= 2)
+    {
+        sdkVersion = $"{parts[0]}.{parts[1]}";
+    }
+}
 var solution = "./Aikido.Zen.sln";
 var projectName = "Aikido.Zen.Core";
 var zenInternalsVersion = "0.1.37";
@@ -130,7 +139,6 @@ Task("Test")
             // skip tests for the wrong framework
             Information($"Running tests for {project.FullPath} on .NET Framework {framework}");
             if (framework.StartsWith("4.") && project.FullPath.Contains("DotNetCore"))
-
             {
                 Information($"Skipping test project {project.FullPath} for .NET Framework {framework}");
                 continue;
@@ -142,8 +150,17 @@ Task("Test")
             }
 
             var logFilePath = $"{coverageDir.FullPath}/test-results-{project.GetFilenameWithoutExtension()}.trx";
+            var outputLogPath = $"{coverageDir.FullPath}/test-output-{project.GetFilenameWithoutExtension()}.log";
+            var errorLogPath = $"{coverageDir.FullPath}/test-error-{project.GetFilenameWithoutExtension()}.log";
 
-            DotNetTest(project.FullPath, new DotNetTestSettings
+            // Create or clear the log files
+            System.IO.File.WriteAllText(outputLogPath, "");
+            System.IO.File.WriteAllText(errorLogPath, "");
+
+            var stdOutput = new List<string>();
+            var stdError = new List<string>();
+
+            var settings = new DotNetTestSettings
             {
                 SetupProcessSettings = processSettings =>
                 {
@@ -166,11 +183,74 @@ Task("Test")
                             .Append("/p:Exclude=[Aikido.Zen.Test]*");
                     }
                     // Increase verbosity to diagnostic for more information
-                    return args
-                        .Append("--verbosity diagnostic")
+                    args = args
+                        .Append("--verbosity detailed")
                         .Append($"--logger trx;LogFileName={logFilePath}");
+
+                    // If SDK version was extracted from framework argument, use it
+                    if (!string.IsNullOrEmpty(sdkVersion))
+                    {
+                        args = args.Append($"--sdk-version {sdkVersion}");
+                    }
+
+                    return args;
                 }
-            });
+            };
+
+            try
+            {
+                var process = StartAndReturnProcess(
+                    "dotnet",
+                    new ProcessSettings
+                    {
+                        Arguments = $"test {project.FullPath} --configuration {configuration} --no-build --no-restore --verbosity detailed --logger trx;LogFileName={logFilePath}",
+                        RedirectStandardOutput = true,
+                        RedirectStandardError = true,
+                        Silent = true
+                    }
+                );
+
+                process.GetStandardOutput().ToList().ForEach(line =>
+                {
+                    stdOutput.Add(line);
+                    System.IO.File.AppendAllText(outputLogPath, line + Environment.NewLine);
+                });
+
+                process.GetStandardError().ToList().ForEach(line =>
+                {
+                    stdError.Add(line);
+                    System.IO.File.AppendAllText(errorLogPath, line + Environment.NewLine);
+                });
+
+                process.WaitForExit();
+
+                if (process.GetExitCode() != 0)
+                {
+                    throw new Exception($"Test failed for {project.GetFilename()}. Exit code: {process.GetExitCode()}");
+                }
+            }
+            catch (Exception ex)
+            {
+                Error($"Test failed for {project.GetFilename()}: {ex.Message}");
+
+                // Print the captured output
+                Information("=== Test Standard Output ===");
+                foreach (var line in stdOutput)
+                {
+                    Information(line);
+                }
+
+                Information("=== Test Standard Error ===");
+                foreach (var line in stdError)
+                {
+                    Error(line);
+                }
+
+                Information($"Full test output log: {outputLogPath}");
+                Information($"Full test error log: {errorLogPath}");
+
+                throw;
+            }
         }
         Information($"Test task completed successfully. Coverage report at: {coverageDir.FullPath}");