Issue914 (#922)

* Fix issue #914 * Adding Linux safety belt * SA error fixed
nunit · Nov 28, 2021 · 3be32d6 · 3be32d6
1 parent 597fe01
commit 3be32d6
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 30 deletions.
diff --git a/build.cake b/build.cake
@@ -13,7 +13,7 @@ var configuration = Argument("configuration", "Release");
 //////////////////////////////////////////////////////////////////////
 
 var version = "4.2.0";
-var modifier = "-alpha.1";
+var modifier = "-alpha.201";
 
 var dbgSuffix = configuration.ToLower() == "debug" ? "-dbg" : "";
 var packageVersion = version + modifier + dbgSuffix;

diff --git a/src/NUnitTestAdapter/AdapterSettings.cs b/src/NUnitTestAdapter/AdapterSettings.cs
@@ -118,6 +118,8 @@ public interface IAdapterSettings
         void Load(string settingsXml);
         void SaveRandomSeed(string dirname);
         void RestoreRandomSeed(string dirname);
+
+        bool EnsureAttachmentFileScheme { get; }
     }
 
     public enum VsTestCategoryType
@@ -325,6 +327,7 @@ public void Load(string settingsXml)
             StopOnError = GetInnerTextAsBool(nunitNode, nameof(StopOnError), false);
             UseNUnitFilter = GetInnerTextAsBool(nunitNode, nameof(UseNUnitFilter), true);
             IncludeStackTraceForSuites = GetInnerTextAsBool(nunitNode, nameof(IncludeStackTraceForSuites), true);
+            EnsureAttachmentFileScheme = GetInnerTextAsBool(nunitNode, nameof(IncludeStackTraceForSuites), false);
 
             // Engine settings
             DiscoveryMethod = MapEnum(GetInnerText(nunitNode, nameof(DiscoveryMethod), Verbosity > 0), DiscoveryMethod.Current);
@@ -472,6 +475,8 @@ public void RestoreRandomSeed(string dirname)
             }
         }
 
+        public bool EnsureAttachmentFileScheme { get; private set; }
+
         #endregion
 
         #region Helper Methods
@@ -508,7 +513,7 @@ private string GetInnerText(XmlNode startNode, string xpath, bool log, params st
             {
                 val = targetNode.InnerText;
 
-                if (validValues != null && validValues.Length > 0)
+                if (validValues is { Length: > 0 })
                 {
                     foreach (string valid in validValues)
                     {

diff --git a/src/NUnitTestAdapter/TestConverter.cs b/src/NUnitTestAdapter/TestConverter.cs
@@ -350,14 +350,21 @@ private AttachmentSet ParseAttachments(INUnitTestEvent resultNode)
 
             foreach (var attachment in resultNode.NUnitAttachments)
             {
-                var path = attachment.FilePath;
                 var description = attachment.Description;
-
-                if (!(string.IsNullOrEmpty(path) || path.StartsWith(fileUriScheme, StringComparison.OrdinalIgnoreCase)))
+                var path = attachment.FilePath;
+                if (adapterSettings.EnsureAttachmentFileScheme)
+                {
+                    if (!(string.IsNullOrEmpty(path) ||
+                          path.StartsWith(fileUriScheme, StringComparison.OrdinalIgnoreCase)))
+                    {
+                        path = fileUriScheme + path;
+                    }
+                }
+                // For Linux paths
+                if (!(string.IsNullOrEmpty(path) || path.StartsWith(fileUriScheme, StringComparison.OrdinalIgnoreCase)) && !path.Contains(':'))
                 {
                     path = fileUriScheme + path;
                 }
-
                 try
                 {
                     // We only support absolute paths since we dont lookup working directory here

diff --git a/src/NUnitTestAdapterTests/Fakes/FakeTestData.cs b/src/NUnitTestAdapterTests/Fakes/FakeTestData.cs
@@ -160,6 +160,10 @@ private static void FakeTestCase() { } // LineNumber should be this line
                             <filePath>file:///home/results/att.log</filePath>
                             <description>lin, with scheme</description>
                         </attachment>
+                        <attachment>
+                            <filePath>C:\Windows\WindowsUpdate.log</filePath>
+                            <description>win, Issue914</description>
+                        </attachment>
                         <attachment>
                             <filePath></filePath>
                             <description>empty path</description>

diff --git a/src/NUnitTestAdapterTests/TestConverterTests.cs b/src/NUnitTestAdapterTests/TestConverterTests.cs
@@ -211,40 +211,26 @@ public void Attachments_CorrectAmountOfConvertedAttachments()
             var fakeAttachments = fakeResultNode.NUnitAttachments
                 .Where(n => !string.IsNullOrEmpty(n.FilePath))
                 .ToArray();
-
+            TestContext.Out.WriteLine("Incoming attachments");
+            foreach (var attachment in fakeAttachments)
+            {
+                TestContext.Out.WriteLine($"{attachment.FilePath}");
+            }
             var convertedAttachments = testResults.TestResults
                 .SelectMany(tr => tr.Attachments.SelectMany(ats => ats.Attachments))
                 .ToArray();
-
+            TestContext.Out.WriteLine("\nConverted attachments (Uri, path)");
+            foreach (var attachment in convertedAttachments)
+            {
+                TestContext.Out.WriteLine($"{attachment.Uri.AbsoluteUri} : {attachment.Uri.LocalPath}");
+            }
             Assert.Multiple(() =>
             {
                 Assert.That(convertedAttachments.Length, Is.GreaterThan(0), "Some converted attachments were expected");
                 Assert.That(convertedAttachments.Length, Is.EqualTo(fakeAttachments.Length), "Attachments are not converted");
             });
         }
 
-        [Test]
-        public void Attachments_AllFilePathesStartWithFileScheme()
-        {
-            const string fileUriScheme = "file://";
-            const string errorMessage = "Path must start with file:// uri scheme";
-
-            var cachedTestCase = testConverter.ConvertTestCase(fakeTestNode);
-            var fakeResultNode = new NUnitTestEventTestCase(FakeTestData.GetResultNode().AsString());
-
-            var testResults = testConverter.GetVsTestResults(fakeResultNode, Enumerable.Empty<INUnitTestEventTestOutput>().ToList());
-
-            var convertedAttachments = testResults.TestResults
-                .SelectMany(tr => tr.Attachments.SelectMany(ats => ats.Attachments))
-                .ToArray();
-
-            foreach (var attachment in convertedAttachments)
-            {
-                var originalPath = attachment.Uri.OriginalString;
-                Assert.That(originalPath.LastIndexOf(fileUriScheme), Is.EqualTo(0), errorMessage);
-            }
-        }
-
         #endregion Attachment tests
 
         private void CheckTestCase(TestCase testCase)