Skip to content

Commit b1448c5

Browse files
sdmacleasdmaclea
authored
Enable SatelliteAssembly tests relying on dotnet/coreclr#24191
1 parent 7d2af71 commit b1448c5

File tree

1 file changed

+21
-50
lines changed

1 file changed

+21
-50
lines changed

‎src/System.Runtime.Loader/tests/SatelliteAssemblies.cs‎

Lines changed: 21 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,20 @@ public static string Describe(string lang)
8888
[InlineData("Default", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "es-MX", "Spanish (Mexico) language Main description 1.0.0")]
8989
[InlineData("Default", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "fr", "Neutral language Main description 1.0.0")]
9090
[InlineData("Default", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "fr-FR", "Neutral language Main description 1.0.0")]
91+
[InlineData("SatelliteAssembliesTests", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "", "Neutral language Main description 1.0.0")]
92+
[InlineData("SatelliteAssembliesTests", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "en", "English language Main description 1.0.0")]
93+
[InlineData("SatelliteAssembliesTests", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "en-US", "English language Main description 1.0.0")]
94+
[InlineData("SatelliteAssembliesTests", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "es", "Neutral language Main description 1.0.0")]
95+
[InlineData("SatelliteAssembliesTests", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "es-MX", "Spanish (Mexico) language Main description 1.0.0")]
96+
[InlineData("SatelliteAssembliesTests", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "fr", "Neutral language Main description 1.0.0")]
97+
[InlineData("SatelliteAssembliesTests", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "fr-FR", "Neutral language Main description 1.0.0")]
98+
[InlineData("LoadFile", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "", "Neutral language Main description 1.0.0")]
99+
[InlineData("LoadFile", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "en", "English language Main description 1.0.0")]
100+
[InlineData("LoadFile", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "en-US", "English language Main description 1.0.0")]
101+
[InlineData("LoadFile", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "es", "Neutral language Main description 1.0.0")]
102+
[InlineData("LoadFile", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "es-MX", "Spanish (Mexico) language Main description 1.0.0")]
103+
[InlineData("LoadFile", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "fr", "Neutral language Main description 1.0.0")]
104+
[InlineData("LoadFile", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "fr-FR", "Neutral language Main description 1.0.0")]
91105
public void describeLib(string alc, string type, string culture, string expected)
92106
{
93107
string result = "Oops";
@@ -120,35 +134,6 @@ public void describeLib(string alc, string type, string culture, string expected
120134
[InlineData("Default", "ReferencedClassLibNeutralIsSatellite.Program, ReferencedClassLibNeutralIsSatellite", "en", "English language ReferencedClassLibNeutralIsSatellite description 1.0.0")]
121135
[InlineData("Default", "ReferencedClassLibNeutralIsSatellite.Program, ReferencedClassLibNeutralIsSatellite", "en-US", "English language ReferencedClassLibNeutralIsSatellite description 1.0.0")]
122136
[InlineData("Default", "ReferencedClassLibNeutralIsSatellite.Program, ReferencedClassLibNeutralIsSatellite", "es", "Neutral (es) language ReferencedClassLibNeutralIsSatellite description 1.0.0")]
123-
public void describeLib37246(string alc, string type, string culture, string expected)
124-
{
125-
describeLib(alc, type, culture, expected);
126-
}
127-
128-
[Theory]
129-
[ActiveIssue("dotnet/coreclr#24191")]
130-
[InlineData("SatelliteAssembliesTests", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "", "Neutral language Main description 1.0.0")]
131-
[InlineData("SatelliteAssembliesTests", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "en", "English language Main description 1.0.0")]
132-
[InlineData("SatelliteAssembliesTests", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "en-US", "English language Main description 1.0.0")]
133-
[InlineData("SatelliteAssembliesTests", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "es", "Neutral language Main description 1.0.0")]
134-
[InlineData("SatelliteAssembliesTests", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "es-MX", "Spanish (Mexico) language Main description 1.0.0")]
135-
[InlineData("SatelliteAssembliesTests", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "fr", "Neutral language Main description 1.0.0")]
136-
[InlineData("SatelliteAssembliesTests", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "fr-FR", "Neutral language Main description 1.0.0")]
137-
[InlineData("LoadFile", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "", "Neutral language Main description 1.0.0")]
138-
[InlineData("LoadFile", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "en", "English language Main description 1.0.0")]
139-
[InlineData("LoadFile", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "en-US", "English language Main description 1.0.0")]
140-
[InlineData("LoadFile", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "es", "Neutral language Main description 1.0.0")]
141-
[InlineData("LoadFile", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "es-MX", "Spanish (Mexico) language Main description 1.0.0")]
142-
[InlineData("LoadFile", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "fr", "Neutral language Main description 1.0.0")]
143-
[InlineData("LoadFile", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "fr-FR", "Neutral language Main description 1.0.0")]
144-
public void describeLib24191(string alc, string type, string culture, string expected)
145-
{
146-
describeLib(alc, type, culture, expected);
147-
}
148-
149-
[Theory]
150-
[ActiveIssue("dotnet/corefx#37246")]
151-
[ActiveIssue("dotnet/coreclr#24191")]
152137
[InlineData("ReferencedClassLib", "ReferencedClassLib.Program, ReferencedClassLib", "", "Neutral language ReferencedClassLib description 1.0.0")]
153138
[InlineData("ReferencedClassLib", "ReferencedClassLib.Program, ReferencedClassLib", "en", "English language ReferencedClassLib description 1.0.0")]
154139
[InlineData("ReferencedClassLib", "ReferencedClassLib.Program, ReferencedClassLib", "en-US", "English language ReferencedClassLib description 1.0.0")]
@@ -157,10 +142,11 @@ public void describeLib24191(string alc, string type, string culture, string exp
157142
[InlineData("ReferencedClassLibNeutralIsSatellite", "ReferencedClassLibNeutralIsSatellite.Program, ReferencedClassLibNeutralIsSatellite", "en", "English language ReferencedClassLibNeutralIsSatellite description 1.0.0")]
158143
[InlineData("ReferencedClassLibNeutralIsSatellite", "ReferencedClassLibNeutralIsSatellite.Program, ReferencedClassLibNeutralIsSatellite", "en-US", "English language ReferencedClassLibNeutralIsSatellite description 1.0.0")]
159144
[InlineData("ReferencedClassLibNeutralIsSatellite", "ReferencedClassLibNeutralIsSatellite.Program, ReferencedClassLibNeutralIsSatellite", "es", "Neutral (es) language ReferencedClassLibNeutralIsSatellite description 1.0.0")]
160-
public void describeLib37246_24191(string alc, string type, string culture, string expected)
145+
public void describeLib37246(string alc, string type, string culture, string expected)
161146
{
162147
describeLib(alc, type, culture, expected);
163148
}
149+
164150
#endregion
165151

166152
[Theory]
@@ -172,6 +158,10 @@ public void describeLib37246_24191(string alc, string type, string culture, stri
172158
[InlineData("ReferencedClassLib", "System.Runtime.Loader.Tests", "es-MX")]
173159
[InlineData("ReferencedClassLibNeutralIsSatellite", "System.Runtime.Loader.Tests", "en")]
174160
[InlineData("ReferencedClassLibNeutralIsSatellite", "System.Runtime.Loader.Tests", "es-MX")]
161+
[InlineData("SatelliteAssembliesTests", "System.Runtime.Loader.Tests", "en")]
162+
[InlineData("SatelliteAssembliesTests", "System.Runtime.Loader.Tests", "es-MX")]
163+
[InlineData("LoadFile", "System.Runtime.Loader.Tests", "en")]
164+
[InlineData("LoadFile", "System.Runtime.Loader.Tests", "es-MX")]
175165
public void SatelliteLoadsCorrectly(string alc, string assemblyName, string culture)
176166
{
177167
AssemblyName satelliteAssemblyName = new AssemblyName(assemblyName + ".resources");
@@ -189,17 +179,6 @@ public void SatelliteLoadsCorrectly(string alc, string assemblyName, string cult
189179
Assert.Equal(AssemblyLoadContext.GetLoadContext(parentAssembly), AssemblyLoadContext.GetLoadContext(satelliteAssembly));
190180
}
191181

192-
[Theory]
193-
[ActiveIssue("dotnet/coreclr#24191")]
194-
[InlineData("SatelliteAssembliesTests", "System.Runtime.Loader.Tests", "en")]
195-
[InlineData("SatelliteAssembliesTests", "System.Runtime.Loader.Tests", "es-MX")]
196-
[InlineData("LoadFile", "System.Runtime.Loader.Tests", "en")]
197-
[InlineData("LoadFile", "System.Runtime.Loader.Tests", "es-MX")]
198-
public void SatelliteLoadsCorrectly24191(string alc, string assemblyName, string culture)
199-
{
200-
SatelliteLoadsCorrectly(alc, assemblyName, culture);
201-
}
202-
203182
[Theory]
204183
[ActiveIssue("dotnet/corefx#37246")]
205184
[InlineData("Default", "ReferencedClassLib", "en")]
@@ -214,18 +193,10 @@ public void SatelliteLoadsCorrectly24191(string alc, string assemblyName, string
214193
[InlineData("ReferencedClassLibNeutralIsSatellite", "ReferencedClassLib", "en")]
215194
[InlineData("ReferencedClassLib", "ReferencedClassLibNeutralIsSatellite", "en")]
216195
[InlineData("ReferencedClassLib", "ReferencedClassLibNeutralIsSatellite", "es")]
217-
public void SatelliteLoadsCorrectly37246(string alc, string assemblyName, string culture)
218-
{
219-
SatelliteLoadsCorrectly(alc, assemblyName, culture);
220-
}
221-
222-
[Theory]
223-
[ActiveIssue("dotnet/corefx#37246")]
224-
[ActiveIssue("dotnet/coreclr#24191")]
225196
[InlineData("ReferencedClassLib", "ReferencedClassLib", "en")]
226197
[InlineData("ReferencedClassLibNeutralIsSatellite", "ReferencedClassLibNeutralIsSatellite", "en")]
227198
[InlineData("ReferencedClassLibNeutralIsSatellite", "ReferencedClassLibNeutralIsSatellite", "es")]
228-
public void SatelliteLoadsCorrectly37246_24191(string alc, string assemblyName, string culture)
199+
public void SatelliteLoadsCorrectly37246(string alc, string assemblyName, string culture)
229200
{
230201
SatelliteLoadsCorrectly(alc, assemblyName, culture);
231202
}

0 commit comments

Comments
 (0)