Add test for predefined culture env var

tqiu8 · tqiu8 · commit 53151f88c446 · 2021-01-25T15:48:33.000-05:00
Modify Globalization tests to catch unsupported locales
Change var names
diff --git a/src/libraries/System.Globalization/tests/CultureInfo/CultureInfoAll.cs b/src/libraries/System.Globalization/tests/CultureInfo/CultureInfoAll.cs
@@ -809,5 +809,25 @@ public void CultureNotFoundExceptionTest()
             e = AssertExtensions.Throws<CultureNotFoundException>("culture", () => new CultureInfo(0x1000));
             Assert.Equal(0x1000, e.InvalidCultureId);
         }
+
+        [Theory]
+        [InlineData("1", "xx-XY")]
+        [InlineData("1", "zx-ZY")]
+        [InlineData("0", "xx-XY")]
+        [InlineData("0", "zx-ZY")]
+        public void PredefinedCulturesOnlyEnvVarTest(string predefinedCulturesOnlyEnvVar, string cultureName)
+        {
+            Environment.SetEnvironmentVariable("DOTNET_SYSTEM_GLOBALIZATION_PREDEFINED_CULTURES_ONLY", predefinedCulturesOnlyEnvVar);
+
+            if (predefinedCulturesOnlyEnvVar == "1")
+            {
+                AssertExtensions.Throws<CultureNotFoundException>(() => new CultureInfo(cultureName));
+            }
+            else
+            {
+                CultureInfo ci = new CultureInfo(cultureName);
+                Assert.Equal(cultureName, ci.Name);
+            }
+        }
     }
 }
diff --git a/src/libraries/System.Globalization/tests/CultureInfo/CultureInfoCurrentCulture.cs b/src/libraries/System.Globalization/tests/CultureInfo/CultureInfoCurrentCulture.cs
@@ -16,17 +16,32 @@ public class CurrentCultureTests
         [Fact]
         public void CurrentCulture()
         {
-            var newCulture = new CultureInfo(CultureInfo.CurrentCulture.Name.Equals("ja-JP", StringComparison.OrdinalIgnoreCase) ? "ar-SA" : "ja-JP");
-            using (new ThreadCultureChange(newCulture))
+            CultureInfo newCulture;
+            try
             {
-                Assert.Equal(CultureInfo.CurrentCulture, newCulture);
+                newCulture = new CultureInfo(CultureInfo.CurrentCulture.Name.Equals("ja-JP", StringComparison.OrdinalIgnoreCase) ? "ar-SA" : "ja-JP");
+                using (new ThreadCultureChange(newCulture))
+                {
+                    Assert.Equal(CultureInfo.CurrentCulture, newCulture);
+                }
+            }
+            catch (CultureNotFoundException)
+            {
+                return;
             }
 
-            newCulture = new CultureInfo("de-DE_phoneb");
-            using (new ThreadCultureChange(newCulture))
+            try
+            {
+                newCulture = new CultureInfo("de-DE_phoneb");
+                using (new ThreadCultureChange(newCulture))
+                {
+                    Assert.Equal(CultureInfo.CurrentCulture, newCulture);
+                    Assert.Equal("de-DE_phoneb", newCulture.CompareInfo.Name);
+                }
+            }
+            catch (CultureNotFoundException)
             {
-                Assert.Equal(CultureInfo.CurrentCulture, newCulture);
-                Assert.Equal("de-DE_phoneb", newCulture.CompareInfo.Name);
+                return;
             }
         }
 
