[libc++] Update locale grouping tests (#119463)

vitalybuka · web-flow · commit 31272e4f83f2 · 2024-12-16T12:50:59.000-05:00
Fixes #119047
diff --git a/libcxx/test/std/localization/locale.categories/category.monetary/locale.moneypunct.byname/grouping.pass.cpp b/libcxx/test/std/localization/locale.categories/category.monetary/locale.moneypunct.byname/grouping.pass.cpp
@@ -89,27 +89,22 @@ int main(int, char**)
     }
 #endif
 
-#if defined( _WIN32) || defined(_AIX)
-    std::string us_grouping = "\3";
-#else
-    std::string us_grouping = "\3\3";
-#endif
     {
         Fnf f(LOCALE_en_US_UTF_8, 1);
-        assert(f.grouping() == us_grouping);
+        assert(f.grouping() == "\3" || f.grouping() == "\3\3");
     }
     {
         Fnt f(LOCALE_en_US_UTF_8, 1);
-        assert(f.grouping() == us_grouping);
+        assert(f.grouping() == "\3" || f.grouping() == "\3\3");
     }
 #ifndef TEST_HAS_NO_WIDE_CHARACTERS
     {
         Fwf f(LOCALE_en_US_UTF_8, 1);
-        assert(f.grouping() == us_grouping);
+        assert(f.grouping() == "\3" || f.grouping() == "\3\3");
     }
     {
         Fwt f(LOCALE_en_US_UTF_8, 1);
-        assert(f.grouping() == us_grouping);
+        assert(f.grouping() == "\3" || f.grouping() == "\3\3");
     }
 #endif
 
@@ -132,27 +127,22 @@ int main(int, char**)
     }
 #endif
 
-#if defined( _WIN32) || defined(_AIX)
-    std::string ru_grouping = "\3";
-#else
-    std::string ru_grouping = "\3\3";
-#endif
     {
         Fnf f(LOCALE_ru_RU_UTF_8, 1);
-        assert(f.grouping() == ru_grouping);
+        assert(f.grouping() == "\3" || f.grouping() == "\3\3");
     }
     {
         Fnt f(LOCALE_ru_RU_UTF_8, 1);
-        assert(f.grouping() == ru_grouping);
+        assert(f.grouping() == "\3" || f.grouping() == "\3\3");
     }
 #ifndef TEST_HAS_NO_WIDE_CHARACTERS
     {
         Fwf f(LOCALE_ru_RU_UTF_8, 1);
-        assert(f.grouping() == ru_grouping);
+        assert(f.grouping() == "\3" || f.grouping() == "\3\3");
     }
     {
         Fwt f(LOCALE_ru_RU_UTF_8, 1);
-        assert(f.grouping() == ru_grouping);
+        assert(f.grouping() == "\3" || f.grouping() == "\3\3");
     }
 #endif
 
diff --git a/libcxx/test/std/localization/locale.categories/facet.numpunct/locale.numpunct.byname/grouping.pass.cpp b/libcxx/test/std/localization/locale.categories/facet.numpunct/locale.numpunct.byname/grouping.pass.cpp
@@ -48,21 +48,13 @@ int main(int, char**)
         {
             typedef char C;
             const std::numpunct<C>& np = std::use_facet<std::numpunct<C> >(l);
-#if defined(_WIN32) || defined(_AIX)
-            assert(np.grouping() == "\3");
-#else
-            assert(np.grouping() == "\3\3");
-#endif
+            assert(np.grouping() == "\3" || np.grouping() == "\3\3");
         }
 #ifndef TEST_HAS_NO_WIDE_CHARACTERS
         {
             typedef wchar_t C;
             const std::numpunct<C>& np = std::use_facet<std::numpunct<C> >(l);
-#  if defined(_WIN32) || defined(_AIX)
-            assert(np.grouping() == "\3");
-#  else
-            assert(np.grouping() == "\3\3");
-#  endif
+            assert(np.grouping() == "\3" || np.grouping() == "\3\3");
         }
 #endif
     }

Original file line number	Diff line number	Diff line change
`@@ -89,27 +89,22 @@ int main(int, char**)`
`89`	`89`	`}`
`90`	`90`	`#endif`
`91`	`91`
`92`		`-#if defined( _WIN32) \|\| defined(_AIX)`
`93`		`- std::string us_grouping = "\3";`
`94`		`-#else`
`95`		`- std::string us_grouping = "\3\3";`
`96`		`-#endif`
`97`	`92`	`{`
`98`	`93`	`Fnf f(LOCALE_en_US_UTF_8, 1);`
`99`		`- assert(f.grouping() == us_grouping);`
	`94`	`+ assert(f.grouping() == "\3" \|\| f.grouping() == "\3\3");`
