Skip to content
This repository has been archived by the owner on Jan 23, 2023. It is now read-only.
/ corefx Public archive

Revert "Disable for coreclr#23583" #36564

Merged
merged 1 commit into from
Apr 8, 2019
Merged

Revert "Disable for coreclr#23583" #36564

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Revert "Disable for coreclr#23583"
  • Loading branch information
@sdmaclea
sdmaclea committed Apr 4, 2019
commit cdc3ac762323dec3cbb378a42b9012adf44684cb
6 changes: 0 additions & 6 deletions src/System.Runtime.Loader/tests/AssemblyLoadContextTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,9 +145,7 @@ public static void DefaultAssemblyLoadContext_Properties()
Assert.Contains("\"Default\"", alc.ToString());
Assert.Contains("System.Runtime.Loader.DefaultAssemblyLoadContext", alc.ToString());
Assert.Contains(alc, AssemblyLoadContext.All);
#if CoreCLR_23583
Assert.Contains(Assembly.GetCallingAssembly(), alc.Assemblies);
#endif
}

[Fact]
Expand All @@ -161,9 +159,7 @@ public static void PublicConstructor_Default()
Assert.Contains("PublicConstructor", alc.ToString());
Assert.Contains("System.Runtime.Loader.AssemblyLoadContext", alc.ToString());
Assert.Contains(alc, AssemblyLoadContext.All);
#if CoreCLR_23583
Assert.Empty(alc.Assemblies);
#endif
}

[Theory]
Expand All @@ -179,9 +175,7 @@ public static void PublicConstructor_Theory(string name, bool isCollectible)
Assert.Contains(name, alc.ToString());
Assert.Contains("System.Runtime.Loader.AssemblyLoadContext", alc.ToString());
Assert.Contains(alc, AssemblyLoadContext.All);
#if CoreCLR_23583
Assert.Empty(alc.Assemblies);
#endif
}
}
}
4 changes: 0 additions & 4 deletions src/System.Runtime.Loader/tests/DefaultContext/DefaultLoadContextTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,7 @@ public void LoadInDefaultContext()

// We should have successfully loaded the assembly in secondary load context.
Assert.NotNull(slcLoadedAssembly);
#if CoreCLR_23583
Assert.Contains(slcLoadedAssembly, slc.Assemblies);
#endif

// And make sure the simple name matches
Assert.Equal(TestAssemblyName, slcLoadedAssembly.GetName().Name);
Expand All @@ -129,9 +127,7 @@ public void LoadInDefaultContext()

// We should have successfully loaded the assembly in default context.
Assert.NotNull(assemblyExpectedFromLoad);
#if CoreCLR_23583
Assert.Contains(assemblyExpectedFromLoad, AssemblyLoadContext.Default.Assemblies);
#endif

// We should have only invoked non-Null returning handler once
Assert.Equal(1, _numNonNullResolutions);
Expand Down
6 changes: 0 additions & 6 deletions src/System.Runtime/tests/System/Reflection/IsCollectibleTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,7 @@ public void Assembly_IsCollectibleFalse_WhenUsingAssemblyLoad()
Assert.Contains("\"Default\"", alc.ToString());
Assert.Contains("System.Runtime.Loader.DefaultAssemblyLoadContext", alc.ToString());
Assert.Contains(alc, AssemblyLoadContext.All);
#if CoreCLR_23583
Assert.Contains(asm, alc.Assemblies);
#endif

return RemoteExecutor.SuccessExitCode;
}).Dispose();
Expand All @@ -78,9 +76,7 @@ public void Assembly_IsCollectibleFalse_WhenUsingAssemblyLoadContext()
Assert.Contains("Assembly_IsCollectibleFalse_WhenUsingAssemblyLoadContext", alc.ToString());
Assert.Contains("System.Runtime.Loader.AssemblyLoadContext", alc.ToString());
Assert.Contains(alc, AssemblyLoadContext.All);
#if CoreCLR_23583
Assert.Contains(asm, alc.Assemblies);
#endif

return RemoteExecutor.SuccessExitCode;
}).Dispose();
Expand All @@ -103,9 +99,7 @@ public void Assembly_IsCollectibleTrue_WhenUsingTestAssemblyLoadContext()
Assert.Contains("\"\"", alc.ToString());
Assert.Contains("System.Reflection.Tests.TestAssemblyLoadContext", alc.ToString());
Assert.Contains(alc, AssemblyLoadContext.All);
#if CoreCLR_23583
Assert.Contains(asm, alc.Assemblies);
#endif

return RemoteExecutor.SuccessExitCode;
}).Dispose();
Expand Down