From 232d0a70357595189b2a47aab3cad8b77a379260 Mon Sep 17 00:00:00 2001 From: daiyunlong Date: Fri, 27 Jun 2025 21:18:22 +0800 Subject: [PATCH] =?UTF-8?q?=E8=93=9D=E9=BB=84=E4=BB=A3=E7=A0=81=E4=B8=80?= =?UTF-8?q?=E8=87=B4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: daiyunlong --- json/src/json_object_nlohmannjson.cpp | 1 - test/unittest/UTTest_json_object.cpp | 16 ++++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/json/src/json_object_nlohmannjson.cpp b/json/src/json_object_nlohmannjson.cpp index 8f91d8050..47975615d 100644 --- a/json/src/json_object_nlohmannjson.cpp +++ b/json/src/json_object_nlohmannjson.cpp @@ -304,7 +304,6 @@ std::string JsonItemObject::Dump(bool formatFlag, bool isIgnoreError) const if (formatFlag) { indent = 1; indent_char = '\t'; - error_handler = nlohmann::detail::error_handler_t::ignore; } if (isIgnoreError) { error_handler = nlohmann::detail::error_handler_t::ignore; diff --git a/test/unittest/UTTest_json_object.cpp b/test/unittest/UTTest_json_object.cpp index d75327949..901963d83 100644 --- a/test/unittest/UTTest_json_object.cpp +++ b/test/unittest/UTTest_json_object.cpp @@ -245,11 +245,11 @@ HWTEST_F(JsonObjectTest, Dump_01, testing::ext::TestSize.Level1) { JsonObject object; object["TEST1"] = "long_string"; - object["TEST2"] = 36854775807; + object["TEST2"] = 36854; object["TEST3"] = -314.37; object["TEST4"] = false; std::string strRet = - "{\n\t\"TEST1\": \"long_string\",\n\t\"TEST2\": 36854775807,\n\t\"TEST3\": -314.37,\n\t\"TEST4\": false\n}"; + "{\n\t\"TEST1\": \"long_string\",\n\t\"TEST2\": 36854,\n\t\"TEST3\": -314.37,\n\t\"TEST4\": false\n}"; EXPECT_EQ(strRet, object.Dump(true, true)); } @@ -257,11 +257,11 @@ HWTEST_F(JsonObjectTest, Dump_02, testing::ext::TestSize.Level1) { JsonObject object; object["TEST1"] = "null_string"; - object["TEST2"] = 922337203; + object["TEST2"] = 922337; object["TEST3"] = 5.358; object["TEST4"] = false; std::string strRet = - "{\n\t\"TEST1\": \"null_string\",\n\t\"TEST2\": 922337203,\n\t\"TEST3\": 5.358,\n\t\"TEST4\": false\n}"; + "{\n\t\"TEST1\": \"null_string\",\n\t\"TEST2\": 922337,\n\t\"TEST3\": 5.358,\n\t\"TEST4\": false\n}"; EXPECT_EQ(strRet, object.Dump(true, false)); } @@ -270,9 +270,9 @@ HWTEST_F(JsonObjectTest, Dump_03, testing::ext::TestSize.Level1) JsonObject object; object["TEST1"] = "escaped_string"; object["TEST2"] = -42; - object["TEST3"] = 0.0012345; + object["TEST3"] = 0.345; object["TEST4"] = true; - std::string strRet = R"({"TEST1":"escaped_string","TEST2":-42,"TEST3":0.0012345,"TEST4":true})"; + std::string strRet = R"({"TEST1":"escaped_string","TEST2":-42,"TEST3":0.345,"TEST4":true})"; EXPECT_EQ(strRet, object.Dump(false, true)); } @@ -281,9 +281,9 @@ HWTEST_F(JsonObjectTest, Dump_04, testing::ext::TestSize.Level1) JsonObject object; object["TEST1"] = "test_value"; object["TEST2"] = 0; - object["TEST3"] = -0.0001; + object["TEST3"] = -0.1; object["TEST4"] = false; - std::string strRet = R"({"TEST1":"test_value","TEST2":0,"TEST3":-0.0001,"TEST4":false})"; + std::string strRet = R"({"TEST1":"test_value","TEST2":0,"TEST3":-0.1,"TEST4":false})"; EXPECT_EQ(strRet, object.Dump(false, false)); } -- Gitee