`100`	`95`	`}`
`101`	`96`	`{`
`102`	`97`	`Fnt f(LOCALE_en_US_UTF_8, 1);`
`103`		`- assert(f.grouping() == us_grouping);`
	`98`	`+ assert(f.grouping() == "\3" \|\| f.grouping() == "\3\3");`
`104`	`99`	`}`
`105`	`100`	`#ifndef TEST_HAS_NO_WIDE_CHARACTERS`
`106`	`101`	`{`
`107`	`102`	`Fwf f(LOCALE_en_US_UTF_8, 1);`
`108`		`- assert(f.grouping() == us_grouping);`
	`103`	`+ assert(f.grouping() == "\3" \|\| f.grouping() == "\3\3");`
`109`	`104`	`}`
`110`	`105`	`{`
`111`	`106`	`Fwt f(LOCALE_en_US_UTF_8, 1);`
`112`		`- assert(f.grouping() == us_grouping);`
	`107`	`+ assert(f.grouping() == "\3" \|\| f.grouping() == "\3\3");`
`113`	`108`	`}`
`114`	`109`	`#endif`
`115`	`110`
`@@ -132,27 +127,22 @@ int main(int, char**)`
`132`	`127`	`}`
`133`	`128`	`#endif`
`134`	`129`
`135`		`-#if defined( _WIN32) \|\| defined(_AIX)`
`136`		`- std::string ru_grouping = "\3";`
`137`		`-#else`
`138`		`- std::string ru_grouping = "\3\3";`
`139`		`-#endif`
`140`	`130`	`{`
`141`	`131`	`Fnf f(LOCALE_ru_RU_UTF_8, 1);`
`142`		`- assert(f.grouping() == ru_grouping);`
	`132`	`+ assert(f.grouping() == "\3" \|\| f.grouping() == "\3\3");`
`143`	`133`	`}`
`144`	`134`	`{`
`145`	`135`	`Fnt f(LOCALE_ru_RU_UTF_8, 1);`
`146`		`- assert(f.grouping() == ru_grouping);`
	`136`	`+ assert(f.grouping() == "\3" \|\| f.grouping() == "\3\3");`
`147`	`137`	`}`
`148`	`138`	`#ifndef TEST_HAS_NO_WIDE_CHARACTERS`
`149`	`139`	`{`
`150`	`140`	`Fwf f(LOCALE_ru_RU_UTF_8, 1);`
`151`		`- assert(f.grouping() == ru_grouping);`
	`141`	`+ assert(f.grouping() == "\3" \|\| f.grouping() == "\3\3");`
`152`	`142`	`}`
`153`	`143`	`{`
`154`	`144`	`Fwt f(LOCALE_ru_RU_UTF_8, 1);`
`155`		`- assert(f.grouping() == ru_grouping);`
	`145`	`+ assert(f.grouping() == "\3" \|\| f.grouping() == "\3\3");`
`156`	`146`	`}`
`157`	`147`	`#endif`
`158`	`148`
Original file line number	Diff line number	Diff line change
`@@ -48,21 +48,13 @@ int main(int, char**)`
`48`	`48`	`{`
`49`	`49`	`typedef char C;`
`50`	`50`	`const std::numpunct<C>& np = std::use_facet<std::numpunct<C> >(l);`
`51`		`-#if defined(_WIN32) \|\| defined(_AIX)`
`52`		`- assert(np.grouping() == "\3");`
`53`		`-#else`
`54`		`- assert(np.grouping() == "\3\3");`
`55`		`-#endif`
	`51`	`+ assert(np.grouping() == "\3" \|\| np.grouping() == "\3\3");`
`56`	`52`	`}`
`57`	`53`	`#ifndef TEST_HAS_NO_WIDE_CHARACTERS`
`58`	`54`	`{`
`59`	`55`	`typedef wchar_t C;`
`60`	`56`	`const std::numpunct<C>& np = std::use_facet<std::numpunct<C> >(l);`
`61`		`-# if defined(_WIN32) \|\| defined(_AIX)`
`62`		`- assert(np.grouping() == "\3");`
`63`		`-# else`
`64`		`- assert(np.grouping() == "\3\3");`
`65`		`-# endif`
	`57`	`+ assert(np.grouping() == "\3" \|\| np.grouping() == "\3\3");`
`66`	`58`	`}`
`67`	`59`	`#endif`
`68`	`60`	`}`