From 1a7f0c5949b03b13a2b369665d68823fc893ffb8 Mon Sep 17 00:00:00 2001 From: z30053452 Date: Mon, 1 Sep 2025 11:31:12 +0800 Subject: [PATCH 01/18] add ut Signed-off-by: z30053452 --- .../app/test/unittest/kvstore_dump_test.cpp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 services/distributeddataservice/app/test/unittest/kvstore_dump_test.cpp diff --git a/services/distributeddataservice/app/test/unittest/kvstore_dump_test.cpp b/services/distributeddataservice/app/test/unittest/kvstore_dump_test.cpp new file mode 100644 index 000000000..2e73d04e2 --- /dev/null +++ b/services/distributeddataservice/app/test/unittest/kvstore_dump_test.cpp @@ -0,0 +1,14 @@ +/* + * Copyright (c) 2021 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ -- Gitee From 3cba23c74aa6d356d73eb49afdd0ee629600f454 Mon Sep 17 00:00:00 2001 From: z30053452 Date: Mon, 1 Sep 2025 17:25:38 +0800 Subject: [PATCH 02/18] code fix Signed-off-by: z30053452 --- .../distributeddataservice/app/test/BUILD.gn | 75 ++++++ .../app/test/unittest/kvstore_dump_test.cpp | 245 ++++++++++++++++++ 2 files changed, 320 insertions(+) diff --git a/services/distributeddataservice/app/test/BUILD.gn b/services/distributeddataservice/app/test/BUILD.gn index d79c567b8..d3048a187 100644 --- a/services/distributeddataservice/app/test/BUILD.gn +++ b/services/distributeddataservice/app/test/BUILD.gn @@ -584,6 +584,80 @@ ohos_unittest("BundleCheckerTest") { ] } +ohos_unittest("KvStoreDumptTest") { + module_out_path = module_output_path + sources = [ + "${data_service_path}/app/src/checker/bundlechecker.cpp", + "${data_service_path}/app/src/checker/system_checker.cpp", + "${data_service_path}/app/src/clone/clonebackupinfo.cpp", + "${data_service_path}/app/src/clone/secret_key_backup_data.cpp", + "${data_service_path}/app/src/db_info_handle_impl.cpp", + "${data_service_path}/app/src/feature_stub_impl.cpp", + "${data_service_path}/app/src/installer/installer.cpp", + "${data_service_path}/app/src/installer/installer_impl.cpp", + "${data_service_path}/app/src/kvstore_account_observer.cpp", + "${data_service_path}/app/src/kvstore_data_service.cpp", + "${data_service_path}/app/src/kvstore_data_service_stub.cpp", + "${data_service_path}/app/src/kvstore_device_listener.cpp", + "${data_service_path}/app/src/kvstore_meta_manager.cpp", + "${data_service_path}/app/src/kvstore_screen_observer.cpp", + "${data_service_path}/app/src/security/security.cpp", + "${data_service_path}/app/src/security/sensitive.cpp", + "${data_service_path}/app/src/session_manager/route_head_handler_impl.cpp", + "${data_service_path}/app/src/session_manager/session_manager.cpp", + "${data_service_path}/app/src/session_manager/upgrade_manager.cpp", + "${data_service_path}/app/src/task_manager.cpp", + "${data_service_path}/app/test/unittest/kvstoredumptest.cpp"," + "${data_service_path}/service/test/mock/account_delegate_mock.cpp", + "${data_service_path}service/test/mock/dbstoremock.cpp"," + "${data_service_path}/service/test/mock/db_change_data_mock.cpp", + "${data_service_path}/service/test/mock/device_manager_adapter_mock.cpp", +] + sanitize = { + ubsan = true + boundary_sanitize = true + integer_overflow = true + debug = false + blocklist = "${datamgr_service_path}/cfi_blocklist.txt" + } + cflags = [ + "-Dprivate=public", + "-Dprotected=public", + ] + + configs = [ ":module_private_config" ] + + external_deps = [ + "ability_base:want", + "access_token:libaccesstoken_sdk", + "bundle_framework:appexecfwk_core", + "c_utils:utils", + "common_event_service:cesfwk_innerkits", + "dataclassification:data_transit_mgr", + "device_auth:deviceauth_sdk", + "device_manager:devicemanagersdk", + "file_api:securitylabel", + "googletest:gmock", + "googletest:gtest_main", + "hicollie:libhicollie", + "hilog:libhilog", + "hisysevent:libhisysevent", + "hitrace:hitrace_meter", + "hitrace:libhitracechain", + "ipc:ipc_core", + "kv_store:distributeddata_mgr", + "kv_store:distributeddb", + "memmgr:memmgrclient", + "safwk:system_ability_fwk", + "samgr:samgr_proxy", + ] + + deps = [ + "${data_service_path}/framework:distributeddatasvcfwk", + "${data_service_path}/service:distributeddatasvc", + ] + part_name = "datamgr_service" +} ############################################################################### group("unittest") { @@ -595,6 +669,7 @@ group("unittest") { ":FeatureStubImplTest", ":KvStoreDataServiceClearTest", ":KvStoreDataServiceTest", + ":KvStoreDumptTest", ":KvStoreMetaManagerUpdateKeyTest", ":SessionManagerTest", ":UpgradeManagerTest", diff --git a/services/distributeddataservice/app/test/unittest/kvstore_dump_test.cpp b/services/distributeddataservice/app/test/unittest/kvstore_dump_test.cpp index 2e73d04e2..78840b77d 100644 --- a/services/distributeddataservice/app/test/unittest/kvstore_dump_test.cpp +++ b/services/distributeddataservice/app/test/unittest/kvstore_dump_test.cpp @@ -12,3 +12,248 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + +#include "auth_delegate.h" +#include "account/account_delegate.h" +#include "account_delegate_mock.h" +#include "bootstrap.h" +#include "db_store_mock.h" +#include "device_manager_adapter.h" +#include "device_manager_adapter_mock.h" +#include "executor_pool.h" +#include +#include "metadata/secret_key_meta_data.h" +#include "metadata/store_meta_data.h" +#include "metadata/appid_meta_data.h" +#include +#include "bootstrap.h" +#include "gtest/gtest.h" +#include "kvstore_data_service.h" +#include "serializable/serializable.h" +#include "system_ability.h" +#include "system_ability_definition.h" +#include "upgrade_manager.h" +#include "utils/base64_utils.h" + +using namespace testing; +using namespace testing::ext; +using namespace OHOS; +using namespace OHOS::AppDistributedKv; +using namespace OHOS::DistributedData; + +namespace OHOS::Test { +static constexpr const char *TEST_BUNDLE_NAME = "TestApplication"; +static constexpr const char *TEST_STORE_NAME = "TestStore"; +static constexpr const char *TEST_UUID = "ABCD"; + +class KvStoreDumpTest : public testing::Test { +public: + static void SetUpTestCase(void); + static void TearDownTestCase(void); + void SetUp(); + void TearDown(); + static void ConfigSendParameters(bool isCancel); + static MessageInfo msgInfo_; + static std::string foregroundUserId_; + static AppDistributedKv::DeviceInfo localDeviceInfo_; + static std::shared_ptr dbStoreMock_; + static StoreMetaData metaData_; + static inline AccountDelegateMock *accountDelegateMock = nullptr; + static inline std::shared_ptr deviceManagerAdapterMock = nullptr; +}; + +std::string KvStoreDumpTest::foregroundUserId_ = "0"; +AppDistributedKv::DeviceInfo KvStoreDumpTest::localDeviceInfo_; +std::shared_ptr KvStoreDumpTest::dbStoreMock_; + +void KvStoreDumpTest::SetUpTestCase(void) +{ + dbStoreMock_ = std::make_shared(); + MetaDataManager::GetInstance().Initialize(dbStoreMock_, nullptr, ""); + accountDelegateMock = new (std::nothrow) AccountDelegateMock(); + if (accountDelegateMock != nullptr) { + AccountDelegate::instance_ = nullptr; + AccountDelegate::RegisterAccountInstance(accountDelegateMock); + } + deviceManagerAdapterMock = std::make_shared(); + BDeviceManagerAdapter::deviceManagerAdapter = deviceManagerAdapterMock; + DeviceInfo deviceInfo; + deviceInfo.uuid = TEST_UUID; + EXPECT_CALL(*deviceManagerAdapterMock, GetLocalDevice()).WillRepeatedly(Return(deviceInfo)); +} + +void KvStoreDumpTest::TearDownTestCase(void) +{ + if (accountDelegateMock != nullptr) { + delete accountDelegateMock; + accountDelegateMock = nullptr; + } + deviceManagerAdapterMock = nullptr; + BDeviceManagerAdapter::deviceManagerAdapter = nullptr; +} + +void KvStoreDumpTest::SetUp(void) +{} + +void KvStoreDumpTest::TearDown(void) +{ + ConfigSendParameters(true); +} + +void KvStoreDumpTest::ConfigSendParameters(bool isCancel) +{ + StoreMetaData localMetaData; + localMetaData.deviceId = TEST_UUID; + localMetaData.user = foregroundUserId_; + localMetaData.bundleName = TEST_BUNDLE_NAME; + localMetaData.storeId = TEST_STORE_NAME; + + if (isCancel) { + MetaDataManager::GetInstance().DelMeta(localMetaData.GetKeyWithoutPath()); + } else { + MetaDataManager::GetInstance().SaveMeta(localMetaData.GetKeyWithoutPath(), localMetaData); + } +} + +/** +@tc.name: DumpStoreInfo001 +@tc.desc: test DumpStoreInfo function +@tc.type: FUNC +@tc.require: +@tc.author: SQL +*/ +HWTEST_F(KvStoreDumpTest, DumpStoreInfo001, TestSize.Level0) +{ + DistributedKv::KvStoreDataService KvStoreDumpTest; + int fd = 0; + std::map> params = {}; + EXPECT_NO_FATAL_FAILURE(KvStoreDumpTest.DumpStoreInfo(fd, params)); +} + +/** +@tc.name: DumpStoreInfo002 +@tc.desc: test DumpStoreInfo function +@tc.type: FUNC +@tc.require: +@tc.author: SQL +*/ +HWTEST_F(KvStoreDumpTest, DumpStoreInfo002, TestSize.Level0) +{ + DistributedKv::KvStoreDataService KvStoreDumpTest; + int fd = 1; + std::map> params = {}; + if (accountDelegateMock != nullptr) { + EXPECT_CALL(*accountDelegateMock, QueryForegroundUserId(_)).WillOnce(Return(true)); + } + ConfigSendParameters(false); + EXPECT_NO_FATAL_FAILURE(KvStoreDumpTest.DumpStoreInfo(fd, params)); +} + +/** +@tc.name: DumpStoreInfo003 +@tc.desc: test DumpStoreInfo function +@tc.type: FUNC +@tc.require: +@tc.author: SQL +*/ +HWTEST_F(KvStoreDumpTest, DumpStoreInfo003, TestSize.Level0) +{ + DistributedKv::KvStoreDataService KvStoreDumpTest; + int fd = 1; + std::map> params = {}; + if (accountDelegateMock != nullptr) { + EXPECT_CALL(*accountDelegateMock, QueryForegroundUserId(_)).WillOnce(Return(false)); + } + EXPECT_NO_FATAL_FAILURE(KvStoreDumpTest.DumpStoreInfo(fd, params)); +} + +/** +@tc.name: DumpStoreInfo004 +@tc.desc: test DumpStoreInfo function +@tc.type: FUNC +@tc.require: +@tc.author: SQL +*/ +HWTEST_F(KvStoreDumpTest, DumpStoreInfo004, TestSize.Level0) +{ + DistributedKv::KvStoreDataService KvStoreDumpTest; + int fd = 1; + std::map> params = {}; + if (accountDelegateMock != nullptr) { + EXPECT_CALL(*accountDelegateMock, QueryForegroundUserId(_)).WillOnce(Return(true)); + } + ConfigSendParameters(true); + EXPECT_NO_FATAL_FAILURE(KvStoreDumpTest.DumpStoreInfo(fd, params)); +} + +/** +* @tc.name: DumpBundleInfo001 +* @tc.desc: test DumpBundleInfo function +* @tc.type: FUNC +* @tc.require: +* @tc.author: SQL +*/ +HWTEST_F(KvStoreDataServiceTest, DumpBundleInfo001, TestSize.Level0) +{ + KvStoreDataService kvStoreDataServiceTest; + int fd = 0; + std::map> params = {}; + EXPECT_NO_FATAL_FAILURE(kvStoreDataServiceTest.DumpBundleInfo(fd, params)); +} + +/** +@tc.name: DumpBundleInfo002 +@tc.desc: test DumpBundleInfo function +@tc.type: FUNC +@tc.require: +@tc.author: SQL +*/ +HWTEST_F(KvStoreDumpTest, DumpBundleInfo002, TestSize.Level0) +{ + DistributedKv::KvStoreDataService KvStoreDumpTest; + int fd = 1; + std::map> params = {}; + if (accountDelegateMock != nullptr) { + EXPECT_CALL(*accountDelegateMock, QueryForegroundUserId(_)).WillOnce(Return(true)); + } + ConfigSendParameters(false); + EXPECT_NO_FATAL_FAILURE(KvStoreDumpTest.DumpStoreInfo(fd, params)); +} + +/** +@tc.name: DumpBundleInfo003 +@tc.desc: test DumpBundleInfo function +@tc.type: FUNC +@tc.require: +@tc.author: SQL +*/ +HWTEST_F(KvStoreDumpTest, DumpBundleInfo003, TestSize.Level0) +{ + DistributedKv::KvStoreDataService KvStoreDumpTest; + int fd = 1; + std::map> params = {}; + if (accountDelegateMock != nullptr) { + EXPECT_CALL(*accountDelegateMock, QueryForegroundUserId(_)).WillOnce(Return(false)); + } + EXPECT_NO_FATAL_FAILURE(KvStoreDumpTest.DumpBundleInfo(fd, params)); +} + +/** +@tc.name: DumpBundleInfo004 +@tc.desc: test DumpBundleInfo function +@tc.type: FUNC +@tc.require: +@tc.author: SQL +*/ +HWTEST_F(KvStoreDumpTest, DumpBundleInfo004, TestSize.Level0) +{ + DistributedKv::KvStoreDataService KvStoreDumpTest; + int fd = 1; + std::map> params = {}; + if (accountDelegateMock != nullptr) { + EXPECT_CALL(*accountDelegateMock, QueryForegroundUserId(_)).WillOnce(Return(true)); + } + ConfigSendParameters(false); + EXPECT_NO_FATAL_FAILURE(KvStoreDumpTest.DumpBundleInfo(fd, params)); +} +} \ No newline at end of file -- Gitee From cad21f2c49d8836f8f051100691713e472ca237a Mon Sep 17 00:00:00 2001 From: z30053452 Date: Mon, 1 Sep 2025 20:11:53 +0800 Subject: [PATCH 03/18] code fix Signed-off-by: z30053452 --- .../distributeddataservice/app/test/BUILD.gn | 8 ++++---- .../app/test/unittest/kvstore_dump_test.cpp | 18 +----------------- 2 files changed, 5 insertions(+), 21 deletions(-) diff --git a/services/distributeddataservice/app/test/BUILD.gn b/services/distributeddataservice/app/test/BUILD.gn index d3048a187..318ae1b81 100644 --- a/services/distributeddataservice/app/test/BUILD.gn +++ b/services/distributeddataservice/app/test/BUILD.gn @@ -584,7 +584,7 @@ ohos_unittest("BundleCheckerTest") { ] } -ohos_unittest("KvStoreDumptTest") { +ohos_unittest("KvStoreDumpTest") { module_out_path = module_output_path sources = [ "${data_service_path}/app/src/checker/bundlechecker.cpp", @@ -607,9 +607,9 @@ ohos_unittest("KvStoreDumptTest") { "${data_service_path}/app/src/session_manager/session_manager.cpp", "${data_service_path}/app/src/session_manager/upgrade_manager.cpp", "${data_service_path}/app/src/task_manager.cpp", - "${data_service_path}/app/test/unittest/kvstoredumptest.cpp"," + "${data_service_path}/app/test/unittest/kvstore_dump_test.cpp", "${data_service_path}/service/test/mock/account_delegate_mock.cpp", - "${data_service_path}service/test/mock/dbstoremock.cpp"," + "${data_service_path}service/test/mock/db_store_mock.cpp"," "${data_service_path}/service/test/mock/db_change_data_mock.cpp", "${data_service_path}/service/test/mock/device_manager_adapter_mock.cpp", ] @@ -669,7 +669,7 @@ group("unittest") { ":FeatureStubImplTest", ":KvStoreDataServiceClearTest", ":KvStoreDataServiceTest", - ":KvStoreDumptTest", + ":KvStoreDumpTest", ":KvStoreMetaManagerUpdateKeyTest", ":SessionManagerTest", ":UpgradeManagerTest", diff --git a/services/distributeddataservice/app/test/unittest/kvstore_dump_test.cpp b/services/distributeddataservice/app/test/unittest/kvstore_dump_test.cpp index 78840b77d..2ebc979e4 100644 --- a/services/distributeddataservice/app/test/unittest/kvstore_dump_test.cpp +++ b/services/distributeddataservice/app/test/unittest/kvstore_dump_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -119,8 +119,6 @@ void KvStoreDumpTest::ConfigSendParameters(bool isCancel) @tc.name: DumpStoreInfo001 @tc.desc: test DumpStoreInfo function @tc.type: FUNC -@tc.require: -@tc.author: SQL */ HWTEST_F(KvStoreDumpTest, DumpStoreInfo001, TestSize.Level0) { @@ -134,8 +132,6 @@ HWTEST_F(KvStoreDumpTest, DumpStoreInfo001, TestSize.Level0) @tc.name: DumpStoreInfo002 @tc.desc: test DumpStoreInfo function @tc.type: FUNC -@tc.require: -@tc.author: SQL */ HWTEST_F(KvStoreDumpTest, DumpStoreInfo002, TestSize.Level0) { @@ -153,8 +149,6 @@ HWTEST_F(KvStoreDumpTest, DumpStoreInfo002, TestSize.Level0) @tc.name: DumpStoreInfo003 @tc.desc: test DumpStoreInfo function @tc.type: FUNC -@tc.require: -@tc.author: SQL */ HWTEST_F(KvStoreDumpTest, DumpStoreInfo003, TestSize.Level0) { @@ -171,8 +165,6 @@ HWTEST_F(KvStoreDumpTest, DumpStoreInfo003, TestSize.Level0) @tc.name: DumpStoreInfo004 @tc.desc: test DumpStoreInfo function @tc.type: FUNC -@tc.require: -@tc.author: SQL */ HWTEST_F(KvStoreDumpTest, DumpStoreInfo004, TestSize.Level0) { @@ -190,8 +182,6 @@ HWTEST_F(KvStoreDumpTest, DumpStoreInfo004, TestSize.Level0) * @tc.name: DumpBundleInfo001 * @tc.desc: test DumpBundleInfo function * @tc.type: FUNC -* @tc.require: -* @tc.author: SQL */ HWTEST_F(KvStoreDataServiceTest, DumpBundleInfo001, TestSize.Level0) { @@ -205,8 +195,6 @@ HWTEST_F(KvStoreDataServiceTest, DumpBundleInfo001, TestSize.Level0) @tc.name: DumpBundleInfo002 @tc.desc: test DumpBundleInfo function @tc.type: FUNC -@tc.require: -@tc.author: SQL */ HWTEST_F(KvStoreDumpTest, DumpBundleInfo002, TestSize.Level0) { @@ -224,8 +212,6 @@ HWTEST_F(KvStoreDumpTest, DumpBundleInfo002, TestSize.Level0) @tc.name: DumpBundleInfo003 @tc.desc: test DumpBundleInfo function @tc.type: FUNC -@tc.require: -@tc.author: SQL */ HWTEST_F(KvStoreDumpTest, DumpBundleInfo003, TestSize.Level0) { @@ -242,8 +228,6 @@ HWTEST_F(KvStoreDumpTest, DumpBundleInfo003, TestSize.Level0) @tc.name: DumpBundleInfo004 @tc.desc: test DumpBundleInfo function @tc.type: FUNC -@tc.require: -@tc.author: SQL */ HWTEST_F(KvStoreDumpTest, DumpBundleInfo004, TestSize.Level0) { -- Gitee From 9317d688605e4f2ddee2dfcd8108ffe4c054b593 Mon Sep 17 00:00:00 2001 From: z30053452 Date: Mon, 1 Sep 2025 20:52:08 +0800 Subject: [PATCH 04/18] code fix Signed-off-by: z30053452 --- services/distributeddataservice/app/test/BUILD.gn | 2 +- .../app/test/unittest/kvstore_dump_test.cpp | 14 -------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/services/distributeddataservice/app/test/BUILD.gn b/services/distributeddataservice/app/test/BUILD.gn index 318ae1b81..18ae61446 100644 --- a/services/distributeddataservice/app/test/BUILD.gn +++ b/services/distributeddataservice/app/test/BUILD.gn @@ -609,7 +609,7 @@ ohos_unittest("KvStoreDumpTest") { "${data_service_path}/app/src/task_manager.cpp", "${data_service_path}/app/test/unittest/kvstore_dump_test.cpp", "${data_service_path}/service/test/mock/account_delegate_mock.cpp", - "${data_service_path}service/test/mock/db_store_mock.cpp"," + "${data_service_path}/service/test/mock/db_store_mock.cpp"," "${data_service_path}/service/test/mock/db_change_data_mock.cpp", "${data_service_path}/service/test/mock/device_manager_adapter_mock.cpp", ] diff --git a/services/distributeddataservice/app/test/unittest/kvstore_dump_test.cpp b/services/distributeddataservice/app/test/unittest/kvstore_dump_test.cpp index 2ebc979e4..442b828ce 100644 --- a/services/distributeddataservice/app/test/unittest/kvstore_dump_test.cpp +++ b/services/distributeddataservice/app/test/unittest/kvstore_dump_test.cpp @@ -13,27 +13,13 @@ * limitations under the License. */ -#include "auth_delegate.h" -#include "account/account_delegate.h" #include "account_delegate_mock.h" -#include "bootstrap.h" #include "db_store_mock.h" #include "device_manager_adapter.h" #include "device_manager_adapter_mock.h" -#include "executor_pool.h" -#include -#include "metadata/secret_key_meta_data.h" #include "metadata/store_meta_data.h" -#include "metadata/appid_meta_data.h" -#include -#include "bootstrap.h" #include "gtest/gtest.h" #include "kvstore_data_service.h" -#include "serializable/serializable.h" -#include "system_ability.h" -#include "system_ability_definition.h" -#include "upgrade_manager.h" -#include "utils/base64_utils.h" using namespace testing; using namespace testing::ext; -- Gitee From 448316d8b8ddfc89e120684912b19c9129e80a8b Mon Sep 17 00:00:00 2001 From: z30053452 Date: Mon, 1 Sep 2025 21:06:22 +0800 Subject: [PATCH 05/18] code fix Signed-off-by: z30053452 --- services/distributeddataservice/app/test/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/distributeddataservice/app/test/BUILD.gn b/services/distributeddataservice/app/test/BUILD.gn index 18ae61446..d27d828bd 100644 --- a/services/distributeddataservice/app/test/BUILD.gn +++ b/services/distributeddataservice/app/test/BUILD.gn @@ -609,7 +609,7 @@ ohos_unittest("KvStoreDumpTest") { "${data_service_path}/app/src/task_manager.cpp", "${data_service_path}/app/test/unittest/kvstore_dump_test.cpp", "${data_service_path}/service/test/mock/account_delegate_mock.cpp", - "${data_service_path}/service/test/mock/db_store_mock.cpp"," + "${data_service_path}/service/test/mock/db_store_mock.cpp", "${data_service_path}/service/test/mock/db_change_data_mock.cpp", "${data_service_path}/service/test/mock/device_manager_adapter_mock.cpp", ] -- Gitee From 183b062f95b513bbd7d6d50f067ca22a096a4140 Mon Sep 17 00:00:00 2001 From: z30053452 Date: Mon, 1 Sep 2025 21:27:38 +0800 Subject: [PATCH 06/18] code fix Signed-off-by: z30053452 --- 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 d27d828bd..0fb233632 100644 --- a/services/distributeddataservice/app/test/BUILD.gn +++ b/services/distributeddataservice/app/test/BUILD.gn @@ -587,9 +587,9 @@ ohos_unittest("BundleCheckerTest") { ohos_unittest("KvStoreDumpTest") { module_out_path = module_output_path sources = [ - "${data_service_path}/app/src/checker/bundlechecker.cpp", + "${data_service_path}/app/src/checker/bundle_checker.cpp", "${data_service_path}/app/src/checker/system_checker.cpp", - "${data_service_path}/app/src/clone/clonebackupinfo.cpp", + "${data_service_path}/app/src/clone/clone_backup_info.cpp", "${data_service_path}/app/src/clone/secret_key_backup_data.cpp", "${data_service_path}/app/src/db_info_handle_impl.cpp", "${data_service_path}/app/src/feature_stub_impl.cpp", -- Gitee From 823c50bedb646f0ef822323a4b941d8f014dc288 Mon Sep 17 00:00:00 2001 From: z30053452 Date: Mon, 1 Sep 2025 21:56:53 +0800 Subject: [PATCH 07/18] code fix Signed-off-by: z30053452 --- .../app/test/unittest/kvstore_dump_test.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/services/distributeddataservice/app/test/unittest/kvstore_dump_test.cpp b/services/distributeddataservice/app/test/unittest/kvstore_dump_test.cpp index 442b828ce..99d1e81b7 100644 --- a/services/distributeddataservice/app/test/unittest/kvstore_dump_test.cpp +++ b/services/distributeddataservice/app/test/unittest/kvstore_dump_test.cpp @@ -169,12 +169,12 @@ HWTEST_F(KvStoreDumpTest, DumpStoreInfo004, TestSize.Level0) * @tc.desc: test DumpBundleInfo function * @tc.type: FUNC */ -HWTEST_F(KvStoreDataServiceTest, DumpBundleInfo001, TestSize.Level0) +HWTEST_F(KvStoreDumpTest, DumpBundleInfo001, TestSize.Level0) { - KvStoreDataService kvStoreDataServiceTest; + DistributedKv::KvStoreDataService KvStoreDumpTest; int fd = 0; std::map> params = {}; - EXPECT_NO_FATAL_FAILURE(kvStoreDataServiceTest.DumpBundleInfo(fd, params)); + EXPECT_NO_FATAL_FAILURE(KvStoreDumpTest.DumpBundleInfo(fd, params)); } /** -- Gitee From e9cf0d5967452029563de1105c887e30cebc6203 Mon Sep 17 00:00:00 2001 From: z30053452 Date: Tue, 2 Sep 2025 15:03:59 +0800 Subject: [PATCH 08/18] code fix Signed-off-by: z30053452 --- .../app/test/unittest/kvstore_dump_test.cpp | 91 ++++++++----------- 1 file changed, 37 insertions(+), 54 deletions(-) diff --git a/services/distributeddataservice/app/test/unittest/kvstore_dump_test.cpp b/services/distributeddataservice/app/test/unittest/kvstore_dump_test.cpp index 99d1e81b7..ed3dcf0a4 100644 --- a/services/distributeddataservice/app/test/unittest/kvstore_dump_test.cpp +++ b/services/distributeddataservice/app/test/unittest/kvstore_dump_test.cpp @@ -55,7 +55,6 @@ std::shared_ptr KvStoreDumpTest::dbStoreMock_; void KvStoreDumpTest::SetUpTestCase(void) { dbStoreMock_ = std::make_shared(); - MetaDataManager::GetInstance().Initialize(dbStoreMock_, nullptr, ""); accountDelegateMock = new (std::nothrow) AccountDelegateMock(); if (accountDelegateMock != nullptr) { AccountDelegate::instance_ = nullptr; @@ -106,77 +105,49 @@ void KvStoreDumpTest::ConfigSendParameters(bool isCancel) @tc.desc: test DumpStoreInfo function @tc.type: FUNC */ -HWTEST_F(KvStoreDumpTest, DumpStoreInfo001, TestSize.Level0) + HWTEST_F(KvStoreDumpTest, DumpStoreInfo001, TestSize.Level0) { DistributedKv::KvStoreDataService KvStoreDumpTest; int fd = 0; std::map> params = {}; + EXPECT_EQ(accountDelegateMock->QueryForegroundUserId(userid), false); EXPECT_NO_FATAL_FAILURE(KvStoreDumpTest.DumpStoreInfo(fd, params)); } /** -@tc.name: DumpStoreInfo002 -@tc.desc: test DumpStoreInfo function -@tc.type: FUNC -*/ -HWTEST_F(KvStoreDumpTest, DumpStoreInfo002, TestSize.Level0) -{ - DistributedKv::KvStoreDataService KvStoreDumpTest; - int fd = 1; - std::map> params = {}; - if (accountDelegateMock != nullptr) { - EXPECT_CALL(*accountDelegateMock, QueryForegroundUserId(_)).WillOnce(Return(true)); - } - ConfigSendParameters(false); - EXPECT_NO_FATAL_FAILURE(KvStoreDumpTest.DumpStoreInfo(fd, params)); -} -/** -@tc.name: DumpStoreInfo003 -@tc.desc: test DumpStoreInfo function +@tc.name: DumpBundleInfo001 +@tc.desc: test DumpBundleInfo function @tc.type: FUNC */ -HWTEST_F(KvStoreDumpTest, DumpStoreInfo003, TestSize.Level0) +HWTEST_F(KvStoreDumpTest, DumpBundleInfo001, TestSize.Level0) { DistributedKv::KvStoreDataService KvStoreDumpTest; - int fd = 1; + int fd = 0; std::map> params = {}; - if (accountDelegateMock != nullptr) { - EXPECT_CALL(*accountDelegateMock, QueryForegroundUserId(_)).WillOnce(Return(false)); - } - EXPECT_NO_FATAL_FAILURE(KvStoreDumpTest.DumpStoreInfo(fd, params)); + EXPECT_EQ(accountDelegateMock->QueryForegroundUserId(userid), false); + EXPECT_NO_FATAL_FAILURE(KvStoreDumpTest.DumpBundleInfo(fd, params)); } - /** -@tc.name: DumpStoreInfo004 +@tc.name: DumpStoreInfo002 @tc.desc: test DumpStoreInfo function @tc.type: FUNC */ -HWTEST_F(KvStoreDumpTest, DumpStoreInfo004, TestSize.Level0) +HWTEST_F(KvStoreDumpTest, DumpStoreInfo002, TestSize.Level0) { DistributedKv::KvStoreDataService KvStoreDumpTest; int fd = 1; std::map> params = {}; if (accountDelegateMock != nullptr) { - EXPECT_CALL(*accountDelegateMock, QueryForegroundUserId(_)).WillOnce(Return(true)); + EXPECT_CALL(*accountDelegateMock, QueryForegroundUserId()).WillOnce(Return(true)); } ConfigSendParameters(true); + std::vector metas; + EXPECT_EQ(MetaDataManager::GetInstance().LoadMeta(StoreMetaData::GetPrefix({ TEST_UUID, foregroundUserId }), metas, + true), false); EXPECT_NO_FATAL_FAILURE(KvStoreDumpTest.DumpStoreInfo(fd, params)); } -/** -* @tc.name: DumpBundleInfo001 -* @tc.desc: test DumpBundleInfo function -* @tc.type: FUNC -*/ -HWTEST_F(KvStoreDumpTest, DumpBundleInfo001, TestSize.Level0) -{ - DistributedKv::KvStoreDataService KvStoreDumpTest; - int fd = 0; - std::map> params = {}; - EXPECT_NO_FATAL_FAILURE(KvStoreDumpTest.DumpBundleInfo(fd, params)); -} - /** @tc.name: DumpBundleInfo002 @tc.desc: test DumpBundleInfo function @@ -188,42 +159,54 @@ HWTEST_F(KvStoreDumpTest, DumpBundleInfo002, TestSize.Level0) int fd = 1; std::map> params = {}; if (accountDelegateMock != nullptr) { - EXPECT_CALL(*accountDelegateMock, QueryForegroundUserId(_)).WillOnce(Return(true)); + EXPECT_CALL(*accountDelegateMock, QueryForegroundUserId()).WillOnce(Return(true)); } - ConfigSendParameters(false); + ConfigSendParameters(true); + std::vector metas; + auto res = MetaDataManager::GetInstance().LoadMeta(StoreMetaData::GetPrefix({ TEST_UUID, foregroundUserId }), + metas, true); + EXPECT_EQ(res, false); EXPECT_NO_FATAL_FAILURE(KvStoreDumpTest.DumpStoreInfo(fd, params)); } /** -@tc.name: DumpBundleInfo003 -@tc.desc: test DumpBundleInfo function +@tc.name: DumpStoreInfo003 +@tc.desc: test DumpStoreInfo function @tc.type: FUNC */ -HWTEST_F(KvStoreDumpTest, DumpBundleInfo003, TestSize.Level0) +HWTEST_F(KvStoreDumpTest, DumpStoreInfo003, TestSize.Level0) { + MetaDataManager::GetInstance().Initialize(dbStoreMock_, nullptr, ""); DistributedKv::KvStoreDataService KvStoreDumpTest; int fd = 1; std::map> params = {}; if (accountDelegateMock != nullptr) { - EXPECT_CALL(*accountDelegateMock, QueryForegroundUserId(_)).WillOnce(Return(false)); + EXPECT_CALL(*accountDelegateMock, QueryForegroundUserId()).WillOnce(Return(true)); } - EXPECT_NO_FATAL_FAILURE(KvStoreDumpTest.DumpBundleInfo(fd, params)); + ConfigSendParameters(false); + std::vector metas; + EXPECT_EQ(MetaDataManager::GetInstance().LoadMeta(StoreMetaData::GetPrefix({ TEST_UUID, foregroundUserId }), metas, + true), true); + EXPECT_NO_FATAL_FAILURE(KvStoreDumpTest.DumpStoreInfo(fd, params)); } /** -@tc.name: DumpBundleInfo004 +@tc.name: DumpBundleInfo003 @tc.desc: test DumpBundleInfo function @tc.type: FUNC */ -HWTEST_F(KvStoreDumpTest, DumpBundleInfo004, TestSize.Level0) +HWTEST_F(KvStoreDumpTest, DumpBundleInfo003, TestSize.Level0) { DistributedKv::KvStoreDataService KvStoreDumpTest; int fd = 1; std::map> params = {}; if (accountDelegateMock != nullptr) { - EXPECT_CALL(*accountDelegateMock, QueryForegroundUserId(_)).WillOnce(Return(true)); + EXPECT_CALL(*accountDelegateMock, QueryForegroundUserId()).WillOnce(Return(true)); } ConfigSendParameters(false); - EXPECT_NO_FATAL_FAILURE(KvStoreDumpTest.DumpBundleInfo(fd, params)); + std::vector metas; + EXPECT_EQ(MetaDataManager::GetInstance().LoadMeta(StoreMetaData::GetPrefix({ TEST_UUID, foregroundUserId }), metas, + true), true); + EXPECT_NO_FATAL_FAILURE(KvStoreDumpTest.DumpStoreInfo(fd, params)); } } \ No newline at end of file -- Gitee From a8389c3a783dc374b3dba27668ac4e297555f85b Mon Sep 17 00:00:00 2001 From: z30053452 Date: Tue, 2 Sep 2025 15:25:23 +0800 Subject: [PATCH 09/18] code fix Signed-off-by: z30053452 --- .../app/test/unittest/kvstore_dump_test.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/services/distributeddataservice/app/test/unittest/kvstore_dump_test.cpp b/services/distributeddataservice/app/test/unittest/kvstore_dump_test.cpp index ed3dcf0a4..d669dd743 100644 --- a/services/distributeddataservice/app/test/unittest/kvstore_dump_test.cpp +++ b/services/distributeddataservice/app/test/unittest/kvstore_dump_test.cpp @@ -31,6 +31,7 @@ namespace OHOS::Test { static constexpr const char *TEST_BUNDLE_NAME = "TestApplication"; static constexpr const char *TEST_STORE_NAME = "TestStore"; static constexpr const char *TEST_UUID = "ABCD"; +static int32_t userid = 0; class KvStoreDumpTest : public testing::Test { public: -- Gitee From 4adffd7a7756907ccf39e158b618a75c17adb2a1 Mon Sep 17 00:00:00 2001 From: z30053452 Date: Tue, 2 Sep 2025 15:45:13 +0800 Subject: [PATCH 10/18] code fix Signed-off-by: z30053452 --- .../app/test/unittest/kvstore_dump_test.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/services/distributeddataservice/app/test/unittest/kvstore_dump_test.cpp b/services/distributeddataservice/app/test/unittest/kvstore_dump_test.cpp index d669dd743..dfab56e6e 100644 --- a/services/distributeddataservice/app/test/unittest/kvstore_dump_test.cpp +++ b/services/distributeddataservice/app/test/unittest/kvstore_dump_test.cpp @@ -140,7 +140,7 @@ HWTEST_F(KvStoreDumpTest, DumpStoreInfo002, TestSize.Level0) int fd = 1; std::map> params = {}; if (accountDelegateMock != nullptr) { - EXPECT_CALL(*accountDelegateMock, QueryForegroundUserId()).WillOnce(Return(true)); + EXPECT_CALL(*accountDelegateMock, QueryForegroundUserId(userid)).WillOnce(Return(true)); } ConfigSendParameters(true); std::vector metas; @@ -160,7 +160,7 @@ HWTEST_F(KvStoreDumpTest, DumpBundleInfo002, TestSize.Level0) int fd = 1; std::map> params = {}; if (accountDelegateMock != nullptr) { - EXPECT_CALL(*accountDelegateMock, QueryForegroundUserId()).WillOnce(Return(true)); + EXPECT_CALL(*accountDelegateMock, QueryForegroundUserId(_)).WillOnce(Return(true)); } ConfigSendParameters(true); std::vector metas; @@ -182,7 +182,7 @@ HWTEST_F(KvStoreDumpTest, DumpStoreInfo003, TestSize.Level0) int fd = 1; std::map> params = {}; if (accountDelegateMock != nullptr) { - EXPECT_CALL(*accountDelegateMock, QueryForegroundUserId()).WillOnce(Return(true)); + EXPECT_CALL(*accountDelegateMock, QueryForegroundUserId(_)).WillOnce(Return(true)); } ConfigSendParameters(false); std::vector metas; @@ -202,7 +202,7 @@ HWTEST_F(KvStoreDumpTest, DumpBundleInfo003, TestSize.Level0) int fd = 1; std::map> params = {}; if (accountDelegateMock != nullptr) { - EXPECT_CALL(*accountDelegateMock, QueryForegroundUserId()).WillOnce(Return(true)); + EXPECT_CALL(*accountDelegateMock, QueryForegroundUserId(_)).WillOnce(Return(true)); } ConfigSendParameters(false); std::vector metas; -- Gitee From 9be59c2b5c24665bb53e3e132b88e42845cadcb8 Mon Sep 17 00:00:00 2001 From: z30053452 Date: Tue, 2 Sep 2025 16:04:24 +0800 Subject: [PATCH 11/18] code fix Signed-off-by: z30053452 --- .../app/test/unittest/kvstore_dump_test.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/services/distributeddataservice/app/test/unittest/kvstore_dump_test.cpp b/services/distributeddataservice/app/test/unittest/kvstore_dump_test.cpp index dfab56e6e..54324d5c8 100644 --- a/services/distributeddataservice/app/test/unittest/kvstore_dump_test.cpp +++ b/services/distributeddataservice/app/test/unittest/kvstore_dump_test.cpp @@ -143,7 +143,7 @@ HWTEST_F(KvStoreDumpTest, DumpStoreInfo002, TestSize.Level0) EXPECT_CALL(*accountDelegateMock, QueryForegroundUserId(userid)).WillOnce(Return(true)); } ConfigSendParameters(true); - std::vector metas; + std::vector metas; EXPECT_EQ(MetaDataManager::GetInstance().LoadMeta(StoreMetaData::GetPrefix({ TEST_UUID, foregroundUserId }), metas, true), false); EXPECT_NO_FATAL_FAILURE(KvStoreDumpTest.DumpStoreInfo(fd, params)); @@ -163,7 +163,7 @@ HWTEST_F(KvStoreDumpTest, DumpBundleInfo002, TestSize.Level0) EXPECT_CALL(*accountDelegateMock, QueryForegroundUserId(_)).WillOnce(Return(true)); } ConfigSendParameters(true); - std::vector metas; + std::vector metas; auto res = MetaDataManager::GetInstance().LoadMeta(StoreMetaData::GetPrefix({ TEST_UUID, foregroundUserId }), metas, true); EXPECT_EQ(res, false); @@ -185,7 +185,7 @@ HWTEST_F(KvStoreDumpTest, DumpStoreInfo003, TestSize.Level0) EXPECT_CALL(*accountDelegateMock, QueryForegroundUserId(_)).WillOnce(Return(true)); } ConfigSendParameters(false); - std::vector metas; + std::vector metas; EXPECT_EQ(MetaDataManager::GetInstance().LoadMeta(StoreMetaData::GetPrefix({ TEST_UUID, foregroundUserId }), metas, true), true); EXPECT_NO_FATAL_FAILURE(KvStoreDumpTest.DumpStoreInfo(fd, params)); @@ -205,7 +205,7 @@ HWTEST_F(KvStoreDumpTest, DumpBundleInfo003, TestSize.Level0) EXPECT_CALL(*accountDelegateMock, QueryForegroundUserId(_)).WillOnce(Return(true)); } ConfigSendParameters(false); - std::vector metas; + std::vector metas; EXPECT_EQ(MetaDataManager::GetInstance().LoadMeta(StoreMetaData::GetPrefix({ TEST_UUID, foregroundUserId }), metas, true), true); EXPECT_NO_FATAL_FAILURE(KvStoreDumpTest.DumpStoreInfo(fd, params)); -- Gitee From 816cbfc67d914c152825b64fcd8583b34e0dc9a3 Mon Sep 17 00:00:00 2001 From: z30053452 Date: Tue, 2 Sep 2025 16:37:40 +0800 Subject: [PATCH 12/18] code fix Signed-off-by: z30053452 --- .../app/test/unittest/kvstore_dump_test.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/services/distributeddataservice/app/test/unittest/kvstore_dump_test.cpp b/services/distributeddataservice/app/test/unittest/kvstore_dump_test.cpp index 54324d5c8..db806e77a 100644 --- a/services/distributeddataservice/app/test/unittest/kvstore_dump_test.cpp +++ b/services/distributeddataservice/app/test/unittest/kvstore_dump_test.cpp @@ -144,7 +144,7 @@ HWTEST_F(KvStoreDumpTest, DumpStoreInfo002, TestSize.Level0) } ConfigSendParameters(true); std::vector metas; - EXPECT_EQ(MetaDataManager::GetInstance().LoadMeta(StoreMetaData::GetPrefix({ TEST_UUID, foregroundUserId }), metas, + EXPECT_EQ(MetaDataManager::GetInstance().LoadMeta(StoreMetaData::GetPrefix({ TEST_UUID, foregroundUserId_ }), metas, true), false); EXPECT_NO_FATAL_FAILURE(KvStoreDumpTest.DumpStoreInfo(fd, params)); } @@ -164,7 +164,7 @@ HWTEST_F(KvStoreDumpTest, DumpBundleInfo002, TestSize.Level0) } ConfigSendParameters(true); std::vector metas; - auto res = MetaDataManager::GetInstance().LoadMeta(StoreMetaData::GetPrefix({ TEST_UUID, foregroundUserId }), + auto res = MetaDataManager::GetInstance().LoadMeta(StoreMetaData::GetPrefix({ TEST_UUID, foregroundUserId_ }), metas, true); EXPECT_EQ(res, false); EXPECT_NO_FATAL_FAILURE(KvStoreDumpTest.DumpStoreInfo(fd, params)); @@ -186,7 +186,7 @@ HWTEST_F(KvStoreDumpTest, DumpStoreInfo003, TestSize.Level0) } ConfigSendParameters(false); std::vector metas; - EXPECT_EQ(MetaDataManager::GetInstance().LoadMeta(StoreMetaData::GetPrefix({ TEST_UUID, foregroundUserId }), metas, + EXPECT_EQ(MetaDataManager::GetInstance().LoadMeta(StoreMetaData::GetPrefix({ TEST_UUID, foregroundUserId_ }), metas, true), true); EXPECT_NO_FATAL_FAILURE(KvStoreDumpTest.DumpStoreInfo(fd, params)); } @@ -206,7 +206,7 @@ HWTEST_F(KvStoreDumpTest, DumpBundleInfo003, TestSize.Level0) } ConfigSendParameters(false); std::vector metas; - EXPECT_EQ(MetaDataManager::GetInstance().LoadMeta(StoreMetaData::GetPrefix({ TEST_UUID, foregroundUserId }), metas, + EXPECT_EQ(MetaDataManager::GetInstance().LoadMeta(StoreMetaData::GetPrefix({ TEST_UUID, foregroundUserId_ }), metas, true), true); EXPECT_NO_FATAL_FAILURE(KvStoreDumpTest.DumpStoreInfo(fd, params)); } -- Gitee From 8baa96e162d6c1f297341c432d71631f54f11b72 Mon Sep 17 00:00:00 2001 From: z30053452 Date: Tue, 2 Sep 2025 17:40:03 +0800 Subject: [PATCH 13/18] code fix Signed-off-by: z30053452 --- .../app/test/unittest/kvstore_dump_test.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/services/distributeddataservice/app/test/unittest/kvstore_dump_test.cpp b/services/distributeddataservice/app/test/unittest/kvstore_dump_test.cpp index db806e77a..14b7be76b 100644 --- a/services/distributeddataservice/app/test/unittest/kvstore_dump_test.cpp +++ b/services/distributeddataservice/app/test/unittest/kvstore_dump_test.cpp @@ -58,8 +58,8 @@ void KvStoreDumpTest::SetUpTestCase(void) dbStoreMock_ = std::make_shared(); accountDelegateMock = new (std::nothrow) AccountDelegateMock(); if (accountDelegateMock != nullptr) { - AccountDelegate::instance_ = nullptr; - AccountDelegate::RegisterAccountInstance(accountDelegateMock); + AccountDelegate::instance_ = nullptr; + AccountDelegate::RegisterAccountInstance(accountDelegateMock); } deviceManagerAdapterMock = std::make_shared(); BDeviceManagerAdapter::deviceManagerAdapter = deviceManagerAdapterMock; @@ -71,8 +71,8 @@ void KvStoreDumpTest::SetUpTestCase(void) void KvStoreDumpTest::TearDownTestCase(void) { if (accountDelegateMock != nullptr) { - delete accountDelegateMock; - accountDelegateMock = nullptr; + delete accountDelegateMock; + accountDelegateMock = nullptr; } deviceManagerAdapterMock = nullptr; BDeviceManagerAdapter::deviceManagerAdapter = nullptr; @@ -106,7 +106,7 @@ void KvStoreDumpTest::ConfigSendParameters(bool isCancel) @tc.desc: test DumpStoreInfo function @tc.type: FUNC */ - HWTEST_F(KvStoreDumpTest, DumpStoreInfo001, TestSize.Level0) +HWTEST_F(KvStoreDumpTest, DumpStoreInfo001, TestSize.Level0) { DistributedKv::KvStoreDataService KvStoreDumpTest; int fd = 0; @@ -202,7 +202,7 @@ HWTEST_F(KvStoreDumpTest, DumpBundleInfo003, TestSize.Level0) int fd = 1; std::map> params = {}; if (accountDelegateMock != nullptr) { - EXPECT_CALL(*accountDelegateMock, QueryForegroundUserId(_)).WillOnce(Return(true)); + EXPECT_CALL(*accountDelegateMock, QueryForegroundUserId(_)).WillOnce(Return(true)); } ConfigSendParameters(false); std::vector metas; -- Gitee From ebbda7fe151344947c36d3ac2310c58acf4cda57 Mon Sep 17 00:00:00 2001 From: z30053452 Date: Tue, 2 Sep 2025 17:42:53 +0800 Subject: [PATCH 14/18] code fix Signed-off-by: z30053452 --- .../app/test/unittest/kvstore_dump_test.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/services/distributeddataservice/app/test/unittest/kvstore_dump_test.cpp b/services/distributeddataservice/app/test/unittest/kvstore_dump_test.cpp index 14b7be76b..6f4fafafc 100644 --- a/services/distributeddataservice/app/test/unittest/kvstore_dump_test.cpp +++ b/services/distributeddataservice/app/test/unittest/kvstore_dump_test.cpp @@ -144,8 +144,9 @@ HWTEST_F(KvStoreDumpTest, DumpStoreInfo002, TestSize.Level0) } ConfigSendParameters(true); std::vector metas; - EXPECT_EQ(MetaDataManager::GetInstance().LoadMeta(StoreMetaData::GetPrefix({ TEST_UUID, foregroundUserId_ }), metas, - true), false); + auto res = MetaDataManager::GetInstance().LoadMeta(StoreMetaData::GetPrefix({ TEST_UUID, foregroundUserId_ }), + metas, true); + EXPECT_EQ(res, false); EXPECT_NO_FATAL_FAILURE(KvStoreDumpTest.DumpStoreInfo(fd, params)); } @@ -167,7 +168,7 @@ HWTEST_F(KvStoreDumpTest, DumpBundleInfo002, TestSize.Level0) auto res = MetaDataManager::GetInstance().LoadMeta(StoreMetaData::GetPrefix({ TEST_UUID, foregroundUserId_ }), metas, true); EXPECT_EQ(res, false); - EXPECT_NO_FATAL_FAILURE(KvStoreDumpTest.DumpStoreInfo(fd, params)); + EXPECT_NO_FATAL_FAILURE(KvStoreDumpTest.DumpBundleInfo(fd, params)); } /** @@ -208,6 +209,6 @@ HWTEST_F(KvStoreDumpTest, DumpBundleInfo003, TestSize.Level0) std::vector metas; EXPECT_EQ(MetaDataManager::GetInstance().LoadMeta(StoreMetaData::GetPrefix({ TEST_UUID, foregroundUserId_ }), metas, true), true); - EXPECT_NO_FATAL_FAILURE(KvStoreDumpTest.DumpStoreInfo(fd, params)); + EXPECT_NO_FATAL_FAILURE(KvStoreDumpTest.DumpBundleInfo(fd, params)); } } \ No newline at end of file -- Gitee From 30679384adb5726499f70b2528b8f8d86126f0a0 Mon Sep 17 00:00:00 2001 From: z30053452 Date: Tue, 2 Sep 2025 20:26:37 +0800 Subject: [PATCH 15/18] code fix Signed-off-by: z30053452 --- .../distributeddataservice/app/test/BUILD.gn | 8 +- .../app/test/unittest/kvstore_dump_test.cpp | 114 ++++++++---------- 2 files changed, 54 insertions(+), 68 deletions(-) diff --git a/services/distributeddataservice/app/test/BUILD.gn b/services/distributeddataservice/app/test/BUILD.gn index 0fb233632..e25543cc8 100644 --- a/services/distributeddataservice/app/test/BUILD.gn +++ b/services/distributeddataservice/app/test/BUILD.gn @@ -584,7 +584,7 @@ ohos_unittest("BundleCheckerTest") { ] } -ohos_unittest("KvStoreDumpTest") { +ohos_unittest("DDMSDumpTest") { module_out_path = module_output_path sources = [ "${data_service_path}/app/src/checker/bundle_checker.cpp", @@ -620,10 +620,6 @@ ohos_unittest("KvStoreDumpTest") { debug = false blocklist = "${datamgr_service_path}/cfi_blocklist.txt" } - cflags = [ - "-Dprivate=public", - "-Dprotected=public", - ] configs = [ ":module_private_config" ] @@ -669,7 +665,7 @@ group("unittest") { ":FeatureStubImplTest", ":KvStoreDataServiceClearTest", ":KvStoreDataServiceTest", - ":KvStoreDumpTest", + ":DDMSDumpTest", ":KvStoreMetaManagerUpdateKeyTest", ":SessionManagerTest", ":UpgradeManagerTest", diff --git a/services/distributeddataservice/app/test/unittest/kvstore_dump_test.cpp b/services/distributeddataservice/app/test/unittest/kvstore_dump_test.cpp index 6f4fafafc..6ccbd38ff 100644 --- a/services/distributeddataservice/app/test/unittest/kvstore_dump_test.cpp +++ b/services/distributeddataservice/app/test/unittest/kvstore_dump_test.cpp @@ -13,13 +13,13 @@ * limitations under the License. */ +#include "kvstore_data_service.h" +#include "gtest/gtest.h" #include "account_delegate_mock.h" #include "db_store_mock.h" #include "device_manager_adapter.h" #include "device_manager_adapter_mock.h" #include "metadata/store_meta_data.h" -#include "gtest/gtest.h" -#include "kvstore_data_service.h" using namespace testing; using namespace testing::ext; @@ -33,27 +33,27 @@ static constexpr const char *TEST_STORE_NAME = "TestStore"; static constexpr const char *TEST_UUID = "ABCD"; static int32_t userid = 0; -class KvStoreDumpTest : public testing::Test { +class DDMSDumpTest : public testing::Test { public: static void SetUpTestCase(void); static void TearDownTestCase(void); void SetUp(); void TearDown(); static void ConfigSendParameters(bool isCancel); - static MessageInfo msgInfo_; + static void MockUserId() static std::string foregroundUserId_; - static AppDistributedKv::DeviceInfo localDeviceInfo_; static std::shared_ptr dbStoreMock_; static StoreMetaData metaData_; + static DistributedKv::KvStoreDataService dumpTest_; static inline AccountDelegateMock *accountDelegateMock = nullptr; static inline std::shared_ptr deviceManagerAdapterMock = nullptr; }; -std::string KvStoreDumpTest::foregroundUserId_ = "0"; -AppDistributedKv::DeviceInfo KvStoreDumpTest::localDeviceInfo_; -std::shared_ptr KvStoreDumpTest::dbStoreMock_; +std::string DDMSDumpTest::foregroundUserId_ = "0"; +std::shared_ptr DDMSDumpTest::dbStoreMock_; +DistributedKv::KvStoreDataService DDMSDumpTest::dumpTest_; -void KvStoreDumpTest::SetUpTestCase(void) +void DDMSDumpTest::SetUpTestCase(void) { dbStoreMock_ = std::make_shared(); accountDelegateMock = new (std::nothrow) AccountDelegateMock(); @@ -68,7 +68,7 @@ void KvStoreDumpTest::SetUpTestCase(void) EXPECT_CALL(*deviceManagerAdapterMock, GetLocalDevice()).WillRepeatedly(Return(deviceInfo)); } -void KvStoreDumpTest::TearDownTestCase(void) +void DDMSDumpTest::TearDownTestCase(void) { if (accountDelegateMock != nullptr) { delete accountDelegateMock; @@ -78,22 +78,21 @@ void KvStoreDumpTest::TearDownTestCase(void) BDeviceManagerAdapter::deviceManagerAdapter = nullptr; } -void KvStoreDumpTest::SetUp(void) +void DDMSDumpTest::SetUp(void) {} -void KvStoreDumpTest::TearDown(void) +void DDMSDumpTest::TearDown(void) { ConfigSendParameters(true); } -void KvStoreDumpTest::ConfigSendParameters(bool isCancel) +void DDMSDumpTest::ConfigSendParameters(bool isCancel) { StoreMetaData localMetaData; localMetaData.deviceId = TEST_UUID; localMetaData.user = foregroundUserId_; localMetaData.bundleName = TEST_BUNDLE_NAME; localMetaData.storeId = TEST_STORE_NAME; - if (isCancel) { MetaDataManager::GetInstance().DelMeta(localMetaData.GetKeyWithoutPath()); } else { @@ -101,114 +100,105 @@ void KvStoreDumpTest::ConfigSendParameters(bool isCancel) } } +void DDMSDumpTest::MockUserId() +{ + if (accountDelegateMock != nullptr) { + EXPECT_CALL(*accountDelegateMock, QueryForegroundUserId(userId)).WillOnce(Return(true)); + } +} + /** @tc.name: DumpStoreInfo001 @tc.desc: test DumpStoreInfo function @tc.type: FUNC */ -HWTEST_F(KvStoreDumpTest, DumpStoreInfo001, TestSize.Level0) +HWTEST_F(DDMSDumpTest, DumpStoreInfo001, TestSize.Level0) { - DistributedKv::KvStoreDataService KvStoreDumpTest; int fd = 0; std::map> params = {}; - EXPECT_EQ(accountDelegateMock->QueryForegroundUserId(userid), false); - EXPECT_NO_FATAL_FAILURE(KvStoreDumpTest.DumpStoreInfo(fd, params)); + EXPECT_NO_FATAL_FAILURE(dumpTest_.DumpStoreInfo(fd, params)); } /** - -@tc.name: DumpBundleInfo001 -@tc.desc: test DumpBundleInfo function -@tc.type: FUNC +* @tc.name: DumpBundleInfo001 +* @tc.desc: test DumpBundleInfo function +* @tc.type: FUNC */ -HWTEST_F(KvStoreDumpTest, DumpBundleInfo001, TestSize.Level0) +HWTEST_F(DDMSDumpTest, DumpBundleInfo001, TestSize.Level0) { - DistributedKv::KvStoreDataService KvStoreDumpTest; int fd = 0; std::map> params = {}; - EXPECT_EQ(accountDelegateMock->QueryForegroundUserId(userid), false); - EXPECT_NO_FATAL_FAILURE(KvStoreDumpTest.DumpBundleInfo(fd, params)); + EXPECT_NO_FATAL_FAILURE(dumpTest_.DumpBundleInfo(fd, params)); } + /** -@tc.name: DumpStoreInfo002 -@tc.desc: test DumpStoreInfo function -@tc.type: FUNC +* @tc.name: DumpStoreInfo002 +* @tc.desc: test DumpStoreInfo function +* @tc.type: FUNC */ -HWTEST_F(KvStoreDumpTest, DumpStoreInfo002, TestSize.Level0) +HWTEST_F(DDMSDumpTest, DumpStoreInfo002, TestSize.Level0) { - DistributedKv::KvStoreDataService KvStoreDumpTest; int fd = 1; std::map> params = {}; - if (accountDelegateMock != nullptr) { - EXPECT_CALL(*accountDelegateMock, QueryForegroundUserId(userid)).WillOnce(Return(true)); - } + MockUserId(); ConfigSendParameters(true); std::vector metas; auto res = MetaDataManager::GetInstance().LoadMeta(StoreMetaData::GetPrefix({ TEST_UUID, foregroundUserId_ }), metas, true); EXPECT_EQ(res, false); - EXPECT_NO_FATAL_FAILURE(KvStoreDumpTest.DumpStoreInfo(fd, params)); + EXPECT_NO_FATAL_FAILURE(dumpTest_.DumpStoreInfo(fd, params)); } /** -@tc.name: DumpBundleInfo002 -@tc.desc: test DumpBundleInfo function -@tc.type: FUNC +* @tc.name: DumpBundleInfo002 +* @tc.desc: test DumpBundleInfo function +* @tc.type: FUNC */ -HWTEST_F(KvStoreDumpTest, DumpBundleInfo002, TestSize.Level0) +HWTEST_F(DDMSDumpTest, DumpBundleInfo002, TestSize.Level0) { - DistributedKv::KvStoreDataService KvStoreDumpTest; int fd = 1; std::map> params = {}; - if (accountDelegateMock != nullptr) { - EXPECT_CALL(*accountDelegateMock, QueryForegroundUserId(_)).WillOnce(Return(true)); - } + MockUserId(); ConfigSendParameters(true); std::vector metas; auto res = MetaDataManager::GetInstance().LoadMeta(StoreMetaData::GetPrefix({ TEST_UUID, foregroundUserId_ }), metas, true); EXPECT_EQ(res, false); - EXPECT_NO_FATAL_FAILURE(KvStoreDumpTest.DumpBundleInfo(fd, params)); + EXPECT_NO_FATAL_FAILURE(dumpTest_.DumpBundleInfo(fd, params)); } /** -@tc.name: DumpStoreInfo003 -@tc.desc: test DumpStoreInfo function -@tc.type: FUNC +* @tc.name: DumpStoreInfo003 +* @tc.desc: test DumpStoreInfo function +* @tc.type: FUNC */ -HWTEST_F(KvStoreDumpTest, DumpStoreInfo003, TestSize.Level0) +HWTEST_F(DDMSDumpTest, DumpStoreInfo003, TestSize.Level0) { MetaDataManager::GetInstance().Initialize(dbStoreMock_, nullptr, ""); - DistributedKv::KvStoreDataService KvStoreDumpTest; int fd = 1; std::map> params = {}; - if (accountDelegateMock != nullptr) { - EXPECT_CALL(*accountDelegateMock, QueryForegroundUserId(_)).WillOnce(Return(true)); - } + MockUserId(); ConfigSendParameters(false); std::vector metas; EXPECT_EQ(MetaDataManager::GetInstance().LoadMeta(StoreMetaData::GetPrefix({ TEST_UUID, foregroundUserId_ }), metas, true), true); - EXPECT_NO_FATAL_FAILURE(KvStoreDumpTest.DumpStoreInfo(fd, params)); + EXPECT_NO_FATAL_FAILURE(dumpTest_.DumpStoreInfo(fd, params)); } /** -@tc.name: DumpBundleInfo003 -@tc.desc: test DumpBundleInfo function -@tc.type: FUNC +* @tc.name: DumpBundleInfo003 +* @tc.desc: test DumpBundleInfo function +* @tc.type: FUNC */ -HWTEST_F(KvStoreDumpTest, DumpBundleInfo003, TestSize.Level0) +HWTEST_F(DDMSDumpTest, DumpBundleInfo003, TestSize.Level0) { - DistributedKv::KvStoreDataService KvStoreDumpTest; int fd = 1; std::map> params = {}; - if (accountDelegateMock != nullptr) { - EXPECT_CALL(*accountDelegateMock, QueryForegroundUserId(_)).WillOnce(Return(true)); - } + MockUserId(); ConfigSendParameters(false); std::vector metas; EXPECT_EQ(MetaDataManager::GetInstance().LoadMeta(StoreMetaData::GetPrefix({ TEST_UUID, foregroundUserId_ }), metas, true), true); - EXPECT_NO_FATAL_FAILURE(KvStoreDumpTest.DumpBundleInfo(fd, params)); + EXPECT_NO_FATAL_FAILURE(dumpTest_.DumpBundleInfo(fd, params)); } } \ No newline at end of file -- Gitee From b1eca13ac9392f4974883ffcd3b210c7e3b16482 Mon Sep 17 00:00:00 2001 From: z30053452 Date: Tue, 2 Sep 2025 20:34:32 +0800 Subject: [PATCH 16/18] code fix Signed-off-by: z30053452 --- .../unittest/{kvstore_dump_test.cpp => ddms_dump_test.cpp} | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) rename services/distributeddataservice/app/test/unittest/{kvstore_dump_test.cpp => ddms_dump_test.cpp} (97%) diff --git a/services/distributeddataservice/app/test/unittest/kvstore_dump_test.cpp b/services/distributeddataservice/app/test/unittest/ddms_dump_test.cpp similarity index 97% rename from services/distributeddataservice/app/test/unittest/kvstore_dump_test.cpp rename to services/distributeddataservice/app/test/unittest/ddms_dump_test.cpp index 6ccbd38ff..2024299ad 100644 --- a/services/distributeddataservice/app/test/unittest/kvstore_dump_test.cpp +++ b/services/distributeddataservice/app/test/unittest/ddms_dump_test.cpp @@ -31,7 +31,6 @@ namespace OHOS::Test { static constexpr const char *TEST_BUNDLE_NAME = "TestApplication"; static constexpr const char *TEST_STORE_NAME = "TestStore"; static constexpr const char *TEST_UUID = "ABCD"; -static int32_t userid = 0; class DDMSDumpTest : public testing::Test { public: @@ -102,9 +101,11 @@ void DDMSDumpTest::ConfigSendParameters(bool isCancel) void DDMSDumpTest::MockUserId() { - if (accountDelegateMock != nullptr) { - EXPECT_CALL(*accountDelegateMock, QueryForegroundUserId(userId)).WillOnce(Return(true)); + int32_t userId = 0; + if (accountDelegateMock == nullptr) { + return; } + EXPECT_CALL(*accountDelegateMock, QueryForegroundUserId(userId)).WillOnce(Return(true)); } /** -- Gitee From 611930ac7d9a6aeb6c7f0baf570060db0c1ba0e3 Mon Sep 17 00:00:00 2001 From: z30053452 Date: Tue, 2 Sep 2025 20:57:57 +0800 Subject: [PATCH 17/18] code fix Signed-off-by: z30053452 --- services/distributeddataservice/app/test/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/distributeddataservice/app/test/BUILD.gn b/services/distributeddataservice/app/test/BUILD.gn index e25543cc8..ef3b17c92 100644 --- a/services/distributeddataservice/app/test/BUILD.gn +++ b/services/distributeddataservice/app/test/BUILD.gn @@ -607,7 +607,7 @@ ohos_unittest("DDMSDumpTest") { "${data_service_path}/app/src/session_manager/session_manager.cpp", "${data_service_path}/app/src/session_manager/upgrade_manager.cpp", "${data_service_path}/app/src/task_manager.cpp", - "${data_service_path}/app/test/unittest/kvstore_dump_test.cpp", + "${data_service_path}/app/test/unittest/ddms_dump_test.cpp", "${data_service_path}/service/test/mock/account_delegate_mock.cpp", "${data_service_path}/service/test/mock/db_store_mock.cpp", "${data_service_path}/service/test/mock/db_change_data_mock.cpp", -- Gitee From 78ba401e83c4801ba16394d910bc62237a7edd54 Mon Sep 17 00:00:00 2001 From: z30053452 Date: Tue, 2 Sep 2025 21:20:00 +0800 Subject: [PATCH 18/18] code fix Signed-off-by: z30053452 --- .../distributeddataservice/app/test/unittest/ddms_dump_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/distributeddataservice/app/test/unittest/ddms_dump_test.cpp b/services/distributeddataservice/app/test/unittest/ddms_dump_test.cpp index 2024299ad..5292577d8 100644 --- a/services/distributeddataservice/app/test/unittest/ddms_dump_test.cpp +++ b/services/distributeddataservice/app/test/unittest/ddms_dump_test.cpp @@ -39,7 +39,7 @@ public: void SetUp(); void TearDown(); static void ConfigSendParameters(bool isCancel); - static void MockUserId() + static void MockUserId(); static std::string foregroundUserId_; static std::shared_ptr dbStoreMock_; static StoreMetaData metaData_; -- Gitee