From 18cf7d0e52af4c41d1138dbe9495f488acdae07e Mon Sep 17 00:00:00 2001 From: "@shi-xiaoxiao-iris" Date: Tue, 5 Jul 2022 15:03:05 +0800 Subject: [PATCH 1/5] =?UTF-8?q?[=E9=9C=80=E6=B1=82]=E5=87=AD=E6=8D=AE?= =?UTF-8?q?=E7=AE=A1=E7=90=86TDD=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: @shi-xiaoxiao-iris --- test/unittest/UTTest_device_manager_impl.cpp | 446 +++++++++++++++++++ test/unittest/UTTest_device_manager_impl.h | 6 + 2 files changed, 452 insertions(+) diff --git a/test/unittest/UTTest_device_manager_impl.cpp b/test/unittest/UTTest_device_manager_impl.cpp index 1b5d01705..217023dd8 100644 --- a/test/unittest/UTTest_device_manager_impl.cpp +++ b/test/unittest/UTTest_device_manager_impl.cpp @@ -2507,6 +2507,452 @@ HWTEST_F(DeviceManagerImplTest, UnRegisterDevStateCallback_010, testing::ext::Te ASSERT_EQ(ret, DM_OK); DeviceManagerImpl::GetInstance().ipcClientProxy_ = nullptr; } + +/** + * @tc.name: RequestCredential_001 + * @tc.desc: 1. set packName null + * set reqJsonStr null + * 2. call DeviceManagerImpl::RequestCredential with parameter + * 3. check ret is ERR_DM_INPUT_PARAMETER_EMPTY + * deviceTypeId + * @tc.type: FUNC + * @tc.require: AR000GHSJK + */ +HWTEST_F(DeviceManagerImplTest, RequestCredential_001, testing::ext::TestSize.Level0) +{ + std::string packName; + std::string reqJsonStr; + std::string returnJsonStr; + int32_t ret= DeviceManager::GetInstance().RequestCredential(packName, reqJsonStr, + returnJsonStr); + ASSERT_EQ(ret, ERR_DM_INPUT_PARAMETER_EMPTY); +} + +/** + * @tc.name: RequestCredential_002 + * @tc.desc: 1. set packName not null + * set reqJsonStr not null + * 2. MOCK IpcClientProxy SendRequest return ERR_DM_IPC_SEND_REQUEST_FAILED + * 3. call DeviceManagerImpl::RequestCredential with parameter + * 4. check ret is ERR_DM_IPC_SEND_REQUEST_FAILED + * deviceTypeId + * @tc.type: FUNC + * @tc.require: AR000GHSJK + */ +HWTEST_F(DeviceManagerImplTest, RequestCredential_002, testing::ext::TestSize.Level0) +{ + std::string packName = "com.ohos.test"; + std::string reqJsonStr = R"({"version":"1.0.0.1","userId":"123"})"; + std::string returnJsonStr; + std::shared_ptr mockInstance = std::make_shared(); + DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; + EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + .Times(1).WillOnce(testing::Return(ERR_DM_IPC_SEND_REQUEST_FAILED)); + int32_t ret= DeviceManager::GetInstance().RequestCredential(packName, reqJsonStr, + returnJsonStr); + ASSERT_EQ(ret, ERR_DM_IPC_SEND_REQUEST_FAILED); + DeviceManagerImpl::GetInstance().ipcClientProxy_ = nullptr; +} + +/** + * @tc.name: RequestCredential_003 + * @tc.desc: 1. set packName not null + * set reqJsonStr not null + * 2. MOCK IpcClientProxy SendRequest return DM_OK + * 3. call DeviceManagerImpl::RequestCredential with parameter + * 4. check ret is DM_OK + * deviceTypeId + * @tc.type: FUNC + * @tc.require: AR000GHSJK + */ +HWTEST_F(DeviceManagerImplTest, RequestCredential_003, testing::ext::TestSize.Level0) +{ + std::string packName = "com.ohos.test"; + std::string reqJsonStr = R"({"version":"1.0.0.1","userId":"123"})"; + std::string returnJsonStr; + std::shared_ptr mockInstance = std::make_shared(); + DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; + EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + .Times(1).WillOnce(testing::Return(DM_OK)); + int32_t ret= DeviceManager::GetInstance().RequestCredential(packName, reqJsonStr, + returnJsonStr); + ASSERT_EQ(ret, DM_OK); + DeviceManagerImpl::GetInstance().ipcClientProxy_ = nullptr; +} + +/** + * @tc.name: RequestCredential_004 + * @tc.desc: 1. set packName not null + * set reqJsonStr not null + * 2. MOCK IpcClientProxy SendRequest return ERR_DM_INIT_FAILED + * 3. call DeviceManagerImpl::RequestCredential with parameter + * 4. check ret is ERR_DM_IPC_SEND_REQUEST_FAILED + * deviceTypeId + * @tc.type: FUNC + * @tc.require: AR000GHSJK + */ +HWTEST_F(DeviceManagerImplTest, RequestCredential_004, testing::ext::TestSize.Level0) +{ + std::string packName = "com.ohos.test"; + std::string reqJsonStr = R"({"version":"1.0.0.1","userId":"123"})"; + std::string returnJsonStr; + std::shared_ptr mockInstance = std::make_shared(); + DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; + EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + .Times(1).WillOnce(testing::Return(ERR_DM_INIT_FAILED)); + int32_t ret= DeviceManager::GetInstance().RequestCredential(packName, reqJsonStr, + returnJsonStr); + ASSERT_EQ(ret, ERR_DM_IPC_SEND_REQUEST_FAILED); + DeviceManagerImpl::GetInstance().ipcClientProxy_ = nullptr; +} + +/** + * @tc.name: ImportCredential_001 + * @tc.desc: 1. set packName null + * set reqJsonStr null + * 2. call DeviceManagerImpl::ImportCredential with parameter + * 3. check ret is ERR_DM_INPUT_PARAMETER_EMPTY + * deviceTypeId + * @tc.type: FUNC + * @tc.require: AR000GHSJK + */ +HWTEST_F(DeviceManagerImplTest, ImportCredential_001, testing::ext::TestSize.Level0) +{ + std::string packName; + std::string credentialInfo; + int32_t ret= DeviceManager::GetInstance().ImportCredential(packName, credentialInfo); + ASSERT_EQ(ret, ERR_DM_INPUT_PARAMETER_EMPTY); +} + +/** + * @tc.name: ImportCredential_002 + * @tc.desc: 1. set packName not null + * set credentialInfo not null + * 2. MOCK IpcClientProxy SendRequest return ERR_DM_IPC_SEND_REQUEST_FAILED + * 3. call DeviceManagerImpl::ImportCredential with parameter + * 4. check ret is ERR_DM_IPC_SEND_REQUEST_FAILED + * deviceTypeId + * @tc.type: FUNC + * @tc.require: AR000GHSJK + */ +HWTEST_F(DeviceManagerImplTest, ImportCredential_002, testing::ext::TestSize.Level0) +{ + std::string packName = "com.ohos.test"; + std::string credentialInfo = R"({"processType":1,"authType":1,"userId":"123", + "credentialData":[{"credentialType":1,"credentialId":"104", + "authCode":"10F9F0576E61730193D2052B7F771887124A68F1607EFCF7796C1491F834CD92", + "serverPk":"","pkInfoSignature":"","pkInfo":"","peerDeviceId":""}]})"; + std::shared_ptr mockInstance = std::make_shared(); + DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; + EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + .Times(1).WillOnce(testing::Return(ERR_DM_IPC_SEND_REQUEST_FAILED)); + int32_t ret= DeviceManager::GetInstance().ImportCredential(packName, credentialInfo); + ASSERT_EQ(ret, ERR_DM_IPC_SEND_REQUEST_FAILED); + DeviceManagerImpl::GetInstance().ipcClientProxy_ = nullptr; +} + +/** + * @tc.name: ImportCredential_003 + * @tc.desc: 1. set packName not null + * set credentialInfo not null + * 2. MOCK IpcClientProxy SendRequest return DM_OK + * 3. call DeviceManagerImpl::ImportCredential with parameter + * 4. check ret is DM_OK + * deviceTypeId + * @tc.type: FUNC + * @tc.require: AR000GHSJK + */ +HWTEST_F(DeviceManagerImplTest, ImportCredential_003, testing::ext::TestSize.Level0) +{ + std::string packName = "com.ohos.test"; + std::string credentialInfo = R"({"processType":1,"authType":1,"userId":"123", + "credentialData":[{"credentialType":1,"credentialId":"104", + "authCode":"10F9F0576E61730193D2052B7F771887124A68F1607EFCF7796C1491F834CD92", + "serverPk":"","pkInfoSignature":"","pkInfo":"","peerDeviceId":""}]})"; + std::shared_ptr mockInstance = std::make_shared(); + DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; + EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + .Times(1).WillOnce(testing::Return(DM_OK)); + int32_t ret= DeviceManager::GetInstance().ImportCredential(packName, credentialInfo); + ASSERT_EQ(ret, DM_OK); + DeviceManagerImpl::GetInstance().ipcClientProxy_ = nullptr; +} + +/** + * @tc.name: ImportCredential_004 + * @tc.desc: 1. set packName not null + * set credentialInfo not null + * 2. MOCK IpcClientProxy SendRequest return ERR_DM_INIT_FAILED + * 3. call DeviceManagerImpl::ImportCredential with parameter + * 4. check ret is ERR_DM_IPC_SEND_REQUEST_FAILED + * deviceTypeId + * @tc.type: FUNC + * @tc.require: AR000GHSJK + */ +HWTEST_F(DeviceManagerImplTest, ImportCredential_004, testing::ext::TestSize.Level0) +{ + std::string packName = "com.ohos.test"; + std::string credentialInfo = R"({"processType":1,"authType":1,"userId":"123", + "credentialData":[{"credentialType":1,"credentialId":"104", + "authCode":"10F9F0576E61730193D2052B7F771887124A68F1607EFCF7796C1491F834CD92", + "serverPk":"","pkInfoSignature":"","pkInfo":"","peerDeviceId":""}]})"; + std::shared_ptr mockInstance = std::make_shared(); + DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; + EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + .Times(1).WillOnce(testing::Return(ERR_DM_INIT_FAILED)); + int32_t ret= DeviceManager::GetInstance().ImportCredential(packName, credentialInfo); + ASSERT_EQ(ret, ERR_DM_IPC_SEND_REQUEST_FAILED); + DeviceManagerImpl::GetInstance().ipcClientProxy_ = nullptr; +} + +/** + * @tc.name: DeleteCredential_001 + * @tc.desc: 1. set packName null + * set deleteInfo null + * 2. call DeviceManagerImpl::DeleteCredential with parameter + * 3. check ret is ERR_DM_INPUT_PARAMETER_EMPTY + * deviceTypeId + * @tc.type: FUNC + * @tc.require: AR000GHSJK + */ +HWTEST_F(DeviceManagerImplTest, DeleteCredential_001, testing::ext::TestSize.Level0) +{ + std::string packName; + std::string deleteInfo; + int32_t ret= DeviceManager::GetInstance().DeleteCredential(packName, deleteInfo); + ASSERT_EQ(ret, ERR_DM_INPUT_PARAMETER_EMPTY); +} + +/** + * @tc.name: DeleteCredential_002 + * @tc.desc: 1. set packName not null + * set deleteInfo not null + * 2. MOCK IpcClientProxy SendRequest return ERR_DM_IPC_SEND_REQUEST_FAILED + * 3. call DeviceManagerImpl::DeleteCredential with parameter + * 4. check ret is ERR_DM_IPC_SEND_REQUEST_FAILED + * deviceTypeId + * @tc.type: FUNC + * @tc.require: AR000GHSJK + */ +HWTEST_F(DeviceManagerImplTest, DeleteCredential_002, testing::ext::TestSize.Level0) +{ + std::string packName = "com.ohos.test"; + std::string deleteInfo = R"({"processType":1,"authType":1,"userId":"123"})"; + std::shared_ptr mockInstance = std::make_shared(); + DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; + EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + .Times(1).WillOnce(testing::Return(ERR_DM_IPC_SEND_REQUEST_FAILED)); + int32_t ret= DeviceManager::GetInstance().DeleteCredential(packName, deleteInfo); + ASSERT_EQ(ret, ERR_DM_IPC_SEND_REQUEST_FAILED); + DeviceManagerImpl::GetInstance().ipcClientProxy_ = nullptr; +} + +/** + * @tc.name: DeleteCredential_003 + * @tc.desc: 1. set packName not null + * set deleteInfo not null + * 2. MOCK IpcClientProxy SendRequest return DM_OK + * 3. call DeviceManagerImpl::DeleteCredential with parameter + * 4. check ret is DM_OK + * deviceTypeId + * @tc.type: FUNC + * @tc.require: AR000GHSJK + */ +HWTEST_F(DeviceManagerImplTest, DeleteCredential_003, testing::ext::TestSize.Level0) +{ + std::string packName = "com.ohos.test"; + std::string deleteInfo = R"({"processType":1,"authType":1,"userId":"123"})"; + std::shared_ptr mockInstance = std::make_shared(); + DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; + EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + .Times(1).WillOnce(testing::Return(DM_OK)); + int32_t ret= DeviceManager::GetInstance().DeleteCredential(packName, deleteInfo); + ASSERT_EQ(ret, DM_OK); + DeviceManagerImpl::GetInstance().ipcClientProxy_ = nullptr; +} + +/** + * @tc.name: DeleteCredential_004 + * @tc.desc: 1. set packName not null + * set credentialInfo not null + * 2. MOCK IpcClientProxy SendRequest return ERR_DM_INIT_FAILED + * 3. call DeviceManagerImpl::DeleteCredential with parameter + * 4. check ret is ERR_DM_IPC_SEND_REQUEST_FAILED + * deviceTypeId + * @tc.type: FUNC + * @tc.require: AR000GHSJK + */ +HWTEST_F(DeviceManagerImplTest, DeleteCredential_004, testing::ext::TestSize.Level0) +{ + std::string packName = "com.ohos.test"; + std::string deleteInfo = R"({"processType":1,"authType":1,"userId":"123"})"; + std::shared_ptr mockInstance = std::make_shared(); + DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; + EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + .Times(1).WillOnce(testing::Return(ERR_DM_INIT_FAILED)); + int32_t ret= DeviceManager::GetInstance().DeleteCredential(packName, deleteInfo); + ASSERT_EQ(ret, ERR_DM_IPC_SEND_REQUEST_FAILED); + DeviceManagerImpl::GetInstance().ipcClientProxy_ = nullptr; +} + +/** + * @tc.name: RegisterCredentialCallback_001 + * @tc.desc: 1. set packName null + * set callback null + * 3. call DeviceManagerImpl::RegisterCredentialCallback with parameter + * 4. check ret is ERR_DM_INPUT_PARAMETER_EMPTY + * deviceTypeId + * @tc.type: FUNC + * @tc.require: AR000GHSJK + */ +HWTEST_F(DeviceManagerImplTest, RegisterCredentialCallback_001, testing::ext::TestSize.Level0) +{ + std::string packName = ""; + std::shared_ptr callback = nullptr; + int32_t ret= DeviceManager::GetInstance().RegisterCredentialCallback(packName, callback); + ASSERT_EQ(ret, ERR_DM_INPUT_PARAMETER_EMPTY); +} + +/** + * @tc.name: RegisterCredentialCallback_002 + * @tc.desc: 1. set packName not null + * set callback not null + * 2. call DeviceManagerImpl::RegisterCredentialCallback with parameter + * 3. check ret is DM_OK + * deviceTypeId + * @tc.type: FUNC + * @tc.require: AR000GHSJK + */ +HWTEST_F(DeviceManagerImplTest, RegisterCredentialCallback_002, testing::ext::TestSize.Level0) +{ + std::string packName = "com.ohos.test"; + std::shared_ptr callback = std::make_shared(); + std::shared_ptr mockInstance = std::make_shared(); + DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; + EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + .Times(1).WillOnce(testing::Return(DM_OK)); + int32_t ret= DeviceManager::GetInstance().RegisterCredentialCallback(packName, callback); + ASSERT_EQ(ret, DM_OK); + DeviceManagerImpl::GetInstance().ipcClientProxy_ = nullptr; +} + +/** + * @tc.name: RegisterCredentialCallback_003 + * @tc.desc: 1. set packName not null + * set callback null + * 2. call DeviceManagerImpl::RegisterCredentialCallback with parameter + * 3. check ret is ERR_DM_INPUT_PARAMETER_EMPTY + * deviceTypeId + * @tc.type: FUNC + * @tc.require: AR000GHSJK + */ +HWTEST_F(DeviceManagerImplTest, RegisterCredentialCallback_003, testing::ext::TestSize.Level0) +{ + std::string packName = "com.ohos.test"; + std::shared_ptr callback = nullptr; + int32_t ret= DeviceManager::GetInstance().RegisterCredentialCallback(packName, callback); + ASSERT_EQ(ret, ERR_DM_INPUT_PARAMETER_EMPTY); +} + +/** + * @tc.name: RegisterCredentialCallback_004 + * @tc.desc: 1. set packName null + * set callback not null + * 2. call DeviceManagerImpl::RegisterCredentialCallback with parameter + * 3. check ret is ERR_DM_INPUT_PARAMETER_EMPTY + * deviceTypeId + * @tc.type: FUNC + * @tc.require: AR000GHSJK + */ +HWTEST_F(DeviceManagerImplTest, RegisterCredentialCallback_004, testing::ext::TestSize.Level0) +{ + std::string packName = ""; + std::shared_ptr callback = std::make_shared(); + int32_t ret= DeviceManager::GetInstance().RegisterCredentialCallback(packName, callback); + ASSERT_EQ(ret, ERR_DM_INPUT_PARAMETER_EMPTY); +} + +/** + * @tc.name: UnRegisterCredentialCallback_001 + * @tc.desc: 1. set packName null + * 2. call DeviceManagerImpl::UnRegisterCredentialCallback with parameter + * 3. check ret is ERR_DM_INPUT_PARAMETER_EMPTY + * deviceTypeId + * @tc.type: FUNC + * @tc.require: AR000GHSJK + */ +HWTEST_F(DeviceManagerImplTest, UnRegisterCredentialCallback_001, testing::ext::TestSize.Level0) +{ + + std::string packName = ""; + int32_t ret= DeviceManager::GetInstance().UnRegisterCredentialCallback(packName); + ASSERT_EQ(ret, ERR_DM_INPUT_PARAMETER_EMPTY); +} + +/** + * @tc.name: UnRegisterCredentialCallback_002 + * @tc.desc: 1. set packName not null + * 2. call DeviceManagerImpl::UnRegisterCredentialCallback with parameter + * 3. check ret is ERR_DM_IPC_SEND_REQUEST_FAILED + * deviceTypeId + * @tc.type: FUNC + * @tc.require: AR000GHSJK + */ +HWTEST_F(DeviceManagerImplTest, UnRegisterCredentialCallback_002, testing::ext::TestSize.Level0) +{ + std::string packName = "com.ohos.test"; + std::shared_ptr mockInstance = std::make_shared(); + DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; + EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + .Times(1).WillOnce(testing::Return(ERR_DM_IPC_SEND_REQUEST_FAILED)); + int32_t ret= DeviceManager::GetInstance().UnRegisterCredentialCallback(packName); + ASSERT_EQ(ret, ERR_DM_IPC_SEND_REQUEST_FAILED); + DeviceManagerImpl::GetInstance().ipcClientProxy_ = nullptr; +} + +/** + * @tc.name: UnRegisterCredentialCallback_003 + * @tc.desc: 1. set packName not null + * set callback null + * 2. call DeviceManagerImpl::UnRegisterCredentialCallback with parameter + * 3. check ret is ERR_DM_IPC_SEND_REQUEST_FAILED + * deviceTypeId + * @tc.type: FUNC + * @tc.require: AR000GHSJK + */ +HWTEST_F(DeviceManagerImplTest, UnRegisterCredentialCallback_003, testing::ext::TestSize.Level0) +{ + // 1. set packName null + std::string packName = "com.ohos.test"; + std::shared_ptr mockInstance = std::make_shared(); + DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; + EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + .Times(1).WillOnce(testing::Return(ERR_DM_INIT_FAILED)); + int32_t ret= DeviceManager::GetInstance().UnRegisterCredentialCallback(packName); + ASSERT_EQ(ret, ERR_DM_IPC_SEND_REQUEST_FAILED); + DeviceManagerImpl::GetInstance().ipcClientProxy_ = nullptr; +} + +/** + * @tc.name: UnRegisterCredentialCallback_004 + * @tc.desc: 1. set packName not null + * 2. call DeviceManagerImpl::UnRegisterCredentialCallback with parameter + * 3. check ret is DM_OK + * deviceTypeId + * @tc.type: FUNC + * @tc.require: AR000GHSJK + */ +HWTEST_F(DeviceManagerImplTest, UnRegisterCredentialCallback_004, testing::ext::TestSize.Level0) +{ + std::string packName = "com.ohos.test"; + std::shared_ptr mockInstance = std::make_shared(); + DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; + EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + .Times(1).WillOnce(testing::Return(DM_OK)); + int32_t ret= DeviceManager::GetInstance().UnRegisterCredentialCallback(packName); + ASSERT_EQ(ret, DM_OK); + DeviceManagerImpl::GetInstance().ipcClientProxy_ = nullptr; +} } // namespace } // namespace DistributedHardware } // namespace OHOS \ No newline at end of file diff --git a/test/unittest/UTTest_device_manager_impl.h b/test/unittest/UTTest_device_manager_impl.h index d0ace90b2..31f9d18ed 100644 --- a/test/unittest/UTTest_device_manager_impl.h +++ b/test/unittest/UTTest_device_manager_impl.h @@ -68,6 +68,12 @@ public: virtual ~DeviceManagerFaCallbackTest() override {} virtual void OnCall(const std::string ¶mJson) override {} }; + +class CredentialCallbackTest : public CredentialCallback { +public: + virtual ~CredentialCallbackTest() {} + virtual void OnCredentialResult(int32_t &action, const std::string &credentialResult) override {} +}; } // namespace DistributedHardware } // namespace OHOS -- Gitee From cafcf18d225c681d37a7f9eed1e0028f46b689dd Mon Sep 17 00:00:00 2001 From: "@shi-xiaoxiao-iris" Date: Tue, 5 Jul 2022 15:17:12 +0800 Subject: [PATCH 2/5] =?UTF-8?q?[=E9=9C=80=E6=B1=82]=E5=87=AD=E6=8D=AE?= =?UTF-8?q?=E7=AE=A1=E7=90=86TDD=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: @shi-xiaoxiao-iris --- test/unittest/UTTest_device_manager_impl.cpp | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/test/unittest/UTTest_device_manager_impl.cpp b/test/unittest/UTTest_device_manager_impl.cpp index 217023dd8..c7093da84 100644 --- a/test/unittest/UTTest_device_manager_impl.cpp +++ b/test/unittest/UTTest_device_manager_impl.cpp @@ -2639,9 +2639,9 @@ HWTEST_F(DeviceManagerImplTest, ImportCredential_002, testing::ext::TestSize.Lev { std::string packName = "com.ohos.test"; std::string credentialInfo = R"({"processType":1,"authType":1,"userId":"123", - "credentialData":[{"credentialType":1,"credentialId":"104", - "authCode":"10F9F0576E61730193D2052B7F771887124A68F1607EFCF7796C1491F834CD92", - "serverPk":"","pkInfoSignature":"","pkInfo":"","peerDeviceId":""}]})"; + "credentialData":[{"credentialType":1,"credentialId":"104", + "authCode":"10F9F0576E61730193D2052B7F771887124A68F1607EFCF7796C1491F834CD92", + "serverPk":"","pkInfoSignature":"","pkInfo":"","peerDeviceId":""}]})"; std::shared_ptr mockInstance = std::make_shared(); DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) @@ -2666,9 +2666,9 @@ HWTEST_F(DeviceManagerImplTest, ImportCredential_003, testing::ext::TestSize.Lev { std::string packName = "com.ohos.test"; std::string credentialInfo = R"({"processType":1,"authType":1,"userId":"123", - "credentialData":[{"credentialType":1,"credentialId":"104", - "authCode":"10F9F0576E61730193D2052B7F771887124A68F1607EFCF7796C1491F834CD92", - "serverPk":"","pkInfoSignature":"","pkInfo":"","peerDeviceId":""}]})"; + "credentialData":[{"credentialType":1,"credentialId":"104", + "authCode":"10F9F0576E61730193D2052B7F771887124A68F1607EFCF7796C1491F834CD92", + "serverPk":"","pkInfoSignature":"","pkInfo":"","peerDeviceId":""}]})"; std::shared_ptr mockInstance = std::make_shared(); DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) @@ -2693,9 +2693,9 @@ HWTEST_F(DeviceManagerImplTest, ImportCredential_004, testing::ext::TestSize.Lev { std::string packName = "com.ohos.test"; std::string credentialInfo = R"({"processType":1,"authType":1,"userId":"123", - "credentialData":[{"credentialType":1,"credentialId":"104", - "authCode":"10F9F0576E61730193D2052B7F771887124A68F1607EFCF7796C1491F834CD92", - "serverPk":"","pkInfoSignature":"","pkInfo":"","peerDeviceId":""}]})"; + "credentialData":[{"credentialType":1,"credentialId":"104", + "authCode":"10F9F0576E61730193D2052B7F771887124A68F1607EFCF7796C1491F834CD92", + "serverPk":"","pkInfoSignature":"","pkInfo":"","peerDeviceId":""}]})"; std::shared_ptr mockInstance = std::make_shared(); DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) @@ -2883,7 +2883,6 @@ HWTEST_F(DeviceManagerImplTest, RegisterCredentialCallback_004, testing::ext::Te */ HWTEST_F(DeviceManagerImplTest, UnRegisterCredentialCallback_001, testing::ext::TestSize.Level0) { - std::string packName = ""; int32_t ret= DeviceManager::GetInstance().UnRegisterCredentialCallback(packName); ASSERT_EQ(ret, ERR_DM_INPUT_PARAMETER_EMPTY); -- Gitee From 8842812ba593f0362f7dc21672df954ab5e2aadc Mon Sep 17 00:00:00 2001 From: "@shi-xiaoxiao-iris" Date: Tue, 5 Jul 2022 15:40:08 +0800 Subject: [PATCH 3/5] =?UTF-8?q?[=E9=9C=80=E6=B1=82]=E5=87=AD=E6=8D=AE?= =?UTF-8?q?=E7=AE=A1=E7=90=86TDD=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: @shi-xiaoxiao-iris --- test/unittest/UTTest_device_manager_impl.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/unittest/UTTest_device_manager_impl.cpp b/test/unittest/UTTest_device_manager_impl.cpp index c7093da84..74f2f81b0 100644 --- a/test/unittest/UTTest_device_manager_impl.cpp +++ b/test/unittest/UTTest_device_manager_impl.cpp @@ -2639,7 +2639,7 @@ HWTEST_F(DeviceManagerImplTest, ImportCredential_002, testing::ext::TestSize.Lev { std::string packName = "com.ohos.test"; std::string credentialInfo = R"({"processType":1,"authType":1,"userId":"123", - "credentialData":[{"credentialType":1,"credentialId":"104", + "credentialData":[{"credentialType":1, "credentialId":"104", "authCode":"10F9F0576E61730193D2052B7F771887124A68F1607EFCF7796C1491F834CD92", "serverPk":"","pkInfoSignature":"","pkInfo":"","peerDeviceId":""}]})"; std::shared_ptr mockInstance = std::make_shared(); @@ -2666,7 +2666,7 @@ HWTEST_F(DeviceManagerImplTest, ImportCredential_003, testing::ext::TestSize.Lev { std::string packName = "com.ohos.test"; std::string credentialInfo = R"({"processType":1,"authType":1,"userId":"123", - "credentialData":[{"credentialType":1,"credentialId":"104", + "credentialData":[{"credentialType":1, "credentialId":"104", "authCode":"10F9F0576E61730193D2052B7F771887124A68F1607EFCF7796C1491F834CD92", "serverPk":"","pkInfoSignature":"","pkInfo":"","peerDeviceId":""}]})"; std::shared_ptr mockInstance = std::make_shared(); @@ -2693,7 +2693,7 @@ HWTEST_F(DeviceManagerImplTest, ImportCredential_004, testing::ext::TestSize.Lev { std::string packName = "com.ohos.test"; std::string credentialInfo = R"({"processType":1,"authType":1,"userId":"123", - "credentialData":[{"credentialType":1,"credentialId":"104", + "credentialData":[{"credentialType":1, "credentialId":"104", "authCode":"10F9F0576E61730193D2052B7F771887124A68F1607EFCF7796C1491F834CD92", "serverPk":"","pkInfoSignature":"","pkInfo":"","peerDeviceId":""}]})"; std::shared_ptr mockInstance = std::make_shared(); -- Gitee From ea75cee40b5c926c373825789eb438db719bb128 Mon Sep 17 00:00:00 2001 From: "@shi-xiaoxiao-iris" Date: Tue, 5 Jul 2022 15:49:42 +0800 Subject: [PATCH 4/5] =?UTF-8?q?[=E9=9C=80=E6=B1=82]=E5=87=AD=E6=8D=AE?= =?UTF-8?q?=E7=AE=A1=E7=90=86TDD=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: @shi-xiaoxiao-iris --- test/unittest/UTTest_device_manager_impl.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test/unittest/UTTest_device_manager_impl.cpp b/test/unittest/UTTest_device_manager_impl.cpp index 74f2f81b0..a74549280 100644 --- a/test/unittest/UTTest_device_manager_impl.cpp +++ b/test/unittest/UTTest_device_manager_impl.cpp @@ -2639,9 +2639,9 @@ HWTEST_F(DeviceManagerImplTest, ImportCredential_002, testing::ext::TestSize.Lev { std::string packName = "com.ohos.test"; std::string credentialInfo = R"({"processType":1,"authType":1,"userId":"123", - "credentialData":[{"credentialType":1, "credentialId":"104", + "credentialData":[ {"credentialType":1,"credentialId":"104", "authCode":"10F9F0576E61730193D2052B7F771887124A68F1607EFCF7796C1491F834CD92", - "serverPk":"","pkInfoSignature":"","pkInfo":"","peerDeviceId":""}]})"; + "serverPk":"","pkInfoSignature":"","pkInfo":"","peerDeviceId":""} ]})"; std::shared_ptr mockInstance = std::make_shared(); DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) @@ -2666,9 +2666,9 @@ HWTEST_F(DeviceManagerImplTest, ImportCredential_003, testing::ext::TestSize.Lev { std::string packName = "com.ohos.test"; std::string credentialInfo = R"({"processType":1,"authType":1,"userId":"123", - "credentialData":[{"credentialType":1, "credentialId":"104", + "credentialData":[ {"credentialType":1,"credentialId":"104", "authCode":"10F9F0576E61730193D2052B7F771887124A68F1607EFCF7796C1491F834CD92", - "serverPk":"","pkInfoSignature":"","pkInfo":"","peerDeviceId":""}]})"; + "serverPk":"","pkInfoSignature":"","pkInfo":"","peerDeviceId":""}] })"; std::shared_ptr mockInstance = std::make_shared(); DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) @@ -2693,9 +2693,9 @@ HWTEST_F(DeviceManagerImplTest, ImportCredential_004, testing::ext::TestSize.Lev { std::string packName = "com.ohos.test"; std::string credentialInfo = R"({"processType":1,"authType":1,"userId":"123", - "credentialData":[{"credentialType":1, "credentialId":"104", + "credentialData":[ {"credentialType":1,"credentialId":"104", "authCode":"10F9F0576E61730193D2052B7F771887124A68F1607EFCF7796C1491F834CD92", - "serverPk":"","pkInfoSignature":"","pkInfo":"","peerDeviceId":""}]})"; + "serverPk":"","pkInfoSignature":"","pkInfo":"","peerDeviceId":""} ]})"; std::shared_ptr mockInstance = std::make_shared(); DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) -- Gitee From e48c65cbcd61029a21da9f712a5e2406482af1af Mon Sep 17 00:00:00 2001 From: "@shi-xiaoxiao-iris" Date: Tue, 5 Jul 2022 16:01:16 +0800 Subject: [PATCH 5/5] =?UTF-8?q?[=E9=9C=80=E6=B1=82]=E5=87=AD=E6=8D=AE?= =?UTF-8?q?=E7=AE=A1=E7=90=86TDD=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: @shi-xiaoxiao-iris --- test/unittest/UTTest_device_manager_impl.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test/unittest/UTTest_device_manager_impl.cpp b/test/unittest/UTTest_device_manager_impl.cpp index a74549280..efcb33e24 100644 --- a/test/unittest/UTTest_device_manager_impl.cpp +++ b/test/unittest/UTTest_device_manager_impl.cpp @@ -2639,9 +2639,9 @@ HWTEST_F(DeviceManagerImplTest, ImportCredential_002, testing::ext::TestSize.Lev { std::string packName = "com.ohos.test"; std::string credentialInfo = R"({"processType":1,"authType":1,"userId":"123", - "credentialData":[ {"credentialType":1,"credentialId":"104", + "credentialData": [{ "credentialType": 1, "credentialId": "104", "authCode":"10F9F0576E61730193D2052B7F771887124A68F1607EFCF7796C1491F834CD92", - "serverPk":"","pkInfoSignature":"","pkInfo":"","peerDeviceId":""} ]})"; + "serverPk":"","pkInfoSignature":"","pkInfo":"","peerDeviceId":"" }]})"; std::shared_ptr mockInstance = std::make_shared(); DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) @@ -2666,9 +2666,9 @@ HWTEST_F(DeviceManagerImplTest, ImportCredential_003, testing::ext::TestSize.Lev { std::string packName = "com.ohos.test"; std::string credentialInfo = R"({"processType":1,"authType":1,"userId":"123", - "credentialData":[ {"credentialType":1,"credentialId":"104", + "credentialData": [{ "credentialType": 1, "credentialId": "104", "authCode":"10F9F0576E61730193D2052B7F771887124A68F1607EFCF7796C1491F834CD92", - "serverPk":"","pkInfoSignature":"","pkInfo":"","peerDeviceId":""}] })"; + "serverPk":"","pkInfoSignature":"","pkInfo":"","peerDeviceId":"" }]})"; std::shared_ptr mockInstance = std::make_shared(); DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) @@ -2693,9 +2693,9 @@ HWTEST_F(DeviceManagerImplTest, ImportCredential_004, testing::ext::TestSize.Lev { std::string packName = "com.ohos.test"; std::string credentialInfo = R"({"processType":1,"authType":1,"userId":"123", - "credentialData":[ {"credentialType":1,"credentialId":"104", + "credentialData": [{ "credentialType": 1, "credentialId": "104", "authCode":"10F9F0576E61730193D2052B7F771887124A68F1607EFCF7796C1491F834CD92", - "serverPk":"","pkInfoSignature":"","pkInfo":"","peerDeviceId":""} ]})"; + "serverPk":"","pkInfoSignature":"","pkInfo":"","peerDeviceId":"" }]})"; std::shared_ptr mockInstance = std::make_shared(); DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) -- Gitee