From 7df9dcb9d794000d6e01dc499472175ceb48c2fb Mon Sep 17 00:00:00 2001 From: zhangbeihai Date: Sat, 17 May 2025 18:38:00 +0800 Subject: [PATCH 1/2] clear callbacks as user Changed Signed-off-by: zhangbeihai --- .../service/object/src/object_manager.cpp | 1 + .../distributeddataservice/service/test/object_manager_test.cpp | 2 ++ 2 files changed, 3 insertions(+) diff --git a/services/distributeddataservice/service/object/src/object_manager.cpp b/services/distributeddataservice/service/object/src/object_manager.cpp index 51635cf04..859de7085 100644 --- a/services/distributeddataservice/service/object/src/object_manager.cpp +++ b/services/distributeddataservice/service/object/src/object_manager.cpp @@ -317,6 +317,7 @@ int32_t ObjectStoreManager::Clear() return STORE_NOT_OPEN; } result = RevokeSaveToStore(""); + callbacks_.Clear(); Close(); return result; } diff --git a/services/distributeddataservice/service/test/object_manager_test.cpp b/services/distributeddataservice/service/test/object_manager_test.cpp index 4250b4c64..d99458eb8 100644 --- a/services/distributeddataservice/service/test/object_manager_test.cpp +++ b/services/distributeddataservice/service/test/object_manager_test.cpp @@ -194,6 +194,8 @@ HWTEST_F(ObjectManagerTest, Clear001, TestSize.Level0) auto manager = ObjectStoreManager::GetInstance(); auto result = manager->Clear(); ASSERT_EQ(result, OHOS::DistributedObject::OBJECT_SUCCESS); + auto size = manager->callbacks_.Size(); + ASSERT_EQ(size, 0); } /** -- Gitee From 1f201bd2bd57b4bd854406dba84e61a67e6038a7 Mon Sep 17 00:00:00 2001 From: zhangbeihai Date: Mon, 19 May 2025 15:07:40 +0800 Subject: [PATCH 2/2] fix testcase Signed-off-by: zhangbeihai --- .../distributeddataservice/service/test/object_manager_test.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/services/distributeddataservice/service/test/object_manager_test.cpp b/services/distributeddataservice/service/test/object_manager_test.cpp index d99458eb8..61eb66a80 100644 --- a/services/distributeddataservice/service/test/object_manager_test.cpp +++ b/services/distributeddataservice/service/test/object_manager_test.cpp @@ -192,6 +192,8 @@ HWTEST_F(ObjectManagerTest, DeleteNotifierNoLock001, TestSize.Level0) HWTEST_F(ObjectManagerTest, Clear001, TestSize.Level0) { auto manager = ObjectStoreManager::GetInstance(); + std::string dataDir = "/data/app/el2/100/database"; + manager->SetData(dataDir, userId_); auto result = manager->Clear(); ASSERT_EQ(result, OHOS::DistributedObject::OBJECT_SUCCESS); auto size = manager->callbacks_.Size(); -- Gitee