@@ -75,18 +75,19 @@ void test_parse_multi_number()
7575{
7676 const auto locale = boost::locale::generator{}(" en_US.UTF-8" );
7777
78- #define BOOST_LOCALE_CALL_I (T, I ) \
79- std::cout << " \t " #I << std::endl; \
80- test_parse_multi_number_by_char<T, I>(locale);
81-
82- #define BOOST_LOCALE_CALL (T ) \
83- std::cout << " test_parse_multi_number " #T << std::endl; \
84- BOOST_LOCALE_CALL_I (T, int16_t ); \
85- BOOST_LOCALE_CALL_I (T, uint16_t ); \
86- BOOST_LOCALE_CALL_I (T, int32_t ); \
87- BOOST_LOCALE_CALL_I (T, uint32_t ); \
88- BOOST_LOCALE_CALL_I (T, int64_t ); \
89- BOOST_LOCALE_CALL_I (T, uint64_t );
78+ #define BOOST_LOCALE_CALL_I (T, I ) \
79+ { \
80+ TEST_CONTEXT (" type" #T << ' :' << #I); \
81+ test_parse_multi_number_by_char<T, I>(locale); \
82+ }
83+
84+ #define BOOST_LOCALE_CALL (T ) \
85+ BOOST_LOCALE_CALL_I (T, int16_t ) \
86+ BOOST_LOCALE_CALL_I (T, uint16_t ) \
87+ BOOST_LOCALE_CALL_I (T, int32_t ) \
88+ BOOST_LOCALE_CALL_I (T, uint32_t ) \
89+ BOOST_LOCALE_CALL_I (T, int64_t ) \
90+ BOOST_LOCALE_CALL_I (T, uint64_t )
9091
9192 BOOST_LOCALE_CALL (char );
9293 BOOST_LOCALE_CALL (wchar_t );
@@ -118,14 +119,19 @@ void test_format_large_number()
118119{
119120 const auto locale = boost::locale::generator{}(" en_US.UTF-8" );
120121
121- std::cout << " Testing char " << std::endl;
122- test_format_large_number_by_char< char >(locale);
123-
124- std::cout << " Testing wchar_t " << std::endl;
125- test_format_large_number_by_char< wchar_t >(locale);
122+ # define BOOST_LOCALE_CALL ( T ) \
123+ { \
124+ TEST_CONTEXT ( " type " << #T); \
125+ test_format_large_number_by_char<T>(locale); \
126+ }
126127
128+ BOOST_LOCALE_CALL (char );
129+ BOOST_LOCALE_CALL (wchar_t );
127130#ifdef BOOST_LOCALE_ENABLE_CHAR16_T
128- std::cout << " Testing char16_t" << std::endl;
129- test_format_large_number_by_char<char16_t >(locale);
131+ BOOST_LOCALE_CALL (char16_t );
130132#endif
133+ #ifdef BOOST_LOCALE_ENABLE_CHAR32_T
134+ BOOST_LOCALE_CALL (char32_t );
135+ #endif
136+ #undef BOOST_LOCALE_CALL
131137}
0 commit comments