From 53e608826be0799a69422b10a7ab32c569d31116 Mon Sep 17 00:00:00 2001 From: liuxiaowei42 Date: Fri, 4 Jul 2025 17:47:14 +0800 Subject: [PATCH 1/2] add ut Signed-off-by: liuxiaowei42 --- ...Test_dm_deviceprofile_connector_second.cpp | 2 +- .../UTTest_device_manager_service.cpp | 141 ++++++++++++++---- .../UTTest_device_manager_service_three.cpp | 39 +++++ .../UTTest_device_manager_service_two.cpp | 100 ++++++++++++- .../mock/device_manager_service_impl_mock.cpp | 14 ++ .../mock/device_manager_service_impl_mock.h | 8 + .../unittest/mock/permission_manager_mock.cpp | 10 ++ test/unittest/mock/permission_manager_mock.h | 4 + 8 files changed, 281 insertions(+), 37 deletions(-) diff --git a/test/commonunittest/UTTest_dm_deviceprofile_connector_second.cpp b/test/commonunittest/UTTest_dm_deviceprofile_connector_second.cpp index 10172634f..632006963 100644 --- a/test/commonunittest/UTTest_dm_deviceprofile_connector_second.cpp +++ b/test/commonunittest/UTTest_dm_deviceprofile_connector_second.cpp @@ -370,7 +370,7 @@ HWTEST_F(DeviceProfileConnectorSecondTest, GetUserIdAndBindLevel_002, testing::e { std::string localUdid = "local_udid"; std::string peerUdid = "peer_udid"; - EXPECT_CALL(*distributedDeviceProfileClientMock_, GetAllAccessControlProfile(_)).WillOnce(Return(DM_OK)); + EXPECT_CALL(*distributedDeviceProfileClientMock_, GetAllAccessControlProfile(_)).WillOnce(Return(DM_OK)); std::map result = connector.GetUserIdAndBindLevel(localUdid, peerUdid); EXPECT_TRUE(result.empty()); diff --git a/test/unittest/UTTest_device_manager_service.cpp b/test/unittest/UTTest_device_manager_service.cpp index 1a5576f52..620ece058 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; @@ -513,6 +524,7 @@ HWTEST_F(DeviceManagerServiceTest, AuthenticateDevice_001, testing::ext::TestSiz std::string extra = "jdddd"; int32_t authType = 1; std::string deviceId; + 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); } @@ -529,6 +541,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 +561,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 +608,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 +624,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 +640,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 +659,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 +676,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 +693,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 +728,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 +745,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 +762,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 +813,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 +830,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 +847,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 +876,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 +891,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 +921,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 +936,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 +966,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 +996,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 +1010,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 +1024,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 +1052,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 +1066,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 +1134,7 @@ HWTEST_F(DeviceManagerServiceTest, GetDeviceInfo_001, testing::ext::TestSize.Lev { std::string networkId = ""; DmDeviceInfo info; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().GetDeviceInfo(networkId, info); EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); } @@ -1112,6 +1149,7 @@ HWTEST_F(DeviceManagerServiceTest, GetDeviceInfo_002, testing::ext::TestSize.Lev { std::string networkId = "networkIdTest"; DmDeviceInfo info; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().GetDeviceInfo(networkId, info); EXPECT_EQ(ret, ERR_DM_POINT_NULL); } @@ -1138,6 +1176,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 +1237,7 @@ HWTEST_F(DeviceManagerServiceTest, BindDevice_001, testing::ext::TestSize.Level1 int32_t authType = 1; std::string deviceId; std::string bindParam; + EXPECT_CALL(*permissionManagerMock_, CheckNewPermission()).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().BindDevice(pkgName, authType, deviceId, bindParam); EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); } @@ -1208,6 +1248,7 @@ HWTEST_F(DeviceManagerServiceTest, BindDevice_002, testing::ext::TestSize.Level1 int32_t authType = 1; std::string deviceId; std::string bindParam; + EXPECT_CALL(*permissionManagerMock_, CheckNewPermission()).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().BindDevice(pkgName, authType, deviceId, bindParam); EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); } @@ -1221,6 +1262,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_, CheckNewPermission()).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().BindDevice(pkgName, authType, deviceId, bindParam); EXPECT_EQ(ret, ERR_DM_BIND_INPUT_PARA_INVALID); } @@ -1243,6 +1285,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_, CheckNewPermission()).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().UnBindDevice(pkgName, deviceId); EXPECT_NE(ret, DM_OK); DeviceManagerService::GetInstance().softbusListener_ = nullptr; @@ -1252,6 +1295,7 @@ HWTEST_F(DeviceManagerServiceTest, UnBindDevice_002, testing::ext::TestSize.Leve { std::string pkgName = "com.ohos.test"; std::string deviceId; + EXPECT_CALL(*permissionManagerMock_, CheckNewPermission()).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().UnBindDevice(pkgName, deviceId); EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); } @@ -1260,6 +1304,7 @@ HWTEST_F(DeviceManagerServiceTest, UnBindDevice_003, testing::ext::TestSize.Leve { std::string pkgName; std::string deviceId = "1234"; + EXPECT_CALL(*permissionManagerMock_, CheckNewPermission()).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().UnBindDevice(pkgName, deviceId); EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); } @@ -1281,8 +1326,9 @@ 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_, CheckNewPermission()).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().UnBindDevice(pkgName, deviceId, extra); - EXPECT_NE(ret, DM_OK); + EXPECT_EQ(ret, ERR_DM_POINT_NULL); DeviceManagerService::GetInstance().softbusListener_ = nullptr; } @@ -1291,6 +1337,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_, CheckNewPermission()).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().UnBindDevice(pkgName, deviceId, extra); EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); } @@ -1300,6 +1347,7 @@ HWTEST_F(DeviceManagerServiceTest, UnBindDevice_007, testing::ext::TestSize.Leve std::string pkgName; std::string deviceId = "1234"; std::string extra = "extra"; + EXPECT_CALL(*permissionManagerMock_, CheckNewPermission()).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().UnBindDevice(pkgName, deviceId, extra); EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); } @@ -1332,6 +1380,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 +1465,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); } @@ -1438,6 +1488,7 @@ HWTEST_F(DeviceManagerServiceTest, UnRegisterUiStateCallback_001, testing::ext:: HWTEST_F(DeviceManagerServiceTest, UnRegisterUiStateCallback_002, testing::ext::TestSize.Level1) { std::string pkgName = "pkgName"; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().UnRegisterUiStateCallback(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,7 @@ HWTEST_F(DeviceManagerServiceTest, StartDiscovering_002, testing::ext::TestSize. std::string pkgName; std::map discoverParam; std::map filterOptions; + 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 +1746,7 @@ HWTEST_F(DeviceManagerServiceTest, StartDiscovering_003, testing::ext::TestSize. std::map discoverParam; std::map filterOptions; DeviceManagerService::GetInstance().InitDMServiceListener(); + EXPECT_CALL(*permissionManagerMock_, CheckNewPermission()).WillRepeatedly(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 +1766,7 @@ 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_, CheckNewPermission()).WillRepeatedly(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 +1786,7 @@ HWTEST_F(DeviceManagerServiceTest, StopDiscovering_002, testing::ext::TestSize.L { std::string pkgName; std::map discoverParam; + 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 +1796,7 @@ HWTEST_F(DeviceManagerServiceTest, StopDiscovering_003, testing::ext::TestSize.L std::string pkgName = "pkgName"; std::map discoverParam; DeviceManagerService::GetInstance().InitDMServiceListener(); + 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 +1817,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); } @@ -1774,7 +1838,7 @@ HWTEST_F(DeviceManagerServiceTest, EnableDiscoveryListener_004, testing::ext::Te std::map filterOptions; DeviceManagerService::GetInstance().InitDMServiceListener(); int32_t ret = DeviceManagerService::GetInstance().EnableDiscoveryListener(pkgName, discoverParam, filterOptions); - EXPECT_NE(ret, ERR_DM_NO_PERMISSION); + EXPECT_EQ(ret, ERR_DM_NO_PERMISSION); DeviceManagerService::GetInstance().UninitDMServiceListener(); } @@ -1791,6 +1855,7 @@ HWTEST_F(DeviceManagerServiceTest, DisableDiscoveryListener_002, testing::ext::T { std::string pkgName; std::map extraParam; + EXPECT_CALL(*permissionManagerMock_, CheckNewPermission()).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().DisableDiscoveryListener(pkgName, extraParam); EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); } @@ -1799,6 +1864,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 +1874,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 +1893,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); } @@ -1857,6 +1925,7 @@ HWTEST_F(DeviceManagerServiceTest, StopAdvertising_002, testing::ext::TestSize.L { std::string pkgName; std::map advertiseParam; + EXPECT_CALL(*permissionManagerMock_, CheckNewPermission()).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().StopAdvertising(pkgName, advertiseParam); EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); } @@ -1865,6 +1934,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 +1944,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 +1982,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 +1995,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 +2015,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 +2042,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 +2066,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 +2090,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 +2107,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 +2117,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 +2127,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 +2147,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 +2167,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 +2176,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 +2216,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 +2248,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 +2261,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 +2281,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 +2293,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 +2304,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 +2324,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); } @@ -2296,6 +2386,7 @@ HWTEST_F(DeviceManagerServiceTest, GetNetworkIdByUdid_002, testing::ext::TestSiz std::string pkgName; std::string udid; std::string networkId = "networkIdTest_002"; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().GetNetworkIdByUdid(pkgName, udid, networkId); EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); } @@ -2307,6 +2398,7 @@ HWTEST_F(DeviceManagerServiceTest, GetNetworkIdByUdid_003, testing::ext::TestSiz std::string networkId = "networkIdTest_003"; EXPECT_CALL(*softbusCacheMock_, GetNetworkIdFromCache(_, _)) .WillOnce(Return(ERR_DM_FAILED)); + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().GetNetworkIdByUdid(pkgName, udid, networkId); EXPECT_EQ(ret, ERR_DM_FAILED); } @@ -2322,6 +2414,7 @@ HWTEST_F(DeviceManagerServiceTest, StopAuthenticateDevice_001, testing::ext::Tes HWTEST_F(DeviceManagerServiceTest, StopAuthenticateDevice_002, testing::ext::TestSize.Level1) { std::string pkgName; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().StopAuthenticateDevice(pkgName); EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); } @@ -2331,6 +2424,7 @@ HWTEST_F(DeviceManagerServiceTest, StopAuthenticateDevice_003, testing::ext::Tes std::string pkgName = "pkgName_003"; DeviceManagerService::GetInstance().isImplsoLoaded_ = false; DeviceManagerService::GetInstance().IsDMServiceImplReady(); + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); EXPECT_CALL(*deviceManagerServiceImplMock_, StopAuthenticateDevice(_)).WillOnce(Return(DM_OK)); int32_t ret = DeviceManagerService::GetInstance().StopAuthenticateDevice(pkgName); EXPECT_EQ(ret, DM_OK); @@ -2342,6 +2436,7 @@ HWTEST_F(DeviceManagerServiceTest, DestroyPinHolder_004, testing::ext::TestSize. PeerTargetId targetId; DmPinType pinType = DmPinType::QR_CODE; std::string payload; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); EXPECT_CALL(*permissionManagerMock_, GetCallerProcessName(_)).WillOnce(Return(DM_OK)); EXPECT_CALL(*permissionManagerMock_, CheckProcessNameValidOnPinHolder(_)).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().DestroyPinHolder(pkgName, targetId, pinType, payload); @@ -2354,6 +2449,7 @@ HWTEST_F(DeviceManagerServiceTest, DestroyPinHolder_005, testing::ext::TestSize. PeerTargetId targetId; DmPinType pinType = DmPinType::QR_CODE; std::string payload; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); EXPECT_CALL(*permissionManagerMock_, GetCallerProcessName(_)).WillOnce(Return(DM_OK)); EXPECT_CALL(*permissionManagerMock_, CheckProcessNameValidOnPinHolder(_)).WillOnce(Return(true)); if (DeviceManagerService::GetInstance().pinHolder_ == nullptr) { @@ -2369,6 +2465,7 @@ HWTEST_F(DeviceManagerServiceTest, CreatePinHolder_003, testing::ext::TestSize.L PeerTargetId targetId; DmPinType pinType = DmPinType::QR_CODE; std::string payload; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); EXPECT_CALL(*permissionManagerMock_, GetCallerProcessName(_)).WillOnce(Return(DM_OK)); EXPECT_CALL(*permissionManagerMock_, CheckProcessNameValidOnPinHolder(_)).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().CreatePinHolder(pkgName, targetId, pinType, payload); @@ -2381,6 +2478,7 @@ HWTEST_F(DeviceManagerServiceTest, CreatePinHolder_004, testing::ext::TestSize.L PeerTargetId targetId; DmPinType pinType = DmPinType::QR_CODE; std::string payload; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); EXPECT_CALL(*permissionManagerMock_, GetCallerProcessName(_)).WillOnce(Return(DM_OK)); EXPECT_CALL(*permissionManagerMock_, CheckProcessNameValidOnPinHolder(_)).WillOnce(Return(true)); if (DeviceManagerService::GetInstance().pinHolder_ == nullptr) { @@ -2393,6 +2491,7 @@ HWTEST_F(DeviceManagerServiceTest, CreatePinHolder_004, testing::ext::TestSize.L HWTEST_F(DeviceManagerServiceTest, RegisterPinHolderCallback_003, testing::ext::TestSize.Level1) { std::string pkgName; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); EXPECT_CALL(*permissionManagerMock_, GetCallerProcessName(_)).WillOnce(Return(DM_OK)); EXPECT_CALL(*permissionManagerMock_, CheckProcessNameValidOnPinHolder(_)).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().RegisterPinHolderCallback(pkgName); @@ -2402,6 +2501,7 @@ HWTEST_F(DeviceManagerServiceTest, RegisterPinHolderCallback_003, testing::ext:: HWTEST_F(DeviceManagerServiceTest, RegisterPinHolderCallback_004, testing::ext::TestSize.Level1) { std::string pkgName = "pkgName"; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); EXPECT_CALL(*permissionManagerMock_, GetCallerProcessName(_)).WillOnce(Return(DM_OK)); EXPECT_CALL(*permissionManagerMock_, CheckProcessNameValidOnPinHolder(_)).WillOnce(Return(true)); if (DeviceManagerService::GetInstance().pinHolder_ == nullptr) { @@ -2423,6 +2523,7 @@ HWTEST_F(DeviceManagerServiceTest, ShiftLNNGear_008, testing::ext::TestSize.Leve std::string callerId = "ShiftLNNGear_008"; 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; @@ -2433,6 +2534,7 @@ HWTEST_F(DeviceManagerServiceTest, ImportAuthCode_003, testing::ext::TestSize.Le { std::string pkgName = "pkgName"; std::string authCode; + EXPECT_CALL(*permissionManagerMock_, CheckNewPermission()).WillOnce(Return(true)); EXPECT_CALL(*permissionManagerMock_, GetCallerProcessName(_)).WillOnce(Return(DM_OK)); EXPECT_CALL(*permissionManagerMock_, CheckProcessNameValidOnAuthCode(_)).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().ImportAuthCode(pkgName, authCode); @@ -2443,6 +2545,7 @@ HWTEST_F(DeviceManagerServiceTest, ImportAuthCode_004, testing::ext::TestSize.Le { std::string pkgName = "pkgName"; std::string authCode = "authCode"; + EXPECT_CALL(*permissionManagerMock_, CheckNewPermission()).WillOnce(Return(true)); EXPECT_CALL(*permissionManagerMock_, GetCallerProcessName(_)).WillOnce(Return(DM_OK)); EXPECT_CALL(*permissionManagerMock_, CheckProcessNameValidOnAuthCode(_)).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().ImportAuthCode(pkgName, authCode); @@ -2452,6 +2555,7 @@ HWTEST_F(DeviceManagerServiceTest, ImportAuthCode_004, testing::ext::TestSize.Le HWTEST_F(DeviceManagerServiceTest, ExportAuthCode_003, testing::ext::TestSize.Level1) { std::string authCode = "authCode"; + EXPECT_CALL(*permissionManagerMock_, CheckNewPermission()).WillOnce(Return(true)); EXPECT_CALL(*permissionManagerMock_, GetCallerProcessName(_)).WillOnce(Return(DM_OK)); EXPECT_CALL(*permissionManagerMock_, CheckProcessNameValidOnAuthCode(_)).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().ExportAuthCode(authCode); @@ -2461,6 +2565,7 @@ HWTEST_F(DeviceManagerServiceTest, ExportAuthCode_003, testing::ext::TestSize.Le HWTEST_F(DeviceManagerServiceTest, IsSameAccount_004, testing::ext::TestSize.Level1) { std::string udid = "udidTest"; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); EXPECT_CALL(*softbusListenerMock_, GetUdidByNetworkId(_, _)).WillOnce(Return(DM_OK)); int32_t ret = DeviceManagerService::GetInstance().IsSameAccount(udid); EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); @@ -2471,6 +2576,7 @@ HWTEST_F(DeviceManagerServiceTest, GetDeviceSecurityLevel_006, testing::ext::Tes std::string pkgName = "com.ohos.test"; std::string invalidNetworkId = "networkId"; int32_t securityLevel = 0; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); DeviceManagerService::GetInstance().softbusListener_ = std::make_shared(); EXPECT_CALL(*softbusListenerMock_, GetDeviceSecurityLevel(_, _)).WillOnce(Return(DM_OK)); int32_t ret = DeviceManagerService::GetInstance().GetDeviceSecurityLevel(pkgName, invalidNetworkId, securityLevel); @@ -2492,37 +2598,6 @@ HWTEST_F(DeviceManagerServiceTest, GetEncryptedUuidByNetworkId_004, testing::ext DeviceManagerService::GetInstance().softbusListener_ = nullptr; EXPECT_EQ(ret, DM_OK); } - -#if !(defined(__LITEOS_M__) || defined(LITE_DEVICE)) -HWTEST_F(DeviceManagerServiceTest, ConvertUdidHashToAnoyDeviceId_001, testing::ext::TestSize.Level1) -{ - std::string udidHash; - std::string result; - EXPECT_CALL(*appManagerMock_, GetAppId()).WillOnce(Return("")); - int32_t ret = DeviceManagerService::GetInstance().ConvertUdidHashToAnoyDeviceId(udidHash, result); - EXPECT_EQ(ret, ERR_DM_FAILED); - EXPECT_CALL(*appManagerMock_, GetAppId()).WillOnce(Return("appId")); - EXPECT_CALL(*cryptoMock_, ConvertUdidHashToAnoyAndSave(_, _, _)).WillOnce(Return(DM_OK)); - ret = DeviceManagerService::GetInstance().ConvertUdidHashToAnoyDeviceId(udidHash, result); - EXPECT_EQ(ret, DM_OK); - EXPECT_CALL(*appManagerMock_, GetAppId()).WillOnce(Return("appId")); - EXPECT_CALL(*cryptoMock_, ConvertUdidHashToAnoyAndSave(_, _, _)).WillOnce(Return(ERR_DM_FAILED)); - ret = DeviceManagerService::GetInstance().ConvertUdidHashToAnoyDeviceId(udidHash, result); - EXPECT_EQ(ret, ERR_DM_FAILED); -} - -HWTEST_F(DeviceManagerServiceTest, GetUdidHashByAnoyDeviceId_001, testing::ext::TestSize.Level1) -{ - std::string udidHash; - std::string anoyDeviceId = "anoyDeviceId"; - EXPECT_CALL(*kVAdapterManagerMock_, Get(_, _)).WillOnce(Return(DM_OK)); - int32_t ret = DeviceManagerService::GetInstance().GetUdidHashByAnoyDeviceId(anoyDeviceId, udidHash); - EXPECT_EQ(ret, DM_OK); - EXPECT_CALL(*kVAdapterManagerMock_, Get(_, _)).WillOnce(Return(ERR_DM_FAILED)); - ret = DeviceManagerService::GetInstance().GetUdidHashByAnoyDeviceId(anoyDeviceId, udidHash); - EXPECT_EQ(ret, ERR_DM_FAILED); -} -#endif } // namespace } // namespace DistributedHardware } // namespace OHOS diff --git a/test/unittest/UTTest_device_manager_service_three.cpp b/test/unittest/UTTest_device_manager_service_three.cpp index ceb939adb..89d07048a 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); @@ -498,6 +529,7 @@ HWTEST_F(DeviceManagerServiceThreeTest, SetLocalDeviceName_301, testing::ext::Te { std::string pkgName = "pkgName"; std::string deviceName = "deviceName"; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); EXPECT_CALL(*permissionManagerMock_, GetCallerProcessName(_)).WillOnce(Return(DM_OK)); EXPECT_CALL(*permissionManagerMock_, CheckProcessNameValidModifyLocalDeviceName(_)).WillOnce(Return(true)); EXPECT_CALL(*deviceManagerServiceMock_, IsDMServiceAdapterResidentLoad()).WillOnce(Return(false)); @@ -510,6 +542,7 @@ HWTEST_F(DeviceManagerServiceThreeTest, SetRemoteDeviceName_301, testing::ext::T std::string pkgName = "pkgName"; std::string deviceName = "deviceName"; std::string deviceId = "d*********3"; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); EXPECT_CALL(*permissionManagerMock_, GetCallerProcessName(_)).WillOnce(Return(DM_OK)); EXPECT_CALL(*permissionManagerMock_, CheckProcessNameValidModifyRemoteDeviceName(_)).WillOnce(Return(true)); EXPECT_CALL(*deviceManagerServiceMock_, IsDMServiceAdapterResidentLoad()).WillOnce(Return(false)); @@ -522,6 +555,7 @@ HWTEST_F(DeviceManagerServiceThreeTest, GetDeviceNetworkIdList_301, testing::ext std::string pkgName = "pkgName"; NetworkIdQueryFilter queryFilter; std::vector networkIds{"uehd*****87"}; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); EXPECT_CALL(*deviceManagerServiceMock_, IsDMServiceAdapterResidentLoad()).WillOnce(Return(false)); int32_t ret = DeviceManagerService::GetInstance().GetDeviceNetworkIdList(pkgName, queryFilter, networkIds); EXPECT_EQ(ret, ERR_DM_UNSUPPORTED_METHOD); @@ -643,6 +677,7 @@ HWTEST_F(DeviceManagerServiceThreeTest, ImportAuthCode_302, testing::ext::TestSi { std::string pkgName; std::string authCode; + EXPECT_CALL(*permissionManagerMock_, CheckNewPermission()).WillOnce(Return(true)); EXPECT_CALL(*permissionManagerMock_, GetCallerProcessName(_)).WillOnce(Return(DM_OK)); EXPECT_CALL(*permissionManagerMock_, CheckProcessNameValidOnAuthCode(_)).WillOnce(Return(false)); int32_t ret = DeviceManagerService::GetInstance().ImportAuthCode(pkgName, authCode); @@ -653,6 +688,7 @@ HWTEST_F(DeviceManagerServiceThreeTest, ImportAuthCode_303, testing::ext::TestSi { std::string pkgName; std::string authCode; + EXPECT_CALL(*permissionManagerMock_, CheckNewPermission()).WillOnce(Return(true)); EXPECT_CALL(*permissionManagerMock_, GetCallerProcessName(_)).WillOnce(Return(ERR_DM_FAILED)); int32_t ret = DeviceManagerService::GetInstance().ImportAuthCode(pkgName, authCode); EXPECT_EQ(ret, ERR_DM_FAILED); @@ -662,6 +698,7 @@ HWTEST_F(DeviceManagerServiceThreeTest, ImportAuthCode_304, testing::ext::TestSi { std::string pkgName; std::string authCode; + EXPECT_CALL(*permissionManagerMock_, CheckNewPermission()).WillOnce(Return(true)); EXPECT_CALL(*permissionManagerMock_, GetCallerProcessName(_)).WillOnce(Return(DM_OK)); EXPECT_CALL(*permissionManagerMock_, CheckProcessNameValidOnAuthCode(_)).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().ImportAuthCode(pkgName, authCode); @@ -672,6 +709,7 @@ HWTEST_F(DeviceManagerServiceThreeTest, ValidateUnBindDeviceParams_301, testing: { std::string pkgName = "ohos.test.pkgName"; std::string deviceId = "deviceId"; + EXPECT_CALL(*permissionManagerMock_, CheckNewPermission()).WillOnce(Return(true)); EXPECT_CALL(*deviceManagerServiceMock_, IsDMServiceImplReady()).WillOnce(Return(ERR_DM_FAILED)); int32_t ret = DeviceManagerService::GetInstance().ValidateUnBindDeviceParams(pkgName, deviceId); EXPECT_EQ(ret, DM_OK); @@ -682,6 +720,7 @@ HWTEST_F(DeviceManagerServiceThreeTest, ValidateUnBindDeviceParams_302, testing: std::string pkgName = "ohos.test.pkgName"; std::string deviceId = "deviceId"; std::string extra; + EXPECT_CALL(*permissionManagerMock_, CheckNewPermission()).WillOnce(Return(true)); EXPECT_CALL(*deviceManagerServiceMock_, IsDMServiceImplReady()).WillOnce(Return(ERR_DM_FAILED)); int32_t ret = DeviceManagerService::GetInstance().ValidateUnBindDeviceParams(pkgName, deviceId, extra); EXPECT_EQ(ret, DM_OK); diff --git a/test/unittest/UTTest_device_manager_service_two.cpp b/test/unittest/UTTest_device_manager_service_two.cpp index e9f421ba6..072b0dc50 100644 --- a/test/unittest/UTTest_device_manager_service_two.cpp +++ b/test/unittest/UTTest_device_manager_service_two.cpp @@ -173,6 +173,7 @@ HWTEST_F(DeviceManagerServiceTest, IsDMImplSoLoaded_201, testing::ext::TestSize. HWTEST_F(DeviceManagerServiceTest, RegisterPinHolderCallback_201, testing::ext::TestSize.Level1) { std::string pkgName = "CollaborationFwk"; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); EXPECT_CALL(*permissionManagerMock_, GetCallerProcessName(_)).WillOnce(Return(DM_OK)); EXPECT_CALL(*permissionManagerMock_, CheckProcessNameValidOnPinHolder(_)).WillOnce(Return(false)); int32_t ret = DeviceManagerService::GetInstance().RegisterPinHolderCallback(pkgName); @@ -189,6 +190,7 @@ HWTEST_F(DeviceManagerServiceTest, CreatePinHolder_201, testing::ext::TestSize.L PeerTargetId targetId; DmPinType pinType = NUMBER_PIN_CODE; std::string payload; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); EXPECT_CALL(*permissionManagerMock_, GetCallerProcessName(_)).WillOnce(Return(DM_OK)); EXPECT_CALL(*permissionManagerMock_, CheckProcessNameValidOnPinHolder(_)).Times(::testing::AtLeast(1)). WillOnce(Return(false)); @@ -206,6 +208,7 @@ HWTEST_F(DeviceManagerServiceTest, GetDeviceSecurityLevel_201, testing::ext::Tes std::string networkId = "123"; int32_t securityLevel; DeviceManagerService::GetInstance().softbusListener_ = std::make_shared(); + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); EXPECT_CALL(*softbusListenerMock_, GetDeviceSecurityLevel(_, _)).WillOnce(Return(ERR_DM_FAILED)); int32_t ret = DeviceManagerService::GetInstance().GetDeviceSecurityLevel(pkgName, networkId, securityLevel); EXPECT_EQ(ret, ERR_DM_FAILED); @@ -220,7 +223,9 @@ HWTEST_F(DeviceManagerServiceTest, CheckAccessControl_201, testing::ext::TestSiz { DmAccessCaller caller; DmAccessCallee callee; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); EXPECT_CALL(*softbusListenerMock_, GetUdidByNetworkId(_, _)).WillOnce(Return(DM_OK)).WillOnce(Return(DM_OK)); + EXPECT_CALL(*deviceManagerServiceImplMock_, CheckAccessControl(_, _, _, _)).WillOnce(Return(true)); bool ret = DeviceManagerService::GetInstance().CheckAccessControl(caller, callee); EXPECT_EQ(ret, false); } @@ -246,7 +251,9 @@ HWTEST_F(DeviceManagerServiceTest, CheckIsSameAccount_201, testing::ext::TestSiz { DmAccessCaller caller; DmAccessCallee callee; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); EXPECT_CALL(*softbusListenerMock_, GetUdidByNetworkId(_, _)).WillOnce(Return(DM_OK)).WillOnce(Return(DM_OK)); + EXPECT_CALL(*deviceManagerServiceImplMock_, CheckIsSameAccount(_, _, _, _)).WillOnce(Return(true)); bool ret = DeviceManagerService::GetInstance().CheckIsSameAccount(caller, callee); EXPECT_EQ(ret, false); } @@ -327,6 +334,7 @@ HWTEST_F(DeviceManagerServiceTest, SetDnPolicy_201, testing::ext::TestSize.Level policy[PARAM_KEY_POLICY_STRATEGY_FOR_BLE] = "100"; policy[PARAM_KEY_POLICY_TIME_OUT] = "10"; std::string processName = "collaboration_service"; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); EXPECT_CALL(*permissionManagerMock_, GetCallerProcessName(_)) .WillOnce(DoAll(SetArgReferee<0>(processName), Return(DM_OK))); EXPECT_CALL(*permissionManagerMock_, CheckProcessNameValidOnSetDnPolicy(_)).WillOnce(Return(true)); @@ -350,6 +358,7 @@ HWTEST_F(DeviceManagerServiceTest, SetDnPolicy_202, testing::ext::TestSize.Level policy[PARAM_KEY_POLICY_STRATEGY_FOR_BLE] = "100"; policy[PARAM_KEY_POLICY_TIME_OUT] = "10"; std::string processName = "collaboration_service"; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); EXPECT_CALL(*permissionManagerMock_, GetCallerProcessName(_)) .WillOnce(DoAll(SetArgReferee<0>(processName), Return(DM_OK))); EXPECT_CALL(*permissionManagerMock_, CheckProcessNameValidOnSetDnPolicy(_)).WillOnce(Return(true)); @@ -368,6 +377,7 @@ HWTEST_F(DeviceManagerServiceTest, SetDnPolicy_203, testing::ext::TestSize.Level std::map policy; policy[PARAM_KEY_POLICY_TIME_OUT] = "10"; std::string processName = "collaboration_service"; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); EXPECT_CALL(*permissionManagerMock_, GetCallerProcessName(_)) .WillOnce(DoAll(SetArgReferee<0>(processName), Return(DM_OK))); EXPECT_CALL(*permissionManagerMock_, CheckProcessNameValidOnSetDnPolicy(_)).WillOnce(Return(true)); @@ -386,6 +396,7 @@ HWTEST_F(DeviceManagerServiceTest, SetDnPolicy_204, testing::ext::TestSize.Level std::map policy; policy[PARAM_KEY_POLICY_STRATEGY_FOR_BLE] = "100"; std::string processName = "collaboration_service"; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); EXPECT_CALL(*permissionManagerMock_, GetCallerProcessName(_)) .WillOnce(DoAll(SetArgReferee<0>(processName), Return(DM_OK))); EXPECT_CALL(*permissionManagerMock_, CheckProcessNameValidOnSetDnPolicy(_)).WillOnce(Return(true)); @@ -405,6 +416,7 @@ HWTEST_F(DeviceManagerServiceTest, SetDnPolicy_205, testing::ext::TestSize.Level policy[PARAM_KEY_POLICY_STRATEGY_FOR_BLE] = "a100"; policy[PARAM_KEY_POLICY_TIME_OUT] = "10"; std::string processName = "collaboration_service"; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); EXPECT_CALL(*permissionManagerMock_, GetCallerProcessName(_)) .WillOnce(DoAll(SetArgReferee<0>(processName), Return(DM_OK))); EXPECT_CALL(*permissionManagerMock_, CheckProcessNameValidOnSetDnPolicy(_)).WillOnce(Return(true)); @@ -424,6 +436,7 @@ HWTEST_F(DeviceManagerServiceTest, SetDnPolicy_206, testing::ext::TestSize.Level policy[PARAM_KEY_POLICY_STRATEGY_FOR_BLE] = "100a"; policy[PARAM_KEY_POLICY_TIME_OUT] = "10"; std::string processName = "collaboration_service"; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); EXPECT_CALL(*permissionManagerMock_, GetCallerProcessName(_)) .WillOnce(DoAll(SetArgReferee<0>(processName), Return(DM_OK))); EXPECT_CALL(*permissionManagerMock_, CheckProcessNameValidOnSetDnPolicy(_)).WillOnce(Return(true)); @@ -436,6 +449,7 @@ HWTEST_F(DeviceManagerServiceTest, GetDeviceScreenStatus_201, testing::ext::Test std::string pkgName = "com.ohos.screenStatusTest"; std::string networkId = ""; int32_t screenStatus = -1; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().GetDeviceScreenStatus(pkgName, networkId, screenStatus); ASSERT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); } @@ -445,6 +459,7 @@ HWTEST_F(DeviceManagerServiceTest, GetDeviceScreenStatus_202, testing::ext::Test std::string pkgName = ""; std::string networkId = "networkIdTest"; int32_t screenStatus = -1; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillRepeatedly(Return(true)); int32_t ret = DeviceManagerService::GetInstance().GetDeviceScreenStatus(pkgName, networkId, screenStatus); ASSERT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); @@ -518,10 +533,12 @@ HWTEST_F(DeviceManagerServiceTest, BindTarget_201, testing::ext::TestSize.Level1 std::string key = PARAM_KEY_TARGET_ID; std::string value = "186"; bindParam.insert(std::make_pair(key, value)); + EXPECT_CALL(*permissionManagerMock_, CheckNewPermission()).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().BindTarget(pkgName, targetId, bindParam); EXPECT_EQ(ret, DM_OK); targetId.wifiIp = "178.168.1.2"; + EXPECT_CALL(*permissionManagerMock_, CheckNewPermission()).WillOnce(Return(true)); EXPECT_CALL(*softbusListenerMock_, GetIPAddrTypeFromCache(_, _, _)).WillOnce(Return(DM_OK)); ret = DeviceManagerService::GetInstance().BindTarget(pkgName, targetId, bindParam); EXPECT_EQ(ret, DM_OK); @@ -532,6 +549,7 @@ HWTEST_F(DeviceManagerServiceTest, UnBindDevice_201, testing::ext::TestSize.Leve std::string pkgName = "com.ohos.test"; std::string deviceId = "123456"; DeviceManagerService::GetInstance().softbusListener_ = std::make_shared(); + EXPECT_CALL(*permissionManagerMock_, CheckNewPermission()).WillOnce(Return(true)); EXPECT_CALL(*kVAdapterManagerMock_, Get(_, _)).WillOnce(Return(DM_OK)); EXPECT_CALL(*softbusListenerMock_, GetUdidFromDp(_, _)).WillOnce(Return(DM_OK)); EXPECT_CALL(*deviceManagerServiceImplMock_, GetBindLevel(_, _, _, _)).WillOnce(Return(0)); @@ -545,24 +563,28 @@ HWTEST_F(DeviceManagerServiceTest, UnBindDevice_202, testing::ext::TestSize.Leve std::string pkgName = "com.ohos.test"; std::string deviceId = "123456"; DeviceManagerService::GetInstance().softbusListener_ = std::make_shared(); + EXPECT_CALL(*permissionManagerMock_, CheckNewPermission()).WillOnce(Return(true)); EXPECT_CALL(*kVAdapterManagerMock_, Get(_, _)).WillOnce(Return(DM_OK)); EXPECT_CALL(*softbusListenerMock_, GetUdidFromDp(_, _)).WillOnce(Return(DM_OK)); EXPECT_CALL(*deviceManagerServiceImplMock_, GetBindLevel(_, _, _, _)).WillOnce(Return(0)); int32_t ret = DeviceManagerService::GetInstance().UnBindDevice(pkgName, deviceId); - EXPECT_NE(ret, DM_OK); + EXPECT_NE(ret, ERR_DM_POINT_NULL); + EXPECT_CALL(*permissionManagerMock_, CheckNewPermission()).WillOnce(Return(true)); 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_NE(ret, ERR_DM_POINT_NULL); + EXPECT_CALL(*permissionManagerMock_, CheckNewPermission()).WillOnce(Return(true)); 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_NE(ret, ERR_DM_POINT_NULL); DeviceManagerService::GetInstance().softbusListener_ = nullptr; } @@ -600,17 +622,20 @@ HWTEST_F(DeviceManagerServiceTest, UnAuthenticateDevice_201, 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(DM_OK)); EXPECT_CALL(*deviceManagerServiceImplMock_, GetBindLevel(_, _, _, _)).WillOnce(Return(0)); int ret = DeviceManagerService::GetInstance().UnAuthenticateDevice(pkgName, networkId); EXPECT_EQ(ret, ERR_DM_FAILED); + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); EXPECT_CALL(*softbusListenerMock_, GetUdidByNetworkId(_, _)).WillOnce(Return(DM_OK)); EXPECT_CALL(*deviceManagerServiceImplMock_, GetBindLevel(_, _, _, _)).WillOnce(Return(1)); EXPECT_CALL(*deviceManagerServiceImplMock_, UnAuthenticateDevice(_, _, _)).WillOnce(Return(ERR_DM_FAILED)); ret = DeviceManagerService::GetInstance().UnAuthenticateDevice(pkgName, networkId); EXPECT_EQ(ret, ERR_DM_FAILED); + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); EXPECT_CALL(*softbusListenerMock_, GetUdidByNetworkId(_, _)).WillOnce(Return(DM_OK)); EXPECT_CALL(*deviceManagerServiceImplMock_, GetBindLevel(_, _, _, _)).WillOnce(Return(1)); EXPECT_CALL(*deviceManagerServiceImplMock_, UnAuthenticateDevice(_, _, _)).WillOnce(Return(DM_OK)); @@ -657,7 +682,8 @@ HWTEST_F(DeviceManagerServiceTest, BindDevice_205, testing::ext::TestSize.Level1 int32_t authType = 1; std::string deviceId = "1234"; std::string bindParam; - + EXPECT_CALL(*permissionManagerMock_, CheckNewPermission()).WillOnce(Return(true)); + EXPECT_CALL(*kVAdapterManagerMock_, Get(_, _)).Times(::testing::AtLeast(2)).WillRepeatedly(Return(DM_OK)); EXPECT_CALL(*softbusListenerMock_, GetTargetInfoFromCache(_, _, _)).WillOnce(Return(DM_OK)); int32_t ret = DeviceManagerService::GetInstance().BindDevice(pkgName, authType, deviceId, bindParam); EXPECT_EQ(ret, DM_OK); @@ -683,6 +709,7 @@ HWTEST_F(DeviceManagerServiceTest, AuthenticateDevice_205, testing::ext::TestSiz std::string extra = "jdddd"; int32_t authType = 0; std::string deviceId = " 2345"; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); EXPECT_CALL(*kVAdapterManagerMock_, Get(_, _)).Times(::testing::AtLeast(1)).WillOnce(Return(DM_OK)); EXPECT_CALL(*softbusListenerMock_, GetTargetInfoFromCache(_, _, _)).WillOnce(Return(DM_OK)); int32_t ret = DeviceManagerService::GetInstance().AuthenticateDevice(pkgName, authType, deviceId, extra); @@ -791,6 +818,7 @@ HWTEST_F(DeviceManagerServiceTest, GetTrustedDeviceList_205, testing::ext::TestS std::string pkgName; std::string extra = "extra"; std::vector deviceList; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillRepeatedly(Return(true)); int ret = DeviceManagerService::GetInstance().GetTrustedDeviceList(pkgName, extra, deviceList); EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); @@ -813,6 +841,7 @@ HWTEST_F(DeviceManagerServiceTest, GetTrustedDeviceList_205, testing::ext::TestS std::unordered_map udidMap; udidMap.insert(std::make_pair("udid01", DmAuthForm::IDENTICAL_ACCOUNT)); udidMap.insert(std::make_pair("udid02", DmAuthForm::ACROSS_ACCOUNT)); + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); EXPECT_CALL(*softbusListenerMock_, GetTrustedDeviceList(_)) .WillOnce(DoAll(SetArgReferee<0>(onlineDeviceList), Return(DM_OK))); EXPECT_CALL(*deviceManagerServiceImplMock_, GetAppTrustDeviceIdList(_)).WillOnce(Return(udidMap)); @@ -822,6 +851,7 @@ HWTEST_F(DeviceManagerServiceTest, GetTrustedDeviceList_205, testing::ext::TestS EXPECT_EQ(ret, DM_OK); pkgName = "ohos.deviceprofile"; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); EXPECT_CALL(*softbusListenerMock_, GetTrustedDeviceList(_)) .WillOnce(DoAll(SetArgReferee<0>(onlineDeviceList), Return(DM_OK))); EXPECT_CALL(*deviceManagerServiceImplMock_, GetAppTrustDeviceIdList(_)).WillOnce(Return(udidMap)); @@ -863,6 +893,7 @@ HWTEST_F(DeviceManagerServiceTest, SetDnPolicy_207, testing::ext::TestSize.Level policy[PARAM_KEY_POLICY_STRATEGY_FOR_BLE] = "100a"; policy[PARAM_KEY_POLICY_TIME_OUT] = "10"; std::string processName = "collaboration_service"; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillRepeatedly(Return(true)); EXPECT_CALL(*permissionManagerMock_, GetCallerProcessName(_)) .WillOnce(DoAll(SetArgReferee<0>(processName), Return(DM_OK))); EXPECT_CALL(*permissionManagerMock_, CheckProcessNameValidOnSetDnPolicy(_)).WillOnce(Return(true)); @@ -965,26 +996,31 @@ HWTEST_F(DeviceManagerServiceTest, UnBindDevice_204, testing::ext::TestSize.Leve std::string pkgName; std::string udidHash; std::string extra; + EXPECT_CALL(*permissionManagerMock_, CheckNewPermission()).WillOnce(Return(true)); int ret = DeviceManagerService::GetInstance().UnBindDevice(pkgName, udidHash, extra); EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); pkgName = "pkgName"; + EXPECT_CALL(*permissionManagerMock_, CheckNewPermission()).WillOnce(Return(true)); ret = DeviceManagerService::GetInstance().UnBindDevice(pkgName, udidHash, extra); EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); udidHash = "udidHash"; DeviceManagerService::GetInstance().softbusListener_ = std::make_shared(); + EXPECT_CALL(*permissionManagerMock_, CheckNewPermission()).WillOnce(Return(true)); 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_NE(ret, DM_OK); + EXPECT_CALL(*permissionManagerMock_, CheckNewPermission()).WillOnce(Return(true)); 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_NE(ret, DM_OK); + EXPECT_CALL(*permissionManagerMock_, CheckNewPermission()).WillOnce(Return(true)); EXPECT_CALL(*kVAdapterManagerMock_, Get(_, _)).WillOnce(Return(DM_OK)); EXPECT_CALL(*softbusListenerMock_, GetUdidFromDp(_, _)).WillOnce(Return(DM_OK)); EXPECT_CALL(*deviceManagerServiceImplMock_, GetBindLevel(_, _, _, _)).WillOnce(Return(1)); @@ -992,6 +1028,7 @@ HWTEST_F(DeviceManagerServiceTest, UnBindDevice_204, testing::ext::TestSize.Leve ret = DeviceManagerService::GetInstance().UnBindDevice(pkgName, udidHash, extra); EXPECT_NE(ret, DM_OK); + EXPECT_CALL(*permissionManagerMock_, CheckNewPermission()).WillOnce(Return(true)); EXPECT_CALL(*kVAdapterManagerMock_, Get(_, _)).WillOnce(Return(DM_OK)); EXPECT_CALL(*softbusListenerMock_, GetUdidFromDp(_, _)).WillOnce(Return(DM_OK)); EXPECT_CALL(*deviceManagerServiceImplMock_, GetBindLevel(_, _, _, _)).WillOnce(Return(1)); @@ -1007,6 +1044,7 @@ HWTEST_F(DeviceManagerServiceTest, UnBindDevice_205, testing::ext::TestSize.Leve std::string udidHash = "udidHash"; std::string extra = "extra"; DeviceManagerService::GetInstance().softbusListener_ = std::make_shared(); + EXPECT_CALL(*permissionManagerMock_, CheckNewPermission()).WillOnce(Return(true)); EXPECT_CALL(*kVAdapterManagerMock_, Get(_, _)).WillOnce(Return(DM_OK)); EXPECT_CALL(*softbusListenerMock_, GetUdidFromDp(_, _)).WillOnce(Return(DM_OK)); EXPECT_CALL(*deviceManagerServiceImplMock_, GetBindLevel(_, _, _, _)).WillOnce(Return(1)); @@ -1079,6 +1117,7 @@ HWTEST_F(DeviceManagerServiceTest, GetAnonyLocalUdid_202, testing::ext::TestSize { std::string pkgName; std::string anonyUdid; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().GetAnonyLocalUdid(pkgName, anonyUdid); EXPECT_EQ(ret, DM_OK); } @@ -1171,6 +1210,7 @@ HWTEST_F(DeviceManagerServiceTest, StopAuthenticateDevice_004, testing::ext::Tes { std::string pkgName = "pkgName_004"; EXPECT_CALL(*deviceManagerServiceImplMock_, StopAuthenticateDevice(_)).WillOnce(Return(ERR_DM_FAILED)); + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().StopAuthenticateDevice(pkgName); EXPECT_EQ(ret, ERR_DM_FAILED); } @@ -1242,18 +1282,22 @@ HWTEST_F(DeviceManagerServiceTest, RegisterAuthenticationType_202, testing::ext: std::string pkgName; std::map authParam; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().RegisterAuthenticationType(pkgName, authParam); EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); pkgName = "pkgName"; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); ret = DeviceManagerService::GetInstance().RegisterAuthenticationType(pkgName, authParam); EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); authParam.insert(std::make_pair(DM_AUTHENTICATION_TYPE, "authentication")); + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); ret = DeviceManagerService::GetInstance().RegisterAuthenticationType(pkgName, authParam); EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); authParam[DM_AUTHENTICATION_TYPE] = "123456"; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); ret = DeviceManagerService::GetInstance().RegisterAuthenticationType(pkgName, authParam); EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); @@ -1303,6 +1347,7 @@ HWTEST_F(DeviceManagerServiceTest, GetDeviceProfileInfoList_202, testing::ext::T { std::string pkgName = "pkgName"; OHOS::DistributedHardware::DmDeviceProfileInfoFilterOptions filterOptions; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().GetDeviceProfileInfoList(pkgName, filterOptions); EXPECT_EQ(ret, ERR_DM_UNSUPPORTED_METHOD); } @@ -1320,6 +1365,7 @@ HWTEST_F(DeviceManagerServiceTest, GetDeviceIconInfo_202, testing::ext::TestSize { std::string pkgName = "pkgName"; OHOS::DistributedHardware::DmDeviceIconInfoFilterOptions filterOptions; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().GetDeviceIconInfo(pkgName, filterOptions); EXPECT_EQ(ret, ERR_DM_UNSUPPORTED_METHOD); } @@ -1337,6 +1383,7 @@ HWTEST_F(DeviceManagerServiceTest, PutDeviceProfileInfoList_202, testing::ext::T { std::string pkgName = "pkgName"; std::vector deviceProfileInfoList; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); EXPECT_CALL(*permissionManagerMock_, CheckProcessNameValidPutDeviceProfileInfoList(_)).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().PutDeviceProfileInfoList(pkgName, deviceProfileInfoList); EXPECT_TRUE(ret == ERR_DM_UNSUPPORTED_METHOD || ret == ERR_DM_INPUT_PARA_INVALID); @@ -1375,6 +1422,7 @@ HWTEST_F(DeviceManagerServiceTest, GetLocalDisplayDeviceName_202, testing::ext:: std::string pkgName = "packName"; int32_t maxNameLength = 1; std::string displayName = "displayName"; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().GetLocalDisplayDeviceName(pkgName, maxNameLength, displayName); EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); } @@ -1390,6 +1438,7 @@ HWTEST_F(DeviceManagerServiceTest, GetAllTrustedDeviceList_201, testing::ext::Te std::string pkgName = ""; std::string extra = "extra"; std::vector deviceList; + EXPECT_CALL(*permissionManagerMock_, CheckNewPermission()).WillRepeatedly(Return(true)); int32_t ret = DeviceManagerService::GetInstance().GetAllTrustedDeviceList(pkgName, extra, deviceList); EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); @@ -1426,21 +1475,25 @@ HWTEST_F(DeviceManagerServiceTest, GetDeviceInfo_202, testing::ext::TestSize.Lev std::string networkId = "networkId"; DmDeviceInfo deviceInfo; DeviceManagerService::GetInstance().softbusListener_ = std::make_shared(); + EXPECT_CALL(*permissionManagerMock_, CheckNewPermission()).WillOnce(Return(true)); EXPECT_CALL(*softbusListenerMock_, GetUdidByNetworkId(_, _)) .WillOnce(DoAll(SetArgReferee<1>("peerDeviceId"), Return(DM_OK))); EXPECT_CALL(*softbusListenerMock_, GetDeviceInfo(_, _)).WillOnce(Return(DM_OK)); int32_t ret = DeviceManagerService::GetInstance().GetDeviceInfo(networkId, deviceInfo); EXPECT_EQ(ret, DM_OK); + EXPECT_CALL(*permissionManagerMock_, CheckNewPermission()).WillOnce(Return(true)); EXPECT_CALL(*softbusListenerMock_, GetUdidByNetworkId(_, _)) .WillOnce(DoAll(SetArgReferee<1>("peerDeviceId"), Return(DM_OK))); EXPECT_CALL(*softbusListenerMock_, GetDeviceInfo(_, _)).WillOnce(Return(ERR_DM_FAILED)); ret = DeviceManagerService::GetInstance().GetDeviceInfo(networkId, deviceInfo); EXPECT_EQ(ret, ERR_DM_FAILED); + EXPECT_CALL(*permissionManagerMock_, CheckNewPermission()).WillOnce(Return(true)); EXPECT_CALL(*softbusListenerMock_, GetUdidByNetworkId(_, _)) .WillOnce(DoAll(SetArgReferee<1>("peerDeviceId"), Return(DM_OK))); EXPECT_CALL(*softbusListenerMock_, GetDeviceInfo(_, _)).WillOnce(Return(DM_OK)); ret = DeviceManagerService::GetInstance().GetDeviceInfo(networkId, deviceInfo); EXPECT_EQ(ret, DM_OK); + EXPECT_CALL(*permissionManagerMock_, CheckNewPermission()).WillOnce(Return(true)); EXPECT_CALL(*softbusListenerMock_, GetUdidByNetworkId(_, _)) .WillOnce(DoAll(SetArgReferee<1>("peerDeviceId"), Return(DM_OK))); EXPECT_CALL(*softbusListenerMock_, GetDeviceInfo(_, _)) @@ -1448,6 +1501,7 @@ HWTEST_F(DeviceManagerServiceTest, GetDeviceInfo_202, testing::ext::TestSize.Lev .WillOnce(Return(DM_OK)); ret = DeviceManagerService::GetInstance().GetDeviceInfo(networkId, deviceInfo); EXPECT_EQ(ret, DM_OK); + EXPECT_CALL(*permissionManagerMock_, CheckNewPermission()).WillOnce(Return(true)); EXPECT_CALL(*softbusListenerMock_, GetUdidByNetworkId(_, _)) .WillOnce(DoAll(SetArgReferee<1>("peerDeviceId"), Return(DM_OK))); ret = DeviceManagerService::GetInstance().GetDeviceInfo(networkId, deviceInfo); @@ -1472,6 +1526,7 @@ HWTEST_F(DeviceManagerServiceTest, InitDPLocalServiceInfo_201, testing::ext::Tes HWTEST_F(DeviceManagerServiceTest, RegisterLocalServiceInfo_201, testing::ext::TestSize.Level1) { DMLocalServiceInfo serviceInfo; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); EXPECT_CALL(*deviceProfileConnectorMock_, PutLocalServiceInfo(_)).WillOnce(Return(DM_OK)); int32_t ret = DeviceManagerService::GetInstance().RegisterLocalServiceInfo(serviceInfo); EXPECT_EQ(ret, DM_OK); @@ -1494,6 +1549,7 @@ HWTEST_F(DeviceManagerServiceTest, UnRegisterLocalServiceInfo_201, testing::ext: { std::string bundleName = "bund******98"; int32_t pinExchangeType = 1; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); EXPECT_CALL(*deviceProfileConnectorMock_, DeleteLocalServiceInfo(_, _)).WillOnce(Return(DM_OK)); int32_t ret = DeviceManagerService::GetInstance().UnRegisterLocalServiceInfo(bundleName, pinExchangeType); EXPECT_EQ(ret, DM_OK); @@ -1502,6 +1558,7 @@ HWTEST_F(DeviceManagerServiceTest, UnRegisterLocalServiceInfo_201, testing::ext: HWTEST_F(DeviceManagerServiceTest, UpdateLocalServiceInfo_201, testing::ext::TestSize.Level1) { DMLocalServiceInfo serviceInfo; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); EXPECT_CALL(*deviceProfileConnectorMock_, UpdateLocalServiceInfo(_)).WillOnce(Return(DM_OK)); int32_t ret = DeviceManagerService::GetInstance().UpdateLocalServiceInfo(serviceInfo); EXPECT_EQ(ret, DM_OK); @@ -1557,6 +1614,7 @@ HWTEST_F(DeviceManagerServiceTest, GetLocalServiceInfoByBundleNameAndPinExchange std::string bundleName = "bund******98"; int32_t pinExchangeType = 1; DMLocalServiceInfo serviceInfo; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); EXPECT_CALL(*deviceProfileConnectorMock_, GetLocalServiceInfoByBundleNameAndPinExchangeType(_, _, _)) .WillOnce(Return(DM_OK)); int32_t ret = DeviceManagerService::GetInstance().GetLocalServiceInfoByBundleNameAndPinExchangeType(bundleName, @@ -1650,6 +1708,7 @@ HWTEST_F(DeviceManagerServiceTest, RestoreLocalDeviceName_201, testing::ext::Tes HWTEST_F(DeviceManagerServiceTest, RestoreLocalDeviceName_202, testing::ext::TestSize.Level1) { std::string pkgName = "pkgName"; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillRepeatedly(Return(true)); EXPECT_CALL(*permissionManagerMock_, GetCallerProcessName(_)).WillOnce(Return(ERR_DM_FAILED)); int32_t ret = DeviceManagerService::GetInstance().RestoreLocalDeviceName(pkgName); EXPECT_EQ(ret, ERR_DM_FAILED); @@ -1678,6 +1737,7 @@ HWTEST_F(DeviceManagerServiceTest, SetLocalDeviceName_202, testing::ext::TestSiz { std::string pkgName = "pkgName"; std::string deviceName = "deviceName"; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillRepeatedly(Return(true)); EXPECT_CALL(*permissionManagerMock_, GetCallerProcessName(_)).WillOnce(Return(ERR_DM_FAILED)); int32_t ret = DeviceManagerService::GetInstance().SetLocalDeviceName(pkgName, deviceName); EXPECT_EQ(ret, ERR_DM_FAILED); @@ -1708,6 +1768,7 @@ HWTEST_F(DeviceManagerServiceTest, SetRemoteDeviceName_202, testing::ext::TestSi std::string pkgName = "pkgName"; std::string deviceName = "deviceName"; std::string deviceId = "d*********9"; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillRepeatedly(Return(true)); EXPECT_CALL(*permissionManagerMock_, GetCallerProcessName(_)).WillOnce(Return(ERR_DM_FAILED)); int32_t ret = DeviceManagerService::GetInstance().SetRemoteDeviceName(pkgName, deviceId, deviceName); EXPECT_EQ(ret, ERR_DM_FAILED); @@ -1873,6 +1934,7 @@ HWTEST_F(DeviceManagerServiceTest, ValidateUnBindDeviceParams_201, testing::ext: { std::string pkgName = ""; std::string deviceId = ""; + EXPECT_CALL(*permissionManagerMock_, CheckNewPermission()).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().ValidateUnBindDeviceParams(pkgName, deviceId); EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); } @@ -1891,6 +1953,7 @@ HWTEST_F(DeviceManagerServiceTest, ValidateUnBindDeviceParams_203, testing::ext: std::string pkgName = ""; std::string deviceId = ""; std::string extra; + EXPECT_CALL(*permissionManagerMock_, CheckNewPermission()).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().ValidateUnBindDeviceParams(pkgName, deviceId, extra); EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); } @@ -1947,6 +2010,37 @@ HWTEST_F(DeviceManagerServiceTest, GetNotifyRemoteUnBindAppWay_002, testing::ext EXPECT_EQ(DeviceManagerService::GetInstance().softbusListener_, nullptr); } + +#if !(defined(__LITEOS_M__) || defined(LITE_DEVICE)) +HWTEST_F(DeviceManagerServiceTest, ConvertUdidHashToAnoyDeviceId_001, testing::ext::TestSize.Level1) +{ + std::string udidHash; + std::string result; + EXPECT_CALL(*appManagerMock_, GetAppId()).WillOnce(Return("")); + int32_t ret = DeviceManagerService::GetInstance().ConvertUdidHashToAnoyDeviceId(udidHash, result); + EXPECT_EQ(ret, ERR_DM_FAILED); + EXPECT_CALL(*appManagerMock_, GetAppId()).WillOnce(Return("appId")); + EXPECT_CALL(*cryptoMock_, ConvertUdidHashToAnoyAndSave(_, _, _)).WillOnce(Return(DM_OK)); + ret = DeviceManagerService::GetInstance().ConvertUdidHashToAnoyDeviceId(udidHash, result); + EXPECT_EQ(ret, DM_OK); + EXPECT_CALL(*appManagerMock_, GetAppId()).WillOnce(Return("appId")); + EXPECT_CALL(*cryptoMock_, ConvertUdidHashToAnoyAndSave(_, _, _)).WillOnce(Return(ERR_DM_FAILED)); + ret = DeviceManagerService::GetInstance().ConvertUdidHashToAnoyDeviceId(udidHash, result); + EXPECT_EQ(ret, ERR_DM_FAILED); +} + +HWTEST_F(DeviceManagerServiceTest, GetUdidHashByAnoyDeviceId_001, testing::ext::TestSize.Level1) +{ + std::string udidHash; + std::string anoyDeviceId = "anoyDeviceId"; + EXPECT_CALL(*kVAdapterManagerMock_, Get(_, _)).WillOnce(Return(DM_OK)); + int32_t ret = DeviceManagerService::GetInstance().GetUdidHashByAnoyDeviceId(anoyDeviceId, udidHash); + EXPECT_EQ(ret, DM_OK); + EXPECT_CALL(*kVAdapterManagerMock_, Get(_, _)).WillOnce(Return(ERR_DM_FAILED)); + ret = DeviceManagerService::GetInstance().GetUdidHashByAnoyDeviceId(anoyDeviceId, udidHash); + EXPECT_EQ(ret, ERR_DM_FAILED); +} +#endif } // namespace } // namespace DistributedHardware } // namespace OHOS diff --git a/test/unittest/mock/device_manager_service_impl_mock.cpp b/test/unittest/mock/device_manager_service_impl_mock.cpp index efd5f34ec..e939ec1b3 100644 --- a/test/unittest/mock/device_manager_service_impl_mock.cpp +++ b/test/unittest/mock/device_manager_service_impl_mock.cpp @@ -102,5 +102,19 @@ void DeviceManagerServiceImpl::HandleAppUnBindEvent(int32_t remoteUserId, const DmDeviceManagerServiceImpl::dmDeviceManagerServiceImpl->HandleAppUnBindEvent(remoteUserId, remoteUdid, tokenId, peerTokenId); } + +bool DeviceManagerServiceImpl::CheckAccessControl(const DmAccessCaller &caller, const std::string &srcUdid, + const DmAccessCallee &callee, const std::string &sinkUdid) +{ + return DmDeviceManagerServiceImpl::dmDeviceManagerServiceImpl->CheckAccessControl(caller, srcUdid, callee, + sinkUdid); +} + +bool DeviceManagerServiceImpl::CheckIsSameAccount(const DmAccessCaller &caller, const std::string &srcUdid, + const DmAccessCallee &callee, const std::string &sinkUdid) +{ + return DmDeviceManagerServiceImpl::dmDeviceManagerServiceImpl->CheckIsSameAccount(caller, srcUdid, callee, + sinkUdid); +} } // namespace DistributedHardware } // namespace OHOS \ No newline at end of file diff --git a/test/unittest/mock/device_manager_service_impl_mock.h b/test/unittest/mock/device_manager_service_impl_mock.h index 6a31d6008..a8d9e45a8 100644 --- a/test/unittest/mock/device_manager_service_impl_mock.h +++ b/test/unittest/mock/device_manager_service_impl_mock.h @@ -46,6 +46,10 @@ public: virtual void HandleAppUnBindEvent(int32_t remoteUserId, const std::string &remoteUdid, int32_t tokenId) = 0; virtual void HandleAppUnBindEvent(int32_t remoteUserId, const std::string &remoteUdid, int32_t tokenId, int32_t peerTokenId) = 0; + virtual bool CheckAccessControl(const DmAccessCaller &caller, const std::string &srcUdid, + const DmAccessCallee &callee, const std::string &sinkUdid) = 0; + virtual bool CheckIsSameAccount(const DmAccessCaller &caller, const std::string &srcUdid, + const DmAccessCallee &callee, const std::string &sinkUdid) = 0; public: static inline std::shared_ptr dmDeviceManagerServiceImpl = nullptr; }; @@ -69,6 +73,10 @@ public: MOCK_METHOD(void, HandleAppUnBindEvent, (int32_t remoteUserId, const std::string &remoteUdid, int32_t tokenId)); MOCK_METHOD(void, HandleAppUnBindEvent, (int32_t remoteUserId, const std::string &remoteUdid, int32_t tokenId, int32_t peerTokenId)); + MOCK_METHOD(bool, CheckAccessControl, (const DmAccessCaller &caller, const std::string &srcUdid, + const DmAccessCallee &callee, const std::string &sinkUdid)); + MOCK_METHOD(bool, CheckIsSameAccount, (const DmAccessCaller &caller, const std::string &srcUdid, + const DmAccessCallee &callee, const std::string &sinkUdid)); }; } } diff --git a/test/unittest/mock/permission_manager_mock.cpp b/test/unittest/mock/permission_manager_mock.cpp index 74a7f0d77..becbab5e6 100644 --- a/test/unittest/mock/permission_manager_mock.cpp +++ b/test/unittest/mock/permission_manager_mock.cpp @@ -20,6 +20,16 @@ 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 77fc56160aea05e6db882da835e4cdb1f355640f Mon Sep 17 00:00:00 2001 From: liuxiaowei42 Date: Fri, 4 Jul 2025 10:05:46 +0000 Subject: [PATCH 2/2] =?UTF-8?q?update=20test/unittest/UTTest=5Fdevice=5Fma?= =?UTF-8?q?nager=5Fservice=5Ftwo.cpp.=20=E5=88=A0=E9=99=A4=E5=A4=9A?= =?UTF-8?q?=E4=BD=99=E6=8D=A2=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: liuxiaowei42 --- test/unittest/UTTest_device_manager_service_two.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/test/unittest/UTTest_device_manager_service_two.cpp b/test/unittest/UTTest_device_manager_service_two.cpp index 072b0dc50..9bdccea3d 100644 --- a/test/unittest/UTTest_device_manager_service_two.cpp +++ b/test/unittest/UTTest_device_manager_service_two.cpp @@ -2008,7 +2008,6 @@ HWTEST_F(DeviceManagerServiceTest, GetNotifyRemoteUnBindAppWay_002, testing::ext DeviceManagerService::GetInstance().softbusListener_ = nullptr; DeviceManagerService::GetInstance().GetNotifyRemoteUnBindAppWay(userId, tokenId, wifiDevices, isBleWay); EXPECT_EQ(DeviceManagerService::GetInstance().softbusListener_, nullptr); - } #if !(defined(__LITEOS_M__) || defined(LITE_DEVICE)) -- Gitee