From a28dc77a56da5a08a142ca2ab2cd7da7dffd75c9 Mon Sep 17 00:00:00 2001 From: yangliu Date: Mon, 19 May 2025 21:37:44 +0800 Subject: [PATCH 1/3] fix ode check Signed-off-by: yangliu --- .../test/unittest/fake/hiview/fake_hiview.cpp | 2 +- .../distributeddataservice/service/BUILD.gn | 6 --- .../service/test/BUILD.gn | 47 +++++++------------ .../test/fuzztest/dumphelper_fuzzer/BUILD.gn | 14 +----- .../fuzztest/kvdbservicestub_fuzzer/BUILD.gn | 13 +---- 5 files changed, 22 insertions(+), 60 deletions(-) diff --git a/services/distributeddataservice/adapter/dfx/test/unittest/fake/hiview/fake_hiview.cpp b/services/distributeddataservice/adapter/dfx/test/unittest/fake/hiview/fake_hiview.cpp index 1f58aa670..b49734e0f 100644 --- a/services/distributeddataservice/adapter/dfx/test/unittest/fake/hiview/fake_hiview.cpp +++ b/services/distributeddataservice/adapter/dfx/test/unittest/fake/hiview/fake_hiview.cpp @@ -13,5 +13,5 @@ * limitations under the License. */ -#include "./include/fake_hiview.h" +#include "include/fake_hiview.h" std::map FakeHivew::fakeCache_; diff --git a/services/distributeddataservice/service/BUILD.gn b/services/distributeddataservice/service/BUILD.gn index b2c3d0415..ad2d450f4 100644 --- a/services/distributeddataservice/service/BUILD.gn +++ b/services/distributeddataservice/service/BUILD.gn @@ -35,12 +35,6 @@ config("module_public_config") { "${data_service_path}/adapter/include", "${data_service_path}/app/src", "${data_service_path}/framework/include", - "${kv_store_common_path}", - "${kv_store_path}/frameworks/innerkitsimpl/distributeddatafwk/include", - "${kv_store_path}/frameworks/innerkitsimpl/kvdb/include", - "${kv_store_distributeddb_path}/include/", - "${kv_store_distributeddb_path}/interfaces/include/", - "${kv_store_distributeddb_path}/interfaces/include/relational", ] cflags = [ "-Wno-c99-designator" ] } diff --git a/services/distributeddataservice/service/test/BUILD.gn b/services/distributeddataservice/service/test/BUILD.gn index 8c92d75f5..9f53b2914 100644 --- a/services/distributeddataservice/service/test/BUILD.gn +++ b/services/distributeddataservice/service/test/BUILD.gn @@ -21,7 +21,6 @@ config("module_private_config") { visibility = [ ":*" ] include_dirs = [ - "//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp/include", "${data_service_path}/adapter/include", "${data_service_path}/app/src", "${data_service_path}/framework/include", @@ -44,12 +43,6 @@ config("module_private_config") { "${data_service_path}/service/permission/include", "${data_service_path}/service/rdb/", "${data_service_path}/service/test/mock", - "${dataobject_path}/interfaces/innerkits", - "${dataobject_path}/frameworks/innerkitsimpl/include", - "${kv_store_distributeddb_path}/interfaces/include/", - "${kv_store_distributeddb_path}/include/", - "${relational_store_path}/interfaces/inner_api/cloud_data/include", - "${relational_store_path}/interfaces/inner_api/common_type/include", "${data_service_path}/adapter/include/communicator", ] cflags = [ "-Werror" ] @@ -193,11 +186,6 @@ ohos_unittest("ValueProxyServiceTest") { "value_proxy_test.cpp", ] - include_dirs = [ - "../../../../../relational_store/interfaces/inner_api/rdb/include", - "${relational_store_path}/interfaces/inner_api/common_type/include", - ] - configs = [ ":module_private_config" ] cflags = [ @@ -215,11 +203,11 @@ ohos_unittest("ValueProxyServiceTest") { "hilog:libhilog", "ipc:ipc_core", "kv_store:distributeddata_inner", + "kv_store:distributeddb", + "relational_store:native_rdb", ] deps = [ - "${kv_store_distributeddb_path}:distributeddb", - "${relational_store_inner_api_path}:native_rdb_static", "../../framework:distributeddatasvcfwk", "../../service:distributeddatasvc", ] @@ -318,6 +306,7 @@ ohos_unittest("DeviceMatrixTest") { "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "c_utils:utils", + "device_manager:devicemanagersdk", "googletest:gtest_main", "hilog:libhilog", "ipc:ipc_core", @@ -350,9 +339,6 @@ ohos_unittest("KVDBGeneralStoreTest") { "${data_service_path}/service/common", "${data_service_path}/service/rdb", "${data_service_path}/service/kvdb", - "${relational_store_path}/interfaces/innerapi/clouddata/include", - "${relational_store_path}/interfaces/inner_api/rdb/include", - "${relational_store_path}/interfaces/inner_api/common_type/include", ] configs = [ ":module_private_config" ] @@ -368,11 +354,13 @@ ohos_unittest("KVDBGeneralStoreTest") { "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "c_utils:utils", + "device_manager:devicemanagersdk", "googletest:gtest_main", "hilog:libhilog", "ipc:ipc_core", "kv_store:distributeddata_inner", "kv_store:distributeddb", + "relational_store:native_rdb", ] deps = [ @@ -465,9 +453,6 @@ ohos_unittest("RdbResultSetImplTest") { include_dirs = [ "${data_service_path}/service/rdb", - "${relational_store_path}/interfaces/inner_api/cloud_data/include", - "${relational_store_path}/interfaces/inner_api/rdb/include", - "${relational_store_path}/interfaces/inner_api/common_type/include", ] configs = [ ":module_private_config" ] @@ -489,12 +474,12 @@ ohos_unittest("RdbResultSetImplTest") { "hilog:libhilog", "ipc:ipc_core", "kv_store:distributeddb", + "relational_store:native_rdb", ] deps = [ "${data_service_path}/adapter/utils:distributeddata_utils", "${data_service_path}/framework:distributeddatasvcfwk", - "${relational_store_inner_api_path}:native_rdb_static", ] } @@ -543,10 +528,12 @@ ohos_unittest("RdbServiceTest") { "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "c_utils:utils", + "device_manager:devicemanagersdk", "googletest:gtest_main", "hilog:libhilog", "ipc:ipc_core", "kv_store:distributeddata_inner", + "kv_store:distributeddb" ] deps = [ @@ -715,6 +702,7 @@ ohos_unittest("ObjectDmsHandlerTest") { external_deps = [ "c_utils:utils", + "device_manager:devicemanagersdk", "dmsfwk:distributed_sdk", "googletest:gtest_main", "hilog:libhilog", @@ -829,6 +817,7 @@ ohos_unittest("ObjectSnapshotTest") { "ipc:ipc_core", "json:nlohmann_json_static", "kv_store:distributeddata_inner", + "relational_store:native_rdb", ] deps = [ @@ -854,9 +843,6 @@ ohos_unittest("MetaDataTest") { "${data_service_path}/app/src", "${data_service_path}/service/kvdb", "${data_service_path}/adapter/include/account", - "${kv_store_path}/frameworks/innerkitsimpl/kvdb/include", - "${kv_store_path}/frameworks/innerkitsimpl/distributeddatafwk/include", - "${kv_store_path}/frameworks/innerkitsimpl/distributeddatasvc/include", "${data_service_path}/adapter/include/communicator", ] @@ -868,13 +854,15 @@ ohos_unittest("MetaDataTest") { "access_token:libtoken_setproc", "c_utils:utils", "dataclassification:data_transit_mgr", + "device_manager:devicemanagersdk", "googletest:gtest_main", "hilog:libhilog", "hisysevent:libhisysevent", "ipc:ipc_core", "json:nlohmann_json_static", - "kv_store:distributeddata_inner", + "kv_store:distributeddata_mgr", "kv_store:distributeddb", + "kv_store:kvdb_inner_lite", ] deps = [ @@ -914,6 +902,7 @@ ohos_unittest("UdmfRunTimeStoreTest") { "bundle_framework:appexecfwk_core", "c_utils:utils", "dataclassification:data_transit_mgr", + "device_manager:devicemanagersdk", "dsoftbus:softbus_client", "googletest:gtest_main", "hilog:libhilog", @@ -1096,9 +1085,6 @@ ohos_unittest("KvdbServiceImplTest") { "${data_service_path}/framework/include/cloud", "${data_service_path}/framework/include/eventcenter", "${data_service_path}/service/test/mock", - "${kv_store_path}/frameworks/innerkitsimpl/kvdb/include", - "${kv_store_path}/frameworks/innerkitsimpl/distributeddatafwk/include", - "${kv_store_path}/frameworks/innerkitsimpl/distributeddatasvc/include", "${data_service_path}/adapter/include/communicator", ] @@ -1116,13 +1102,16 @@ ohos_unittest("KvdbServiceImplTest") { "c_utils:utils", "dataclassification:data_transit_mgr", "device_auth:deviceauth_sdk", + "device_manager:devicemanagersdk", "googletest:gmock_main", "googletest:gtest_main", "hilog:libhilog", "hisysevent:libhisysevent", "ipc:ipc_core", - "kv_store:distributeddata_inner", "kv_store:distributeddb", + "kv_store:distributeddata_mgr", + "kv_store:distributeddata_inner", + "kv_store:kvdb_inner_lite", "relational_store:native_rdb", ] diff --git a/services/distributeddataservice/service/test/fuzztest/dumphelper_fuzzer/BUILD.gn b/services/distributeddataservice/service/test/fuzztest/dumphelper_fuzzer/BUILD.gn index 2fd165553..c0b40e1c2 100644 --- a/services/distributeddataservice/service/test/fuzztest/dumphelper_fuzzer/BUILD.gn +++ b/services/distributeddataservice/service/test/fuzztest/dumphelper_fuzzer/BUILD.gn @@ -21,18 +21,6 @@ ohos_fuzztest("DumpHelperFuzzTest") { include_dirs = [ "${data_service_path}/service/dumper/include", - "${kv_store_common_path}", - "${kv_store_path}/frameworks/innerkitsimpl/distributeddatafwk/include", - "${kv_store_path}/frameworks/innerkitsimpl/distributeddatasvc/include", - "${kv_store_path}/frameworks/innerkitsimpl/kvdb/include", - "${kv_store_distributeddb_path}", - "${kv_store_distributeddb_path}/include/", - "${kv_store_distributeddb_path}/interfaces/include/", - "${kv_store_distributeddb_path}/interfaces/include/relational", - "${dataobject_path}/frameworks/innerkitsimpl/include", - "${relational_store_path}/interfaces/inner_api/cloud_data/include", - "${relational_store_path}/interfaces/inner_api/rdb/include", - "${relational_store_path}/interfaces/inner_api/common_type/include", "//third_party/json/single_include", ] @@ -55,7 +43,6 @@ ohos_fuzztest("DumpHelperFuzzTest") { "${data_service_path}/adapter/account:distributeddata_account", "${data_service_path}/adapter/utils:distributeddata_utils", "${data_service_path}/framework:distributeddatasvcfwk", - "${kv_store_distributeddb_path}:distributeddb", ] external_deps = [ @@ -76,6 +63,7 @@ ohos_fuzztest("DumpHelperFuzzTest") { "kv_store:distributeddata_inner", "kv_store:distributeddata_mgr", "relational_store:native_rdb", + "kv_store:distributeddb" ] } diff --git a/services/distributeddataservice/service/test/fuzztest/kvdbservicestub_fuzzer/BUILD.gn b/services/distributeddataservice/service/test/fuzztest/kvdbservicestub_fuzzer/BUILD.gn index 87efa4b39..4d2d1c46a 100644 --- a/services/distributeddataservice/service/test/fuzztest/kvdbservicestub_fuzzer/BUILD.gn +++ b/services/distributeddataservice/service/test/fuzztest/kvdbservicestub_fuzzer/BUILD.gn @@ -33,16 +33,6 @@ ohos_fuzztest("KvdbServiceStubFuzzTest") { "${data_service_path}/service/matrix/include", "${data_service_path}/service/permission/include", "${data_service_path}/service/rdb", - "${kv_store_common_path}", - "${kv_store_path}/frameworks/innerkitsimpl/distributeddatafwk/include", - "${kv_store_path}/frameworks/innerkitsimpl/distributeddatasvc/include", - "${kv_store_path}/frameworks/innerkitsimpl/kvdb/include", - "${kv_store_distributeddb_path}", - "${kv_store_distributeddb_path}/include/", - "${kv_store_distributeddb_path}/interfaces/include/", - "${kv_store_distributeddb_path}/interfaces/include/relational", - "${relational_store_path}/interfaces/inner_api/common_type/include", - "//third_party/json/single_include", "${data_service_path}/adapter/include/communicator", "${data_service_path}/adapter/include/utils", ] @@ -102,7 +92,6 @@ ohos_fuzztest("KvdbServiceStubFuzzTest") { "${data_service_path}/adapter/utils:distributeddata_utils", "${data_service_path}/framework:distributeddatasvcfwk", "${data_service_path}/service:distributeddatasvc", - "${kv_store_distributeddb_path}:distributeddb", ] external_deps = [ @@ -121,6 +110,8 @@ ohos_fuzztest("KvdbServiceStubFuzzTest") { "ipc:ipc_core", "kv_store:distributeddata_inner", "kv_store:distributeddata_mgr", + "kv_store:distributeddb", + "relational_store:native_rdb", "safwk:system_ability_fwk", "samgr:samgr_proxy", ] -- Gitee From c13509d42f7bd0063ecda6d53b16db2276d4e0ef Mon Sep 17 00:00:00 2001 From: yangliu Date: Tue, 20 May 2025 14:27:28 +0800 Subject: [PATCH 2/3] update Signed-off-by: yangliu --- services/distributeddataservice/service/test/BUILD.gn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/services/distributeddataservice/service/test/BUILD.gn b/services/distributeddataservice/service/test/BUILD.gn index 9f53b2914..8b57b91c3 100644 --- a/services/distributeddataservice/service/test/BUILD.gn +++ b/services/distributeddataservice/service/test/BUILD.gn @@ -78,6 +78,7 @@ ohos_unittest("CloudDataTest") { "access_token:libtoken_setproc", "access_token:libtokenid_sdk", "c_utils:utils", + "device_manager:devicemanagersdk", "hicollie:libhicollie", "json:nlohmann_json_static", "kv_store:distributeddata_inner", @@ -129,6 +130,7 @@ ohos_unittest("CloudServiceImplTest") { "access_token:libaccesstoken_sdk", "access_token:libtoken_setproc", "c_utils:utils", + "device_manager:devicemanagersdk", "hicollie:libhicollie", "json:nlohmann_json_static", "kv_store:distributeddata_inner", -- Gitee From ae26f93b709eba13060c9dc7feb47539c74d0f56 Mon Sep 17 00:00:00 2001 From: yangliu Date: Tue, 20 May 2025 16:10:56 +0800 Subject: [PATCH 3/3] update Signed-off-by: yangliu --- .../service/test/fuzztest/kvdbservicestub_fuzzer/BUILD.gn | 1 + 1 file changed, 1 insertion(+) diff --git a/services/distributeddataservice/service/test/fuzztest/kvdbservicestub_fuzzer/BUILD.gn b/services/distributeddataservice/service/test/fuzztest/kvdbservicestub_fuzzer/BUILD.gn index 4d2d1c46a..0ce893ac1 100644 --- a/services/distributeddataservice/service/test/fuzztest/kvdbservicestub_fuzzer/BUILD.gn +++ b/services/distributeddataservice/service/test/fuzztest/kvdbservicestub_fuzzer/BUILD.gn @@ -111,6 +111,7 @@ ohos_fuzztest("KvdbServiceStubFuzzTest") { "kv_store:distributeddata_inner", "kv_store:distributeddata_mgr", "kv_store:distributeddb", + "kv_store:kvdb_inner_lite", "relational_store:native_rdb", "safwk:system_ability_fwk", "samgr:samgr_proxy", -- Gitee