From ef1ae202c02050ff37df762e4e3da32acfa99ebc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= <alex.koeplinger@outlook.com>
Date: Tue, 21 Jul 2020 13:36:06 +0200
Subject: [PATCH] WASM: Enable System.Reflection tests

Disable tests that won't work on browser.
---
 eng/testing/tests.mobile.targets                          | 8 ++++++++
 .../tests/PortableExecutable/PEBuilderTests.cs            | 3 +++
 src/libraries/System.Reflection/tests/AssemblyTests.cs    | 7 +++++--
 .../System.Reflection/tests/CoreCLR/AssemblyTests.cs      | 1 +
 src/libraries/tests.proj                                  | 3 ---
 5 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/eng/testing/tests.mobile.targets b/eng/testing/tests.mobile.targets
index 70887c7ac77f6f..5622b19e249bdc 100644
--- a/eng/testing/tests.mobile.targets
+++ b/eng/testing/tests.mobile.targets
@@ -147,11 +147,19 @@
       <ExtraAssemblies Include="$(PublishDir)System.Xml.dll" />
       <ExtraAssemblies Include="$(PublishDir)WindowsBase.dll" />
     </ItemGroup>
+    <!-- these tests load assemblies from the file system -->
     <ItemGroup Condition="'$(AssemblyName)' == 'System.Reflection.MetadataLoadContext.Tests'">
       <WasmFilesToIncludeInFileSystem Include="$(PublishDir)System.Private.CoreLib.dll" />
       <WasmFilesToIncludeInFileSystem Include="$(PublishDir)System.Reflection.MetadataLoadContext.Tests.dll" />
       <WasmFilesToIncludeInFileSystem Include="$(PublishDir)mscorlib.dll" />
     </ItemGroup>
+    <ItemGroup Condition="'$(AssemblyName)' == 'System.Reflection.Metadata.Tests'">
+      <WasmFilesToIncludeInFileSystem Include="$(PublishDir)System.Reflection.Metadata.Tests.dll" />
+    </ItemGroup>
+    <ItemGroup Condition="'$(AssemblyName)' == 'System.Reflection.Tests'">
+      <WasmFilesToIncludeInFileSystem Include="$(PublishDir)System.Reflection.Tests.dll" />
+      <WasmFilesToIncludeInFileSystem Include="$(PublishDir)System.Reflection.Tests.pdb" />
+    </ItemGroup>
     <Error Condition="!Exists('$(MicrosoftNetCoreAppRuntimePackRidDir)')" Text="MicrosoftNetCoreAppRuntimePackRidDir=$(MicrosoftNetCoreAppRuntimePackRidDir) doesn't exist" />
     <WasmAppBuilder
       AppDir="$(BundleDir)"
diff --git a/src/libraries/System.Reflection.Metadata/tests/PortableExecutable/PEBuilderTests.cs b/src/libraries/System.Reflection.Metadata/tests/PortableExecutable/PEBuilderTests.cs
index 23953c1c469691..dd7d036f31bd9a 100644
--- a/src/libraries/System.Reflection.Metadata/tests/PortableExecutable/PEBuilderTests.cs
+++ b/src/libraries/System.Reflection.Metadata/tests/PortableExecutable/PEBuilderTests.cs
@@ -134,6 +134,7 @@ public void BasicValidation(Machine machine)
         }
 
         [Fact]
