Merge remote-tracking branch 'linux/devlocal' into development

Author: ras0219-msft

Release/src/json/json_parsing.cpp

@@ -920,6 +920,7 @@ std::unique_ptr<web::json::details::_Object> JSON_Parser<CharType>::_ParseObject
     GetNextToken(tkn);
 
     auto obj = utility::details::make_unique<web::json::details::_Object>();
+    auto& elems = obj->m_object.m_elements;
 
     if ( tkn.kind != JSON_Parser<CharType>::Token::TKN_CloseBrace ) 
     {
@@ -951,9 +952,9 @@ std::unique_ptr<web::json::details::_Object> JSON_Parser<CharType>::_ParseObject
             auto fieldValue = _ParseValue(tkn);
             auto type = fieldValue->type();
 
-            obj->m_object.m_elements.emplace_back(utility::conversions::to_string_t(fieldName), json::value(std::move(fieldValue), type));
+            elems.emplace_back(utility::conversions::to_string_t(fieldName), json::value(std::move(fieldValue), type));
 #else
-            obj->m_object.m_elements.emplace_back(utility::conversions::to_string_t(fieldName), json::value(_ParseValue(tkn)));
+            elems.emplace_back(utility::conversions::to_string_t(fieldName), json::value(_ParseValue(tkn)));
 #endif
 
             // State 4: Looking for a comma or a closing brace
@@ -975,6 +976,8 @@ std::unique_ptr<web::json::details::_Object> JSON_Parser<CharType>::_ParseObject
 
     GetNextToken(tkn);
 
+    ::std::sort(elems.begin(), elems.end(), json::object::compare_pairs);
+
     return obj;
 
 error:

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

@@ -118,7 +118,13 @@ TEST_FIXTURE(uri_address, outside_ssl_json,
     }).then([=](json::value jsonArray)
     {
         int count = 0;
-        auto& items = jsonArray[U("items")];
+        json::object& obj = jsonArray.as_object();
+
+        VERIFY_ARE_NOT_EQUAL(obj.find(U("pageInfo")), obj.end());
+        VERIFY_ARE_NOT_EQUAL(obj.find(U("items")), obj.end());
+
+        auto& items = obj[U("items")];
+
         for(auto iter = items.as_array().cbegin(); iter != items.as_array().cend(); ++iter)
         {
             const auto& i = *iter;

Release/tests/Functional/json/parsing_tests.cpp

@@ -498,6 +498,20 @@ TEST(deeply_nested)
     VERIFY_PARSING_THROW(json::value::parse(strBad));
 }
 
+TEST(parse_object)
+{
+    utility::stringstream_t ss;
+    ss << U("{\"z\":2, \"a\":1}");
+    json::value v = json::value::parse(ss);
+    auto& obj = v.as_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.size(), 2);
+}
+
 } // SUITE(parsing_tests)
 
 }}}