Merge pull request github#1983 from hvitved/csharp/unit-test-windows

calumgrant · web-flow · commit 478095223e5c · 2019-09-20T13:52:01.000+01:00
C#: Fix broken unit test on Windows
diff --git a/csharp/extractor/Semmle.Extraction.Tests/Options.cs b/csharp/extractor/Semmle.Extraction.Tests/Options.cs
@@ -3,6 +3,7 @@
 using System;
 using System.IO;
 using Semmle.Util;
+using System.Text.RegularExpressions;
 
 namespace Semmle.Extraction.Tests
 {
@@ -197,7 +198,7 @@ public void ArchiveArguments()
             {
                 File.AppendAllText(file, "Test");
                 new string[] { "/noconfig", "@" + file }.WriteCommandLine(sw);
-                Assert.Equal("Test\n", sw.ToString());
+                Assert.Equal("Test", Regex.Replace(sw.ToString(), @"\t|\n|\r", ""));
             }
             finally
             {

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`using System;`
`4`	`4`	`using System.IO;`
`5`	`5`	`using Semmle.Util;`
	`6`	`+using System.Text.RegularExpressions;`
`6`	`7`
`7`	`8`	`namespace Semmle.Extraction.Tests`
`8`	`9`	`{`
`@@ -197,7 +198,7 @@ public void ArchiveArguments()`
`197`	`198`	`{`
`198`	`199`	`File.AppendAllText(file, "Test");`
`199`	`200`	`new string[] { "/noconfig", "@" + file }.WriteCommandLine(sw);`
`200`		`- Assert.Equal("Test\n", sw.ToString());`
	`201`	`+ Assert.Equal("Test", Regex.Replace(sw.ToString(), @"\t\|\n\|\r", ""));`
`201`	`202`	`}`
`202`	`203`	`finally`
`203`	`204`	`{`