未验证 提交 3dcf48e2 编写于 作者: A Alexander Köplinger 提交者: GitHub

Reenable a test on iOS/tvOS/Browser that was disabled (#89083)

上级 e8a18d69
...@@ -145,8 +145,6 @@ public void ExportedTypes(Type type, bool expected) ...@@ -145,8 +145,6 @@ public void ExportedTypes(Type type, bool expected)
} }
[Fact] [Fact]
[SkipOnPlatform(TestPlatforms.Browser, "entry assembly won't be xunit.console on browser")]
[ActiveIssue("https://github.com/dotnet/runtime/issues/36892", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst | TestPlatforms.Android)]
public void GetEntryAssembly() public void GetEntryAssembly()
{ {
Assert.NotNull(Assembly.GetEntryAssembly()); Assert.NotNull(Assembly.GetEntryAssembly());
...@@ -158,6 +156,21 @@ public void GetEntryAssembly() ...@@ -158,6 +156,21 @@ public void GetEntryAssembly()
// The single file test runner is not 'xunit.console'. // The single file test runner is not 'xunit.console'.
correct = assembly.IndexOf("System.Reflection.Tests", StringComparison.OrdinalIgnoreCase) != -1; correct = assembly.IndexOf("System.Reflection.Tests", StringComparison.OrdinalIgnoreCase) != -1;
} }
else if (PlatformDetection.IsiOS || PlatformDetection.IstvOS)
{
// The iOS/tvOS test runner is not 'xunit.console'.
correct = assembly.IndexOf("AppleTestRunner", StringComparison.OrdinalIgnoreCase) != -1;
}
else if (PlatformDetection.IsAndroid)
{
// The Android test runner is not 'xunit.console'.
correct = assembly.IndexOf("AndroidTestRunner", StringComparison.OrdinalIgnoreCase) != -1;
}
else if (PlatformDetection.IsBrowser)
{
// The browser test runner is not 'xunit.console'.
correct = assembly.IndexOf("WasmTestRunner", StringComparison.OrdinalIgnoreCase) != -1;
}
else else
{ {
// Under Visual Studio, the runner is 'testhost', otherwise it is 'xunit.console'. // Under Visual Studio, the runner is 'testhost', otherwise it is 'xunit.console'.
...@@ -778,7 +791,7 @@ public void AssemblyLoadFromBytesNeg() ...@@ -778,7 +791,7 @@ public void AssemblyLoadFromBytesNeg()
} }
[ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsAssemblyLoadingSupported))] [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsAssemblyLoadingSupported))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/36892", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)] [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst, "Symbols are in a different location on iOS/tvOS/MacCatalyst")]
public void AssemblyLoadFromBytesWithSymbols() public void AssemblyLoadFromBytesWithSymbols()
{ {
Assembly assembly = typeof(AssemblyTests).Assembly; Assembly assembly = typeof(AssemblyTests).Assembly;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册