Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Reenable for dotnet/coreclr#24191 #37311

Merged
merged 1 commit into from
Apr 30, 2019
Merged

Reenable for dotnet/coreclr#24191 #37311

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
71 changes: 21 additions & 50 deletions src/System.Runtime.Loader/tests/SatelliteAssemblies.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,20 @@ public static string Describe(string lang)
[InlineData("Default", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "es-MX", "Spanish (Mexico) language Main description 1.0.0")]
[InlineData("Default", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "fr", "Neutral language Main description 1.0.0")]
[InlineData("Default", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "fr-FR", "Neutral language Main description 1.0.0")]
[InlineData("SatelliteAssembliesTests", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "", "Neutral language Main description 1.0.0")]
[InlineData("SatelliteAssembliesTests", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "en", "English language Main description 1.0.0")]
[InlineData("SatelliteAssembliesTests", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "en-US", "English language Main description 1.0.0")]
[InlineData("SatelliteAssembliesTests", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "es", "Neutral language Main description 1.0.0")]
[InlineData("SatelliteAssembliesTests", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "es-MX", "Spanish (Mexico) language Main description 1.0.0")]
[InlineData("SatelliteAssembliesTests", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "fr", "Neutral language Main description 1.0.0")]
[InlineData("SatelliteAssembliesTests", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "fr-FR", "Neutral language Main description 1.0.0")]
[InlineData("LoadFile", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "", "Neutral language Main description 1.0.0")]
[InlineData("LoadFile", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "en", "English language Main description 1.0.0")]
[InlineData("LoadFile", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "en-US", "English language Main description 1.0.0")]
[InlineData("LoadFile", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "es", "Neutral language Main description 1.0.0")]
[InlineData("LoadFile", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "es-MX", "Spanish (Mexico) language Main description 1.0.0")]
[InlineData("LoadFile", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "fr", "Neutral language Main description 1.0.0")]
[InlineData("LoadFile", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "fr-FR", "Neutral language Main description 1.0.0")]
public void describeLib(string alc, string type, string culture, string expected)
{
string result = "Oops";
Expand Down Expand Up @@ -120,35 +134,6 @@ public void describeLib(string alc, string type, string culture, string expected
[InlineData("Default", "ReferencedClassLibNeutralIsSatellite.Program, ReferencedClassLibNeutralIsSatellite", "en", "English language ReferencedClassLibNeutralIsSatellite description 1.0.0")]
[InlineData("Default", "ReferencedClassLibNeutralIsSatellite.Program, ReferencedClassLibNeutralIsSatellite", "en-US", "English language ReferencedClassLibNeutralIsSatellite description 1.0.0")]
[InlineData("Default", "ReferencedClassLibNeutralIsSatellite.Program, ReferencedClassLibNeutralIsSatellite", "es", "Neutral (es) language ReferencedClassLibNeutralIsSatellite description 1.0.0")]
public void describeLib37246(string alc, string type, string culture, string expected)
{
describeLib(alc, type, culture, expected);
}

[Theory]
[ActiveIssue("dotnet/coreclr#24191")]
[InlineData("SatelliteAssembliesTests", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "", "Neutral language Main description 1.0.0")]
[InlineData("SatelliteAssembliesTests", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "en", "English language Main description 1.0.0")]
[InlineData("SatelliteAssembliesTests", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "en-US", "English language Main description 1.0.0")]
[InlineData("SatelliteAssembliesTests", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "es", "Neutral language Main description 1.0.0")]
[InlineData("SatelliteAssembliesTests", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "es-MX", "Spanish (Mexico) language Main description 1.0.0")]
[InlineData("SatelliteAssembliesTests", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "fr", "Neutral language Main description 1.0.0")]
[InlineData("SatelliteAssembliesTests", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "fr-FR", "Neutral language Main description 1.0.0")]
[InlineData("LoadFile", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "", "Neutral language Main description 1.0.0")]
[InlineData("LoadFile", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "en", "English language Main description 1.0.0")]
[InlineData("LoadFile", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "en-US", "English language Main description 1.0.0")]
[InlineData("LoadFile", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "es", "Neutral language Main description 1.0.0")]
[InlineData("LoadFile", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "es-MX", "Spanish (Mexico) language Main description 1.0.0")]
[InlineData("LoadFile", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "fr", "Neutral language Main description 1.0.0")]
[InlineData("LoadFile", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "fr-FR", "Neutral language Main description 1.0.0")]
public void describeLib24191(string alc, string type, string culture, string expected)
{
describeLib(alc, type, culture, expected);
}

[Theory]
[ActiveIssue("dotnet/corefx#37246")]
[ActiveIssue("dotnet/coreclr#24191")]
[InlineData("ReferencedClassLib", "ReferencedClassLib.Program, ReferencedClassLib", "", "Neutral language ReferencedClassLib description 1.0.0")]
[InlineData("ReferencedClassLib", "ReferencedClassLib.Program, ReferencedClassLib", "en", "English language ReferencedClassLib description 1.0.0")]
[InlineData("ReferencedClassLib", "ReferencedClassLib.Program, ReferencedClassLib", "en-US", "English language ReferencedClassLib description 1.0.0")]
Expand All @@ -157,10 +142,11 @@ public void describeLib24191(string alc, string type, string culture, string exp
[InlineData("ReferencedClassLibNeutralIsSatellite", "ReferencedClassLibNeutralIsSatellite.Program, ReferencedClassLibNeutralIsSatellite", "en", "English language ReferencedClassLibNeutralIsSatellite description 1.0.0")]
[InlineData("ReferencedClassLibNeutralIsSatellite", "ReferencedClassLibNeutralIsSatellite.Program, ReferencedClassLibNeutralIsSatellite", "en-US", "English language ReferencedClassLibNeutralIsSatellite description 1.0.0")]
[InlineData("ReferencedClassLibNeutralIsSatellite", "ReferencedClassLibNeutralIsSatellite.Program, ReferencedClassLibNeutralIsSatellite", "es", "Neutral (es) language ReferencedClassLibNeutralIsSatellite description 1.0.0")]
public void describeLib37246_24191(string alc, string type, string culture, string expected)
public void describeLib37246(string alc, string type, string culture, string expected)
{
describeLib(alc, type, culture, expected);
}

#endregion

[Theory]
Expand All @@ -172,6 +158,10 @@ public void describeLib37246_24191(string alc, string type, string culture, stri
[InlineData("ReferencedClassLib", "System.Runtime.Loader.Tests", "es-MX")]
[InlineData("ReferencedClassLibNeutralIsSatellite", "System.Runtime.Loader.Tests", "en")]
[InlineData("ReferencedClassLibNeutralIsSatellite", "System.Runtime.Loader.Tests", "es-MX")]
[InlineData("SatelliteAssembliesTests", "System.Runtime.Loader.Tests", "en")]
[InlineData("SatelliteAssembliesTests", "System.Runtime.Loader.Tests", "es-MX")]
[InlineData("LoadFile", "System.Runtime.Loader.Tests", "en")]
[InlineData("LoadFile", "System.Runtime.Loader.Tests", "es-MX")]
public void SatelliteLoadsCorrectly(string alc, string assemblyName, string culture)
{
AssemblyName satelliteAssemblyName = new AssemblyName(assemblyName + ".resources");
Expand All @@ -189,17 +179,6 @@ public void SatelliteLoadsCorrectly(string alc, string assemblyName, string cult
Assert.Equal(AssemblyLoadContext.GetLoadContext(parentAssembly), AssemblyLoadContext.GetLoadContext(satelliteAssembly));
}

[Theory]
[ActiveIssue("dotnet/coreclr#24191")]
[InlineData("SatelliteAssembliesTests", "System.Runtime.Loader.Tests", "en")]
[InlineData("SatelliteAssembliesTests", "System.Runtime.Loader.Tests", "es-MX")]
[InlineData("LoadFile", "System.Runtime.Loader.Tests", "en")]
[InlineData("LoadFile", "System.Runtime.Loader.Tests", "es-MX")]
public void SatelliteLoadsCorrectly24191(string alc, string assemblyName, string culture)
{
SatelliteLoadsCorrectly(alc, assemblyName, culture);
}

[Theory]
[ActiveIssue("dotnet/corefx#37246")]
[InlineData("Default", "ReferencedClassLib", "en")]
Expand All @@ -214,18 +193,10 @@ public void SatelliteLoadsCorrectly24191(string alc, string assemblyName, string
[InlineData("ReferencedClassLibNeutralIsSatellite", "ReferencedClassLib", "en")]
[InlineData("ReferencedClassLib", "ReferencedClassLibNeutralIsSatellite", "en")]
[InlineData("ReferencedClassLib", "ReferencedClassLibNeutralIsSatellite", "es")]
public void SatelliteLoadsCorrectly37246(string alc, string assemblyName, string culture)
{
SatelliteLoadsCorrectly(alc, assemblyName, culture);
}

[Theory]
[ActiveIssue("dotnet/corefx#37246")]
[ActiveIssue("dotnet/coreclr#24191")]
[InlineData("ReferencedClassLib", "ReferencedClassLib", "en")]
[InlineData("ReferencedClassLibNeutralIsSatellite", "ReferencedClassLibNeutralIsSatellite", "en")]
[InlineData("ReferencedClassLibNeutralIsSatellite", "ReferencedClassLibNeutralIsSatellite", "es")]
public void SatelliteLoadsCorrectly37246_24191(string alc, string assemblyName, string culture)
public void SatelliteLoadsCorrectly37246(string alc, string assemblyName, string culture)
{
SatelliteLoadsCorrectly(alc, assemblyName, culture);
}
Expand Down