Skip to content

Commit 3dcf48e

Browse files
authored
Reenable a test on iOS/tvOS/Browser that was disabled (#89083)
1 parent e8a18d6 commit 3dcf48e

1 file changed

Lines changed: 16 additions & 3 deletions

File tree

src/libraries/System.Reflection/tests/AssemblyTests.cs

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,6 @@ public void ExportedTypes(Type type, bool expected)
145145
}
146146

147147
[Fact]
148-
[SkipOnPlatform(TestPlatforms.Browser, "entry assembly won't be xunit.console on browser")]
149-
[ActiveIssue("https://github.com/dotnet/runtime/issues/36892", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst | TestPlatforms.Android)]
150148
public void GetEntryAssembly()
151149
{
152150
Assert.NotNull(Assembly.GetEntryAssembly());
@@ -158,6 +156,21 @@ public void GetEntryAssembly()
158156
// The single file test runner is not 'xunit.console'.
159157
correct = assembly.IndexOf("System.Reflection.Tests", StringComparison.OrdinalIgnoreCase) != -1;
160158
}
159+
else if (PlatformDetection.IsiOS || PlatformDetection.IstvOS)
160+
{
161+
// The iOS/tvOS test runner is not 'xunit.console'.
162+
correct = assembly.IndexOf("AppleTestRunner", StringComparison.OrdinalIgnoreCase) != -1;
163+
}
164+
else if (PlatformDetection.IsAndroid)
165+
{
166+
// The Android test runner is not 'xunit.console'.
167+
correct = assembly.IndexOf("AndroidTestRunner", StringComparison.OrdinalIgnoreCase) != -1;
168+
}
169+
else if (PlatformDetection.IsBrowser)
170+
{
171+
// The browser test runner is not 'xunit.console'.
172+
correct = assembly.IndexOf("WasmTestRunner", StringComparison.OrdinalIgnoreCase) != -1;
173+
}
161174
else
162175
{
163176
// Under Visual Studio, the runner is 'testhost', otherwise it is 'xunit.console'.
@@ -778,7 +791,7 @@ public void AssemblyLoadFromBytesNeg()
778791
}
779792

780793
[ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsAssemblyLoadingSupported))]
781-
[ActiveIssue("https://github.com/dotnet/runtime/issues/36892", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
794+
[SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst, "Symbols are in a different location on iOS/tvOS/MacCatalyst")]
782795
public void AssemblyLoadFromBytesWithSymbols()
783796
{
784797
Assembly assembly = typeof(AssemblyTests).Assembly;

0 commit comments

Comments
 (0)