[libcxx] [test] Fix the monetary locale pos/neg_format test for Windows and macOS

[mstorsjo]

Summary

The zh_CN.UTF-8 locale on Glibc has got n_sign_posn == 4 (which means
having the negative sign just after the currency symbol), but has
int_n_sign_posn == 1 (which means before the string).

On Windows, there's no separate int_n_sign_posn field, so the same
n_sign_posn (which is 4 there too) is used for international currency
formatting too. This makes the ordering for the international case on
Windows be the same as for the national one right above it.

On Apple platforms, the fr_FR.UTF-8 locale has got n_sign_posn == 2
but p_sign_posn == 1, giving a different order for the French locale
for the negative format.

On Apple platforms for the zh_CN.UTF-8 locale, both n_sign_posn and
int_n_sign_posn are 4, but p_sign_posn and int_p_sign_posn are 1.

[• Quuxplusone]

I have no particular desire to block this, but should it scope-creep into a full refactor instead? (see my comment inline)

libcxx/test/std/localization/locale.categories/category.monetary/locale.moneypunct.byname/neg_format.pass.cpp

152

Is the order always either value-none-symbol-sign or sign-value-none-symbol?
Thus, could every one of these tests (even the ones you're not touching) profitably be refactored into something like this?

        Fnf f(LOCALE_fr_FR_UTF_8, 1);
        std::money_base::pattern p = f.neg_format();
#ifdef __APPLE__
        assert_has_sign_at_back(p);
#else
        assert_has_sign_at_front(p);
#endif

[mstorsjo]

libcxx/test/std/localization/locale.categories/category.monetary/locale.moneypunct.byname/neg_format.pass.cpp

152

I think there’s practically 5 different orders, so it could be possible to do something like that, yes. I’ll see if I can make a sensible improvement with that idea.

[mstorsjo]

Factorized the asserts into functions like assert_sign_symbol_none_value(), which asserts that specific token order; in practice each test had 4 different unique sequences.

[• Quuxplusone]

Awesome!

libcxx/test/std/localization/locale.categories/category.monetary/locale.moneypunct.byname/neg_format.pass.cpp

 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 //
-// XFAIL: darwin
-//
 // NetBSD does not support LC_MONETARY at the moment
 // XFAIL: netbsd
 
-// XFAIL: LIBCXX-WINDOWS-FIXME
-
 // REQUIRES: locale.en_US.UTF-8
 // REQUIRES: locale.fr_FR.UTF-8
 // REQUIRES: locale.ru_RU.UTF-8
 // REQUIRES: locale.zh_CN.UTF-8
 
 // <locale>
 
 // class moneypunct_byname<charT, International>
class Fwt
     : public std::moneypunct_byname<wchar_t, true>
 {
 public:
     explicit Fwt(const std::string& nm, std::size_t refs = 0)
         : std::moneypunct_byname<wchar_t, true>(nm, refs) {}
 };
 #endif // TEST_HAS_NO_WIDE_CHARACTERS
 
-int main(int, char**)
-{
-    {
-        Fnf f("C", 1);
-        std::money_base::pattern p = f.neg_format();
-        assert(p.field[0] == std::money_base::symbol);
-        assert(p.field[1] == std::money_base::sign);
-        assert(p.field[2] == std::money_base::none);
-        assert(p.field[3] == std::money_base::value);
-    }
-    {
-        Fnt f("C", 1);
-        std::money_base::pattern p = f.neg_format();
-        assert(p.field[0] == std::money_base::symbol);
-        assert(p.field[1] == std::money_base::sign);
-        assert(p.field[2] == std::money_base::none);
-        assert(p.field[3] == std::money_base::value);
-    }
+void assert_symbol_sign_none_value(std::money_base::pattern p)
+
+void assert_sign_symbol_none_value(std::money_base::pattern p)
+    assert(p.field[0] == std::money_base::sign);
+    assert(p.field[1] == std::money_base::symbol);
+
+void assert_value_none_symbol_sign(std::money_base::pattern p)
+{
+    assert(p.field[0] == std::money_base::value);
+    assert(p.field[1] == std::money_base::none);
+    assert(p.field[2] == std::money_base::symbol);
+    assert(p.field[3] == std::money_base::sign);
+}
+
+void assert_sign_value_none_symbol(std::money_base::pattern p)
+{
+    assert(p.field[0] == std::money_base::sign);
+    assert(p.field[1] == std::money_base::value);
+    assert(p.field[2] == std::money_base::none);
+    assert(p.field[3] == std::money_base::symbol);
+}
+
+int main(int, char**)
+{
+    {
+        Fnf f("C", 1);
+        std::money_base::pattern p = f.neg_format();
+        assert_symbol_sign_none_value(p);
+    }
+    {
+        Fnt f("C", 1);
+        std::money_base::pattern p = f.neg_format();
+        assert_symbol_sign_none_value(p);
+    }
 #ifndef TEST_HAS_NO_WIDE_CHARACTERS
     {
         Fwf f("C", 1);
         std::money_base::pattern p = f.neg_format();
-        assert(p.field[0] == std::money_base::symbol);
-        assert(p.field[1] == std::money_base::sign);
-        assert(p.field[2] == std::money_base::none);
-        assert(p.field[3] == std::money_base::value);
+        assert_symbol_sign_none_value(p);
     }
     {
         Fwt f("C", 1);
         std::money_base::pattern p = f.neg_format();
-        assert(p.field[0] == std::money_base::symbol);
-        assert(p.field[1] == std::money_base::sign);
-        assert(p.field[2] == std::money_base::none);
-        assert(p.field[3] == std::money_base::value);
+        assert_symbol_sign_none_value(p);
     }
 #endif // TEST_HAS_NO_WIDE_CHARACTERS
 
     {
         Fnf f(LOCALE_en_US_UTF_8, 1);
         std::money_base::pattern p = f.neg_format();
-        assert(p.field[0] == std::money_base::sign);
-        assert(p.field[1] == std::money_base::symbol);
-        assert(p.field[2] == std::money_base::none);
-        assert(p.field[3] == std::money_base::value);
+        assert_sign_symbol_none_value(p);
     }
     {
         Fnt f(LOCALE_en_US_UTF_8, 1);
         std::money_base::pattern p = f.neg_format();
-        assert(p.field[0] == std::money_base::sign);
-        assert(p.field[1] == std::money_base::symbol);
-        assert(p.field[2] == std::money_base::none);
-        assert(p.field[3] == std::money_base::value);
+        assert_sign_symbol_none_value(p);
     }
 #ifndef TEST_HAS_NO_WIDE_CHARACTERS
     {
         Fwf f(LOCALE_en_US_UTF_8, 1);
         std::money_base::pattern p = f.neg_format();
-        assert(p.field[0] == std::money_base::sign);
-        assert(p.field[1] == std::money_base::symbol);
-        assert(p.field[2] == std::money_base::none);
-        assert(p.field[3] == std::money_base::value);
+        assert_sign_symbol_none_value(p);
     }
     {
         Fwt f(LOCALE_en_US_UTF_8, 1);
         std::money_base::pattern p = f.neg_format();
-        assert(p.field[0] == std::money_base::sign);
-        assert(p.field[1] == std::money_base::symbol);
-        assert(p.field[2] == std::money_base::none);
-        assert(p.field[3] == std::money_base::value);
+        assert_sign_symbol_none_value(p);
     }
 #endif // TEST_HAS_NO_WIDE_CHARACTERS
 
     {
         Fnf f(LOCALE_fr_FR_UTF_8, 1);
         std::money_base::pattern p = f.neg_format();
-        assert(p.field[0] == std::money_base::sign);
-        assert(p.field[1] == std::money_base::value);
-        assert(p.field[2] == std::money_base::none);
-        assert(p.field[3] == std::money_base::symbol);
+#ifdef __APPLE__
+        assert_value_none_symbol_sign(p);
+#else
+        assert_sign_value_none_symbol(p);
+#endif
     }
     {
         Fnt f(LOCALE_fr_FR_UTF_8, 1);
         std::money_base::pattern p = f.neg_format();
-        assert(p.field[0] == std::money_base::sign);
-        assert(p.field[1] == std::money_base::value);
-        assert(p.field[2] == std::money_base::none);
-        assert(p.field[3] == std::money_base::symbol);
+#ifdef __APPLE__
+        assert_value_none_symbol_sign(p);
+#else
+        assert_sign_value_none_symbol(p);
+#endif
     }
 #ifndef TEST_HAS_NO_WIDE_CHARACTERS
     {
         Fwf f(LOCALE_fr_FR_UTF_8, 1);
         std::money_base::pattern p = f.neg_format();
-        assert(p.field[0] == std::money_base::sign);
-        assert(p.field[1] == std::money_base::value);
-        assert(p.field[2] == std::money_base::none);
-        assert(p.field[3] == std::money_base::symbol);
+#ifdef __APPLE__
+        assert_value_none_symbol_sign(p);
+#else
+        assert_sign_value_none_symbol(p);
+#endif
     }
     {
         Fwt f(LOCALE_fr_FR_UTF_8, 1);
         std::money_base::pattern p = f.neg_format();
-        assert(p.field[0] == std::money_base::sign);
-        assert(p.field[1] == std::money_base::value);
-        assert(p.field[2] == std::money_base::none);
-        assert(p.field[3] == std::money_base::symbol);
+#ifdef __APPLE__
+        assert_value_none_symbol_sign(p);
+#else
+        assert_sign_value_none_symbol(p);
+#endif
     }
 #endif // TEST_HAS_NO_WIDE_CHARACTERS
 
     {
         Fnf f(LOCALE_ru_RU_UTF_8, 1);
         std::money_base::pattern p = f.neg_format();
-        assert(p.field[0] == std::money_base::sign);
-        assert(p.field[1] == std::money_base::value);
-        assert(p.field[2] == std::money_base::none);
-        assert(p.field[3] == std::money_base::symbol);
+        assert_sign_value_none_symbol(p);
     }
     {
         Fnt f(LOCALE_ru_RU_UTF_8, 1);
         std::money_base::pattern p = f.neg_format();
-        assert(p.field[0] == std::money_base::sign);
-        assert(p.field[1] == std::money_base::value);
-        assert(p.field[2] == std::money_base::none);
-        assert(p.field[3] == std::money_base::symbol);
+        assert_sign_value_none_symbol(p);
     }
 #ifndef TEST_HAS_NO_WIDE_CHARACTERS
     {
         Fwf f(LOCALE_ru_RU_UTF_8, 1);
         std::money_base::pattern p = f.neg_format();
-        assert(p.field[0] == std::money_base::sign);
-        assert(p.field[1] == std::money_base::value);
-        assert(p.field[2] == std::money_base::none);
-        assert(p.field[3] == std::money_base::symbol);
+        assert_sign_value_none_symbol(p);
     }
     {
         Fwt f(LOCALE_ru_RU_UTF_8, 1);
         std::money_base::pattern p = f.neg_format();
-        assert(p.field[0] == std::money_base::sign);
-        assert(p.field[1] == std::money_base::value);
-        assert(p.field[2] == std::money_base::none);
-        assert(p.field[3] == std::money_base::symbol);
+        assert_sign_value_none_symbol(p);
     }
 #endif // TEST_HAS_NO_WIDE_CHARACTERS
 
     {
         Fnf f(LOCALE_zh_CN_UTF_8, 1);
         std::money_base::pattern p = f.neg_format();
-        assert(p.field[0] == std::money_base::symbol);
-        assert(p.field[1] == std::money_base::sign);
-        assert(p.field[2] == std::money_base::none);
-        assert(p.field[3] == std::money_base::value);
+        assert_symbol_sign_none_value(p);
     }
     {
         Fnt f(LOCALE_zh_CN_UTF_8, 1);
         std::money_base::pattern p = f.neg_format();
-        assert(p.field[0] == std::money_base::sign);
-        assert(p.field[1] == std::money_base::symbol);
-        assert(p.field[2] == std::money_base::none);
-        assert(p.field[3] == std::money_base::value);
+#if defined(_WIN32) || defined(__APPLE__)
+        assert_symbol_sign_none_value(p);
+#else
+        assert_sign_symbol_none_value(p);
+#endif
     }
 #ifndef TEST_HAS_NO_WIDE_CHARACTERS
     {
         Fwf f(LOCALE_zh_CN_UTF_8, 1);
         std::money_base::pattern p = f.neg_format();
-        assert(p.field[0] == std::money_base::symbol);
-        assert(p.field[1] == std::money_base::sign);
-        assert(p.field[2] == std::money_base::none);
-        assert(p.field[3] == std::money_base::value);
+        assert_symbol_sign_none_value(p);
     }
     {
         Fwt f(LOCALE_zh_CN_UTF_8, 1);
         std::money_base::pattern p = f.neg_format();
-        assert(p.field[0] == std::money_base::sign);
-        assert(p.field[1] == std::money_base::symbol);
-        assert(p.field[2] == std::money_base::none);
-        assert(p.field[3] == std::money_base::value);
+#if defined(_WIN32) || defined(__APPLE__)
+        assert_symbol_sign_none_value(p);
+#else
+        assert_sign_symbol_none_value(p);
+#endif
     }
 #endif // TEST_HAS_NO_WIDE_CHARACTERS
 
   return 0;
 }

libcxx/test/std/localization/locale.categories/category.monetary/locale.moneypunct.byname/pos_format.pass.cpp

 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 //
-// XFAIL: darwin
-//
 // NetBSD does not support LC_MONETARY at the moment
 // XFAIL: netbsd
 
-// XFAIL: LIBCXX-WINDOWS-FIXME
-
 // REQUIRES: locale.en_US.UTF-8
 // REQUIRES: locale.fr_FR.UTF-8
 // REQUIRES: locale.ru_RU.UTF-8
 // REQUIRES: locale.zh_CN.UTF-8
 
 // <locale>
 
 // class moneypunct_byname<charT, International>
class Fwt
     : public std::moneypunct_byname<wchar_t, true>
 {
 public:
     explicit Fwt(const std::string& nm, std::size_t refs = 0)
         : std::moneypunct_byname<wchar_t, true>(nm, refs) {}
 };
 #endif // TEST_HAS_NO_WIDE_CHARACTERS
 
-int main(int, char**)
-{
-    {
-        Fnf f("C", 1);
-        std::money_base::pattern p = f.pos_format();
-        assert(p.field[0] == std::money_base::symbol);
-        assert(p.field[1] == std::money_base::sign);
-        assert(p.field[2] == std::money_base::none);
-        assert(p.field[3] == std::money_base::value);
-    }
-    {
-        Fnt f("C", 1);
-        std::money_base::pattern p = f.pos_format();
-        assert(p.field[0] == std::money_base::symbol);
-        assert(p.field[1] == std::money_base::sign);
-        assert(p.field[2] == std::money_base::none);
-        assert(p.field[3] == std::money_base::value);
-    }
+void assert_symbol_sign_none_value(std::money_base::pattern p)
+
+void assert_sign_symbol_none_value(std::money_base::pattern p)
+    assert(p.field[0] == std::money_base::sign);
+    assert(p.field[1] == std::money_base::symbol);
+
+void assert_value_none_symbol_sign(std::money_base::pattern p)
+{
+    assert(p.field[0] == std::money_base::value);
+    assert(p.field[1] == std::money_base::none);
+    assert(p.field[2] == std::money_base::symbol);
+    assert(p.field[3] == std::money_base::sign);
+}
+
+void assert_sign_value_none_symbol(std::money_base::pattern p)
+{
+    assert(p.field[0] == std::money_base::sign);
+    assert(p.field[1] == std::money_base::value);
+    assert(p.field[2] == std::money_base::none);
+    assert(p.field[3] == std::money_base::symbol);
+}
+
+int main(int, char**)
+{
+    {
+        Fnf f("C", 1);
+        std::money_base::pattern p = f.pos_format();
+        assert_symbol_sign_none_value(p);
+    }
+    {
+        Fnt f("C", 1);
+        std::money_base::pattern p = f.pos_format();
+        assert_symbol_sign_none_value(p);
+    }
 #ifndef TEST_HAS_NO_WIDE_CHARACTERS
     {
         Fwf f("C", 1);
         std::money_base::pattern p = f.pos_format();
-        assert(p.field[0] == std::money_base::symbol);
-        assert(p.field[1] == std::money_base::sign);
-        assert(p.field[2] == std::money_base::none);
-        assert(p.field[3] == std::money_base::value);
+        assert_symbol_sign_none_value(p);
     }
     {
         Fwt f("C", 1);
         std::money_base::pattern p = f.pos_format();
-        assert(p.field[0] == std::money_base::symbol);
-        assert(p.field[1] == std::money_base::sign);
-        assert(p.field[2] == std::money_base::none);
-        assert(p.field[3] == std::money_base::value);
+        assert_symbol_sign_none_value(p);
     }
 #endif // TEST_HAS_NO_WIDE_CHARACTERS
 
     {
         Fnf f(LOCALE_en_US_UTF_8, 1);
         std::money_base::pattern p = f.pos_format();
-        assert(p.field[0] == std::money_base::sign);
-        assert(p.field[1] == std::money_base::symbol);
-        assert(p.field[2] == std::money_base::none);
-        assert(p.field[3] == std::money_base::value);
+        assert_sign_symbol_none_value(p);
     }
     {
         Fnt f(LOCALE_en_US_UTF_8, 1);
         std::money_base::pattern p = f.pos_format();
-        assert(p.field[0] == std::money_base::sign);
-        assert(p.field[1] == std::money_base::symbol);
-        assert(p.field[2] == std::money_base::none);
-        assert(p.field[3] == std::money_base::value);
+        assert_sign_symbol_none_value(p);
     }
 #ifndef TEST_HAS_NO_WIDE_CHARACTERS
     {
         Fwf f(LOCALE_en_US_UTF_8, 1);
         std::money_base::pattern p = f.pos_format();
-        assert(p.field[0] == std::money_base::sign);
-        assert(p.field[1] == std::money_base::symbol);
-        assert(p.field[2] == std::money_base::none);
-        assert(p.field[3] == std::money_base::value);
+        assert_sign_symbol_none_value(p);
     }
     {
         Fwt f(LOCALE_en_US_UTF_8, 1);
         std::money_base::pattern p = f.pos_format();
-        assert(p.field[0] == std::money_base::sign);
-        assert(p.field[1] == std::money_base::symbol);
-        assert(p.field[2] == std::money_base::none);
-        assert(p.field[3] == std::money_base::value);
+        assert_sign_symbol_none_value(p);
     }
 #endif // TEST_HAS_NO_WIDE_CHARACTERS
 
     {
         Fnf f(LOCALE_fr_FR_UTF_8, 1);
         std::money_base::pattern p = f.pos_format();
-        assert(p.field[0] == std::money_base::sign);
-        assert(p.field[1] == std::money_base::value);
-        assert(p.field[2] == std::money_base::none);
-        assert(p.field[3] == std::money_base::symbol);
+        assert_sign_value_none_symbol(p);
     }
     {
         Fnt f(LOCALE_fr_FR_UTF_8, 1);
         std::money_base::pattern p = f.pos_format();
-        assert(p.field[0] == std::money_base::sign);
-        assert(p.field[1] == std::money_base::value);
-        assert(p.field[2] == std::money_base::none);
-        assert(p.field[3] == std::money_base::symbol);
+        assert_sign_value_none_symbol(p);
     }
 #ifndef TEST_HAS_NO_WIDE_CHARACTERS
     {
         Fwf f(LOCALE_fr_FR_UTF_8, 1);
         std::money_base::pattern p = f.pos_format();
-        assert(p.field[0] == std::money_base::sign);
-        assert(p.field[1] == std::money_base::value);
-        assert(p.field[2] == std::money_base::none);
-        assert(p.field[3] == std::money_base::symbol);
+        assert_sign_value_none_symbol(p);
     }
     {
         Fwt f(LOCALE_fr_FR_UTF_8, 1);
         std::money_base::pattern p = f.pos_format();
-        assert(p.field[0] == std::money_base::sign);
-        assert(p.field[1] == std::money_base::value);
-        assert(p.field[2] == std::money_base::none);
-        assert(p.field[3] == std::money_base::symbol);
+        assert_sign_value_none_symbol(p);
     }
 #endif // TEST_HAS_NO_WIDE_CHARACTERS
 
     {
         Fnf f(LOCALE_ru_RU_UTF_8, 1);
         std::money_base::pattern p = f.pos_format();
-        assert(p.field[0] == std::money_base::sign);
-        assert(p.field[1] == std::money_base::value);
-        assert(p.field[2] == std::money_base::none);
-        assert(p.field[3] == std::money_base::symbol);
+        assert_sign_value_none_symbol(p);
     }
     {
         Fnt f(LOCALE_ru_RU_UTF_8, 1);
         std::money_base::pattern p = f.pos_format();
-        assert(p.field[0] == std::money_base::sign);
-        assert(p.field[1] == std::money_base::value);
-        assert(p.field[2] == std::money_base::none);
-        assert(p.field[3] == std::money_base::symbol);
+        assert_sign_value_none_symbol(p);
     }
 #ifndef TEST_HAS_NO_WIDE_CHARACTERS
     {
         Fwf f(LOCALE_ru_RU_UTF_8, 1);
         std::money_base::pattern p = f.pos_format();
-        assert(p.field[0] == std::money_base::sign);
-        assert(p.field[1] == std::money_base::value);
-        assert(p.field[2] == std::money_base::none);
-        assert(p.field[3] == std::money_base::symbol);
+        assert_sign_value_none_symbol(p);
     }
     {
         Fwt f(LOCALE_ru_RU_UTF_8, 1);
         std::money_base::pattern p = f.pos_format();
-        assert(p.field[0] == std::money_base::sign);
-        assert(p.field[1] == std::money_base::value);
-        assert(p.field[2] == std::money_base::none);
-        assert(p.field[3] == std::money_base::symbol);
+        assert_sign_value_none_symbol(p);
     }
 #endif // TEST_HAS_NO_WIDE_CHARACTERS
 
     {
         Fnf f(LOCALE_zh_CN_UTF_8, 1);
         std::money_base::pattern p = f.pos_format();
-        assert(p.field[0] == std::money_base::symbol);
-        assert(p.field[1] == std::money_base::sign);
-        assert(p.field[2] == std::money_base::none);
-        assert(p.field[3] == std::money_base::value);
+#ifdef __APPLE__
+        assert_sign_symbol_none_value(p);
+#else
+        assert_symbol_sign_none_value(p);
+#endif
     }
     {
         Fnt f(LOCALE_zh_CN_UTF_8, 1);
         std::money_base::pattern p = f.pos_format();
-        assert(p.field[0] == std::money_base::sign);
-        assert(p.field[1] == std::money_base::symbol);
-        assert(p.field[2] == std::money_base::none);
-        assert(p.field[3] == std::money_base::value);
+#ifdef _WIN32
+        assert_symbol_sign_none_value(p);
+#else
+        assert_sign_symbol_none_value(p);
+#endif
     }
 #ifndef TEST_HAS_NO_WIDE_CHARACTERS
     {
         Fwf f(LOCALE_zh_CN_UTF_8, 1);
         std::money_base::pattern p = f.pos_format();
-        assert(p.field[0] == std::money_base::symbol);
-        assert(p.field[1] == std::money_base::sign);
-        assert(p.field[2] == std::money_base::none);
-        assert(p.field[3] == std::money_base::value);
+#ifdef __APPLE__
+        assert_sign_symbol_none_value(p);
+#else
+        assert_symbol_sign_none_value(p);
+#endif
     }
     {
         Fwt f(LOCALE_zh_CN_UTF_8, 1);
         std::money_base::pattern p = f.pos_format();
-        assert(p.field[0] == std::money_base::sign);
-        assert(p.field[1] == std::money_base::symbol);
-        assert(p.field[2] == std::money_base::none);
-        assert(p.field[3] == std::money_base::value);
+#ifdef _WIN32
+        assert_symbol_sign_none_value(p);
+#else
+        assert_sign_symbol_none_value(p);
+#endif
     }
 #endif // TEST_HAS_NO_WIDE_CHARACTERS
 
   return 0;
 }