Fix #48579 (#49387)
authorNikitin A. Kirill <nikitin.a.kirill@gmail.com>
Fri, 28 May 2021 18:42:08 +0000 (22:42 +0400)
committerGitHub <noreply@github.com>
Fri, 28 May 2021 18:42:08 +0000 (11:42 -0700)
src/tests/Loader/ContextualReflection/ContextualReflection.cs

index 295b8b464d461da230112f8d0e8c95a547d65ee1..e0a61754f990cce176e7e28091a9a109cc2a567a 100644 (file)
@@ -729,14 +729,14 @@ namespace ContextualReflectionTest
         void TestDefineDynamicAssembly(bool collectibleContext, AssemblyBuilderAccess assemblyBuilderAccess)
         {
             AssemblyLoadContext assemblyLoadContext = collectibleContext ? new AssemblyLoadContext("DynamicAssembly Collectable context", true) : AssemblyLoadContext.Default;
-            AssemblyName dynamicAssemblyName = new AssemblyName("DynamicAssembly");
+            AssemblyBuilder assemblyBuilder;
 
             using (assemblyLoadContext.EnterContextualReflection())
             {
-                AssemblyBuilder assemblyBuilder = AssemblyBuilder.DefineDynamicAssembly(dynamicAssemblyName, assemblyBuilderAccess);
+                assemblyBuilder = AssemblyBuilder.DefineDynamicAssembly(new AssemblyName($"DynamicAssembly_{Guid.NewGuid():N}"), assemblyBuilderAccess);
             }
 
-            Assert.IsTrue(assemblyLoadContext.Assemblies.Any(a => AssemblyName.ReferenceMatchesDefinition(a.GetName(), dynamicAssemblyName)));
+            Assert.IsTrue(assemblyLoadContext.Assemblies.Any(a => AssemblyName.ReferenceMatchesDefinition(a.GetName(), assemblyBuilder.GetName())));
         }
 
         void TestMockAssemblyThrows()
@@ -752,9 +752,8 @@ namespace ContextualReflectionTest
             VerifyUsingStatementContextualReflectionUsage();
             VerifyBadContextualReflectionUsage();
 
-            // TestDynamicAssembly() disabled due to https://github.com/dotnet/runtime/issues/48579
-            //TestDynamicAssembly(true);
-            //TestDynamicAssembly(false);
+            TestDynamicAssembly(true);
+            TestDynamicAssembly(false);
 
             RunTests(isolated : false);
             alcProgramInstance.RunTestsIsolated();