Fix escaping regression on coverage converter

SonarSource · May 23, 2016 · 8fcf6f8 · 8fcf6f8
1 parent 47cef9c
commit 8fcf6f8
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 3 deletions.
diff --git a/SonarQube.TeamBuild.Integration/CoverageReportConverter.cs b/SonarQube.TeamBuild.Integration/CoverageReportConverter.cs
@@ -192,7 +192,7 @@ public static bool ConvertBinaryToXml(string converterExeFilePath, string inputB
 
             List<string> args = new List<string>();
             args.Add("analyze");
-            args.Add(string.Format(System.Globalization.CultureInfo.InvariantCulture, @"/output:""{0}""", outputXmlFilePath));
+            args.Add(string.Format(System.Globalization.CultureInfo.InvariantCulture, @"/output:{0}", outputXmlFilePath));
             args.Add(inputBinaryFilePath);
 
             ProcessRunnerArguments runnerArgs = new ProcessRunnerArguments(converterExeFilePath, false, logger)

diff --git a/Tests/SonarQube.TeamBuild.Integration.Tests/CoverageReportConverterTests.cs b/Tests/SonarQube.TeamBuild.Integration.Tests/CoverageReportConverterTests.cs
@@ -30,7 +30,7 @@ public void Conv_OutputIsCaptured()
 
             string inputFilePath = Path.Combine(testDir, "input.txt");
             File.WriteAllText(inputFilePath, "dummy input file");
-            
+
             string converterFilePath = Path.Combine(testDir, "converter.bat");
             File.WriteAllText(converterFilePath,
 @"
@@ -41,7 +41,7 @@ echo Error output...>&2
 
             // Act
             bool success = CoverageReportConverter.ConvertBinaryToXml(converterFilePath, inputFilePath, outputFilePath, logger);
-            
+
             // Assert
             Assert.IsTrue(success, "Expecting the process to succeed");
 
@@ -106,6 +106,36 @@ public void Conv_FailsIfFileConverterReturnsAnErrorCode()
             Assert.IsFalse(File.Exists(outputFilePath), "Not expecting the output file to exist");
         }
 
+        [TestMethod]
+        public void Conv_HasThreeArguments()
+        {
+            // Arrange
+            TestLogger logger = new TestLogger();
+            string testDir = TestUtils.CreateTestSpecificFolder(this.TestContext);
+
+            string outputFilePath = Path.Combine(testDir, "output.txt");
+
+            string inputFilePath = Path.Combine(testDir, "input.txt");
+            File.WriteAllText(inputFilePath, "dummy input file");
+
+            string converterFilePath = Path.Combine(testDir, "converter.bat");
+            File.WriteAllText(converterFilePath,
+@"
+set argC=0
+for %%x in (%*) do Set /A argC+=1
+
+echo Converter called with %argC% args
+echo success > """ + outputFilePath + @"""");
+
+            // Act
+            bool success = CoverageReportConverter.ConvertBinaryToXml(converterFilePath, inputFilePath, outputFilePath, logger);
+
+            // Assert
+            Assert.IsTrue(success, "Expecting the process to succeed");
+
+            logger.AssertMessageLogged("Converter called with 3 args");
+        }
+
         #endregion
     }
 }