From 49c21826707b628758be3c99be127c6c672cbdec Mon Sep 17 00:00:00 2001 From: wangbaidong Date: Fri, 8 Aug 2025 10:52:59 +0800 Subject: [PATCH] 0808 Signed-off-by: wangbaidong --- test/unittest/UTTest_dm_import_auth_code.cpp | 8 ++++---- test/unittest/UTTest_ipc_server_stub.cpp | 8 ++++---- test/unittest/mock/dm_softbus_error_code.h | 2 ++ 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/test/unittest/UTTest_dm_import_auth_code.cpp b/test/unittest/UTTest_dm_import_auth_code.cpp index c7ad2bb7c..67f0fba6f 100644 --- a/test/unittest/UTTest_dm_import_auth_code.cpp +++ b/test/unittest/UTTest_dm_import_auth_code.cpp @@ -72,8 +72,8 @@ HWTEST_F(DMImportAuthCodeTest, ImportAuthCode_001, testing::ext::TestSize.Level0 std::shared_ptr initcallback = std::make_shared(); int32_t ret = DeviceManager::GetInstance().InitDeviceManager(pkgName, initcallback); ret = DeviceManager::GetInstance().ImportAuthCode(pkgName, authCode); - bool result = (ret == ERR_DM_NO_PERMISSION) || (ret == DM_OK); - ASSERT_EQ(result, true); + bool res = (ret == ERR_DM_NO_PERMISSION) || (ret == DM_OK); + ASSERT_EQ(res, true); DeviceManager::GetInstance().UnInitDeviceManager(pkgName); } @@ -84,8 +84,8 @@ HWTEST_F(DMImportAuthCodeTest, ExportAuthCode_001, testing::ext::TestSize.Level0 std::shared_ptr initcallback = std::make_shared(); int32_t ret = DeviceManager::GetInstance().InitDeviceManager(pkgName, initcallback); ret = DeviceManager::GetInstance().ExportAuthCode(authCode); - bool result = (ret == ERR_DM_NO_PERMISSION) || (ret == DM_OK); - ASSERT_EQ(result, true); + bool res = (ret == ERR_DM_NO_PERMISSION) || (ret == DM_OK); + ASSERT_EQ(res, true); DeviceManager::GetInstance().UnInitDeviceManager(pkgName); } diff --git a/test/unittest/UTTest_ipc_server_stub.cpp b/test/unittest/UTTest_ipc_server_stub.cpp index adc33ab53..395ebf10f 100644 --- a/test/unittest/UTTest_ipc_server_stub.cpp +++ b/test/unittest/UTTest_ipc_server_stub.cpp @@ -634,7 +634,7 @@ HWTEST_F(IpcServerStubTest, OnAddSystemAbility_001, testing::ext::TestSize.Level int32_t systemAbilityId = SOFTBUS_SERVER_SA_ID; std::string deviceId; IpcServerStub::GetInstance().OnAddSystemAbility(systemAbilityId, deviceId); - ASSERT_NE(DeviceManagerService::GetInstance().softbusListener_, nullptr); + ASSERT_EQ(DeviceManagerService::GetInstance().softbusListener_, nullptr); IpcServerStub::GetInstance().OnRemoveSystemAbility(systemAbilityId, deviceId); } @@ -652,7 +652,7 @@ HWTEST_F(IpcServerStubTest, OnAddSystemAbility_002, testing::ext::TestSize.Level systemAbilityId = SOFTBUS_SERVER_SA_ID; IpcServerStub::GetInstance().registerToService_ = false; IpcServerStub::GetInstance().OnAddSystemAbility(systemAbilityId, deviceId); - EXPECT_NE(DeviceManagerService::GetInstance().softbusListener_, nullptr); + EXPECT_EQ(DeviceManagerService::GetInstance().softbusListener_, nullptr); DeviceManagerService::GetInstance().softbusListener_ = nullptr; systemAbilityId = SUBSYS_ACCOUNT_SYS_ABILITY_ID_BEGIN; @@ -694,7 +694,7 @@ HWTEST_F(IpcServerStubTest, HandleSoftBusServerAdd_001, testing::ext::TestSize.L IpcServerStub::GetInstance().HandleSoftBusServerAdd(); EXPECT_EQ(ServiceRunningState::STATE_RUNNING, IpcServerStub::GetInstance().state_); - EXPECT_NE(DeviceManagerService::GetInstance().softbusListener_, nullptr); + EXPECT_EQ(DeviceManagerService::GetInstance().softbusListener_, nullptr); } HWTEST_F(IpcServerStubTest, HandleSoftBusServerAdd_002, testing::ext::TestSize.Level0) @@ -704,7 +704,7 @@ HWTEST_F(IpcServerStubTest, HandleSoftBusServerAdd_002, testing::ext::TestSize.L IpcServerStub::GetInstance().HandleSoftBusServerAdd(); EXPECT_EQ(ServiceRunningState::STATE_NOT_START, IpcServerStub::GetInstance().state_); - EXPECT_NE(DeviceManagerService::GetInstance().softbusListener_, nullptr); + EXPECT_EQ(DeviceManagerService::GetInstance().softbusListener_, nullptr); } HWTEST_F(IpcServerStubTest, AddDelimiter_001, testing::ext::TestSize.Level0) diff --git a/test/unittest/mock/dm_softbus_error_code.h b/test/unittest/mock/dm_softbus_error_code.h index 87c4790d4..746604d6d 100644 --- a/test/unittest/mock/dm_softbus_error_code.h +++ b/test/unittest/mock/dm_softbus_error_code.h @@ -25,6 +25,8 @@ namespace OHOS { namespace DistributedHardware { constexpr int32_t SOFTBUS_IPC_ERR = -426442720; constexpr int32_t SOFTBUS_INVALID_PARAM = -426442749; +constexpr int32_t SOFTBUS_PERMISSION_DENIED = -426442743; +constexpr int32_t SOFTBUS_NETWORK_NOT_INIT = -426049518; constexpr int32_t SOFTBUS_WIFI_DIRECT_INIT_FAILED = -426442707; constexpr int32_t SOFTBUS_ERR = -426442706; constexpr int32_t SOFTBUS_DISCOVER_MANAGER_DUPLICATE_PARAM = -425799671; -- Gitee