From faa2fead8f1e074c7238f7fac1f5b45e5ae0815c Mon Sep 17 00:00:00 2001 From: BrainL Date: Thu, 26 Jun 2025 15:52:23 +0800 Subject: [PATCH 1/3] modifyUT_0626 Signed-off-by: BrainL --- .../UTTest_device_manager_service.cpp | 93 +++++++++++++++++++ .../UTTest_device_manager_service_three.cpp | 31 +++++++ .../UTTest_device_manager_service_two.cpp | 87 ----------------- .../unittest/mock/permission_manager_mock.cpp | 9 ++ test/unittest/mock/permission_manager_mock.h | 4 + 5 files changed, 137 insertions(+), 87 deletions(-) diff --git a/test/unittest/UTTest_device_manager_service.cpp b/test/unittest/UTTest_device_manager_service.cpp index c4e7f4be8..306f17124 100644 --- a/test/unittest/UTTest_device_manager_service.cpp +++ b/test/unittest/UTTest_device_manager_service.cpp @@ -177,6 +177,7 @@ HWTEST_F(DeviceManagerServiceTest, PublishDeviceDiscovery_002, testing::ext::Tes { std::string pkgName; DmPublishInfo publishInfo; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); int ret = DeviceManagerService::GetInstance().PublishDeviceDiscovery(pkgName, publishInfo); EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); } @@ -192,6 +193,7 @@ HWTEST_F(DeviceManagerServiceTest, PublishDeviceDiscovery_003, testing::ext::Tes { std::string pkgName = "com.ohos.test"; DmPublishInfo publishInfo; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillRepeatedly(Return(true)); int ret = DeviceManagerService::GetInstance().PublishDeviceDiscovery(pkgName, publishInfo); pkgName = "1com.ohos.test1"; ret = DeviceManagerService::GetInstance().PublishDeviceDiscovery(pkgName, publishInfo); @@ -209,6 +211,7 @@ HWTEST_F(DeviceManagerServiceTest, PublishDeviceDiscovery_004, testing::ext::Tes { std::string pkgName = "PublishDeviceDiscovery_004"; DmPublishInfo publishInfo; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillRepeatedly(Return(true)); DeviceManagerService::GetInstance().InitDMServiceListener(); int ret = DeviceManagerService::GetInstance().PublishDeviceDiscovery(pkgName, publishInfo); pkgName = "1com.ohos.test1"; @@ -241,6 +244,7 @@ HWTEST_F(DeviceManagerServiceTest, UnPublishDeviceDiscovery_002, testing::ext::T { std::string pkgName; int32_t publishId = 1; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); DeviceManagerService::GetInstance().InitDMServiceListener(); int ret = DeviceManagerService::GetInstance().UnPublishDeviceDiscovery(pkgName, publishId); EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); @@ -257,6 +261,7 @@ HWTEST_F(DeviceManagerServiceTest, UnPublishDeviceDiscovery_003, testing::ext::T { std::string pkgName = "com.ohos.test003"; int32_t publishId = 1; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); DeviceManagerService::GetInstance().InitDMServiceListener(); int ret = DeviceManagerService::GetInstance().UnPublishDeviceDiscovery(pkgName, publishId); EXPECT_TRUE(ret == SOFTBUS_DISCOVER_COAP_STOP_PUBLISH_FAIL || ret == SOFTBUS_ERR || @@ -368,6 +373,7 @@ HWTEST_F(DeviceManagerServiceTest, ShiftLNNGear_001, testing::ext::TestSize.Leve std::string pkgName; std::string callerId = "com.ohos.test"; bool isRefresh = true; + EXPECT_CALL(*permissionManagerMock_, CheckNewPermission()).WillOnce(Return(true)); int ret = DeviceManagerService::GetInstance().ShiftLNNGear(pkgName, callerId, isRefresh, false); EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); } @@ -384,6 +390,7 @@ HWTEST_F(DeviceManagerServiceTest, ShiftLNNGear_002, testing::ext::TestSize.Leve std::string callerId; bool isRefresh = true; std::vector deviceList; + EXPECT_CALL(*permissionManagerMock_, CheckNewPermission()).WillOnce(Return(true)); int ret = DeviceManagerService::GetInstance().ShiftLNNGear(pkgName, callerId, isRefresh, false); EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); } @@ -416,6 +423,7 @@ HWTEST_F(DeviceManagerServiceTest, ShiftLNNGear_003, testing::ext::TestSize.Leve std::string pkgName = "com.ohos.test"; std::string callerId = "com.ohos.test"; bool isRefresh = true; + EXPECT_CALL(*permissionManagerMock_, CheckNewPermission()).WillOnce(Return(true)); int ret = DeviceManagerService::GetInstance().ShiftLNNGear(pkgName, callerId, isRefresh, false); EXPECT_NE(ret, DM_OK); } @@ -463,6 +471,7 @@ HWTEST_F(DeviceManagerServiceTest, ShiftLNNGear_005, testing::ext::TestSize.Leve std::string pkgName = "com.ohos.test"; std::string callerId = "com.ohos.test"; bool isRefresh = false; + EXPECT_CALL(*permissionManagerMock_, CheckNewPermission()).WillOnce(Return(true)); int ret = DeviceManagerService::GetInstance().ShiftLNNGear(pkgName, callerId, isRefresh, false); EXPECT_EQ(ret, DM_OK); } @@ -479,6 +488,7 @@ HWTEST_F(DeviceManagerServiceTest, ShiftLNNGear_006, testing::ext::TestSize.Leve std::string callerId = "ShiftLNNGear_006"; bool isRefresh = true; DeviceManagerService::GetInstance().softbusListener_ = nullptr; + EXPECT_CALL(*permissionManagerMock_, CheckNewPermission()).WillOnce(Return(true)); int ret = DeviceManagerService::GetInstance().ShiftLNNGear(pkgName, callerId, isRefresh, false); EXPECT_EQ(ret, ERR_DM_POINT_NULL); } @@ -495,6 +505,7 @@ HWTEST_F(DeviceManagerServiceTest, ShiftLNNGear_007, testing::ext::TestSize.Leve std::string callerId = "ShiftLNNGear_007"; bool isRefresh = true; DeviceManagerService::GetInstance().softbusListener_ = std::make_shared(); + EXPECT_CALL(*permissionManagerMock_, CheckNewPermission()).WillOnce(Return(true)); EXPECT_CALL(*softbusListenerMock_, ShiftLNNGear(_, _)).WillOnce(Return(ERR_DM_FAILED)); int ret = DeviceManagerService::GetInstance().ShiftLNNGear(pkgName, callerId, isRefresh, false); DeviceManagerService::GetInstance().softbusListener_ = nullptr; @@ -529,6 +540,7 @@ HWTEST_F(DeviceManagerServiceTest, AuthenticateDevice_002, testing::ext::TestSiz std::string extra = "jdddd"; int32_t authType = 0; std::string deviceId = " 2345"; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().AuthenticateDevice(pkgName, authType, deviceId, extra); EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); } @@ -548,6 +560,7 @@ HWTEST_F(DeviceManagerServiceTest, AuthenticateDevice_003, testing::ext::TestSiz EXPECT_CALL(*kVAdapterManagerMock_, Get(_, _)).WillOnce(Return(ERR_DM_FAILED)); EXPECT_CALL(*softbusListenerMock_, GetTargetInfoFromCache(_, _, _)).WillOnce(Return(ERR_DM_BIND_INPUT_PARA_INVALID)); + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().AuthenticateDevice(pkgName, authType, deviceId, extra); EXPECT_EQ(ret, ERR_DM_BIND_INPUT_PARA_INVALID); } @@ -594,6 +607,7 @@ HWTEST_F(DeviceManagerServiceTest, UnAuthenticateDevice_002, testing::ext::TestS { std::string pkgName; std::string networkId = "12345"; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); int ret = DeviceManagerService::GetInstance().UnAuthenticateDevice(pkgName, networkId); EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); } @@ -609,6 +623,7 @@ HWTEST_F(DeviceManagerServiceTest, UnAuthenticateDevice_003, testing::ext::TestS { std::string pkgName = "com.ohos.test"; std::string networkId; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); int ret = DeviceManagerService::GetInstance().UnAuthenticateDevice(pkgName, networkId); EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); } @@ -624,6 +639,7 @@ HWTEST_F(DeviceManagerServiceTest, UnAuthenticateDevice_004, testing::ext::TestS { std::string pkgName = "com.ohos.test"; std::string networkId = "12345"; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); EXPECT_CALL(*softbusListenerMock_, GetUdidByNetworkId(_, _)).WillOnce(Return(ERR_DM_FAILED)); int ret = DeviceManagerService::GetInstance().UnAuthenticateDevice(pkgName, networkId); EXPECT_EQ(ret, ERR_DM_FAILED); @@ -642,6 +658,7 @@ HWTEST_F(DeviceManagerServiceTest, GetUdidByNetworkId_001, testing::ext::TestSiz std::string netWorkId = "123"; std::string udid = "123"; EXPECT_CALL(*softbusListenerMock_, GetUdidByNetworkId(_, _)).WillOnce(Return(SOFTBUS_IPC_ERR)); + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); int ret = DeviceManagerService::GetInstance().GetUdidByNetworkId(pkgName, netWorkId, udid); EXPECT_EQ(ret, SOFTBUS_IPC_ERR); } @@ -658,6 +675,7 @@ HWTEST_F(DeviceManagerServiceTest, GetUdidByNetworkId_002, testing::ext::TestSiz std::string pkgName; std::string netWorkId = "111"; std::string udid = "2222"; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); int ret = DeviceManagerService::GetInstance().GetUdidByNetworkId(pkgName, netWorkId, udid); EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); } @@ -674,6 +692,7 @@ HWTEST_F(DeviceManagerServiceTest, GetUdidByNetworkId_003, testing::ext::TestSiz std::string pkgName = "pkgName"; std::string netWorkId = ""; std::string udid = ""; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); int ret = DeviceManagerService::GetInstance().GetUdidByNetworkId(pkgName, netWorkId, udid); EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); } @@ -708,6 +727,7 @@ HWTEST_F(DeviceManagerServiceTest, GetUuidByNetworkId_001, testing::ext::TestSiz std::string netWorkId = "12"; std::string uuid = "12"; EXPECT_CALL(*softbusListenerMock_, GetUuidByNetworkId(_, _)).WillOnce(Return(SOFTBUS_IPC_ERR)); + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); int ret = DeviceManagerService::GetInstance().GetUuidByNetworkId(pkgName, netWorkId, uuid); EXPECT_EQ(ret, SOFTBUS_IPC_ERR); } @@ -724,6 +744,7 @@ HWTEST_F(DeviceManagerServiceTest, GetUuidByNetworkId_002, testing::ext::TestSiz std::string pkgName; std::string netWorkId = "12"; std::string uuid = "21"; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); int ret = DeviceManagerService::GetInstance().GetUuidByNetworkId(pkgName, netWorkId, uuid); EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); } @@ -740,6 +761,7 @@ HWTEST_F(DeviceManagerServiceTest, GetUuidByNetworkId_003, testing::ext::TestSiz std::string pkgName = "com.ohos.test"; std::string netWorkId = ""; std::string uuid = ""; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); int ret = DeviceManagerService::GetInstance().GetUuidByNetworkId(pkgName, netWorkId, uuid); EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); } @@ -790,6 +812,7 @@ HWTEST_F(DeviceManagerServiceTest, SetUserOperation_002, testing::ext::TestSize. std::string pkgName = ""; int32_t action = 0; const std::string param = "{\"test\": \"extra\"}"; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); int ret = DeviceManagerService::GetInstance().SetUserOperation(pkgName, action, param); EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); } @@ -806,6 +829,7 @@ HWTEST_F(DeviceManagerServiceTest, SetUserOperation_003, testing::ext::TestSize. std::string pkgName = "pkgName"; int32_t action = 0; const std::string param; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); int ret = DeviceManagerService::GetInstance().SetUserOperation(pkgName, action, param); EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); } @@ -822,6 +846,7 @@ HWTEST_F(DeviceManagerServiceTest, SetUserOperation_004, testing::ext::TestSize. std::string pkgName = "pkgName"; int32_t action = 0; const std::string param = R"({"test":"extra"})"; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); int ret = DeviceManagerService::GetInstance().SetUserOperation(pkgName, action, param); EXPECT_EQ(ret, DM_OK); } @@ -850,6 +875,7 @@ HWTEST_F(DeviceManagerServiceTest, RequestCredential_001, testing::ext::TestSize { const std::string reqJsonStr = "test"; std::string returnJsonStr = "returntest"; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().RequestCredential(reqJsonStr, returnJsonStr); EXPECT_EQ(ret, ERR_DM_FAILED); } @@ -864,6 +890,7 @@ HWTEST_F(DeviceManagerServiceTest, RequestCredential_002, testing::ext::TestSize { const std::string reqJsonStr = ""; std::string returnJsonStr = "returntest"; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().RequestCredential(reqJsonStr, returnJsonStr); EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); } @@ -893,6 +920,7 @@ HWTEST_F(DeviceManagerServiceTest, ImportCredential_001, testing::ext::TestSize. { const std::string pkgName = "pkgNametest"; const std::string credentialInfo = "credentialInfotest"; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().ImportCredential(pkgName, credentialInfo); EXPECT_EQ(ret, ERR_DM_FAILED); } @@ -907,6 +935,7 @@ HWTEST_F(DeviceManagerServiceTest, ImportCredential_002, testing::ext::TestSize. { const std::string pkgName = ""; const std::string credentialInfo = ""; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().ImportCredential(pkgName, credentialInfo); EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); } @@ -936,6 +965,7 @@ HWTEST_F(DeviceManagerServiceTest, DeleteCredential_001, testing::ext::TestSize. { const std::string pkgName = "pkgNametest"; const std::string deleteInfo = "deleteInfotest"; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().DeleteCredential(pkgName, deleteInfo); EXPECT_EQ(ret, ERR_DM_FAILED); } @@ -965,6 +995,7 @@ HWTEST_F(DeviceManagerServiceTest, DeleteCredential_003, testing::ext::TestSize. { const std::string pkgName = ""; const std::string deleteInfo = ""; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().DeleteCredential(pkgName, deleteInfo); EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); } @@ -978,6 +1009,7 @@ HWTEST_F(DeviceManagerServiceTest, DeleteCredential_003, testing::ext::TestSize. HWTEST_F(DeviceManagerServiceTest, RegisterCredentialCallback_001, testing::ext::TestSize.Level1) { const std::string pkgName = "pkgNametest"; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().RegisterCredentialCallback(pkgName); EXPECT_EQ(ret, DM_OK); } @@ -991,6 +1023,7 @@ HWTEST_F(DeviceManagerServiceTest, RegisterCredentialCallback_001, testing::ext: HWTEST_F(DeviceManagerServiceTest, RegisterCredentialCallback_002, testing::ext::TestSize.Level1) { const std::string pkgName = ""; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().RegisterCredentialCallback(pkgName); EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); } @@ -1018,6 +1051,7 @@ HWTEST_F(DeviceManagerServiceTest, RegisterCredentialCallback_003, testing::ext: HWTEST_F(DeviceManagerServiceTest, UnRegisterCredentialCallback_001, testing::ext::TestSize.Level1) { const std::string pkgName = "pkgNametest"; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().UnRegisterCredentialCallback(pkgName); EXPECT_EQ(ret, DM_OK); } @@ -1031,6 +1065,7 @@ HWTEST_F(DeviceManagerServiceTest, UnRegisterCredentialCallback_001, testing::ex HWTEST_F(DeviceManagerServiceTest, UnRegisterCredentialCallback_002, testing::ext::TestSize.Level1) { const std::string pkgName = ""; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().UnRegisterCredentialCallback(pkgName); EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); } @@ -1098,6 +1133,8 @@ HWTEST_F(DeviceManagerServiceTest, GetDeviceInfo_001, testing::ext::TestSize.Lev { std::string networkId = ""; DmDeviceInfo info; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); + EXPECT_CALL(*permissionManagerMock_, CheckNewPermission()).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().GetDeviceInfo(networkId, info); EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); } @@ -1112,6 +1149,8 @@ HWTEST_F(DeviceManagerServiceTest, GetDeviceInfo_002, testing::ext::TestSize.Lev { std::string networkId = "networkIdTest"; DmDeviceInfo info; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); + EXPECT_CALL(*permissionManagerMock_, CheckNewPermission()).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().GetDeviceInfo(networkId, info); EXPECT_EQ(ret, ERR_DM_POINT_NULL); } @@ -1138,6 +1177,7 @@ HWTEST_F(DeviceManagerServiceTest, GetDeviceInfo_004, testing::ext::TestSize.Lev */ HWTEST_F(DeviceManagerServiceTest, CheckApiPermission_001, testing::ext::TestSize.Level1) { + EXPECT_CALL(*permissionManagerMock_, CheckNewPermission()).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().CheckApiPermission(0); EXPECT_EQ(ret, DM_OK); } @@ -1198,6 +1238,7 @@ HWTEST_F(DeviceManagerServiceTest, BindDevice_001, testing::ext::TestSize.Level1 int32_t authType = 1; std::string deviceId; std::string bindParam; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().BindDevice(pkgName, authType, deviceId, bindParam); EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); } @@ -1208,6 +1249,7 @@ HWTEST_F(DeviceManagerServiceTest, BindDevice_002, testing::ext::TestSize.Level1 int32_t authType = 1; std::string deviceId; std::string bindParam; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().BindDevice(pkgName, authType, deviceId, bindParam); EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); } @@ -1221,6 +1263,7 @@ HWTEST_F(DeviceManagerServiceTest, BindDevice_003, testing::ext::TestSize.Level1 EXPECT_CALL(*kVAdapterManagerMock_, Get(_, _)).WillOnce(Return(ERR_DM_FAILED)); EXPECT_CALL(*softbusListenerMock_, GetTargetInfoFromCache(_, _, _)).WillOnce(Return(ERR_DM_BIND_INPUT_PARA_INVALID)); + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().BindDevice(pkgName, authType, deviceId, bindParam); EXPECT_EQ(ret, ERR_DM_BIND_INPUT_PARA_INVALID); } @@ -1243,6 +1286,7 @@ HWTEST_F(DeviceManagerServiceTest, UnBindDevice_001, testing::ext::TestSize.Leve DeviceManagerService::GetInstance().softbusListener_ = std::make_shared(); EXPECT_CALL(*kVAdapterManagerMock_, Get(_, _)).WillOnce(Return(ERR_DM_FAILED)); EXPECT_CALL(*softbusListenerMock_, GetUdidFromDp(_, _)).WillOnce(Return(ERR_DM_FAILED)); + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().UnBindDevice(pkgName, deviceId); EXPECT_EQ(ret, ERR_DM_POINT_NULL); DeviceManagerService::GetInstance().softbusListener_ = nullptr; @@ -1252,6 +1296,7 @@ HWTEST_F(DeviceManagerServiceTest, UnBindDevice_002, testing::ext::TestSize.Leve { std::string pkgName = "com.ohos.test"; std::string deviceId; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().UnBindDevice(pkgName, deviceId); EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); } @@ -1260,6 +1305,7 @@ HWTEST_F(DeviceManagerServiceTest, UnBindDevice_003, testing::ext::TestSize.Leve { std::string pkgName; std::string deviceId = "1234"; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().UnBindDevice(pkgName, deviceId); EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); } @@ -1281,6 +1327,7 @@ HWTEST_F(DeviceManagerServiceTest, UnBindDevice_005, testing::ext::TestSize.Leve DeviceManagerService::GetInstance().softbusListener_ = std::make_shared(); EXPECT_CALL(*kVAdapterManagerMock_, Get(_, _)).WillOnce(Return(ERR_DM_FAILED)); EXPECT_CALL(*softbusListenerMock_, GetUdidFromDp(_, _)).WillOnce(Return(ERR_DM_FAILED)); + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().UnBindDevice(pkgName, deviceId, extra); EXPECT_EQ(ret, ERR_DM_POINT_NULL); DeviceManagerService::GetInstance().softbusListener_ = nullptr; @@ -1291,6 +1338,7 @@ HWTEST_F(DeviceManagerServiceTest, UnBindDevice_006, testing::ext::TestSize.Leve std::string pkgName = "com.ohos.test"; std::string deviceId; std::string extra = "extra"; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().UnBindDevice(pkgName, deviceId, extra); EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); } @@ -1300,6 +1348,7 @@ HWTEST_F(DeviceManagerServiceTest, UnBindDevice_007, testing::ext::TestSize.Leve std::string pkgName; std::string deviceId = "1234"; std::string extra = "extra"; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().UnBindDevice(pkgName, deviceId, extra); EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); } @@ -1332,6 +1381,7 @@ HWTEST_F(DeviceManagerServiceTest, MineRequestCredential_001, testing::ext::Test DeviceManagerService::GetInstance().isImplsoLoaded_ = false; std::string pkgName; std::string returnJsonStr; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().MineRequestCredential(pkgName, returnJsonStr); EXPECT_EQ(ret, DM_OK); } @@ -1416,6 +1466,7 @@ HWTEST_F(DeviceManagerServiceTest, RegisterUiStateCallback_001, testing::ext::Te HWTEST_F(DeviceManagerServiceTest, RegisterUiStateCallback_002, testing::ext::TestSize.Level1) { std::string pkgName = "pkgName"; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().RegisterUiStateCallback(pkgName); EXPECT_EQ(ret, DM_OK); } @@ -1497,6 +1548,7 @@ HWTEST_F(DeviceManagerServiceTest, NotifyEvent_003, testing::ext::TestSize.Level int32_t eventId = DM_NOTIFY_EVENT_ON_PINHOLDER_EVENT; std::string event; DeviceManagerService::GetInstance().InitDMServiceListener(); + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().NotifyEvent(pkgName, eventId, event); EXPECT_EQ(ret, ERR_DM_FAILED); DeviceManagerService::GetInstance().UninitDMServiceListener(); @@ -1563,6 +1615,7 @@ HWTEST_F(DeviceManagerServiceTest, CheckApiPermission_004, testing::ext::TestSiz HWTEST_F(DeviceManagerServiceTest, CheckApiPermission_005, testing::ext::TestSize.Level1) { + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().CheckApiPermission(1); EXPECT_EQ(ret, DM_OK); } @@ -1594,6 +1647,7 @@ HWTEST_F(DeviceManagerServiceTest, GetNetworkTypeByNetworkId_002, testing::ext:: std::string pkgName; std::string netWorkId; int32_t networkType = 0; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().GetNetworkTypeByNetworkId(pkgName, netWorkId, networkType); EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); } @@ -1603,6 +1657,7 @@ HWTEST_F(DeviceManagerServiceTest, GetNetworkTypeByNetworkId_003, testing::ext:: std::string pkgName = "pkgName"; std::string netWorkId = "netWorkId"; int32_t networkType = 0; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().GetNetworkTypeByNetworkId(pkgName, netWorkId, networkType); EXPECT_EQ(ret, ERR_DM_POINT_NULL); } @@ -1615,6 +1670,7 @@ HWTEST_F(DeviceManagerServiceTest, GetNetworkTypeByNetworkId_004, testing::ext:: DeviceManagerService::GetInstance().softbusListener_ = std::make_shared(); EXPECT_CALL(*softbusListenerMock_, GetNetworkTypeByNetworkId(_, _)) .WillOnce(Return(ERR_DM_FAILED)); + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().GetNetworkTypeByNetworkId(pkgName, netWorkId, networkType); DeviceManagerService::GetInstance().softbusListener_ = nullptr; EXPECT_EQ(ret, ERR_DM_FAILED); @@ -1634,6 +1690,7 @@ HWTEST_F(DeviceManagerServiceTest, ImportAuthCode_002, testing::ext::TestSize.Le std::string pkgName = "pkgName"; std::string authCode = "authCode"; EXPECT_CALL(*permissionManagerMock_, GetCallerProcessName(_)).WillOnce(Return(DM_OK)); + EXPECT_CALL(*permissionManagerMock_, CheckNewPermission()).WillOnce(Return(true)); EXPECT_CALL(*permissionManagerMock_, CheckProcessNameValidOnAuthCode(_)).WillOnce(Return(false)); int32_t ret = DeviceManagerService::GetInstance().ImportAuthCode(pkgName, authCode); EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); @@ -1651,6 +1708,7 @@ HWTEST_F(DeviceManagerServiceTest, ExportAuthCode_002, testing::ext::TestSize.Le { std::string authCode = "authCode"; EXPECT_CALL(*permissionManagerMock_, GetCallerProcessName(_)).WillOnce(Return(DM_OK)); + EXPECT_CALL(*permissionManagerMock_, CheckNewPermission()).WillOnce(Return(true)); EXPECT_CALL(*permissionManagerMock_, CheckProcessNameValidOnAuthCode(_)).WillOnce(Return(false)); int32_t ret = DeviceManagerService::GetInstance().ExportAuthCode(authCode); EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); @@ -1677,6 +1735,8 @@ HWTEST_F(DeviceManagerServiceTest, StartDiscovering_002, testing::ext::TestSize. std::string pkgName; std::map discoverParam; std::map filterOptions; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); + EXPECT_CALL(*permissionManagerMock_, CheckNewPermission()).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().StartDiscovering(pkgName, discoverParam, filterOptions); EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); } @@ -1687,6 +1747,8 @@ HWTEST_F(DeviceManagerServiceTest, StartDiscovering_003, testing::ext::TestSize. std::map discoverParam; std::map filterOptions; DeviceManagerService::GetInstance().InitDMServiceListener(); + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); + EXPECT_CALL(*permissionManagerMock_, CheckNewPermission()).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().StartDiscovering(pkgName, discoverParam, filterOptions); EXPECT_TRUE(ret == SOFTBUS_IPC_ERR || ret == DM_OK || ret == SOFTBUS_DISCOVER_MANAGER_INNERFUNCTION_FAIL); ret = DeviceManagerService::GetInstance().StopDiscovering(pkgName, discoverParam); @@ -1706,6 +1768,8 @@ HWTEST_F(DeviceManagerServiceTest, StartDiscovering_004, testing::ext::TestSize. std::to_string(static_cast(DmExchangeFreq::DM_LOW)); std::map filterOptions; DeviceManagerService::GetInstance().InitDMServiceListener(); + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); + EXPECT_CALL(*permissionManagerMock_, CheckNewPermission()).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().StartDiscovering(pkgName, discoverParam, filterOptions); EXPECT_TRUE(ret == SOFTBUS_IPC_ERR || ret == DM_OK || ret == SOFTBUS_DISCOVER_MANAGER_INNERFUNCTION_FAIL); DeviceManagerService::GetInstance().StopDiscovering(pkgName, discoverParam); @@ -1725,6 +1789,8 @@ HWTEST_F(DeviceManagerServiceTest, StopDiscovering_002, testing::ext::TestSize.L { std::string pkgName; std::map discoverParam; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); + EXPECT_CALL(*permissionManagerMock_, CheckNewPermission()).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().StopDiscovering(pkgName, discoverParam); EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); } @@ -1734,6 +1800,8 @@ HWTEST_F(DeviceManagerServiceTest, StopDiscovering_003, testing::ext::TestSize.L std::string pkgName = "pkgName"; std::map discoverParam; DeviceManagerService::GetInstance().InitDMServiceListener(); + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); + EXPECT_CALL(*permissionManagerMock_, CheckNewPermission()).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().StopDiscovering(pkgName, discoverParam); EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); DeviceManagerService::GetInstance().UninitDMServiceListener(); @@ -1754,6 +1822,7 @@ HWTEST_F(DeviceManagerServiceTest, EnableDiscoveryListener_002, testing::ext::Te std::string pkgName; std::map discoverParam; std::map filterOptions; + EXPECT_CALL(*permissionManagerMock_, CheckNewPermission()).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().EnableDiscoveryListener(pkgName, discoverParam, filterOptions); EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); } @@ -1799,6 +1868,7 @@ HWTEST_F(DeviceManagerServiceTest, DisableDiscoveryListener_003, testing::ext::T { std::string pkgName = "pkgName"; std::map extraParam; + EXPECT_CALL(*permissionManagerMock_, CheckNewPermission()).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().DisableDiscoveryListener(pkgName, extraParam); EXPECT_EQ(ret, ERR_DM_POINT_NULL); } @@ -1808,6 +1878,7 @@ HWTEST_F(DeviceManagerServiceTest, DisableDiscoveryListener_004, testing::ext::T std::string pkgName = "pkgName"; std::map extraParam; DeviceManagerService::GetInstance().InitDMServiceListener(); + EXPECT_CALL(*permissionManagerMock_, CheckNewPermission()).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().DisableDiscoveryListener(pkgName, extraParam); EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); DeviceManagerService::GetInstance().UninitDMServiceListener(); @@ -1826,6 +1897,7 @@ HWTEST_F(DeviceManagerServiceTest, StartAdvertising_002, testing::ext::TestSize. { std::string pkgName; std::map advertiseParam; + EXPECT_CALL(*permissionManagerMock_, CheckNewPermission()).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().StartAdvertising(pkgName, advertiseParam); EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); } @@ -1865,6 +1937,7 @@ HWTEST_F(DeviceManagerServiceTest, StopAdvertising_003, testing::ext::TestSize.L { std::string pkgName = "pkgName"; std::map advertiseParam; + EXPECT_CALL(*permissionManagerMock_, CheckNewPermission()).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().StopAdvertising(pkgName, advertiseParam); EXPECT_EQ(ret, ERR_DM_POINT_NULL); } @@ -1874,6 +1947,7 @@ HWTEST_F(DeviceManagerServiceTest, StopAdvertising_004, testing::ext::TestSize.L std::string pkgName = "StopAdvertising_004"; std::map advertiseParam; DeviceManagerService::GetInstance().InitDMServiceListener(); + EXPECT_CALL(*permissionManagerMock_, CheckNewPermission()).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().StopAdvertising(pkgName, advertiseParam); EXPECT_TRUE(ret == SOFTBUS_DISCOVER_COAP_STOP_PUBLISH_FAIL || ret == SOFTBUS_ERR || ret == ERR_DM_INPUT_PARA_INVALID); @@ -1911,6 +1985,7 @@ HWTEST_F(DeviceManagerServiceTest, BindTarget_005, testing::ext::TestSize.Level1 std::string pkgName; PeerTargetId targetId; std::map bindParam; + EXPECT_CALL(*permissionManagerMock_, CheckNewPermission()).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().BindTarget(pkgName, targetId, bindParam); EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); } @@ -1923,6 +1998,7 @@ HWTEST_F(DeviceManagerServiceTest, BindTarget_006, testing::ext::TestSize.Level1 targetId.wifiIp = ""; DeviceManagerService::GetInstance().isImplsoLoaded_ = false; DeviceManagerService::GetInstance().dmServiceImpl_ = nullptr; + EXPECT_CALL(*permissionManagerMock_, CheckNewPermission()).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().BindTarget(pkgName, targetId, bindParam); EXPECT_EQ(ret, DM_OK); } @@ -1942,6 +2018,7 @@ HWTEST_F(DeviceManagerServiceTest, UnbindTarget_005, testing::ext::TestSize.Leve std::string pkgName; PeerTargetId targetId; std::map unbindParam; + EXPECT_CALL(*permissionManagerMock_, CheckNewPermission()).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().UnbindTarget(pkgName, targetId, unbindParam); EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); } @@ -1968,6 +2045,7 @@ HWTEST_F(DeviceManagerServiceTest, RegisterPinHolderCallback_002, testing::ext:: std::string pkgName = "pkgName"; EXPECT_CALL(*permissionManagerMock_, GetCallerProcessName(_)).WillOnce(Return(DM_OK)); EXPECT_CALL(*permissionManagerMock_, CheckProcessNameValidOnPinHolder(_)).WillOnce(Return(false)); + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().RegisterPinHolderCallback(pkgName); EXPECT_NE(ret, DM_OK); } @@ -1991,6 +2069,7 @@ HWTEST_F(DeviceManagerServiceTest, CreatePinHolder_002, testing::ext::TestSize.L std::string payload; EXPECT_CALL(*permissionManagerMock_, GetCallerProcessName(_)).WillOnce(Return(DM_OK)); EXPECT_CALL(*permissionManagerMock_, CheckProcessNameValidOnPinHolder(_)).WillOnce(Return(false)); + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().CreatePinHolder(pkgName, targetId, pinType, payload); EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); } @@ -2014,6 +2093,7 @@ HWTEST_F(DeviceManagerServiceTest, DestroyPinHolder_002, testing::ext::TestSize. std::string payload; EXPECT_CALL(*permissionManagerMock_, GetCallerProcessName(_)).WillOnce(Return(DM_OK)); EXPECT_CALL(*permissionManagerMock_, CheckProcessNameValidOnPinHolder(_)).WillOnce(Return(false)); + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().DestroyPinHolder(pkgName, targetId, pinType, payload); EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); } @@ -2030,6 +2110,7 @@ HWTEST_F(DeviceManagerServiceTest, DpAclAdd_001, testing::ext::TestSize.Level1) HWTEST_F(DeviceManagerServiceTest, DpAclAdd_002, testing::ext::TestSize.Level1) { std::string udid = "udid"; + EXPECT_CALL(*permissionManagerMock_, CheckNewPermission()).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().DpAclAdd(udid); EXPECT_EQ(ret, DM_OK); } @@ -2039,6 +2120,7 @@ HWTEST_F(DeviceManagerServiceTest, GetDeviceSecurityLevel_001, testing::ext::Tes std::string pkgName; std::string networkId; int32_t securityLevel = -1; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().GetDeviceSecurityLevel(pkgName, networkId, securityLevel); EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); } @@ -2048,6 +2130,7 @@ HWTEST_F(DeviceManagerServiceTest, GetDeviceSecurityLevel_002, testing::ext::Tes std::string pkgName = "com.ohos.test"; std::string invalidNetworkId = "12345"; int32_t securityLevel = -1; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().GetDeviceSecurityLevel(pkgName, invalidNetworkId, securityLevel); EXPECT_EQ(ret, ERR_DM_POINT_NULL); } @@ -2067,6 +2150,7 @@ HWTEST_F(DeviceManagerServiceTest, GetDeviceSecurityLevel_004, testing::ext::Tes std::string pkgName = "com.ohos.test"; std::string invalidNetworkId; int32_t securityLevel = -1; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().GetDeviceSecurityLevel(pkgName, invalidNetworkId, securityLevel); EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); } @@ -2086,6 +2170,7 @@ HWTEST_F(DeviceManagerServiceTest, IsSameAccount_001, testing::ext::TestSize.Lev { std::string udid = ""; EXPECT_CALL(*softbusListenerMock_, GetUdidByNetworkId(_, _)).WillOnce(Return(ERR_DM_INPUT_PARA_INVALID)); + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().IsSameAccount(udid); EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); } @@ -2094,6 +2179,7 @@ HWTEST_F(DeviceManagerServiceTest, IsSameAccount_002, testing::ext::TestSize.Lev { std::string udid = "udidTest"; EXPECT_CALL(*softbusListenerMock_, GetUdidByNetworkId(_, _)).WillOnce(Return(ERR_DM_INPUT_PARA_INVALID)); + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().IsSameAccount(udid); EXPECT_NE(ret, DM_OK); } @@ -2133,6 +2219,7 @@ HWTEST_F(DeviceManagerServiceTest, SetDnPolicy_001, testing::ext::TestSize.Level EXPECT_CALL(*permissionManagerMock_, GetCallerProcessName(_)) .WillOnce(DoAll(SetArgReferee<0>(processName), Return(DM_OK))); EXPECT_CALL(*permissionManagerMock_, CheckProcessNameValidOnSetDnPolicy(_)).WillOnce(Return(true)); + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); int ret = DeviceManagerService::GetInstance().SetDnPolicy(pkgName, policy); EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); } @@ -2164,6 +2251,7 @@ HWTEST_F(DeviceManagerServiceTest, SetDnPolicy_003, testing::ext::TestSize.Level EXPECT_CALL(*permissionManagerMock_, GetCallerProcessName(_)) .WillOnce(DoAll(SetArgReferee<0>(processName), Return(DM_OK))); EXPECT_CALL(*permissionManagerMock_, CheckProcessNameValidOnSetDnPolicy(_)).WillOnce(Return(true)); + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); int ret = DeviceManagerService::GetInstance().SetDnPolicy(pkgName, policy); EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); } @@ -2176,6 +2264,7 @@ HWTEST_F(DeviceManagerServiceTest, DestroyPinHolder_003, testing::ext::TestSize. std::string payload; EXPECT_CALL(*permissionManagerMock_, GetCallerProcessName(_)).WillOnce(Return(DM_OK)); EXPECT_CALL(*permissionManagerMock_, CheckProcessNameValidOnPinHolder(_)).WillOnce(Return(false)); + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().DestroyPinHolder(pkgName, targetId, pinType, payload); EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); } @@ -2195,6 +2284,7 @@ HWTEST_F(DeviceManagerServiceTest, GetDeviceScreenStatus_002, testing::ext::Test std::string pkgName; std::string networkId; int32_t screenStatus = 1; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); int ret = DeviceManagerService::GetInstance().GetDeviceScreenStatus(pkgName, networkId, screenStatus); EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); } @@ -2206,6 +2296,7 @@ HWTEST_F(DeviceManagerServiceTest, GetDeviceScreenStatus_003, testing::ext::Test int32_t screenStatus = 1; DeviceManagerService::GetInstance().softbusListener_ = std::make_shared(); EXPECT_CALL(*softbusListenerMock_, GetDeviceScreenStatus(_, _)).WillOnce(Return(ERR_DM_FAILED)); + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); int ret = DeviceManagerService::GetInstance().GetDeviceScreenStatus(pkgName, networkId, screenStatus); EXPECT_EQ(ret, ERR_DM_FAILED); DeviceManagerService::GetInstance().softbusListener_ = nullptr; @@ -2216,6 +2307,7 @@ HWTEST_F(DeviceManagerServiceTest, GetDeviceScreenStatus_004, testing::ext::Test std::string pkgName = "pkgname"; std::string networkId = "networkId_003"; int32_t screenStatus = 1; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); int ret = DeviceManagerService::GetInstance().GetDeviceScreenStatus(pkgName, networkId, screenStatus); EXPECT_EQ(ret, ERR_DM_POINT_NULL); } @@ -2235,6 +2327,7 @@ HWTEST_F(DeviceManagerServiceTest, EnableDiscoveryListener_005, testing::ext::Te std::string pkgName = "pkgName"; std::map discoverParam; std::map filterOptions; + EXPECT_CALL(*permissionManagerMock_, CheckNewPermission()).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().EnableDiscoveryListener(pkgName, discoverParam, filterOptions); EXPECT_EQ(ret, ERR_DM_POINT_NULL); } diff --git a/test/unittest/UTTest_device_manager_service_three.cpp b/test/unittest/UTTest_device_manager_service_three.cpp index f944566c4..75b30fc63 100644 --- a/test/unittest/UTTest_device_manager_service_three.cpp +++ b/test/unittest/UTTest_device_manager_service_three.cpp @@ -124,6 +124,7 @@ HWTEST_F(DeviceManagerServiceThreeTest, AuthenticateDevice_301, testing::ext::Te std::string extra = "jdddd"; int32_t authType = 1; std::string deviceId = "deviceId"; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); EXPECT_CALL(*deviceManagerServiceMock_, IsDMServiceImplReady()).WillOnce(Return(false)); int32_t ret = DeviceManagerService::GetInstance().AuthenticateDevice(pkgName, authType, deviceId, extra); EXPECT_EQ(ret, ERR_DM_NOT_INIT); @@ -140,6 +141,7 @@ HWTEST_F(DeviceManagerServiceThreeTest, UnAuthenticateDevice_301, testing::ext:: { std::string pkgName = "com.ohos.test"; std::string networkId = "12345"; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); EXPECT_CALL(*softbusListenerMock_, GetUdidByNetworkId(_, _)).WillOnce(Return(DM_OK)); EXPECT_CALL(*deviceManagerServiceMock_, IsDMServiceImplReady()).WillOnce(Return(false)); int ret = DeviceManagerService::GetInstance().UnAuthenticateDevice(pkgName, networkId); @@ -158,6 +160,7 @@ HWTEST_F(DeviceManagerServiceThreeTest, SetUserOperation_301, testing::ext::Test std::string pkgName = "pkgName"; int32_t action = 0; const std::string param = "extra"; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); EXPECT_CALL(*deviceManagerServiceMock_, IsDMServiceImplReady()).WillOnce(Return(false)); int ret = DeviceManagerService::GetInstance().SetUserOperation(pkgName, action, param); EXPECT_EQ(ret, ERR_DM_NOT_INIT); @@ -173,6 +176,7 @@ HWTEST_F(DeviceManagerServiceThreeTest, RequestCredential_301, testing::ext::Tes { const std::string reqJsonStr = "test"; std::string returnJsonStr = "returntest"; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); EXPECT_CALL(*deviceManagerServiceMock_, IsDMServiceImplReady()).WillOnce(Return(false)); int32_t ret = DeviceManagerService::GetInstance().RequestCredential(reqJsonStr, returnJsonStr); EXPECT_EQ(ret, ERR_DM_NOT_INIT); @@ -188,6 +192,7 @@ HWTEST_F(DeviceManagerServiceThreeTest, ImportCredential_301, testing::ext::Test { const std::string pkgName = "pkgNametest"; const std::string credentialInfo = "credentialInfotest"; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillRepeatedly(Return(true)); EXPECT_CALL(*deviceManagerServiceMock_, IsDMServiceImplReady()).WillOnce(Return(false)); int32_t ret = DeviceManagerService::GetInstance().ImportCredential(pkgName, credentialInfo); EXPECT_EQ(ret, ERR_DM_NOT_INIT); @@ -209,6 +214,7 @@ HWTEST_F(DeviceManagerServiceThreeTest, DeleteCredential_301, testing::ext::Test { const std::string pkgName = "pkgNametest"; const std::string deleteInfo = "deleteInfotest"; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); EXPECT_CALL(*deviceManagerServiceMock_, IsDMServiceImplReady()).WillOnce(Return(false)); int32_t ret = DeviceManagerService::GetInstance().DeleteCredential(pkgName, deleteInfo); EXPECT_EQ(ret, ERR_DM_NOT_INIT); @@ -223,6 +229,7 @@ HWTEST_F(DeviceManagerServiceThreeTest, DeleteCredential_301, testing::ext::Test HWTEST_F(DeviceManagerServiceThreeTest, RegisterCredentialCallback_301, testing::ext::TestSize.Level1) { const std::string pkgName = "pkgNametest"; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); EXPECT_CALL(*deviceManagerServiceMock_, IsDMServiceImplReady()).WillOnce(Return(false)); int32_t ret = DeviceManagerService::GetInstance().RegisterCredentialCallback(pkgName); EXPECT_EQ(ret, ERR_DM_NOT_INIT); @@ -234,6 +241,7 @@ HWTEST_F(DeviceManagerServiceThreeTest, BindDevice_301, testing::ext::TestSize.L int32_t authType = 1; std::string deviceId = "1234"; std::string bindParam; + EXPECT_CALL(*permissionManagerMock_, CheckNewPermission()).WillOnce(Return(true)); EXPECT_CALL(*deviceManagerServiceMock_, IsDMServiceImplReady()).WillOnce(Return(false)); int32_t ret = DeviceManagerService::GetInstance().BindDevice(pkgName, authType, deviceId, bindParam); EXPECT_EQ(ret, ERR_DM_NOT_INIT); @@ -243,6 +251,7 @@ HWTEST_F(DeviceManagerServiceThreeTest, UnBindDevice_301, testing::ext::TestSize { std::string pkgName = "com.ohos.test"; std::string deviceId = "1234"; + EXPECT_CALL(*permissionManagerMock_, CheckNewPermission()).WillOnce(Return(true)); EXPECT_CALL(*deviceManagerServiceMock_, IsDMServiceImplReady()).WillOnce(Return(false)); int32_t ret = DeviceManagerService::GetInstance().UnBindDevice(pkgName, deviceId); EXPECT_EQ(ret, ERR_DM_NOT_INIT); @@ -253,6 +262,7 @@ HWTEST_F(DeviceManagerServiceThreeTest, MineRequestCredential_301, testing::ext: DeviceManagerService::GetInstance().isImplsoLoaded_ = false; std::string pkgName; std::string returnJsonStr; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); EXPECT_CALL(*deviceManagerServiceMock_, IsDMServiceImplReady()).WillOnce(Return(false)); int32_t ret = DeviceManagerService::GetInstance().MineRequestCredential(pkgName, returnJsonStr); EXPECT_EQ(ret, ERR_DM_NOT_INIT); @@ -263,6 +273,7 @@ HWTEST_F(DeviceManagerServiceThreeTest, CheckCredential_301, testing::ext::TestS std::string pkgName; std::string returnJsonStr; std::string reqJsonStr; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); EXPECT_CALL(*deviceManagerServiceMock_, IsDMServiceImplReady()).WillOnce(Return(false)); int32_t ret = DeviceManagerService::GetInstance().CheckCredential(pkgName, reqJsonStr, returnJsonStr); EXPECT_EQ(ret, ERR_DM_NOT_INIT); @@ -271,6 +282,7 @@ HWTEST_F(DeviceManagerServiceThreeTest, CheckCredential_301, testing::ext::TestS HWTEST_F(DeviceManagerServiceThreeTest, RegisterUiStateCallback_301, testing::ext::TestSize.Level1) { std::string pkgName = "pkgName"; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); EXPECT_CALL(*deviceManagerServiceMock_, IsDMServiceImplReady()).WillOnce(Return(false)); int32_t ret = DeviceManagerService::GetInstance().RegisterUiStateCallback(pkgName); EXPECT_EQ(ret, ERR_DM_NOT_INIT); @@ -279,6 +291,7 @@ HWTEST_F(DeviceManagerServiceThreeTest, RegisterUiStateCallback_301, testing::ex HWTEST_F(DeviceManagerServiceThreeTest, UnRegisterUiStateCallback_301, testing::ext::TestSize.Level1) { std::string pkgName = "pkgName"; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); EXPECT_CALL(*deviceManagerServiceMock_, IsDMServiceImplReady()).WillOnce(Return(false)); int32_t ret = DeviceManagerService::GetInstance().UnRegisterUiStateCallback(pkgName); EXPECT_EQ(ret, ERR_DM_NOT_INIT); @@ -289,6 +302,7 @@ HWTEST_F(DeviceManagerServiceThreeTest, NotifyEvent_301, testing::ext::TestSize. std::string pkgName; int32_t eventId = 0; std::string event; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); EXPECT_CALL(*deviceManagerServiceMock_, IsDMServiceImplReady()).WillOnce(Return(false)); int32_t ret = DeviceManagerService::GetInstance().NotifyEvent(pkgName, eventId, event); EXPECT_EQ(ret, ERR_DM_NOT_INIT); @@ -299,11 +313,13 @@ HWTEST_F(DeviceManagerServiceThreeTest, BindTarget_301, testing::ext::TestSize.L std::string pkgName = "pkgName"; PeerTargetId targetId; std::map bindParam; + EXPECT_CALL(*permissionManagerMock_, CheckNewPermission()).WillOnce(Return(true)); EXPECT_CALL(*deviceManagerServiceMock_, IsDMServiceImplReady()).WillOnce(Return(false)); int32_t ret = DeviceManagerService::GetInstance().BindTarget(pkgName, targetId, bindParam); EXPECT_EQ(ret, ERR_DM_NOT_INIT); bindParam.insert(std::make_pair(PARAM_KEY_META_TYPE, pkgName)); + EXPECT_CALL(*permissionManagerMock_, CheckNewPermission()).WillOnce(Return(true)); EXPECT_CALL(*deviceManagerServiceMock_, IsDMServiceAdapterResidentLoad()).WillOnce(Return(false)); ret = DeviceManagerService::GetInstance().BindTarget(pkgName, targetId, bindParam); EXPECT_EQ(ret, ERR_DM_UNSUPPORTED_METHOD); @@ -312,6 +328,7 @@ HWTEST_F(DeviceManagerServiceThreeTest, BindTarget_301, testing::ext::TestSize.L HWTEST_F(DeviceManagerServiceThreeTest, DpAclAdd_301, testing::ext::TestSize.Level1) { std::string udid = "udid"; + EXPECT_CALL(*permissionManagerMock_, CheckNewPermission()).WillOnce(Return(true)); EXPECT_CALL(*deviceManagerServiceMock_, IsDMServiceImplReady()).WillOnce(Return(false)); int32_t ret = DeviceManagerService::GetInstance().DpAclAdd(udid); EXPECT_EQ(ret, ERR_DM_NOT_INIT); @@ -320,6 +337,7 @@ HWTEST_F(DeviceManagerServiceThreeTest, DpAclAdd_301, testing::ext::TestSize.Lev HWTEST_F(DeviceManagerServiceThreeTest, IsSameAccount_301, testing::ext::TestSize.Level1) { std::string udid = "udidTest"; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); EXPECT_CALL(*softbusListenerMock_, GetUdidByNetworkId(_, _)).WillOnce(Return(DM_OK)); EXPECT_CALL(*deviceManagerServiceMock_, IsDMServiceImplReady()).WillOnce(Return(false)); int32_t ret = DeviceManagerService::GetInstance().IsSameAccount(udid); @@ -330,6 +348,7 @@ HWTEST_F(DeviceManagerServiceThreeTest, CheckIsSameAccount_301, testing::ext::Te { DmAccessCaller caller; DmAccessCallee callee; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); EXPECT_CALL(*deviceManagerServiceMock_, IsDMServiceImplReady()).WillOnce(Return(false)); bool ret = DeviceManagerService::GetInstance().CheckIsSameAccount(caller, callee); EXPECT_FALSE(ret); @@ -339,6 +358,7 @@ HWTEST_F(DeviceManagerServiceThreeTest, CheckAccessControl_301, testing::ext::Te { DmAccessCaller caller; DmAccessCallee callee; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); EXPECT_CALL(*deviceManagerServiceMock_, IsDMServiceImplReady()).WillOnce(Return(false)); bool ret = DeviceManagerService::GetInstance().CheckAccessControl(caller, callee); EXPECT_FALSE(ret); @@ -347,6 +367,7 @@ HWTEST_F(DeviceManagerServiceThreeTest, CheckAccessControl_301, testing::ext::Te HWTEST_F(DeviceManagerServiceThreeTest, StopAuthenticateDevice_301, testing::ext::TestSize.Level1) { std::string pkgName = "pkgName_003"; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); EXPECT_CALL(*deviceManagerServiceMock_, IsDMServiceImplReady()).WillOnce(Return(false)); int32_t ret = DeviceManagerService::GetInstance().StopAuthenticateDevice(pkgName); EXPECT_EQ(ret, ERR_DM_NOT_INIT); @@ -356,6 +377,7 @@ HWTEST_F(DeviceManagerServiceThreeTest, ImportAuthCode_301, testing::ext::TestSi { std::string pkgName = "pkgName"; std::string authCode = "authCode"; + EXPECT_CALL(*permissionManagerMock_, CheckNewPermission()).WillRepeatedly(Return(true)); EXPECT_CALL(*permissionManagerMock_, GetCallerProcessName(_)).WillOnce(Return(DM_OK)); EXPECT_CALL(*permissionManagerMock_, CheckProcessNameValidOnAuthCode(_)).WillOnce(Return(true)); EXPECT_CALL(*deviceManagerServiceMock_, IsDMServiceImplReady()).WillOnce(Return(false)); @@ -376,6 +398,7 @@ HWTEST_F(DeviceManagerServiceThreeTest, ImportAuthCode_301, testing::ext::TestSi HWTEST_F(DeviceManagerServiceThreeTest, ExportAuthCode_301, testing::ext::TestSize.Level1) { std::string authCode = "authCode"; + EXPECT_CALL(*permissionManagerMock_, CheckNewPermission()).WillRepeatedly(Return(true)); EXPECT_CALL(*permissionManagerMock_, GetCallerProcessName(_)).WillOnce(Return(DM_OK)); EXPECT_CALL(*permissionManagerMock_, CheckProcessNameValidOnAuthCode(_)).WillOnce(Return(true)); EXPECT_CALL(*deviceManagerServiceMock_, IsDMServiceImplReady()).WillOnce(Return(false)); @@ -402,6 +425,7 @@ HWTEST_F(DeviceManagerServiceThreeTest, UnbindTarget_301, testing::ext::TestSize std::string pkgName = "pkgName"; PeerTargetId targetId; std::map unbindParam; + EXPECT_CALL(*permissionManagerMock_, CheckNewPermission()).WillOnce(Return(true)); EXPECT_CALL(*deviceManagerServiceMock_, IsDMServiceAdapterResidentLoad()).WillOnce(Return(false)); int32_t ret = DeviceManagerService::GetInstance().UnbindTarget(pkgName, targetId, unbindParam); EXPECT_EQ(ret, ERR_DM_UNSUPPORTED_METHOD); @@ -415,6 +439,7 @@ HWTEST_F(DeviceManagerServiceThreeTest, SetDnPolicy_301, testing::ext::TestSize. policy[PARAM_KEY_POLICY_STRATEGY_FOR_BLE] = "100"; policy[PARAM_KEY_POLICY_TIME_OUT] = "10"; std::string processName = "collaboration_service"; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillRepeatedly(Return(true)); EXPECT_CALL(*permissionManagerMock_, GetCallerProcessName(_)) .WillRepeatedly(DoAll(SetArgReferee<0>(processName), Return(DM_OK))); EXPECT_CALL(*permissionManagerMock_, CheckProcessNameValidOnSetDnPolicy(_)).WillOnce(Return(true)); @@ -432,6 +457,7 @@ HWTEST_F(DeviceManagerServiceThreeTest, UnBindDevice_302, testing::ext::TestSize std::string pkgName = "com.ohos.test"; std::string deviceId = "1234"; std::string extra; + EXPECT_CALL(*permissionManagerMock_, CheckNewPermission()).WillOnce(Return(true)); EXPECT_CALL(*deviceManagerServiceMock_, IsDMServiceImplReady()).WillOnce(Return(false)); int32_t ret = DeviceManagerService::GetInstance().UnBindDevice(pkgName, deviceId, extra); EXPECT_EQ(ret, ERR_DM_NOT_INIT); @@ -442,6 +468,7 @@ HWTEST_F(DeviceManagerServiceThreeTest, RegisterAuthenticationType_301, testing: std::string pkgName = "pkgName"; std::map authParam; authParam.insert(std::make_pair(DM_AUTHENTICATION_TYPE, "123456")); + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); EXPECT_CALL(*deviceManagerServiceMock_, IsDMServiceImplReady()).WillOnce(Return(false)); int32_t ret = DeviceManagerService::GetInstance().RegisterAuthenticationType(pkgName, authParam); EXPECT_EQ(ret, ERR_DM_INIT_FAILED); @@ -451,6 +478,7 @@ HWTEST_F(DeviceManagerServiceThreeTest, GetDeviceProfileInfoList_301, testing::e { std::string pkgName = "pkgName"; DmDeviceProfileInfoFilterOptions filterOptions; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); EXPECT_CALL(*deviceManagerServiceMock_, IsDMServiceAdapterResidentLoad()).WillOnce(Return(false)); int32_t ret = DeviceManagerService::GetInstance().GetDeviceProfileInfoList(pkgName, filterOptions); EXPECT_EQ(ret, ERR_DM_UNSUPPORTED_METHOD); @@ -460,6 +488,7 @@ HWTEST_F(DeviceManagerServiceThreeTest, GetDeviceIconInfo_301, testing::ext::Tes { std::string pkgName = "pkgName"; DmDeviceIconInfoFilterOptions filterOptions; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); EXPECT_CALL(*deviceManagerServiceMock_, IsDMServiceAdapterResidentLoad()).WillOnce(Return(false)); int32_t ret = DeviceManagerService::GetInstance().GetDeviceIconInfo(pkgName, filterOptions); EXPECT_EQ(ret, ERR_DM_UNSUPPORTED_METHOD); @@ -470,6 +499,7 @@ HWTEST_F(DeviceManagerServiceThreeTest, GetDeviceInfo_301, testing::ext::TestSiz std::string networkId = "networkId"; DmDeviceInfo deviceInfo; DeviceManagerService::GetInstance().softbusListener_ = std::make_shared(); + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); EXPECT_CALL(*softbusListenerMock_, GetUdidByNetworkId(_, _)).WillOnce(Return(DM_OK)); EXPECT_CALL(*deviceManagerServiceMock_, IsDMServiceImplReady()).WillOnce(Return(false)); int32_t ret = DeviceManagerService::GetInstance().GetDeviceInfo(networkId, deviceInfo); @@ -481,6 +511,7 @@ HWTEST_F(DeviceManagerServiceThreeTest, PutDeviceProfileInfoList_301, testing::e { std::string pkgName = "pkgName"; std::vector deviceProfileInfoList; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); EXPECT_CALL(*deviceManagerServiceMock_, IsDMServiceAdapterResidentLoad()).WillOnce(Return(false)); EXPECT_CALL(*permissionManagerMock_, CheckProcessNameValidPutDeviceProfileInfoList(_)).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().PutDeviceProfileInfoList(pkgName, deviceProfileInfoList); diff --git a/test/unittest/UTTest_device_manager_service_two.cpp b/test/unittest/UTTest_device_manager_service_two.cpp index 8aedde22c..c3cb99751 100644 --- a/test/unittest/UTTest_device_manager_service_two.cpp +++ b/test/unittest/UTTest_device_manager_service_two.cpp @@ -1500,58 +1500,6 @@ HWTEST_F(DeviceManagerServiceTest, UnRegisterLocalServiceInfo_201, testing::ext: EXPECT_EQ(ret, DM_OK); } -HWTEST_F(DeviceManagerServiceTest, UpdateLocalServiceInfo_201, testing::ext::TestSize.Level1) -{ - DMLocalServiceInfo serviceInfo; - EXPECT_CALL(*deviceProfileConnectorMock_, UpdateLocalServiceInfo(_)).WillOnce(Return(DM_OK)); - int32_t ret = DeviceManagerService::GetInstance().UpdateLocalServiceInfo(serviceInfo); - EXPECT_EQ(ret, DM_OK); - - std::string localUdid = "localUdid"; - std::vector peerUdids{"kxjasdkaj"}; - std::vector foregroundUserIds{1, 2}; - std::vector backgroundUserIds{1, 2}; - DeviceManagerService::GetInstance().softbusListener_ = std::make_shared(); - EXPECT_CALL(*softbusCacheMock_, GetNetworkIdFromCache(_, _)).WillOnce(DoAll(SetArgReferee<1>(""), Return(DM_OK))); - DeviceManagerService::GetInstance().NotifyRemoteLocalUserSwitch(localUdid, peerUdids, - foregroundUserIds, backgroundUserIds); - - EXPECT_CALL(*softbusCacheMock_, GetNetworkIdFromCache(_, _)) - .WillOnce(DoAll(SetArgReferee<1>("net*****7"), Return(DM_OK))); - EXPECT_CALL(*softbusListenerMock_, GetNetworkTypeByNetworkId(_, _)) - .WillOnce(DoAll(SetArgReferee<1>(1), Return(ERR_DM_FAILED))); - DeviceManagerService::GetInstance().NotifyRemoteLocalUserSwitch(localUdid, peerUdids, - foregroundUserIds, backgroundUserIds); - - EXPECT_CALL(*softbusCacheMock_, GetNetworkIdFromCache(_, _)) - .WillOnce(DoAll(SetArgReferee<1>("net*****7"), Return(DM_OK))); - EXPECT_CALL(*softbusListenerMock_, GetNetworkTypeByNetworkId(_, _)) - .WillOnce(DoAll(SetArgReferee<1>(1), Return(DM_OK))); - EXPECT_CALL(*dMCommToolMock_, SendUserIds(_, _, _)).WillOnce(Return(ERR_DM_FAILED)); - DeviceManagerService::GetInstance().NotifyRemoteLocalUserSwitch(localUdid, peerUdids, - foregroundUserIds, backgroundUserIds); - - EXPECT_CALL(*softbusCacheMock_, GetNetworkIdFromCache(_, _)) - .WillOnce(DoAll(SetArgReferee<1>("net*****7"), Return(DM_OK))); - EXPECT_CALL(*softbusListenerMock_, GetNetworkTypeByNetworkId(_, _)) - .WillOnce(DoAll(SetArgReferee<1>(4), Return(DM_OK))); - DeviceManagerService::GetInstance().NotifyRemoteLocalUserSwitch(localUdid, peerUdids, - foregroundUserIds, backgroundUserIds); - - std::map wifiDevices; - wifiDevices.insert(std::make_pair("deviceName", "networkwifi")); - EXPECT_CALL(*dMCommToolMock_, SendUserIds(_, _, _)).WillOnce(Return(ERR_DM_FAILED)); - DeviceManagerService::GetInstance().NotifyRemoteLocalUserSwitchByWifi(localUdid, wifiDevices, - foregroundUserIds, backgroundUserIds); - - GTEST_LOG_(INFO) << "NotifyRemoteLocalUserSwitchByWifi SendUserIds is ok" ; - EXPECT_CALL(*dMCommToolMock_, SendUserIds(_, _, _)).WillOnce(Return(DM_OK)); - DeviceManagerService::GetInstance().NotifyRemoteLocalUserSwitchByWifi(localUdid, wifiDevices, - foregroundUserIds, backgroundUserIds); - GTEST_LOG_(INFO) << "NotifyRemoteLocalUserSwitchByWifi end" ; - DeviceManagerService::GetInstance().softbusListener_ = nullptr; -} - HWTEST_F(DeviceManagerServiceTest, GetLocalServiceInfoByBundleNameAndPinExchangeType_201, testing::ext::TestSize.Level1) { @@ -1725,41 +1673,6 @@ HWTEST_F(DeviceManagerServiceTest, SetRemoteDeviceName_202, testing::ext::TestSi } HWTEST_F(DeviceManagerServiceTest, GetDeviceNetworkIdList_201, testing::ext::TestSize.Level1) -{ - std::string pkgName = "pkgName"; - NetworkIdQueryFilter queryFilter; - std::vector networkIds{"uehd*****87"}; - DeletePermission(); - int32_t ret = DeviceManagerService::GetInstance().GetDeviceNetworkIdList(pkgName, queryFilter, networkIds); - EXPECT_EQ(ret, ERR_DM_NO_PERMISSION); - - int32_t stopUserId = 1; - std::string stopEventUdid = "ud*********4"; - std::vector acceptEventUdids{"acc**********7"}; - DeviceManagerService::GetInstance().InitDMServiceListener(); - DeviceManagerService::GetInstance().HandleUserStop(stopUserId, stopEventUdid, acceptEventUdids); - DeviceManagerService::GetInstance().HandleUserStop(stopUserId, stopEventUdid); - - std::string localUdid = "local*******76"; - std::vector peerUdids; - DeviceManagerService::GetInstance().NotifyRemoteLocalUserStop(localUdid, peerUdids, stopUserId); - DeviceManagerService::GetInstance().softbusListener_ = std::make_shared(); - DeviceManagerService::GetInstance().SendUserStopBroadCast(peerUdids, stopUserId); - std::string remoteUdid = "re********7"; - DeviceManagerService::GetInstance().HandleUserStopBroadCast(stopUserId, remoteUdid); - - std::map wifiDevices; - wifiDevices.insert(std::make_pair("wikjdmcsk", "deviceInfowifi")); - EXPECT_CALL(*dMCommToolMock_, SendUserStop(_, _)).WillOnce(Return(ERR_DM_FAILED)); - DeviceManagerService::GetInstance().NotifyRemoteLocalUserStopByWifi(localUdid, wifiDevices, stopUserId); - - EXPECT_CALL(*dMCommToolMock_, SendUserStop(_, _)).WillOnce(Return(DM_OK)); - DeviceManagerService::GetInstance().NotifyRemoteLocalUserStopByWifi(localUdid, wifiDevices, stopUserId); - DeviceManagerService::GetInstance().UninitDMServiceListener(); - DeviceManagerService::GetInstance().softbusListener_ = nullptr; -} - -HWTEST_F(DeviceManagerServiceTest, GetDeviceNetworkIdList_202, testing::ext::TestSize.Level1) { std::string pkgName = "pkgName"; NetworkIdQueryFilter queryFilter; diff --git a/test/unittest/mock/permission_manager_mock.cpp b/test/unittest/mock/permission_manager_mock.cpp index 74a7f0d77..709144ff5 100644 --- a/test/unittest/mock/permission_manager_mock.cpp +++ b/test/unittest/mock/permission_manager_mock.cpp @@ -20,6 +20,15 @@ namespace OHOS { namespace DistributedHardware { DM_IMPLEMENT_SINGLE_INSTANCE(PermissionManager); +bool PermissionManager::CheckPermission() +{ + return DmPermissionManager::dmPermissionManager->CheckPermission(); +} +bool PermissionManager::CheckNewPermission() +{ + return DmPermissionManager::dmPermissionManager->CheckNewPermission(); +} + bool PermissionManager::CheckProcessNameValidOnPinHolder(const std::string &processName) { return DmPermissionManager::dmPermissionManager->CheckProcessNameValidOnPinHolder(processName); diff --git a/test/unittest/mock/permission_manager_mock.h b/test/unittest/mock/permission_manager_mock.h index ef8f53df8..29bb5ba51 100644 --- a/test/unittest/mock/permission_manager_mock.h +++ b/test/unittest/mock/permission_manager_mock.h @@ -26,6 +26,8 @@ class DmPermissionManager { public: virtual ~DmPermissionManager() = default; public: + virtual bool CheckPermission() = 0; + virtual bool CheckNewPermission() = 0; virtual bool CheckProcessNameValidOnPinHolder(const std::string &processName) = 0; virtual bool CheckProcessNameValidOnAuthCode(const std::string &processName) = 0; virtual int32_t GetCallerProcessName(std::string &processName) = 0; @@ -40,6 +42,8 @@ public: class PermissionManagerMock : public DmPermissionManager { public: + MOCK_METHOD(bool, CheckPermission, ()); + MOCK_METHOD(bool, CheckNewPermission, ()); MOCK_METHOD(bool, CheckProcessNameValidOnPinHolder, (const std::string &)); MOCK_METHOD(bool, CheckProcessNameValidOnAuthCode, (const std::string &)); MOCK_METHOD(int32_t, GetCallerProcessName, (std::string &)); -- Gitee From 591638b13ca5e71a922387fe3faefb27238c63be Mon Sep 17 00:00:00 2001 From: BrainL Date: Thu, 26 Jun 2025 16:17:40 +0800 Subject: [PATCH 2/3] modifyUT2_0626 Signed-off-by: BrainL --- .../UTTest_device_manager_service_two.cpp | 87 +++++++++++++++++++ 1 file changed, 87 insertions(+) diff --git a/test/unittest/UTTest_device_manager_service_two.cpp b/test/unittest/UTTest_device_manager_service_two.cpp index c3cb99751..8aedde22c 100644 --- a/test/unittest/UTTest_device_manager_service_two.cpp +++ b/test/unittest/UTTest_device_manager_service_two.cpp @@ -1500,6 +1500,58 @@ HWTEST_F(DeviceManagerServiceTest, UnRegisterLocalServiceInfo_201, testing::ext: EXPECT_EQ(ret, DM_OK); } +HWTEST_F(DeviceManagerServiceTest, UpdateLocalServiceInfo_201, testing::ext::TestSize.Level1) +{ + DMLocalServiceInfo serviceInfo; + EXPECT_CALL(*deviceProfileConnectorMock_, UpdateLocalServiceInfo(_)).WillOnce(Return(DM_OK)); + int32_t ret = DeviceManagerService::GetInstance().UpdateLocalServiceInfo(serviceInfo); + EXPECT_EQ(ret, DM_OK); + + std::string localUdid = "localUdid"; + std::vector peerUdids{"kxjasdkaj"}; + std::vector foregroundUserIds{1, 2}; + std::vector backgroundUserIds{1, 2}; + DeviceManagerService::GetInstance().softbusListener_ = std::make_shared(); + EXPECT_CALL(*softbusCacheMock_, GetNetworkIdFromCache(_, _)).WillOnce(DoAll(SetArgReferee<1>(""), Return(DM_OK))); + DeviceManagerService::GetInstance().NotifyRemoteLocalUserSwitch(localUdid, peerUdids, + foregroundUserIds, backgroundUserIds); + + EXPECT_CALL(*softbusCacheMock_, GetNetworkIdFromCache(_, _)) + .WillOnce(DoAll(SetArgReferee<1>("net*****7"), Return(DM_OK))); + EXPECT_CALL(*softbusListenerMock_, GetNetworkTypeByNetworkId(_, _)) + .WillOnce(DoAll(SetArgReferee<1>(1), Return(ERR_DM_FAILED))); + DeviceManagerService::GetInstance().NotifyRemoteLocalUserSwitch(localUdid, peerUdids, + foregroundUserIds, backgroundUserIds); + + EXPECT_CALL(*softbusCacheMock_, GetNetworkIdFromCache(_, _)) + .WillOnce(DoAll(SetArgReferee<1>("net*****7"), Return(DM_OK))); + EXPECT_CALL(*softbusListenerMock_, GetNetworkTypeByNetworkId(_, _)) + .WillOnce(DoAll(SetArgReferee<1>(1), Return(DM_OK))); + EXPECT_CALL(*dMCommToolMock_, SendUserIds(_, _, _)).WillOnce(Return(ERR_DM_FAILED)); + DeviceManagerService::GetInstance().NotifyRemoteLocalUserSwitch(localUdid, peerUdids, + foregroundUserIds, backgroundUserIds); + + EXPECT_CALL(*softbusCacheMock_, GetNetworkIdFromCache(_, _)) + .WillOnce(DoAll(SetArgReferee<1>("net*****7"), Return(DM_OK))); + EXPECT_CALL(*softbusListenerMock_, GetNetworkTypeByNetworkId(_, _)) + .WillOnce(DoAll(SetArgReferee<1>(4), Return(DM_OK))); + DeviceManagerService::GetInstance().NotifyRemoteLocalUserSwitch(localUdid, peerUdids, + foregroundUserIds, backgroundUserIds); + + std::map wifiDevices; + wifiDevices.insert(std::make_pair("deviceName", "networkwifi")); + EXPECT_CALL(*dMCommToolMock_, SendUserIds(_, _, _)).WillOnce(Return(ERR_DM_FAILED)); + DeviceManagerService::GetInstance().NotifyRemoteLocalUserSwitchByWifi(localUdid, wifiDevices, + foregroundUserIds, backgroundUserIds); + + GTEST_LOG_(INFO) << "NotifyRemoteLocalUserSwitchByWifi SendUserIds is ok" ; + EXPECT_CALL(*dMCommToolMock_, SendUserIds(_, _, _)).WillOnce(Return(DM_OK)); + DeviceManagerService::GetInstance().NotifyRemoteLocalUserSwitchByWifi(localUdid, wifiDevices, + foregroundUserIds, backgroundUserIds); + GTEST_LOG_(INFO) << "NotifyRemoteLocalUserSwitchByWifi end" ; + DeviceManagerService::GetInstance().softbusListener_ = nullptr; +} + HWTEST_F(DeviceManagerServiceTest, GetLocalServiceInfoByBundleNameAndPinExchangeType_201, testing::ext::TestSize.Level1) { @@ -1673,6 +1725,41 @@ HWTEST_F(DeviceManagerServiceTest, SetRemoteDeviceName_202, testing::ext::TestSi } HWTEST_F(DeviceManagerServiceTest, GetDeviceNetworkIdList_201, testing::ext::TestSize.Level1) +{ + std::string pkgName = "pkgName"; + NetworkIdQueryFilter queryFilter; + std::vector networkIds{"uehd*****87"}; + DeletePermission(); + int32_t ret = DeviceManagerService::GetInstance().GetDeviceNetworkIdList(pkgName, queryFilter, networkIds); + EXPECT_EQ(ret, ERR_DM_NO_PERMISSION); + + int32_t stopUserId = 1; + std::string stopEventUdid = "ud*********4"; + std::vector acceptEventUdids{"acc**********7"}; + DeviceManagerService::GetInstance().InitDMServiceListener(); + DeviceManagerService::GetInstance().HandleUserStop(stopUserId, stopEventUdid, acceptEventUdids); + DeviceManagerService::GetInstance().HandleUserStop(stopUserId, stopEventUdid); + + std::string localUdid = "local*******76"; + std::vector peerUdids; + DeviceManagerService::GetInstance().NotifyRemoteLocalUserStop(localUdid, peerUdids, stopUserId); + DeviceManagerService::GetInstance().softbusListener_ = std::make_shared(); + DeviceManagerService::GetInstance().SendUserStopBroadCast(peerUdids, stopUserId); + std::string remoteUdid = "re********7"; + DeviceManagerService::GetInstance().HandleUserStopBroadCast(stopUserId, remoteUdid); + + std::map wifiDevices; + wifiDevices.insert(std::make_pair("wikjdmcsk", "deviceInfowifi")); + EXPECT_CALL(*dMCommToolMock_, SendUserStop(_, _)).WillOnce(Return(ERR_DM_FAILED)); + DeviceManagerService::GetInstance().NotifyRemoteLocalUserStopByWifi(localUdid, wifiDevices, stopUserId); + + EXPECT_CALL(*dMCommToolMock_, SendUserStop(_, _)).WillOnce(Return(DM_OK)); + DeviceManagerService::GetInstance().NotifyRemoteLocalUserStopByWifi(localUdid, wifiDevices, stopUserId); + DeviceManagerService::GetInstance().UninitDMServiceListener(); + DeviceManagerService::GetInstance().softbusListener_ = nullptr; +} + +HWTEST_F(DeviceManagerServiceTest, GetDeviceNetworkIdList_202, testing::ext::TestSize.Level1) { std::string pkgName = "pkgName"; NetworkIdQueryFilter queryFilter; -- Gitee From a916e58a2d329c0c2d5d47e78cb0939a61fcee49 Mon Sep 17 00:00:00 2001 From: BrainL Date: Thu, 26 Jun 2025 17:50:10 +0800 Subject: [PATCH 3/3] modifyUT2_0626 Signed-off-by: BrainL --- test/unittest/mock/permission_manager_mock.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/test/unittest/mock/permission_manager_mock.cpp b/test/unittest/mock/permission_manager_mock.cpp index 709144ff5..becbab5e6 100644 --- a/test/unittest/mock/permission_manager_mock.cpp +++ b/test/unittest/mock/permission_manager_mock.cpp @@ -24,6 +24,7 @@ bool PermissionManager::CheckPermission() { return DmPermissionManager::dmPermissionManager->CheckPermission(); } + bool PermissionManager::CheckNewPermission() { return DmPermissionManager::dmPermissionManager->CheckNewPermission(); -- Gitee