From 033122a27d60818be274b77ff11ad236e72b81bd Mon Sep 17 00:00:00 2001 From: suoqilong Date: Mon, 28 Apr 2025 02:17:55 +0000 Subject: [PATCH 1/5] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E7=94=A8=E4=BE=8B?= =?UTF-8?q?=E6=95=B4=E6=94=B9-0428?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: suoqilong --- .../distributeddataservice/service/test/BUILD.gn | 1 + .../service/test/user_delegate_mock_test.cpp | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/services/distributeddataservice/service/test/BUILD.gn b/services/distributeddataservice/service/test/BUILD.gn index 17eb73404..503d6f059 100644 --- a/services/distributeddataservice/service/test/BUILD.gn +++ b/services/distributeddataservice/service/test/BUILD.gn @@ -2016,6 +2016,7 @@ group("unittest") { ":KvdbServiceImplTest", ":QueryHelperUnitTest", ":UpgradeMockTest", + ":UserDelegateMockTest", ] } diff --git a/services/distributeddataservice/service/test/user_delegate_mock_test.cpp b/services/distributeddataservice/service/test/user_delegate_mock_test.cpp index 373782b7e..d59431f57 100644 --- a/services/distributeddataservice/service/test/user_delegate_mock_test.cpp +++ b/services/distributeddataservice/service/test/user_delegate_mock_test.cpp @@ -39,6 +39,11 @@ bool MetaDataManager::Subscribe(std::string prefix, Observer observer, bool isLo return false; } +bool MetaDataManager::SaveMeta(const std::string &key, const Serializable &value, bool isLocal) +{ + return true; +} + namespace OHOS::Test { namespace DistributedDataTest { class UserDelegateMockTest : public testing::Test { @@ -144,6 +149,13 @@ HWTEST_F(UserDelegateMockTest, Init, TestSize.Level0) ASSERT_NE(poolPtr, nullptr); UserDelegate::GetInstance().executors_ = poolPtr; ASSERT_NE(UserDelegate::GetInstance().executors_, nullptr); + + std::vector users = { 0 }; + EXPECT_CALL(AccountDelegateMock::Init(), QueryUsers(_)) + .WillRepeatedly(([&users](std::vector &out) { + out = users; + })); + EXPECT_TRUE(UserDelegate::GetInstance().InitLocalUserMeta()); UserDelegate::GetInstance().Init(poolPtr); ASSERT_TRUE(UserDelegate::GetInstance().executors_ != nullptr); } -- Gitee From d6b3c3c94c5c75ab8a09c73ea7bef2b8fe1231ef Mon Sep 17 00:00:00 2001 From: suoqilong Date: Mon, 28 Apr 2025 03:13:35 +0000 Subject: [PATCH 2/5] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E7=94=A8=E4=BE=8B?= =?UTF-8?q?=E6=95=B4=E6=94=B9-0428?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: suoqilong --- .../service/test/user_delegate_mock_test.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/services/distributeddataservice/service/test/user_delegate_mock_test.cpp b/services/distributeddataservice/service/test/user_delegate_mock_test.cpp index d59431f57..f27921d18 100644 --- a/services/distributeddataservice/service/test/user_delegate_mock_test.cpp +++ b/services/distributeddataservice/service/test/user_delegate_mock_test.cpp @@ -154,6 +154,7 @@ HWTEST_F(UserDelegateMockTest, Init, TestSize.Level0) EXPECT_CALL(AccountDelegateMock::Init(), QueryUsers(_)) .WillRepeatedly(([&users](std::vector &out) { out = users; + return true; })); EXPECT_TRUE(UserDelegate::GetInstance().InitLocalUserMeta()); UserDelegate::GetInstance().Init(poolPtr); -- Gitee From 85d2335662dccc12192c45e8baca454d3cbfce02 Mon Sep 17 00:00:00 2001 From: suoqilong Date: Tue, 29 Apr 2025 01:19:04 +0000 Subject: [PATCH 3/5] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E7=94=A8=E4=BE=8B?= =?UTF-8?q?=E6=95=B4=E6=94=B9-0428?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: suoqilong --- .../service/test/user_delegate_mock_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/distributeddataservice/service/test/user_delegate_mock_test.cpp b/services/distributeddataservice/service/test/user_delegate_mock_test.cpp index f27921d18..26cb1fc20 100644 --- a/services/distributeddataservice/service/test/user_delegate_mock_test.cpp +++ b/services/distributeddataservice/service/test/user_delegate_mock_test.cpp @@ -150,7 +150,7 @@ HWTEST_F(UserDelegateMockTest, Init, TestSize.Level0) UserDelegate::GetInstance().executors_ = poolPtr; ASSERT_NE(UserDelegate::GetInstance().executors_, nullptr); - std::vector users = { 0 }; + std::vector users = {1, 2, 3}; EXPECT_CALL(AccountDelegateMock::Init(), QueryUsers(_)) .WillRepeatedly(([&users](std::vector &out) { out = users; -- Gitee From cb2bbe13296a2482d52852c79cbdbed91b428a73 Mon Sep 17 00:00:00 2001 From: suoqilong Date: Tue, 29 Apr 2025 11:14:51 +0000 Subject: [PATCH 4/5] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E7=94=A8=E4=BE=8B?= =?UTF-8?q?=E6=95=B4=E6=94=B9-0428?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: suoqilong --- .../service/test/user_delegate_mock_test.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/services/distributeddataservice/service/test/user_delegate_mock_test.cpp b/services/distributeddataservice/service/test/user_delegate_mock_test.cpp index 26cb1fc20..712caca91 100644 --- a/services/distributeddataservice/service/test/user_delegate_mock_test.cpp +++ b/services/distributeddataservice/service/test/user_delegate_mock_test.cpp @@ -95,7 +95,8 @@ HWTEST_F(UserDelegateMockTest, InitLocalUserMeta, TestSize.Level0) std::vector users; EXPECT_CALL(AccountDelegateMock::Init(), QueryUsers(_)) - .WillRepeatedly(DoAll(SetArgReferee<0>(users), Return(true))); + .Times(1) + .WillOnce(DoAll(SetArgReferee<0>(users), Return(true))); ret = UserDelegate::GetInstance().InitLocalUserMeta(); UserDelegate::GetInstance().DeleteUsers("users"); EXPECT_FALSE(ret); @@ -145,17 +146,14 @@ HWTEST_F(UserDelegateMockTest, Init, TestSize.Level0) EXPECT_CALL(AccountDelegateMock::Init(), Subscribe(_)).WillRepeatedly(Return(0)); DeviceInfo devInfo = { .uuid = "HJJ4FGAGAAGA45WF3663FAGA" }; EXPECT_CALL(*devMgrAdapterMock, GetLocalDevice()).WillRepeatedly(Return(devInfo)); - std::shared_ptr poolPtr = std::make_shared(0, 1); + std::shared_ptr poolPtr = std::make_shared(1, 0); ASSERT_NE(poolPtr, nullptr); UserDelegate::GetInstance().executors_ = poolPtr; ASSERT_NE(UserDelegate::GetInstance().executors_, nullptr); - std::vector users = {1, 2, 3}; + std::vector users = {0, 1}; EXPECT_CALL(AccountDelegateMock::Init(), QueryUsers(_)) - .WillRepeatedly(([&users](std::vector &out) { - out = users; - return true; - })); + .WillRepeatedly(DoAll(SetArgReferee<0>(users), Return(true))); EXPECT_TRUE(UserDelegate::GetInstance().InitLocalUserMeta()); UserDelegate::GetInstance().Init(poolPtr); ASSERT_TRUE(UserDelegate::GetInstance().executors_ != nullptr); -- Gitee From ee6ba766b3ebbf74e5dbc45afbf9f806e1c0ba4d Mon Sep 17 00:00:00 2001 From: suoqilong Date: Wed, 7 May 2025 07:29:23 +0000 Subject: [PATCH 5/5] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E7=94=A8=E4=BE=8B?= =?UTF-8?q?=E6=95=B4=E6=94=B9-0428?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: suoqilong --- .../service/test/user_delegate_mock_test.cpp | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/services/distributeddataservice/service/test/user_delegate_mock_test.cpp b/services/distributeddataservice/service/test/user_delegate_mock_test.cpp index 712caca91..910e17ca9 100644 --- a/services/distributeddataservice/service/test/user_delegate_mock_test.cpp +++ b/services/distributeddataservice/service/test/user_delegate_mock_test.cpp @@ -41,6 +41,8 @@ bool MetaDataManager::Subscribe(std::string prefix, Observer observer, bool isLo bool MetaDataManager::SaveMeta(const std::string &key, const Serializable &value, bool isLocal) { + (void)key; + (void)value; return true; } @@ -89,7 +91,9 @@ HWTEST_F(UserDelegateMockTest, GetLocalUserStatus, TestSize.Level0) */ HWTEST_F(UserDelegateMockTest, InitLocalUserMeta, TestSize.Level0) { - EXPECT_CALL(AccountDelegateMock::Init(), QueryUsers(_)).WillOnce(Return(false)); + EXPECT_CALL(AccountDelegateMock::Init(), QueryUsers(_)) + .Times(1) + .WillOnce(Return(false)); bool ret = UserDelegate::GetInstance().InitLocalUserMeta(); EXPECT_FALSE(ret); @@ -148,15 +152,16 @@ HWTEST_F(UserDelegateMockTest, Init, TestSize.Level0) EXPECT_CALL(*devMgrAdapterMock, GetLocalDevice()).WillRepeatedly(Return(devInfo)); std::shared_ptr poolPtr = std::make_shared(1, 0); ASSERT_NE(poolPtr, nullptr); - UserDelegate::GetInstance().executors_ = poolPtr; - ASSERT_NE(UserDelegate::GetInstance().executors_, nullptr); + UserDelegate instance; + instance.executors_ = poolPtr; + ASSERT_NE(instance.executors_, nullptr); std::vector users = {0, 1}; EXPECT_CALL(AccountDelegateMock::Init(), QueryUsers(_)) .WillRepeatedly(DoAll(SetArgReferee<0>(users), Return(true))); - EXPECT_TRUE(UserDelegate::GetInstance().InitLocalUserMeta()); - UserDelegate::GetInstance().Init(poolPtr); - ASSERT_TRUE(UserDelegate::GetInstance().executors_ != nullptr); + EXPECT_TRUE(instance.InitLocalUserMeta()); + instance.Init(poolPtr); + ASSERT_TRUE(instance.executors_ != nullptr); } } } \ No newline at end of file -- Gitee