json tests enabled

Author: Ognjen

Release/tests/Functional/json/parsing_tests.cpp

@@ -203,7 +203,6 @@ TEST(bug_416116)
 }
 
 // TODO: re-enable some of these for Linux, TFS#535122.
-#ifdef _MS_WINDOWS
 
 TEST(byte_ptr_parsing_array)
 {
@@ -238,7 +237,7 @@ TEST(byte_ptr_parsing_object)
 TEST(Konnichiwa)
 {
     utility::string_t ws = U("\"こんにちは\"");
-    std::string s = utf16_to_utf8(ws);
+    std::string s = to_utf8string(ws);
 
     std::stringstream ss;
     ss << s;
@@ -254,14 +253,14 @@ TEST(Konnichiwa)
 
 TEST(Russian)
 {
-    std::wstring ws = L"{ \"results\" : [ { \"id\" : 272655310, \"name\" : \"Андрей Иванов\" } ] }";
+    utility::string_t ws = U("{ \"results\" : [ { \"id\" : 272655310, \"name\" : \"Андрей Иванов\" } ] }");
 
     json::value v1 = json::value::parse(ws);
     auto s2 = v1.to_string();
 
     VERIFY_ARE_EQUAL(s2, ws);
 
-    std::string s = utf16_to_utf8(ws);
+    std::string s = to_utf8string(ws);
 
     std::stringstream ss;
     ss << s;
@@ -271,8 +270,6 @@ TEST(Russian)
     VERIFY_ARE_EQUAL(s3, ws);
 }
 
-#endif // _MS_WINDOWS
-
 utility::string_t make_deep_json_string(size_t depth)
 {
     utility::string_t strval;
@@ -302,4 +299,4 @@ TEST(deeply_nested)
 
 } // SUITE(parsing_tests)
 
-}}}
+}}}