From 1d8b27ff4f3068d889837368ed0e59068fdc07f1 Mon Sep 17 00:00:00 2001 From: bjd Date: Wed, 28 May 2025 11:16:13 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E9=83=A8=E4=BB=B6=E5=8C=96=E6=95=B4?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: bjd --- services/distributeddataservice/app/BUILD.gn | 3 +-- services/distributeddataservice/app/test/BUILD.gn | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/services/distributeddataservice/app/BUILD.gn b/services/distributeddataservice/app/BUILD.gn index 85cd9d5be..ded045781 100644 --- a/services/distributeddataservice/app/BUILD.gn +++ b/services/distributeddataservice/app/BUILD.gn @@ -38,8 +38,6 @@ ohos_sa_profile("distributeddata_profile") { config("module_private_config") { visibility = [ ":*" ] include_dirs = [ - "${kv_store_path}/frameworks/innerkitsimpl/distributeddatasvc/include", - "${kv_store_path}/frameworks/innerkitsimpl/distributeddatafwk/include", "${data_service_path}/adapter/include/account", "${data_service_path}/adapter/include/permission", "${data_service_path}/adapter/include/screen", @@ -150,6 +148,7 @@ ohos_shared_library("distributeddataservice") { "ipc:ipc_core", "cJSON:cjson", "kv_store:datamgr_common", + "kv_store:distributeddata_inner", "kv_store:distributeddata_mgr", "kv_store:distributeddb", "memmgr:memmgrclient", diff --git a/services/distributeddataservice/app/test/BUILD.gn b/services/distributeddataservice/app/test/BUILD.gn index bfb70673a..9b4d6a490 100644 --- a/services/distributeddataservice/app/test/BUILD.gn +++ b/services/distributeddataservice/app/test/BUILD.gn @@ -19,8 +19,6 @@ module_output_path = "datamgr_service/datamgr_service/distributeddataservice" config("module_private_config") { visibility = [ ":*" ] include_dirs = [ - "${kv_store_path}/frameworks/innerkitsimpl/distributeddatafwk/include", - "${kv_store_path}/frameworks/innerkitsimpl/distributeddatafwk/src", "${data_service_path}/adapter/include/permission", "${data_service_path}/adapter/include/account", "${data_service_path}/adapter/include", @@ -114,6 +112,7 @@ ohos_unittest("KvStoreDataServiceTest") { "kv_store:distributeddata_inner", "kv_store:distributeddata_mgr", "kv_store:distributeddb", + "kv_store:kvdb_inner_lite", "memmgr:memmgrclient", "safwk:system_ability_fwk", "samgr:samgr_proxy", @@ -172,6 +171,7 @@ ohos_unittest("SessionManagerTest") { "kv_store:distributeddata_inner", "kv_store:distributeddata_mgr", "kv_store:distributeddb", + "kv_store:kvdb_inner_lite", "safwk:system_ability_fwk", "samgr:samgr_proxy", ] -- Gitee From 53078c24d1500ffe60b2b7575a62009a5b6b3cf5 Mon Sep 17 00:00:00 2001 From: bjd Date: Wed, 28 May 2025 11:58:59 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E9=83=A8=E4=BB=B6=E5=8C=96=E6=95=B4?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: bjd --- services/distributeddataservice/app/test/BUILD.gn | 1 + 1 file changed, 1 insertion(+) diff --git a/services/distributeddataservice/app/test/BUILD.gn b/services/distributeddataservice/app/test/BUILD.gn index 9b4d6a490..b6e3245b3 100644 --- a/services/distributeddataservice/app/test/BUILD.gn +++ b/services/distributeddataservice/app/test/BUILD.gn @@ -246,6 +246,7 @@ ohos_unittest("KvStoreDataServiceClearTest") { "kv_store:distributeddata_inner", "kv_store:distributeddata_mgr", "kv_store:distributeddb", + "kv_store:kvdb_inner_lite", "memmgr:memmgrclient", "safwk:system_ability_fwk", "samgr:samgr_proxy", -- Gitee From ed20f935410a235e4b5da2b76256b900f0a30b1f Mon Sep 17 00:00:00 2001 From: bjd Date: Thu, 29 May 2025 23:00:17 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E9=83=A8=E4=BB=B6=E5=8C=96=E6=95=B4?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: bjd --- .../distributeddataservice/app/test/BUILD.gn | 6 ++++++ .../framework/test/serializable_test.cpp | 17 +++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/services/distributeddataservice/app/test/BUILD.gn b/services/distributeddataservice/app/test/BUILD.gn index b6e3245b3..bccc0a525 100644 --- a/services/distributeddataservice/app/test/BUILD.gn +++ b/services/distributeddataservice/app/test/BUILD.gn @@ -90,6 +90,12 @@ ohos_unittest("KvStoreDataServiceTest") { "${data_service_path}/service/common/xcollie.cpp", ] + sanitize = { + cfi = true + cfi_cross_dso = true + debug = false + } + configs = [ ":module_private_config" ] external_deps = [ diff --git a/services/distributeddataservice/framework/test/serializable_test.cpp b/services/distributeddataservice/framework/test/serializable_test.cpp index 4c8ece234..7c458e56e 100644 --- a/services/distributeddataservice/framework/test/serializable_test.cpp +++ b/services/distributeddataservice/framework/test/serializable_test.cpp @@ -314,4 +314,21 @@ HWTEST_F(SerializableTest, IsJson, TestSize.Level1) ASSERT_FALSE(Serializable::IsJson(str)); ASSERT_TRUE(Serializable::IsJson(jsonStr)); } + +/** +* @tc.name: ToString +* @tc.desc: string. +* @tc.type: FUNC +*/ +HWTEST_F(SerializableTest, ToString, TestSize.Level1) +{ + Serializable::JSONWrapper wrapper; + wrapper["name"] = "Alice"; + wrapper["age"] = 30; + wrapper["height"] = 1.75; + wrapper["is_student"] = false; + std::string result = wrapper; + EXPECT_EQ(result, "{\"name\":\"Alice\",\"age\":30,\"height\":1.75,\"is_student\":false}"); + EXPECT_TRUE(wrapper["age"].is_number_float()); +} } // namespace OHOS::Test \ No newline at end of file -- Gitee From fbd9d823dd0b7572212937feba65db198ae94506 Mon Sep 17 00:00:00 2001 From: bjd Date: Mon, 2 Jun 2025 09:58:30 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E9=83=A8=E4=BB=B6=E5=8C=96=E6=95=B4?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: bjd --- services/distributeddataservice/app/test/BUILD.gn | 7 ------- .../framework/test/serializable_test.cpp | 2 ++ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/services/distributeddataservice/app/test/BUILD.gn b/services/distributeddataservice/app/test/BUILD.gn index bccc0a525..9b4d6a490 100644 --- a/services/distributeddataservice/app/test/BUILD.gn +++ b/services/distributeddataservice/app/test/BUILD.gn @@ -90,12 +90,6 @@ ohos_unittest("KvStoreDataServiceTest") { "${data_service_path}/service/common/xcollie.cpp", ] - sanitize = { - cfi = true - cfi_cross_dso = true - debug = false - } - configs = [ ":module_private_config" ] external_deps = [ @@ -252,7 +246,6 @@ ohos_unittest("KvStoreDataServiceClearTest") { "kv_store:distributeddata_inner", "kv_store:distributeddata_mgr", "kv_store:distributeddb", - "kv_store:kvdb_inner_lite", "memmgr:memmgrclient", "safwk:system_ability_fwk", "samgr:samgr_proxy", diff --git a/services/distributeddataservice/framework/test/serializable_test.cpp b/services/distributeddataservice/framework/test/serializable_test.cpp index 7c458e56e..a5992e84b 100644 --- a/services/distributeddataservice/framework/test/serializable_test.cpp +++ b/services/distributeddataservice/framework/test/serializable_test.cpp @@ -329,6 +329,8 @@ HWTEST_F(SerializableTest, ToString, TestSize.Level1) wrapper["is_student"] = false; std::string result = wrapper; EXPECT_EQ(result, "{\"name\":\"Alice\",\"age\":30,\"height\":1.75,\"is_student\":false}"); + EXPECT_TRUE(wrapper["name"].is_string()); EXPECT_TRUE(wrapper["age"].is_number_float()); + EXPECT_TRUE(wrapper["is_student"].is_boolean()); } } // namespace OHOS::Test \ No newline at end of file -- Gitee From 222399c663439cd7c556b8e211c6fa9143142e1a Mon Sep 17 00:00:00 2001 From: bjd Date: Mon, 2 Jun 2025 09:59:45 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E9=83=A8=E4=BB=B6=E5=8C=96=E6=95=B4?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: bjd --- services/distributeddataservice/app/test/BUILD.gn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/distributeddataservice/app/test/BUILD.gn b/services/distributeddataservice/app/test/BUILD.gn index 9b4d6a490..bfb70673a 100644 --- a/services/distributeddataservice/app/test/BUILD.gn +++ b/services/distributeddataservice/app/test/BUILD.gn @@ -19,6 +19,8 @@ module_output_path = "datamgr_service/datamgr_service/distributeddataservice" config("module_private_config") { visibility = [ ":*" ] include_dirs = [ + "${kv_store_path}/frameworks/innerkitsimpl/distributeddatafwk/include", + "${kv_store_path}/frameworks/innerkitsimpl/distributeddatafwk/src", "${data_service_path}/adapter/include/permission", "${data_service_path}/adapter/include/account", "${data_service_path}/adapter/include", @@ -112,7 +114,6 @@ ohos_unittest("KvStoreDataServiceTest") { "kv_store:distributeddata_inner", "kv_store:distributeddata_mgr", "kv_store:distributeddb", - "kv_store:kvdb_inner_lite", "memmgr:memmgrclient", "safwk:system_ability_fwk", "samgr:samgr_proxy", @@ -171,7 +172,6 @@ ohos_unittest("SessionManagerTest") { "kv_store:distributeddata_inner", "kv_store:distributeddata_mgr", "kv_store:distributeddb", - "kv_store:kvdb_inner_lite", "safwk:system_ability_fwk", "samgr:samgr_proxy", ] -- Gitee From 7e1266164140ca6de01bf95b8b9b3cc60f92b153 Mon Sep 17 00:00:00 2001 From: bjd Date: Mon, 2 Jun 2025 18:34:19 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E9=83=A8=E4=BB=B6=E5=8C=96=E6=95=B4?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: bjd --- services/distributeddataservice/app/BUILD.gn | 1 - 1 file changed, 1 deletion(-) diff --git a/services/distributeddataservice/app/BUILD.gn b/services/distributeddataservice/app/BUILD.gn index ded045781..d676ea9d9 100644 --- a/services/distributeddataservice/app/BUILD.gn +++ b/services/distributeddataservice/app/BUILD.gn @@ -148,7 +148,6 @@ ohos_shared_library("distributeddataservice") { "ipc:ipc_core", "cJSON:cjson", "kv_store:datamgr_common", - "kv_store:distributeddata_inner", "kv_store:distributeddata_mgr", "kv_store:distributeddb", "memmgr:memmgrclient", -- Gitee