Fixing several locale tests to use a locale more widely avaliable on machines.

Author: stgates

Release/tests/functional/http/client/building_request_tests.cpp

@@ -250,7 +250,13 @@ TEST_FIXTURE(uri_address, set_body_with_charset)
 
 TEST_FIXTURE(uri_address, set_content_length_locale, "Ignore:Android", "Locale unsupported on Android")
 {
-    tests::common::utilities::locale_guard loc(std::locale("en-us"));
+#ifdef _WIN32
+    std::string changedLocale("fr-FR");
+#else
+    std::string changedLocale("fr_FR.utf8");
+#endif
+
+    tests::common::utilities::locale_guard loc(std::locale(changedLocale.c_str()));
 
     http_request req(methods::PUT);
     req.headers().set_content_length(1000);
@@ -270,7 +276,12 @@ TEST_FIXTURE(uri_address, set_port_locale, "Ignore:Android", "Locale unsupported
     });
 
     {
-        tests::common::utilities::locale_guard loc(std::locale("en-us"));
+#ifdef _WIN32
+        std::string changedLocale("fr-FR");
+#else
+        std::string changedLocale("fr_FR.utf8");
+#endif
+        tests::common::utilities::locale_guard loc(std::locale(changedLocale.c_str()));
         http_request msg(methods::PUT);
         msg.set_body(data);
         http_asserts::assert_response_equals(client.request(msg).get(), status_codes::OK);

Release/tests/functional/json/json_numbers_tests.cpp

@@ -195,8 +195,8 @@ TEST(parsing_doubles_setlocale, "Ignore:Android", "Locale not supported on Andro
 #endif
     setlocale(LC_ALL, changedLocale.c_str());
 
-    test_double(1.91563, U("1.91563"));
-    test_double(2.0e93, U("2.0e93"));
+    test_double(1.91563);
+    test_double(2.0e93);
     setlocale(LC_ALL, "C");
 }
 

Release/tests/functional/uri/uri_builder_tests.cpp

@@ -458,7 +458,13 @@ TEST(to_string_invalid_uri)
 
 TEST(append_query_locale, "Ignore:Android", "Locale unsupported on Android")
 {
-    tests::common::utilities::locale_guard loc(std::locale("en-us"));
+#ifdef _WIN32
+    std::string changedLocale("fr-FR");
+#else
+    std::string changedLocale("fr_FR.utf8");
+#endif
+
+    tests::common::utilities::locale_guard loc(std::locale(changedLocale.c_str()));
 
     uri_builder builder;
     auto const &key = U("key1000");

Release/tests/functional/utils/strings.cpp

@@ -71,19 +71,31 @@ TEST(latin1_to_utf16)
 
 TEST(print_string_locale, "Ignore:Android", "Locale unsupported on Android")
 {
-    tests::common::utilities::locale_guard loc(std::locale("en-us"));
+#ifdef _WIN32
+    std::string changedLocale("fr-FR");
+#else
+    std::string changedLocale("fr_FR.utf8");
+#endif
+
+    tests::common::utilities::locale_guard loc(std::locale(changedLocale.c_str()));
 
     VERIFY_ARE_EQUAL(_XPLATSTR("1,000"), utility::conversions::print_string(1000));
     VERIFY_ARE_EQUAL(_XPLATSTR("1000"), utility::conversions::print_string(1000, std::locale::classic()));
 }
 
 TEST(scan_string_locale, "Ignore:Android", "Locale unsupported on Android")
 {
+#ifdef _WIN32
+    std::string changedLocale("fr-FR");
+#else
+    std::string changedLocale("fr_FR.utf8");
+#endif
+
     VERIFY_ARE_EQUAL(_XPLATSTR("1000"), utility::conversions::scan_string<utility::string_t>(utility::string_t(_XPLATSTR("1000"))));
     VERIFY_ARE_EQUAL(_XPLATSTR("1,000"), utility::conversions::scan_string<utility::string_t>(utility::string_t(_XPLATSTR("1,000"))));
 
-    VERIFY_ARE_EQUAL(_XPLATSTR("1000"), utility::conversions::scan_string<utility::string_t>(utility::string_t(_XPLATSTR("1000")), std::locale("en-us")));
-    VERIFY_ARE_EQUAL(_XPLATSTR("1,000"), utility::conversions::scan_string<utility::string_t>(utility::string_t(_XPLATSTR("1,000")), std::locale("en-us")));
+    VERIFY_ARE_EQUAL(_XPLATSTR("1000"), utility::conversions::scan_string<utility::string_t>(utility::string_t(_XPLATSTR("1000")), std::locale(changedLocale.c_str())));
+    VERIFY_ARE_EQUAL(_XPLATSTR("1,000"), utility::conversions::scan_string<utility::string_t>(utility::string_t(_XPLATSTR("1,000")), std::locale(changedLocale.c_str())));
 
     {
         tests::common::utilities::locale_guard loc(std::locale("en-us"));