Skip to content

Commit 60af9b0

Browse files
authored
Merge pull request github#13733 from tamasvajk/fix/test-path-combine
C#: Fix test expectations in `RuntimeVersion` tests to handle platfor…
2 parents 4391799 + 35cc058 commit 60af9b0

File tree

1 file changed

+6
-4
lines changed
  • csharp/extractor/Semmle.Extraction.Tests

1 file changed

+6
-4
lines changed

csharp/extractor/Semmle.Extraction.Tests/Runtime.cs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ internal class DotNetStub : IDotNet
2222

2323
public class RuntimeTests
2424
{
25+
private static string FixExpectedPathOnWindows(string path) => path.Replace('\\', '/');
26+
2527
[Fact]
2628
public void TestRuntime1()
2729
{
@@ -46,10 +48,10 @@ public void TestRuntime1()
4648
Assert.Equal(2, runtimes.Count);
4749

4850
Assert.True(runtimes.TryGetValue("Microsoft.AspNetCore.App", out var aspNetCoreApp));
49-
Assert.Equal("/path/dotnet/shared/Microsoft.AspNetCore.App/7.0.2", aspNetCoreApp.FullPath);
51+
Assert.Equal("/path/dotnet/shared/Microsoft.AspNetCore.App/7.0.2", FixExpectedPathOnWindows(aspNetCoreApp.FullPath));
5052

5153
Assert.True(runtimes.TryGetValue("Microsoft.NETCore.App", out var netCoreApp));
52-
Assert.Equal("/path/dotnet/shared/Microsoft.NETCore.App/7.0.2", netCoreApp.FullPath);
54+
Assert.Equal("/path/dotnet/shared/Microsoft.NETCore.App/7.0.2", FixExpectedPathOnWindows(netCoreApp.FullPath));
5355
}
5456

5557
[Fact]
@@ -72,7 +74,7 @@ public void TestRuntime2()
7274
Assert.Single(runtimes);
7375

7476
Assert.True(runtimes.TryGetValue("Microsoft.NETCore.App", out var netCoreApp));
75-
Assert.Equal("/path/dotnet/shared/Microsoft.NETCore.App/8.0.0-preview.5.43280.8", netCoreApp.FullPath);
77+
Assert.Equal("/path/dotnet/shared/Microsoft.NETCore.App/8.0.0-preview.5.43280.8", FixExpectedPathOnWindows(netCoreApp.FullPath));
7678
}
7779

7880
[Fact]
@@ -95,7 +97,7 @@ public void TestRuntime3()
9597
Assert.Single(runtimes);
9698

9799
Assert.True(runtimes.TryGetValue("Microsoft.NETCore.App", out var netCoreApp));
98-
Assert.Equal("/path/dotnet/shared/Microsoft.NETCore.App/8.0.0-rc.4.43280.8", netCoreApp.FullPath);
100+
Assert.Equal("/path/dotnet/shared/Microsoft.NETCore.App/8.0.0-rc.4.43280.8", FixExpectedPathOnWindows(netCoreApp.FullPath));
99101
}
100102

101103
}

0 commit comments

Comments
 (0)