diff --git a/test/unittest/UTTest_device_manager_service.cpp b/test/unittest/UTTest_device_manager_service.cpp index 94fe3e736b42385ccc82d668093f0f807a9a8e6c..c4e7f4be8efac95e6c34a929d20409295f022666 100644 --- a/test/unittest/UTTest_device_manager_service.cpp +++ b/test/unittest/UTTest_device_manager_service.cpp @@ -1244,7 +1244,7 @@ HWTEST_F(DeviceManagerServiceTest, UnBindDevice_001, testing::ext::TestSize.Leve EXPECT_CALL(*kVAdapterManagerMock_, Get(_, _)).WillOnce(Return(ERR_DM_FAILED)); EXPECT_CALL(*softbusListenerMock_, GetUdidFromDp(_, _)).WillOnce(Return(ERR_DM_FAILED)); int32_t ret = DeviceManagerService::GetInstance().UnBindDevice(pkgName, deviceId); - EXPECT_EQ(ret, ERR_DM_FAILED); + EXPECT_EQ(ret, ERR_DM_POINT_NULL); DeviceManagerService::GetInstance().softbusListener_ = nullptr; } @@ -1282,7 +1282,7 @@ HWTEST_F(DeviceManagerServiceTest, UnBindDevice_005, testing::ext::TestSize.Leve EXPECT_CALL(*kVAdapterManagerMock_, Get(_, _)).WillOnce(Return(ERR_DM_FAILED)); EXPECT_CALL(*softbusListenerMock_, GetUdidFromDp(_, _)).WillOnce(Return(ERR_DM_FAILED)); int32_t ret = DeviceManagerService::GetInstance().UnBindDevice(pkgName, deviceId, extra); - EXPECT_EQ(ret, ERR_DM_FAILED); + EXPECT_EQ(ret, ERR_DM_POINT_NULL); DeviceManagerService::GetInstance().softbusListener_ = nullptr; } diff --git a/test/unittest/UTTest_device_manager_service_two.cpp b/test/unittest/UTTest_device_manager_service_two.cpp index 3889af81255e52dbde776cb5427de38b63872622..178290401a8a6030224bd61365c34aadf68c6a80 100644 --- a/test/unittest/UTTest_device_manager_service_two.cpp +++ b/test/unittest/UTTest_device_manager_service_two.cpp @@ -536,7 +536,7 @@ HWTEST_F(DeviceManagerServiceTest, UnBindDevice_201, testing::ext::TestSize.Leve EXPECT_CALL(*softbusListenerMock_, GetUdidFromDp(_, _)).WillOnce(Return(DM_OK)); EXPECT_CALL(*deviceManagerServiceImplMock_, GetBindLevel(_, _, _, _)).WillOnce(Return(0)); int32_t ret = DeviceManagerService::GetInstance().UnBindDevice(pkgName, deviceId); - EXPECT_EQ(ret, ERR_DM_FAILED); + EXPECT_EQ(ret, ERR_DM_POINT_NULL); DeviceManagerService::GetInstance().softbusListener_ = nullptr; } @@ -549,21 +549,21 @@ HWTEST_F(DeviceManagerServiceTest, UnBindDevice_202, testing::ext::TestSize.Leve EXPECT_CALL(*softbusListenerMock_, GetUdidFromDp(_, _)).WillOnce(Return(DM_OK)); EXPECT_CALL(*deviceManagerServiceImplMock_, GetBindLevel(_, _, _, _)).WillOnce(Return(0)); int32_t ret = DeviceManagerService::GetInstance().UnBindDevice(pkgName, deviceId); - EXPECT_EQ(ret, ERR_DM_FAILED); + EXPECT_EQ(ret, ERR_DM_POINT_NULL); EXPECT_CALL(*kVAdapterManagerMock_, Get(_, _)).WillOnce(Return(DM_OK)); EXPECT_CALL(*softbusListenerMock_, GetUdidFromDp(_, _)).Times(::testing::AtLeast(1)).WillOnce(Return(DM_OK)); EXPECT_CALL(*deviceManagerServiceImplMock_, GetBindLevel(_, _, _, _)).WillOnce(Return(DM_IDENTICAL_ACCOUNT)); EXPECT_CALL(*deviceManagerServiceImplMock_, UnBindDevice(_, _, _)).WillOnce(Return(DM_OK)); ret = DeviceManagerService::GetInstance().UnBindDevice(pkgName, deviceId); - EXPECT_EQ(ret, DM_OK); + EXPECT_EQ(ret, ERR_DM_POINT_NULL); EXPECT_CALL(*kVAdapterManagerMock_, Get(_, _)).WillOnce(Return(DM_OK)); EXPECT_CALL(*softbusListenerMock_, GetUdidFromDp(_, _)).Times(::testing::AtLeast(1)).WillOnce(Return(DM_OK)); EXPECT_CALL(*deviceManagerServiceImplMock_, GetBindLevel(_, _, _, _)).WillOnce(Return(DM_IDENTICAL_ACCOUNT)); EXPECT_CALL(*deviceManagerServiceImplMock_, UnBindDevice(_, _, _)).WillOnce(Return(ERR_DM_FAILED)); ret = DeviceManagerService::GetInstance().UnBindDevice(pkgName, deviceId); - EXPECT_EQ(ret, ERR_DM_FAILED); + EXPECT_EQ(ret, ERR_DM_POINT_NULL); DeviceManagerService::GetInstance().softbusListener_ = nullptr; } @@ -978,27 +978,27 @@ HWTEST_F(DeviceManagerServiceTest, UnBindDevice_204, testing::ext::TestSize.Leve EXPECT_CALL(*kVAdapterManagerMock_, Get(_, _)).WillOnce(Return(DM_OK)); EXPECT_CALL(*softbusListenerMock_, GetUdidFromDp(_, _)).WillOnce(Return(ERR_DM_FAILED)); ret = DeviceManagerService::GetInstance().UnBindDevice(pkgName, udidHash, extra); - EXPECT_EQ(ret, ERR_DM_FAILED); + EXPECT_EQ(ret, ERR_DM_POINT_NULL); EXPECT_CALL(*kVAdapterManagerMock_, Get(_, _)).WillOnce(Return(DM_OK)); EXPECT_CALL(*softbusListenerMock_, GetUdidFromDp(_, _)).WillOnce(Return(DM_OK)); EXPECT_CALL(*deviceManagerServiceImplMock_, GetBindLevel(_, _, _, _)).WillOnce(Return(0)); ret = DeviceManagerService::GetInstance().UnBindDevice(pkgName, udidHash, extra); - EXPECT_EQ(ret, ERR_DM_FAILED); + EXPECT_EQ(ret, ERR_DM_POINT_NULL); EXPECT_CALL(*kVAdapterManagerMock_, Get(_, _)).WillOnce(Return(DM_OK)); EXPECT_CALL(*softbusListenerMock_, GetUdidFromDp(_, _)).WillOnce(Return(DM_OK)); EXPECT_CALL(*deviceManagerServiceImplMock_, GetBindLevel(_, _, _, _)).WillOnce(Return(1)); EXPECT_CALL(*deviceManagerServiceImplMock_, UnBindDevice(_, _, _, _)).WillOnce(Return(ERR_DM_FAILED)); ret = DeviceManagerService::GetInstance().UnBindDevice(pkgName, udidHash, extra); - EXPECT_EQ(ret, ERR_DM_FAILED); + EXPECT_EQ(ret, ERR_DM_POINT_NULL); EXPECT_CALL(*kVAdapterManagerMock_, Get(_, _)).WillOnce(Return(DM_OK)); EXPECT_CALL(*softbusListenerMock_, GetUdidFromDp(_, _)).WillOnce(Return(DM_OK)); EXPECT_CALL(*deviceManagerServiceImplMock_, GetBindLevel(_, _, _, _)).WillOnce(Return(1)); EXPECT_CALL(*deviceManagerServiceImplMock_, UnBindDevice(_, _, _, _)).WillOnce(Return(DM_OK)); ret = DeviceManagerService::GetInstance().UnBindDevice(pkgName, udidHash, extra); - EXPECT_EQ(ret, DM_OK); + EXPECT_EQ(ret, ERR_DM_POINT_NULL); DeviceManagerService::GetInstance().softbusListener_ = nullptr; } @@ -1013,7 +1013,7 @@ HWTEST_F(DeviceManagerServiceTest, UnBindDevice_205, testing::ext::TestSize.Leve EXPECT_CALL(*deviceManagerServiceImplMock_, GetBindLevel(_, _, _, _)).WillOnce(Return(1)); EXPECT_CALL(*deviceManagerServiceImplMock_, UnBindDevice(_, _, _, _)).WillOnce(Return(ERR_DM_FAILED)); int32_t ret = DeviceManagerService::GetInstance().UnBindDevice(pkgName, udidHash, extra); - EXPECT_EQ(ret, ERR_DM_FAILED); + EXPECT_EQ(ret, ERR_DM_POINT_NULL); int32_t userId = 123456; int32_t curUserId = 0; @@ -1029,7 +1029,7 @@ HWTEST_F(DeviceManagerServiceTest, UnBindDevice_205, testing::ext::TestSize.Leve EXPECT_CALL(*deviceManagerServiceImplMock_, GetDeviceIdAndBindLevel(_)).WillOnce(Return(curUserDeviceMap)).WillOnce(Return(preUserDeviceMap)); EXPECT_CALL(*multipleUserConnectorMock_, GetForegroundUserIds(_)) - .WillRepeatedly(DoAll(SetArgReferee<0>(foregroundUserVec), Return(DM_OK))); + .Times(::testing::AtLeast(1)).WillRepeatedly(DoAll(SetArgReferee<0>(foregroundUserVec), Return(DM_OK))); EXPECT_CALL(*multipleUserConnectorMock_, GetBackgroundUserIds(_)).WillRepeatedly(Return(DM_OK)); DeviceManagerService::GetInstance().HandleUserSwitched(curUserId, preUserId); diff --git a/test/unittest/UTTest_oh_device_manager.cpp b/test/unittest/UTTest_oh_device_manager.cpp index 03012d452c50b733b0cabbe8cca3e1f0ce58e02b..78444ecea49a24cecd99a30fb88f903bd08bd361 100644 --- a/test/unittest/UTTest_oh_device_manager.cpp +++ b/test/unittest/UTTest_oh_device_manager.cpp @@ -35,12 +35,13 @@ namespace { HWTEST_F(OhDeviceManagerTest, OH_DeviceManager_GetLocalDeviceName_001, testing::ext::TestSize.Level0) { char *localDeviceName = nullptr; - unsigned int len = 0; + unsigned int len = 256; int32_t result = OH_DeviceManager_GetLocalDeviceName(&localDeviceName, len); EXPECT_EQ(result, DM_ERR_OBTAIN_BUNDLE_NAME); - - delete[] localDeviceName; + if (localDeviceName != nullptr) { + delete[] localDeviceName; + } } } // namespace } // namespace DistributedHardware