Merge fix for JSON sorting bug

Author: ras0219-msft

Release/src/json/json_parsing.cpp

@@ -952,9 +952,9 @@ std::unique_ptr<web::json::details::_Object> JSON_Parser<CharType>::_ParseObject
             auto fieldValue = _ParseValue(tkn);
             auto type = fieldValue->type();
 
-            elems.emplace_back(utility::conversions::to_string_t(fieldName), json::value(std::move(fieldValue), type));
+            elems.emplace_back(utility::conversions::to_string_t(std::move(fieldName)), json::value(std::move(fieldValue), type));
 #else
-            elems.emplace_back(utility::conversions::to_string_t(fieldName), json::value(_ParseValue(tkn)));
+            elems.emplace_back(utility::conversions::to_string_t(std::move(fieldName)), json::value(_ParseValue(tkn)));
 #endif
 
             // State 4: Looking for a comma or a closing brace

Release/tests/Functional/http/client/outside_tests.cpp

@@ -115,10 +115,10 @@ TEST_FIXTURE(uri_address, outside_ssl_json,
     playlistClient.request(methods::GET).then([=](http_response playlistResponse) -> pplx::task<json::value>
     {
         return playlistResponse.extract_json();
-    }).then([=](json::value jsonArray)
+    }).then([=](json::value v)
     {
         int count = 0;
-        json::object& obj = jsonArray.as_object();
+        auto& obj = v.as_object();
 
         VERIFY_ARE_NOT_EQUAL(obj.find(U("pageInfo")), obj.end());
         VERIFY_ARE_NOT_EQUAL(obj.find(U("items")), obj.end());

Release/tests/Functional/json/parsing_tests.cpp

@@ -498,7 +498,13 @@ TEST(deeply_nested)
     VERIFY_PARSING_THROW(json::value::parse(strBad));
 }
 
-TEST(parse_object)
+ static bool compare_pairs(const std::pair<utility::string_t, json::value>& p1,
+                           const std::pair<utility::string_t, json::value>& p2)
+ {
+   return p1.first < p2.first;
+ }
+
+TEST(unsorted_object_parsing)
 {
     utility::stringstream_t ss;
     ss << U("{\"z\":2, \"a\":1}");
@@ -507,9 +513,11 @@ TEST(parse_object)
 
     VERIFY_ARE_NOT_EQUAL(obj.find(U("a")), obj.end());
     VERIFY_ARE_NOT_EQUAL(obj.find(U("z")), obj.end());
-    VERIFY_ARE_EQUAL(obj["a"], 1);
-    VERIFY_ARE_EQUAL(obj["z"], 2);
+    VERIFY_ARE_EQUAL(obj[U("a")], 1);
+    VERIFY_ARE_EQUAL(obj[U("z")], 2);
     VERIFY_ARE_EQUAL(obj.size(), 2);
+
+    VERIFY_IS_TRUE(::std::is_sorted(obj.begin(), obj.end(), compare_pairs));
 }
 
 } // SUITE(parsing_tests)