diff --git a/test/unittest/UTTest_device_manager_service.cpp b/test/unittest/UTTest_device_manager_service.cpp index c4e7f4be8efac95e6c34a929d20409295f022666..468c4d2c0ead701461c77f68184c0e51753f4c42 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; diff --git a/test/unittest/UTTest_device_manager_service_three.cpp b/test/unittest/UTTest_device_manager_service_three.cpp index f944566c4a842cddd234ea3549eb38d6d7938e85..f1031d97c1ffcc44f775dde5c51467ca1615717d 100644 --- a/test/unittest/UTTest_device_manager_service_three.cpp +++ b/test/unittest/UTTest_device_manager_service_three.cpp @@ -124,6 +124,7 @@ HWTEST_F(DeviceManagerServiceThreeTest, AuthenticateDevice_301, testing::ext::Te std::string extra = "jdddd"; int32_t authType = 1; std::string deviceId = "deviceId"; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); EXPECT_CALL(*deviceManagerServiceMock_, IsDMServiceImplReady()).WillOnce(Return(false)); int32_t ret = DeviceManagerService::GetInstance().AuthenticateDevice(pkgName, authType, deviceId, extra); EXPECT_EQ(ret, ERR_DM_NOT_INIT); @@ -140,6 +141,7 @@ HWTEST_F(DeviceManagerServiceThreeTest, UnAuthenticateDevice_301, testing::ext:: { std::string pkgName = "com.ohos.test"; std::string networkId = "12345"; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); EXPECT_CALL(*softbusListenerMock_, GetUdidByNetworkId(_, _)).WillOnce(Return(DM_OK)); EXPECT_CALL(*deviceManagerServiceMock_, IsDMServiceImplReady()).WillOnce(Return(false)); int ret = DeviceManagerService::GetInstance().UnAuthenticateDevice(pkgName, networkId); @@ -158,6 +160,7 @@ HWTEST_F(DeviceManagerServiceThreeTest, SetUserOperation_301, testing::ext::Test std::string pkgName = "pkgName"; int32_t action = 0; const std::string param = "extra"; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); EXPECT_CALL(*deviceManagerServiceMock_, IsDMServiceImplReady()).WillOnce(Return(false)); int ret = DeviceManagerService::GetInstance().SetUserOperation(pkgName, action, param); EXPECT_EQ(ret, ERR_DM_NOT_INIT); @@ -173,6 +176,7 @@ HWTEST_F(DeviceManagerServiceThreeTest, RequestCredential_301, testing::ext::Tes { const std::string reqJsonStr = "test"; std::string returnJsonStr = "returntest"; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); EXPECT_CALL(*deviceManagerServiceMock_, IsDMServiceImplReady()).WillOnce(Return(false)); int32_t ret = DeviceManagerService::GetInstance().RequestCredential(reqJsonStr, returnJsonStr); EXPECT_EQ(ret, ERR_DM_NOT_INIT); @@ -188,6 +192,7 @@ HWTEST_F(DeviceManagerServiceThreeTest, ImportCredential_301, testing::ext::Test { const std::string pkgName = "pkgNametest"; const std::string credentialInfo = "credentialInfotest"; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillRepeatedly(Return(true)); EXPECT_CALL(*deviceManagerServiceMock_, IsDMServiceImplReady()).WillOnce(Return(false)); int32_t ret = DeviceManagerService::GetInstance().ImportCredential(pkgName, credentialInfo); EXPECT_EQ(ret, ERR_DM_NOT_INIT); @@ -209,6 +214,7 @@ HWTEST_F(DeviceManagerServiceThreeTest, DeleteCredential_301, testing::ext::Test { const std::string pkgName = "pkgNametest"; const std::string deleteInfo = "deleteInfotest"; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); EXPECT_CALL(*deviceManagerServiceMock_, IsDMServiceImplReady()).WillOnce(Return(false)); int32_t ret = DeviceManagerService::GetInstance().DeleteCredential(pkgName, deleteInfo); EXPECT_EQ(ret, ERR_DM_NOT_INIT); @@ -223,6 +229,7 @@ HWTEST_F(DeviceManagerServiceThreeTest, DeleteCredential_301, testing::ext::Test HWTEST_F(DeviceManagerServiceThreeTest, RegisterCredentialCallback_301, testing::ext::TestSize.Level1) { const std::string pkgName = "pkgNametest"; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); EXPECT_CALL(*deviceManagerServiceMock_, IsDMServiceImplReady()).WillOnce(Return(false)); int32_t ret = DeviceManagerService::GetInstance().RegisterCredentialCallback(pkgName); EXPECT_EQ(ret, ERR_DM_NOT_INIT); @@ -234,6 +241,7 @@ HWTEST_F(DeviceManagerServiceThreeTest, BindDevice_301, testing::ext::TestSize.L int32_t authType = 1; std::string deviceId = "1234"; std::string bindParam; + EXPECT_CALL(*permissionManagerMock_, CheckNewPermission()).WillOnce(Return(true)); EXPECT_CALL(*deviceManagerServiceMock_, IsDMServiceImplReady()).WillOnce(Return(false)); int32_t ret = DeviceManagerService::GetInstance().BindDevice(pkgName, authType, deviceId, bindParam); EXPECT_EQ(ret, ERR_DM_NOT_INIT); @@ -243,6 +251,7 @@ HWTEST_F(DeviceManagerServiceThreeTest, UnBindDevice_301, testing::ext::TestSize { std::string pkgName = "com.ohos.test"; std::string deviceId = "1234"; + EXPECT_CALL(*permissionManagerMock_, CheckNewPermission()).WillOnce(Return(true)); EXPECT_CALL(*deviceManagerServiceMock_, IsDMServiceImplReady()).WillOnce(Return(false)); int32_t ret = DeviceManagerService::GetInstance().UnBindDevice(pkgName, deviceId); EXPECT_EQ(ret, ERR_DM_NOT_INIT); @@ -253,6 +262,7 @@ HWTEST_F(DeviceManagerServiceThreeTest, MineRequestCredential_301, testing::ext: DeviceManagerService::GetInstance().isImplsoLoaded_ = false; std::string pkgName; std::string returnJsonStr; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); EXPECT_CALL(*deviceManagerServiceMock_, IsDMServiceImplReady()).WillOnce(Return(false)); int32_t ret = DeviceManagerService::GetInstance().MineRequestCredential(pkgName, returnJsonStr); EXPECT_EQ(ret, ERR_DM_NOT_INIT); @@ -263,6 +273,7 @@ HWTEST_F(DeviceManagerServiceThreeTest, CheckCredential_301, testing::ext::TestS std::string pkgName; std::string returnJsonStr; std::string reqJsonStr; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); EXPECT_CALL(*deviceManagerServiceMock_, IsDMServiceImplReady()).WillOnce(Return(false)); int32_t ret = DeviceManagerService::GetInstance().CheckCredential(pkgName, reqJsonStr, returnJsonStr); EXPECT_EQ(ret, ERR_DM_NOT_INIT); @@ -271,6 +282,7 @@ HWTEST_F(DeviceManagerServiceThreeTest, CheckCredential_301, testing::ext::TestS HWTEST_F(DeviceManagerServiceThreeTest, RegisterUiStateCallback_301, testing::ext::TestSize.Level1) { std::string pkgName = "pkgName"; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); EXPECT_CALL(*deviceManagerServiceMock_, IsDMServiceImplReady()).WillOnce(Return(false)); int32_t ret = DeviceManagerService::GetInstance().RegisterUiStateCallback(pkgName); EXPECT_EQ(ret, ERR_DM_NOT_INIT); @@ -279,6 +291,7 @@ HWTEST_F(DeviceManagerServiceThreeTest, RegisterUiStateCallback_301, testing::ex HWTEST_F(DeviceManagerServiceThreeTest, UnRegisterUiStateCallback_301, testing::ext::TestSize.Level1) { std::string pkgName = "pkgName"; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); EXPECT_CALL(*deviceManagerServiceMock_, IsDMServiceImplReady()).WillOnce(Return(false)); int32_t ret = DeviceManagerService::GetInstance().UnRegisterUiStateCallback(pkgName); EXPECT_EQ(ret, ERR_DM_NOT_INIT); @@ -289,6 +302,7 @@ HWTEST_F(DeviceManagerServiceThreeTest, NotifyEvent_301, testing::ext::TestSize. std::string pkgName; int32_t eventId = 0; std::string event; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); EXPECT_CALL(*deviceManagerServiceMock_, IsDMServiceImplReady()).WillOnce(Return(false)); int32_t ret = DeviceManagerService::GetInstance().NotifyEvent(pkgName, eventId, event); EXPECT_EQ(ret, ERR_DM_NOT_INIT); @@ -299,11 +313,13 @@ HWTEST_F(DeviceManagerServiceThreeTest, BindTarget_301, testing::ext::TestSize.L std::string pkgName = "pkgName"; PeerTargetId targetId; std::map bindParam; + EXPECT_CALL(*permissionManagerMock_, CheckNewPermission()).WillOnce(Return(true)); EXPECT_CALL(*deviceManagerServiceMock_, IsDMServiceImplReady()).WillOnce(Return(false)); int32_t ret = DeviceManagerService::GetInstance().BindTarget(pkgName, targetId, bindParam); EXPECT_EQ(ret, ERR_DM_NOT_INIT); bindParam.insert(std::make_pair(PARAM_KEY_META_TYPE, pkgName)); + EXPECT_CALL(*permissionManagerMock_, CheckNewPermission()).WillOnce(Return(true)); EXPECT_CALL(*deviceManagerServiceMock_, IsDMServiceAdapterResidentLoad()).WillOnce(Return(false)); ret = DeviceManagerService::GetInstance().BindTarget(pkgName, targetId, bindParam); EXPECT_EQ(ret, ERR_DM_UNSUPPORTED_METHOD); @@ -312,6 +328,7 @@ HWTEST_F(DeviceManagerServiceThreeTest, BindTarget_301, testing::ext::TestSize.L HWTEST_F(DeviceManagerServiceThreeTest, DpAclAdd_301, testing::ext::TestSize.Level1) { std::string udid = "udid"; + EXPECT_CALL(*permissionManagerMock_, CheckNewPermission()).WillOnce(Return(true)); EXPECT_CALL(*deviceManagerServiceMock_, IsDMServiceImplReady()).WillOnce(Return(false)); int32_t ret = DeviceManagerService::GetInstance().DpAclAdd(udid); EXPECT_EQ(ret, ERR_DM_NOT_INIT); @@ -320,6 +337,7 @@ HWTEST_F(DeviceManagerServiceThreeTest, DpAclAdd_301, testing::ext::TestSize.Lev HWTEST_F(DeviceManagerServiceThreeTest, IsSameAccount_301, testing::ext::TestSize.Level1) { std::string udid = "udidTest"; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); EXPECT_CALL(*softbusListenerMock_, GetUdidByNetworkId(_, _)).WillOnce(Return(DM_OK)); EXPECT_CALL(*deviceManagerServiceMock_, IsDMServiceImplReady()).WillOnce(Return(false)); int32_t ret = DeviceManagerService::GetInstance().IsSameAccount(udid); @@ -330,6 +348,7 @@ HWTEST_F(DeviceManagerServiceThreeTest, CheckIsSameAccount_301, testing::ext::Te { DmAccessCaller caller; DmAccessCallee callee; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); EXPECT_CALL(*deviceManagerServiceMock_, IsDMServiceImplReady()).WillOnce(Return(false)); bool ret = DeviceManagerService::GetInstance().CheckIsSameAccount(caller, callee); EXPECT_FALSE(ret); @@ -339,6 +358,7 @@ HWTEST_F(DeviceManagerServiceThreeTest, CheckAccessControl_301, testing::ext::Te { DmAccessCaller caller; DmAccessCallee callee; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); EXPECT_CALL(*deviceManagerServiceMock_, IsDMServiceImplReady()).WillOnce(Return(false)); bool ret = DeviceManagerService::GetInstance().CheckAccessControl(caller, callee); EXPECT_FALSE(ret); @@ -347,6 +367,7 @@ HWTEST_F(DeviceManagerServiceThreeTest, CheckAccessControl_301, testing::ext::Te HWTEST_F(DeviceManagerServiceThreeTest, StopAuthenticateDevice_301, testing::ext::TestSize.Level1) { std::string pkgName = "pkgName_003"; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); EXPECT_CALL(*deviceManagerServiceMock_, IsDMServiceImplReady()).WillOnce(Return(false)); int32_t ret = DeviceManagerService::GetInstance().StopAuthenticateDevice(pkgName); EXPECT_EQ(ret, ERR_DM_NOT_INIT); @@ -356,6 +377,7 @@ HWTEST_F(DeviceManagerServiceThreeTest, ImportAuthCode_301, testing::ext::TestSi { std::string pkgName = "pkgName"; std::string authCode = "authCode"; + EXPECT_CALL(*permissionManagerMock_, CheckNewPermission()).WillRepeatedly(Return(true)); EXPECT_CALL(*permissionManagerMock_, GetCallerProcessName(_)).WillOnce(Return(DM_OK)); EXPECT_CALL(*permissionManagerMock_, CheckProcessNameValidOnAuthCode(_)).WillOnce(Return(true)); EXPECT_CALL(*deviceManagerServiceMock_, IsDMServiceImplReady()).WillOnce(Return(false)); @@ -376,6 +398,7 @@ HWTEST_F(DeviceManagerServiceThreeTest, ImportAuthCode_301, testing::ext::TestSi HWTEST_F(DeviceManagerServiceThreeTest, ExportAuthCode_301, testing::ext::TestSize.Level1) { std::string authCode = "authCode"; + EXPECT_CALL(*permissionManagerMock_, CheckNewPermission()).WillRepeatedly(Return(true)); EXPECT_CALL(*permissionManagerMock_, GetCallerProcessName(_)).WillOnce(Return(DM_OK)); EXPECT_CALL(*permissionManagerMock_, CheckProcessNameValidOnAuthCode(_)).WillOnce(Return(true)); EXPECT_CALL(*deviceManagerServiceMock_, IsDMServiceImplReady()).WillOnce(Return(false)); @@ -402,6 +425,7 @@ HWTEST_F(DeviceManagerServiceThreeTest, UnbindTarget_301, testing::ext::TestSize std::string pkgName = "pkgName"; PeerTargetId targetId; std::map unbindParam; + EXPECT_CALL(*permissionManagerMock_, CheckNewPermission()).WillOnce(Return(true)); EXPECT_CALL(*deviceManagerServiceMock_, IsDMServiceAdapterResidentLoad()).WillOnce(Return(false)); int32_t ret = DeviceManagerService::GetInstance().UnbindTarget(pkgName, targetId, unbindParam); EXPECT_EQ(ret, ERR_DM_UNSUPPORTED_METHOD); @@ -415,6 +439,7 @@ HWTEST_F(DeviceManagerServiceThreeTest, SetDnPolicy_301, testing::ext::TestSize. policy[PARAM_KEY_POLICY_STRATEGY_FOR_BLE] = "100"; policy[PARAM_KEY_POLICY_TIME_OUT] = "10"; std::string processName = "collaboration_service"; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillRepeatedly(Return(true)); EXPECT_CALL(*permissionManagerMock_, GetCallerProcessName(_)) .WillRepeatedly(DoAll(SetArgReferee<0>(processName), Return(DM_OK))); EXPECT_CALL(*permissionManagerMock_, CheckProcessNameValidOnSetDnPolicy(_)).WillOnce(Return(true)); @@ -432,6 +457,7 @@ HWTEST_F(DeviceManagerServiceThreeTest, UnBindDevice_302, testing::ext::TestSize std::string pkgName = "com.ohos.test"; std::string deviceId = "1234"; std::string extra; + EXPECT_CALL(*permissionManagerMock_, CheckNewPermission()).WillOnce(Return(true)); EXPECT_CALL(*deviceManagerServiceMock_, IsDMServiceImplReady()).WillOnce(Return(false)); int32_t ret = DeviceManagerService::GetInstance().UnBindDevice(pkgName, deviceId, extra); EXPECT_EQ(ret, ERR_DM_NOT_INIT); @@ -442,6 +468,7 @@ HWTEST_F(DeviceManagerServiceThreeTest, RegisterAuthenticationType_301, testing: std::string pkgName = "pkgName"; std::map authParam; authParam.insert(std::make_pair(DM_AUTHENTICATION_TYPE, "123456")); + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); EXPECT_CALL(*deviceManagerServiceMock_, IsDMServiceImplReady()).WillOnce(Return(false)); int32_t ret = DeviceManagerService::GetInstance().RegisterAuthenticationType(pkgName, authParam); EXPECT_EQ(ret, ERR_DM_INIT_FAILED); @@ -451,6 +478,7 @@ HWTEST_F(DeviceManagerServiceThreeTest, GetDeviceProfileInfoList_301, testing::e { std::string pkgName = "pkgName"; DmDeviceProfileInfoFilterOptions filterOptions; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); EXPECT_CALL(*deviceManagerServiceMock_, IsDMServiceAdapterResidentLoad()).WillOnce(Return(false)); int32_t ret = DeviceManagerService::GetInstance().GetDeviceProfileInfoList(pkgName, filterOptions); EXPECT_EQ(ret, ERR_DM_UNSUPPORTED_METHOD); @@ -460,6 +488,7 @@ HWTEST_F(DeviceManagerServiceThreeTest, GetDeviceIconInfo_301, testing::ext::Tes { std::string pkgName = "pkgName"; DmDeviceIconInfoFilterOptions filterOptions; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); EXPECT_CALL(*deviceManagerServiceMock_, IsDMServiceAdapterResidentLoad()).WillOnce(Return(false)); int32_t ret = DeviceManagerService::GetInstance().GetDeviceIconInfo(pkgName, filterOptions); EXPECT_EQ(ret, ERR_DM_UNSUPPORTED_METHOD); @@ -470,6 +499,7 @@ HWTEST_F(DeviceManagerServiceThreeTest, GetDeviceInfo_301, testing::ext::TestSiz std::string networkId = "networkId"; DmDeviceInfo deviceInfo; DeviceManagerService::GetInstance().softbusListener_ = std::make_shared(); + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); EXPECT_CALL(*softbusListenerMock_, GetUdidByNetworkId(_, _)).WillOnce(Return(DM_OK)); EXPECT_CALL(*deviceManagerServiceMock_, IsDMServiceImplReady()).WillOnce(Return(false)); int32_t ret = DeviceManagerService::GetInstance().GetDeviceInfo(networkId, deviceInfo); @@ -481,6 +511,7 @@ HWTEST_F(DeviceManagerServiceThreeTest, PutDeviceProfileInfoList_301, testing::e { std::string pkgName = "pkgName"; std::vector deviceProfileInfoList; + EXPECT_CALL(*permissionManagerMock_, CheckPermission()).WillOnce(Return(true)); EXPECT_CALL(*deviceManagerServiceMock_, IsDMServiceAdapterResidentLoad()).WillOnce(Return(false)); EXPECT_CALL(*permissionManagerMock_, CheckProcessNameValidPutDeviceProfileInfoList(_)).WillOnce(Return(true)); int32_t ret = DeviceManagerService::GetInstance().PutDeviceProfileInfoList(pkgName, deviceProfileInfoList); diff --git a/test/unittest/mock/permission_manager_mock.cpp b/test/unittest/mock/permission_manager_mock.cpp index 74a7f0d77f207ae76a75532ed902356e27d4c96a..e0df111eefe2afe6740f9633a13fd781043219f1 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(void) +{ + return DmPermissionManager::dmPermissionManager->CheckPermission(); +} + +bool PermissionManager::CheckNewPermission(void) +{ + 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 ef8f53df878e193847db412447acfa7082f9a8cb..b2f8caaddca34fa7150c036f652d316decd7b68c 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(void) = 0; + virtual bool CheckNewPermission(void) = 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 &));