From 4a61e83ac88879113bc5a6028736a357d94a11d3 Mon Sep 17 00:00:00 2001 From: li-tiangang4 Date: Fri, 25 Jul 2025 13:57:28 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=B1=E8=B4=A5UT?= =?UTF-8?q?=E7=94=A8=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: li-tiangang4 --- .../accessmanager/access_manager_test.cpp | 104 +++++++++++++++--- 1 file changed, 86 insertions(+), 18 deletions(-) diff --git a/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/access_manager_test.cpp b/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/access_manager_test.cpp index 2aab85bf..46c47a3e 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/access_manager_test.cpp +++ b/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/access_manager_test.cpp @@ -18,11 +18,15 @@ #include "gtest/gtest.h" #include "dm_device_info.h" +#include "device_manager.h" +#include "device_manager_impl.h" #include "dh_context.h" #include "distributed_hardware_manager_factory.h" #include "distributed_hardware_errno.h" + using namespace testing::ext; +using namespace testing; namespace OHOS { namespace DistributedHardware { @@ -39,6 +43,33 @@ const std::string TEST_UUID = "222222"; const std::string TEST_UDID = "333333"; } +static int32_t g_InitDMValue = 0; +static int32_t g_UnInitDMValue = 0; +static int32_t g_RegisterDMValue = 0; +static int32_t g_UnRegisterDMValue = 0; + +int32_t DeviceManagerImpl::InitDeviceManager(const std::string &pkgName, + std::shared_ptr dmInitCallback) +{ + return g_InitDMValue; +} + +int32_t DeviceManagerImpl::UnInitDeviceManager(const std::string &pkgName) +{ + return g_UnInitDMValue; +} + +int32_t DeviceManagerImpl::RegisterDevStateCallback(const std::string &pkgName, + const std::string &extra, std::shared_ptr callback) +{ + return g_RegisterDMValue; +} + +int32_t DeviceManagerImpl::RegisterDevStateCallback(const std::string &pkgName) +{ + return g_UnRegisterDMValue; +} + class AccessManagerTest : public testing::Test { public: static void SetUpTestCase(void); @@ -50,6 +81,10 @@ public: void AccessManagerTest::SetUp() { DistributedHardwareManagerFactory::GetInstance().isInit_.store(true); + g_InitDMValue = 0; + g_UnInitDMValue = 0; + g_RegisterDMValue = 0; + g_UnRegisterDMValue = 0; } void AccessManagerTest::TearDown() {} @@ -117,7 +152,50 @@ HWTEST_F(AccessManagerTest, SendOffLineEvent_001, TestSize.Level1) */ HWTEST_F(AccessManagerTest, Init_001, TestSize.Level1) { - EXPECT_EQ(DH_FWK_SUCCESS, AccessManager::GetInstance()->Init()); + g_InitDMValue = -1; + auto ret = AccessManager::GetInstance()->Init(); + EXPECT_EQ(ERR_DH_FWK_ACCESS_INIT_DM_FAILED, ret); +} + +HWTEST_F(AccessManagerTest, Init_002, TestSize.Level1) +{ + g_RegisterDMValue = -1; + auto ret = AccessManager::GetInstance()->Init(); + EXPECT_EQ(ERR_DH_FWK_ACCESS_REGISTER_DM_FAILED, ret); +} + +HWTEST_F(AccessManagerTest, Init_003, TestSize.Level1) +{ + g_RegisterDMValue = 0; + auto ret = AccessManager::GetInstance()->Init(); + EXPECT_EQ(DH_FWK_SUCCESS, ret); +} + +/** + * @tc.name: UnInit_001 + * @tc.desc: Verify the UnInit function + * @tc.type: FUNC + * @tc.require: AR000GHSJM + */ +HWTEST_F(AccessManagerTest, UnInit_001, TestSize.Level1) +{ + g_UnInitDMValue = -1; + auto ret = AccessManager::GetInstance()->UnInit(); + EXPECT_EQ(ERR_DH_FWK_ACCESS_INIT_DM_FAILED, ret); +} + +HWTEST_F(AccessManagerTest, UnInit_002, TestSize.Level1) +{ + g_UnRegisterDMValue = -1; + auto ret = AccessManager::GetInstance()->UnInit(); + EXPECT_EQ(ERR_DH_FWK_ACCESS_REGISTER_DM_FAILED, ret); +} + +HWTEST_F(AccessManagerTest, UnInit_003, TestSize.Level1) +{ + g_UnRegisterDMValue = 0; + auto ret = AccessManager::GetInstance()->UnInit(); + EXPECT_EQ(DH_FWK_SUCCESS, ret); } /** @@ -128,8 +206,11 @@ HWTEST_F(AccessManagerTest, Init_001, TestSize.Level1) */ HWTEST_F(AccessManagerTest, OnRemoteDied_001, TestSize.Level1) { - AccessManager::GetInstance()->OnRemoteDied(); - EXPECT_EQ(DH_FWK_SUCCESS, AccessManager::GetInstance()->Init()); + g_InitDMValue = -1; + ASSERT_NO_FATAL_FAILURE(AccessManager::GetInstance()->OnRemoteDied()); + + g_InitDMValue = 0; + ASSERT_NO_FATAL_FAILURE(AccessManager::GetInstance()->OnRemoteDied()); } /** @@ -146,8 +227,7 @@ HWTEST_F(AccessManagerTest, OnDeviceOnline_001, TestSize.Level1) .deviceTypeId = 1, .networkId = "" }; - AccessManager::GetInstance()->OnDeviceOnline(deviceInfo); - EXPECT_EQ(DH_FWK_SUCCESS, AccessManager::GetInstance()->Init()); + ASSERT_NO_FATAL_FAILURE(AccessManager::GetInstance()->OnDeviceOnline(deviceInfo)); } HWTEST_F(AccessManagerTest, OnDeviceOnline_002, TestSize.Level1) @@ -158,8 +238,7 @@ HWTEST_F(AccessManagerTest, OnDeviceOnline_002, TestSize.Level1) .deviceTypeId = 1, .networkId = "123456789" }; - AccessManager::GetInstance()->OnDeviceOnline(deviceInfo); - EXPECT_EQ(DH_FWK_SUCCESS, AccessManager::GetInstance()->Init()); + ASSERT_NO_FATAL_FAILURE(AccessManager::GetInstance()->OnDeviceOnline(deviceInfo)); } /** @@ -206,17 +285,6 @@ HWTEST_F(AccessManagerTest, OnDeviceOffline_003, TestSize.Level1) DHContext::GetInstance().RemoveOnlineDeviceIdEntryByNetworkId(TEST_NETWORKID); } -/** - * @tc.name: UnInit_001 - * @tc.desc: Verify the UnInit function - * @tc.type: FUNC - * @tc.require: AR000GHSJM - */ -HWTEST_F(AccessManagerTest, UnInit_001, TestSize.Level1) -{ - EXPECT_EQ(DH_FWK_SUCCESS, AccessManager::GetInstance()->UnInit()); -} - /** * @tc.name: CheckExitSAOrNot_001 * @tc.desc: Verify the CheckExitSAOrNot function -- Gitee From 9264b60bdbf1e0dc2830d9560167ec1e501f9877 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=A4=A9=E5=88=9A?= Date: Sat, 26 Jul 2025 09:38:37 +0000 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BC=96=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 李天刚 --- .../test/unittest/common/accessmanager/access_manager_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/access_manager_test.cpp b/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/access_manager_test.cpp index 46c47a3e..b66a287a 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/access_manager_test.cpp +++ b/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/access_manager_test.cpp @@ -65,7 +65,7 @@ int32_t DeviceManagerImpl::RegisterDevStateCallback(const std::string &pkgName, return g_RegisterDMValue; } -int32_t DeviceManagerImpl::RegisterDevStateCallback(const std::string &pkgName) +int32_t DeviceManagerImpl::UnRegisterDevStateCallback(const std::string &pkgName) { return g_UnRegisterDMValue; } -- Gitee From c6570caa0ee6c22398683de2d91c3e3406bdfe7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=A4=A9=E5=88=9A?= Date: Sat, 26 Jul 2025 10:27:12 +0000 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9access=5Fmanager=5Ftest.c?= =?UTF-8?q?pp.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 李天刚 --- .../unittest/common/accessmanager/access_manager_test.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/access_manager_test.cpp b/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/access_manager_test.cpp index b66a287a..2a6cc700 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/access_manager_test.cpp +++ b/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/access_manager_test.cpp @@ -181,14 +181,14 @@ HWTEST_F(AccessManagerTest, UnInit_001, TestSize.Level1) { g_UnInitDMValue = -1; auto ret = AccessManager::GetInstance()->UnInit(); - EXPECT_EQ(ERR_DH_FWK_ACCESS_INIT_DM_FAILED, ret); + EXPECT_EQ(ERR_DH_FWK_ACCESS_UNINIT_DM_FAILED, ret); } HWTEST_F(AccessManagerTest, UnInit_002, TestSize.Level1) { g_UnRegisterDMValue = -1; auto ret = AccessManager::GetInstance()->UnInit(); - EXPECT_EQ(ERR_DH_FWK_ACCESS_REGISTER_DM_FAILED, ret); + EXPECT_EQ(ERR_DH_FWK_ACCESS_UNREGISTER_DM_FAILED, ret); } HWTEST_F(AccessManagerTest, UnInit_003, TestSize.Level1) -- Gitee