[browser][HybridGlobalization] Fix incorrect value in `FirstDayOfWeek…

…` test (dotnet#93595) * Prevent from returning Sunday randomly. * Unify logic. * Add wrap for exception, revert returning Sunday on error.
steveharter · Oct 18, 2023 · 93fc05c · 93fc05c
1 parent 0f4196f
commit 93fc05c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/...braries/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoFirstDayOfWeek.cs b/...braries/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoFirstDayOfWeek.cs
@@ -12,9 +12,7 @@ public static IEnumerable<object[]> FirstDayOfWeek_Get_TestData()
         {
             yield return new object[] { DateTimeFormatInfo.InvariantInfo, DayOfWeek.Sunday, "invariant" };
             yield return new object[] { new CultureInfo("en-US", false).DateTimeFormat, DayOfWeek.Sunday, "en-US" };
-            // ActiveIssue: https://github.com/dotnet/runtime/issues/93354
-            if (!PlatformDetection.IsHybridGlobalizationOnBrowser)
-                yield return new object[] { new CultureInfo("fr-FR", false).DateTimeFormat, DayOfWeek.Monday, "fr-FR" };
+            yield return new object[] { new CultureInfo("fr-FR", false).DateTimeFormat, DayOfWeek.Monday, "fr-FR" };
         }
 
         public static IEnumerable<object[]> FirstDayOfWeek_Get_TestData_HybridGlobalization()

diff --git a/src/libraries/System.Private.CoreLib/src/System/Globalization/CultureData.Browser.cs b/src/libraries/System.Private.CoreLib/src/System/Globalization/CultureData.Browser.cs
@@ -48,7 +48,7 @@ private static unsafe int GetFirstWeekOfYear(string localeName)
             if (exception != 0)
             {
                 // Failed, just use 0
-                Debug.Fail($"[CultureData.GetFirstWeekOfYear()] failed with {ex_result}");
+                Debug.Fail($"[CultureData.GetFirstDayOfWeek()] failed with {ex_result}");
                 return 0;
             }
             return result;

diff --git a/src/mono/wasm/runtime/hybrid-globalization/change-case.ts b/src/mono/wasm/runtime/hybrid-globalization/change-case.ts
@@ -75,6 +75,7 @@ export function mono_wasm_change_case_invariant(src: number, srcLength: number,
                 }
             }
         }
+        wrap_no_error_root(is_exception, exceptionRoot);
     }
     catch (ex: any) {
         wrap_error_root(is_exception, ex, exceptionRoot);

diff --git a/src/mono/wasm/runtime/hybrid-globalization/locales.ts b/src/mono/wasm/runtime/hybrid-globalization/locales.ts
@@ -1,7 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-import { wrap_error_root } from "../invoke-js";
+import { wrap_error_root, wrap_no_error_root } from "../invoke-js";
 import { mono_wasm_new_external_root } from "../roots";
 import { monoStringToString } from "../strings";
 import { Int32Ptr } from "../types/emscripten";
@@ -15,6 +15,7 @@ export function mono_wasm_get_first_day_of_week(culture: MonoStringRef, isExcept
     try {
         const cultureName = monoStringToString(cultureRoot);
         const canonicalLocale = normalizeLocale(cultureName);
+        wrap_no_error_root(isException, exceptionRoot);
         return getFirstDayOfWeek(canonicalLocale);
     }
     catch (ex: any) {
@@ -34,6 +35,7 @@ export function mono_wasm_get_first_week_of_year(culture: MonoStringRef, isExcep
     try {
         const cultureName = monoStringToString(cultureRoot);
         const canonicalLocale = normalizeLocale(cultureName);
+        wrap_no_error_root(isException, exceptionRoot);
         return getFirstWeekOfYear(canonicalLocale);
     }
     catch (ex: any) {
-Original file line number
+Diff line change
@@ Expand Up @@
                     }
                 }
             }
+            wrap_no_error_root(is_exception, exceptionRoot);
         }
         catch (ex: any) {
             wrap_error_root(is_exception, ex, exceptionRoot);
@@ Expand Down @@