@@ -39,17 +54,32 @@ public void CurrentCulture_Set_Null_ThrowsArgumentNullException()
         [Fact]
         public void CurrentUICulture()
         {
-            var newUICulture = new CultureInfo(CultureInfo.CurrentUICulture.Name.Equals("ja-JP", StringComparison.OrdinalIgnoreCase) ? "ar-SA" : "ja-JP");
-            using (new ThreadCultureChange(null, newUICulture))
+            CultureInfo newUICulture;
+            try
             {
-                Assert.Equal(CultureInfo.CurrentUICulture, newUICulture);
+                newUICulture = new CultureInfo(CultureInfo.CurrentUICulture.Name.Equals("ja-JP", StringComparison.OrdinalIgnoreCase) ? "ar-SA" : "ja-JP");
+                using (new ThreadCultureChange(null, newUICulture))
+                {
+                    Assert.Equal(CultureInfo.CurrentUICulture, newUICulture);
+                }
+            }
+            catch (CultureNotFoundException)
+            {
+                return;
             }
 
-            newUICulture = new CultureInfo("de-DE_phoneb");
-            using (new ThreadCultureChange(null, newUICulture))
+            try
+            {
+                newUICulture = new CultureInfo("de-DE_phoneb");
+                using (new ThreadCultureChange(null, newUICulture))
+                {
+                    Assert.Equal(CultureInfo.CurrentUICulture, newUICulture);
+                    Assert.Equal("de-DE_phoneb", newUICulture.CompareInfo.Name);
+                }
+            }
+            catch (CultureNotFoundException)
             {
-                Assert.Equal(CultureInfo.CurrentUICulture, newUICulture);
-                Assert.Equal("de-DE_phoneb", newUICulture.CompareInfo.Name);
+                return;
             }
         }
 
diff --git a/src/libraries/System.Globalization/tests/System/Globalization/TextInfoTests.cs b/src/libraries/System.Globalization/tests/System/Globalization/TextInfoTests.cs
@@ -307,7 +307,13 @@ private static void TestToLower(string name, string str, string expected)
         [MemberData(nameof(ToLower_TestData))]
         public void ToLower(string name, string str, string expected)
         {
-            TestToLower(name, str, expected);
+            try{
+                TestToLower(name, str, expected);
+            }
+            catch (CultureNotFoundException)
+            {
+                return;
+            }
         }
 
         [Theory]
@@ -430,7 +436,14 @@ private static void TestToUpper(string name, string str, string expected)
         [MemberData(nameof(ToUpper_TestData))]
         public void ToUpper(string name, string str, string expected)
         {
-            TestToUpper(name, str, expected);
+            try
+            {
+                TestToUpper(name, str, expected);
+            }
+            catch (CultureNotFoundException)
+            {
+                return;
+            }
         }
 
         [Theory]
diff --git a/src/libraries/System.Private.CoreLib/src/System/Globalization/CultureData.cs b/src/libraries/System.Private.CoreLib/src/System/Globalization/CultureData.cs
@@ -803,7 +803,7 @@ private static string NormalizeCultureName(string name, out bool isNeutralName)
                 return CultureData.Invariant;
             }
 
