Updating locale tests to silently pass if the necessary locale isn't installed on the machine.

Author: stgates

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

@@ -250,13 +250,22 @@ TEST_FIXTURE(uri_address, set_body_with_charset)
 
 TEST_FIXTURE(uri_address, set_content_length_locale, "Ignore:Android", "Locale unsupported on Android")
 {
+    std::locale changedLocale;
+    try
+    {
 #ifdef _WIN32
-    std::string changedLocale("fr-FR");
+        changedLocale = std::locale("fr-FR");
 #else
-    std::string changedLocale("fr_FR.UTF-8");
+        changedLocale = std::locale("fr_FR.UTF-8");
 #endif
+    }
+    catch (const std::exception &)
+    {
+        // Silently pass if locale isn't installed on the machine.
+        return;
+    }
 
-    tests::common::utilities::locale_guard loc(std::locale(changedLocale.c_str()));
+    tests::common::utilities::locale_guard loc(changedLocale);
 
     http_request req(methods::PUT);
     req.headers().set_content_length(1000);
@@ -276,12 +285,22 @@ TEST_FIXTURE(uri_address, set_port_locale, "Ignore:Android", "Locale unsupported
     });
 
     {
+        std::locale changedLocale;
+        try
+        {
 #ifdef _WIN32
-        std::string changedLocale("fr-FR");
+            changedLocale = std::locale("fr-FR");
 #else
-        std::string changedLocale("fr_FR.UTF-8");
+            changedLocale = std::locale("fr_FR.UTF-8");
 #endif
-        tests::common::utilities::locale_guard loc(std::locale(changedLocale.c_str()));
+        }
+        catch (const std::exception &)
+        {
+            // Silently pass if locale isn't installed on machine.
+            return;
+        }
+
+        tests::common::utilities::locale_guard loc(changedLocale);
         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

@@ -201,11 +201,14 @@ TEST(parsing_doubles_setlocale, "Ignore:Android", "Locale not supported on Andro
 #else
     std::string changedLocale("fr_FR.UTF-8");
 #endif
-    setlocale(LC_ALL, changedLocale.c_str());
 
-    test_double(1.91563);
-    test_double(2.0e93);
-    setlocale(LC_ALL, "C");
+    // If locale isn't installed on system just silently pass.
+    if (setlocale(LC_ALL, changedLocale.c_str()) != nullptr)
+    {
+        test_double(1.91563);
+        test_double(2.0e93);
+        setlocale(LC_ALL, "C");
+    }
 }
 
 TEST(parsing_very_large_doubles)

Release/tests/functional/uri/uri_builder_tests.cpp

@@ -458,13 +458,22 @@ TEST(to_string_invalid_uri)
 
 TEST(append_query_locale, "Ignore:Android", "Locale unsupported on Android")
 {
+    std::locale changedLocale;
+    try
+    {
 #ifdef _WIN32
-    std::string changedLocale("fr-FR");
+        changedLocale = std::locale("fr-FR");
 #else
-    std::string changedLocale("fr_FR.UTF-8");
+        changedLocale = std::locale("fr_FR.UTF-8");
 #endif
+    }
+    catch (const std::exception &)
+    {
+        // Silently pass if locale isn't installed on machine.
+        return;
+    }
 
-    tests::common::utilities::locale_guard loc(std::locale(changedLocale.c_str()));
+    tests::common::utilities::locale_guard loc(changedLocale);
 
     uri_builder builder;
     auto const &key = U("key1000");

Release/tests/functional/utils/strings.cpp

@@ -71,13 +71,22 @@ TEST(latin1_to_utf16)
 
 TEST(print_string_locale, "Ignore:Android", "Locale unsupported on Android")
 {
+    std::locale changedLocale;
+    try
+    {
 #ifdef _WIN32
-    std::string changedLocale("fr-FR");
+        changedLocale = std::locale("fr-FR");
 #else
-    std::string changedLocale("fr_FR.UTF-8");
+        changedLocale = std::locale("fr_FR.UTF-8");
 #endif
+    }
+    catch (const std::exception &)
+    {
+        // Silently pass if locale isn't installed on machine.
+        return;
+    }
 
-    tests::common::utilities::locale_guard loc(std::locale(changedLocale.c_str()));
+    tests::common::utilities::locale_guard loc(changedLocale);
 
     utility::ostringstream_t oss;
     oss << 1000;
@@ -87,20 +96,29 @@ TEST(print_string_locale, "Ignore:Android", "Locale unsupported on Android")
 
 TEST(scan_string_locale, "Ignore:Android", "Locale unsupported on Android")
 {
+    std::locale changedLocale;
+    try
+    {
 #ifdef _WIN32
-    std::string changedLocale("fr-FR");
+        changedLocale = std::locale("fr-FR");
 #else
-    std::string changedLocale("fr_FR.UTF-8");
+        changedLocale = std::locale("fr_FR.UTF-8");
 #endif
+    }
+    catch (const std::exception &)
+    {
+        // Silently pass if locale isn't installed on machine.
+        return;
+    }
 
     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(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())));
+    VERIFY_ARE_EQUAL(_XPLATSTR("1000"), utility::conversions::scan_string<utility::string_t>(utility::string_t(_XPLATSTR("1000")), changedLocale));
+    VERIFY_ARE_EQUAL(_XPLATSTR("1,000"), utility::conversions::scan_string<utility::string_t>(utility::string_t(_XPLATSTR("1,000")), changedLocale));
 
     {
-        tests::common::utilities::locale_guard loc(std::locale(changedLocale.c_str()));
+        tests::common::utilities::locale_guard loc(changedLocale);
         VERIFY_ARE_EQUAL(_XPLATSTR("1000"), utility::conversions::scan_string<utility::string_t>(utility::string_t(_XPLATSTR("1000")), std::locale::classic()));
         VERIFY_ARE_EQUAL(_XPLATSTR("1,000"), utility::conversions::scan_string<utility::string_t>(utility::string_t(_XPLATSTR("1,000")), std::locale::classic()));
     }