Merge pull request #4418 from tamasvajk/feature/reenable-test

tamasvajk · web-flow · commit cec6bbea57dd · 2020-10-07T16:03:27.000+02:00
C#: Reenable disabled test on OSX
diff --git a/csharp/extractor/Semmle.Extraction.Tests/Layout.cs b/csharp/extractor/Semmle.Extraction.Tests/Layout.cs
@@ -45,10 +45,14 @@ public void TestDefaultLayout()
             Directory.SetCurrentDirectory(tmpDir);
             if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
             {
-                // `Directory.SetCurrentDirectory()` doesn't seem to work on macOS,
-                // so disable this test on macOS, for now
+                // `Directory.SetCurrentDirectory()` seems to slightly change the path on macOS,
+                // so adjusting it:
                 Assert.NotEqual(Directory.GetCurrentDirectory(), tmpDir);
-                return;
+                tmpDir = "/private" + tmpDir;
+                // Remove trailing slash:
+                Assert.Equal('/', tmpDir[tmpDir.Length - 1]);
+                tmpDir = tmpDir.Substring(0, tmpDir.Length - 1);
+                Assert.Equal(Directory.GetCurrentDirectory(), tmpDir);
             }
             var f1 = project!.GetTrapPath(Logger, new TransformedPathStub("foo.cs"), TrapWriter.CompressionMode.Gzip);
             var g1 = TrapWriter.NestPaths(Logger, tmpDir, "foo.cs.trap.gz");