-            if (GlobalizationMode.PredefinedOnly)
+            if (GlobalizationMode.GetPredefinedCulturesOnly())
             {
                 if (GlobalizationMode.UseNls)
                 {
diff --git a/src/libraries/System.Private.CoreLib/src/System/Globalization/CultureInfo.Icu.cs b/src/libraries/System.Private.CoreLib/src/System/Globalization/CultureInfo.Icu.cs
@@ -11,10 +11,7 @@ private static CultureInfo IcuGetPredefinedCultureInfo(string name)
         {
             Debug.Assert(!GlobalizationMode.UseNls);
 
-            if (!Interop.Globalization.IsPredefinedLocale(name))
-            {
-                throw new CultureNotFoundException(nameof(name), SR.Format(SR.Argument_InvalidPredefinedCultureName, name));
-            }
+            CultureData.IcuIsEnsurePredefinedLocaleName(name);
 
             return GetCultureInfo(name);
         }
diff --git a/src/libraries/System.Private.CoreLib/src/System/Globalization/CultureInfo.Nls.cs b/src/libraries/System.Private.CoreLib/src/System/Globalization/CultureInfo.Nls.cs
@@ -11,10 +11,7 @@ private static CultureInfo NlsGetPredefinedCultureInfo(string name)
         {
             Debug.Assert(GlobalizationMode.UseNls);
 
-            if (CultureData.GetLocaleInfoExInt(name, Interop.Kernel32.LOCALE_ICONSTRUCTEDLOCALE) == 1)
-            {
-                throw new CultureNotFoundException(nameof(name), SR.Format(SR.Argument_InvalidPredefinedCultureName, name));
-            }
+            CultureData.NlsIsEnsurePredefinedLocaleName(name);
 
             return GetCultureInfo(name);
         }
diff --git a/src/libraries/System.Private.CoreLib/src/System/Globalization/GlobalizationMode.cs b/src/libraries/System.Private.CoreLib/src/System/Globalization/GlobalizationMode.cs
@@ -14,7 +14,8 @@ private static bool GetInvariantSwitchValue() =>
         private static bool TryGetAppLocalIcuSwitchValue([NotNullWhen(true)] out string? value) =>
             TryGetStringValue("System.Globalization.AppLocalIcu", "DOTNET_SYSTEM_GLOBALIZATION_APPLOCALICU", out value);
 
-        internal static bool PredefinedOnly { get; } = GetSwitchValue("System.Globalization.PredefinedOnly", "DOTNET_SYSTEM_GLOBALIZATION_PREDEFINED_ONLY");
+        internal static bool GetPredefinedCulturesOnly() =>
+            GetSwitchValue("System.Globalization.PredefinedCulturesOnly", "DOTNET_SYSTEM_GLOBALIZATION_PREDEFINED_CULTURES_ONLY");
 
         private static bool GetSwitchValue(string switchName, string envVariable)
         {
diff --git a/src/mono/wasm/runtime/library_mono.js b/src/mono/wasm/runtime/library_mono.js
@@ -1905,8 +1905,8 @@ var MonoSupportLib = {
 			if (invariantMode)
 				this.mono_wasm_setenv ("DOTNET_SYSTEM_GLOBALIZATION_INVARIANT", "1");
 			
-			// Set globalization mode to PredefinedOnly
-			this.mono_wasm_setenv ("DOTNET_SYSTEM_GLOBALIZATION_PREDEFINED_ONLY", "1");
+			// Set globalization mode to PredefinedCulturesOnly
+			this.mono_wasm_setenv ("DOTNET_SYSTEM_GLOBALIZATION_PREDEFINED_CULTURES_ONLY", "1");
 		},
 
 		// Used by the debugger to enumerate loaded dlls and pdbs

Original file line number	Diff line number	Diff line change
`@@ -803,7 +803,7 @@ private static string NormalizeCultureName(string name, out bool isNeutralName)`
`803`	`803`	`return CultureData.Invariant;`
`804`	`804`	`}`
`805`	`805`
`806`		`- if (GlobalizationMode.PredefinedOnly)`
	`806`	`+ if (GlobalizationMode.GetPredefinedCulturesOnly())`
`807`	`807`	`{`
`808`	`808`	`if (GlobalizationMode.UseNls)`
`809`	`809`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11,10 +11,7 @@ private static CultureInfo IcuGetPredefinedCultureInfo(string name)`
`11`	`11`	`{`
`12`	`12`	`Debug.Assert(!GlobalizationMode.UseNls);`
`13`	`13`
`14`		`- if (!Interop.Globalization.IsPredefinedLocale(name))`
`15`		`- {`
`16`		`- throw new CultureNotFoundException(nameof(name), SR.Format(SR.Argument_InvalidPredefinedCultureName, name));`
`17`		`- }`
	`14`	`+ CultureData.IcuIsEnsurePredefinedLocaleName(name);`
`18`	`15`
`19`	`16`	`return GetCultureInfo(name);`
`20`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,8 @@ private static bool GetInvariantSwitchValue() =>`
`14`	`14`	`private static bool TryGetAppLocalIcuSwitchValue([NotNullWhen(true)] out string? value) =>`
`15`	`15`	`TryGetStringValue("System.Globalization.AppLocalIcu", "DOTNET_SYSTEM_GLOBALIZATION_APPLOCALICU", out value);`
`16`	`16`
`17`		`- internal static bool PredefinedOnly { get; } = GetSwitchValue("System.Globalization.PredefinedOnly", "DOTNET_SYSTEM_GLOBALIZATION_PREDEFINED_ONLY");`
	`17`	`+ internal static bool GetPredefinedCulturesOnly() =>`
	`18`	`+ GetSwitchValue("System.Globalization.PredefinedCulturesOnly", "DOTNET_SYSTEM_GLOBALIZATION_PREDEFINED_CULTURES_ONLY");`
`18`	`19`
`19`	`20`	`private static bool GetSwitchValue(string switchName, string envVariable)`
`20`	`21`	`{`