+        [PlatformSpecific(~TestPlatforms.Browser)] // System.Security.Cryptography isn't supported on browser
         public void BasicValidationSigned()
         {
             using (var peStream = new MemoryStream())
@@ -654,6 +655,7 @@ private static IEnumerable<string> GetBlobRanges(BlobBuilder builder, IEnumerabl
         }
 
         [Fact]
+        [PlatformSpecific(~TestPlatforms.Browser)] // System.Security.Cryptography isn't supported on browser
         public void Checksum()
         {
             Assert.True(TestChecksumAndAuthenticodeSignature(new MemoryStream(Misc.Signed), Misc.KeyPair));
@@ -661,6 +663,7 @@ public void Checksum()
         }
 
         [Fact]
+        [PlatformSpecific(~TestPlatforms.Browser)] // System.Security.Cryptography isn't supported on browser
         public void ChecksumFXAssemblies()
         {
             var paths = new[]
diff --git a/src/libraries/System.Reflection/tests/AssemblyTests.cs b/src/libraries/System.Reflection/tests/AssemblyTests.cs
index a244bbb4222484..e4033244fd9b90 100644
--- a/src/libraries/System.Reflection/tests/AssemblyTests.cs
+++ b/src/libraries/System.Reflection/tests/AssemblyTests.cs
@@ -142,6 +142,7 @@ public void ExportedTypes(Type type, bool expected)
         }
 
         [Fact]
+        [PlatformSpecific(~TestPlatforms.Browser)] // entry assembly won't be xunit.console on browser
         public void GetEntryAssembly()
         {
             Assert.NotNull(Assembly.GetEntryAssembly());
@@ -157,7 +158,8 @@ public void GetFile()
             AssertExtensions.Throws<ArgumentException>(null, () => typeof(AssemblyTests).Assembly.GetFile(""));
             Assert.Null(typeof(AssemblyTests).Assembly.GetFile("NonExistentfile.dll"));
             Assert.NotNull(typeof(AssemblyTests).Assembly.GetFile("System.Reflection.Tests.dll"));
-            Assert.Equal(typeof(AssemblyTests).Assembly.GetFile("System.Reflection.Tests.dll").Name, typeof(AssemblyTests).Assembly.Location);
+            if (PlatformDetection.IsNotBrowser) // see https://github.com/dotnet/runtime/issues/39650
+                Assert.Equal(typeof(AssemblyTests).Assembly.GetFile("System.Reflection.Tests.dll").Name, typeof(AssemblyTests).Assembly.Location);
         }
 
         [Fact]
@@ -165,7 +167,8 @@ public void GetFiles()
         {
             Assert.NotNull(typeof(AssemblyTests).Assembly.GetFiles());
             Assert.Equal(1, typeof(AssemblyTests).Assembly.GetFiles().Length);
-            Assert.Equal(typeof(AssemblyTests).Assembly.GetFiles()[0].Name, typeof(AssemblyTests).Assembly.Location);
+            if (PlatformDetection.IsNotBrowser) // see https://github.com/dotnet/runtime/issues/39650
+                Assert.Equal(typeof(AssemblyTests).Assembly.GetFiles()[0].Name, typeof(AssemblyTests).Assembly.Location);
         }
 
         public static IEnumerable<object[]> GetHashCode_TestData()
diff --git a/src/libraries/System.Reflection/tests/CoreCLR/AssemblyTests.cs b/src/libraries/System.Reflection/tests/CoreCLR/AssemblyTests.cs
index d75ba5a0ceb21c..544fc17414aa8d 100644
--- a/src/libraries/System.Reflection/tests/CoreCLR/AssemblyTests.cs
+++ b/src/libraries/System.Reflection/tests/CoreCLR/AssemblyTests.cs
@@ -11,6 +11,7 @@ namespace System.Reflection.Tests
     public class AssemblyTests
     {
         [Fact]
+        [ActiveIssue("https://github.com/dotnet/runtime/issues/39650", TestPlatforms.Browser)]
         public void CurrentLocation_HasLocaton()
         {
             string location = GetExecutingAssembly().Location;
diff --git a/src/libraries/tests.proj b/src/libraries/tests.proj
index 4ea05eaec8c961..d069428ca23dfe 100644
--- a/src/libraries/tests.proj
+++ b/src/libraries/tests.proj
@@ -41,9 +41,6 @@
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Private.Uri\tests\FunctionalTests\System.Private.Uri.Functional.Tests.csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Private.Xml\tests\XmlSerializer\ReflectionOnly\System.Xml.XmlSerializer.ReflectionOnly.Tests.csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Private.Xml\tests\XmlSerializer\System.Xml.XmlSerializer.Tests.csproj" />
-    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Reflection.Metadata\tests\System.Reflection.Metadata.Tests.csproj" />
-    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Reflection\tests\CoreCLR\System.Reflection.CoreCLR.Tests.csproj" />
-    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Reflection\tests\System.Reflection.Tests.csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Security.Permissions\tests\System.Security.Permissions.Tests.csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Threading.Thread\tests\System.Threading.Thread.Tests.csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.ValueTuple\tests\System.ValueTuple.Tests.csproj" />