From 29812a548aea71cdfb6e05874a447eec5d78252d Mon Sep 17 00:00:00 2001 From: puhui Date: Tue, 18 Jan 2022 20:47:52 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: puhui --- .../native_cpp/src/device_manager_impl.cpp | 4 ++-- .../include/authentication/dm_auth_manager.h | 4 ++-- .../include/device_manager_service.h | 1 + .../src/authentication/dm_auth_manager.cpp | 16 +++------------- .../src/device_manager_service.cpp | 14 ++++++++++++-- .../src/devicestate/dm_device_state_manager.cpp | 2 +- 6 files changed, 21 insertions(+), 20 deletions(-) diff --git a/interfaces/inner_kits/native_cpp/src/device_manager_impl.cpp b/interfaces/inner_kits/native_cpp/src/device_manager_impl.cpp index 417bd62c6..31107e981 100644 --- a/interfaces/inner_kits/native_cpp/src/device_manager_impl.cpp +++ b/interfaces/inner_kits/native_cpp/src/device_manager_impl.cpp @@ -258,7 +258,7 @@ int32_t DeviceManagerImpl::StartDeviceDiscovery(const std::string &pkgName, cons ret = rsp->GetErrCode(); if (ret != DM_OK) { LOGE("StartDeviceDiscovery error: Failed with ret %d", ret); - return DM_IPC_RESPOND_ERROR; + return ret; } LOGI("StartDeviceDiscovery completed, pkgName: %s", pkgName.c_str()); @@ -292,7 +292,7 @@ int32_t DeviceManagerImpl::StopDeviceDiscovery(const std::string &pkgName, uint1 ret = rsp->GetErrCode(); if (ret != DM_OK) { LOGE("StopDeviceDiscovery error: Failed with ret %d", ret); - return DM_IPC_RESPOND_ERROR; + return ret; } DeviceManagerNotify::GetInstance().UnRegisterDiscoveryCallback(pkgName, subscribeId); diff --git a/services/devicemanagerservice/include/authentication/dm_auth_manager.h b/services/devicemanagerservice/include/authentication/dm_auth_manager.h index b727f8f01..054ffe072 100644 --- a/services/devicemanagerservice/include/authentication/dm_auth_manager.h +++ b/services/devicemanagerservice/include/authentication/dm_auth_manager.h @@ -122,7 +122,8 @@ class DmAuthManager final : public ISoftbusSessionCallback, public std::enable_shared_from_this { public: DmAuthManager(std::shared_ptr softbusConnector, - std::shared_ptr listener); + std::shared_ptr listener, + std::shared_ptr hiChainConnector_); ~DmAuthManager(); int32_t AuthenticateDevice(const std::string &pkgName, int32_t authType, const std::string &deviceId, const std::string &extra); @@ -158,7 +159,6 @@ public: void ShowAuthInfoDialog(); void ShowStartAuthDialog(); int32_t GetAuthenticationParam(DmAuthParam &authParam); - int32_t RegisterCallback(); int32_t OnUserOperation(int32_t action); void UserSwitchEventCallback(void); diff --git a/services/devicemanagerservice/include/device_manager_service.h b/services/devicemanagerservice/include/device_manager_service.h index 8c54e9f3a..aedfc875d 100644 --- a/services/devicemanagerservice/include/device_manager_service.h +++ b/services/devicemanagerservice/include/device_manager_service.h @@ -59,6 +59,7 @@ private: std::shared_ptr softbusConnector_; std::shared_ptr listener_; std::shared_ptr abilityMgr_; + std::shared_ptr hiChainConnector_; }; } // namespace DistributedHardware } // namespace OHOS diff --git a/services/devicemanagerservice/src/authentication/dm_auth_manager.cpp b/services/devicemanagerservice/src/authentication/dm_auth_manager.cpp index 6b3fcae09..dbf9ae8ea 100644 --- a/services/devicemanagerservice/src/authentication/dm_auth_manager.cpp +++ b/services/devicemanagerservice/src/authentication/dm_auth_manager.cpp @@ -59,20 +59,17 @@ static void TimeOut(void *data) } DmAuthManager::DmAuthManager(std::shared_ptr softbusConnector, - std::shared_ptr listener) - : softbusConnector_(softbusConnector), listener_(listener) + std::shared_ptr listener, + std::shared_ptr hiChainConnector) + : softbusConnector_(softbusConnector), hiChainConnector_(hiChainConnector), listener_(listener) { LOGI("DmAuthManager constructor"); - hiChainConnector_ = std::make_shared(); - DmConfigManager &dmConfigManager = DmConfigManager::GetInstance(); dmConfigManager.GetAuthAdapter(authenticationMap_); } DmAuthManager::~DmAuthManager() { - softbusConnector_->GetSoftbusSession()->UnRegisterSessionCallback(); - hiChainConnector_->UnRegisterHiChainCallback(); LOGI("DmAuthManager destructor"); } @@ -697,13 +694,6 @@ int32_t DmAuthManager::GetAuthenticationParam(DmAuthParam &authParam) return DM_OK; } -int32_t DmAuthManager::RegisterCallback() -{ - softbusConnector_->GetSoftbusSession()->RegisterSessionCallback(shared_from_this()); - hiChainConnector_->RegisterHiChainCallback(shared_from_this()); - return DM_OK; -} - int32_t DmAuthManager::OnUserOperation(int32_t action) { switch (action) { diff --git a/services/devicemanagerservice/src/device_manager_service.cpp b/services/devicemanagerservice/src/device_manager_service.cpp index 5faa4cca6..7c1fae22c 100644 --- a/services/devicemanagerservice/src/device_manager_service.cpp +++ b/services/devicemanagerservice/src/device_manager_service.cpp @@ -37,6 +37,8 @@ DeviceManagerService::~DeviceManagerService() if (dmCommonEventManager.UnsubscribeServiceEvent(CommonEventSupport::COMMON_EVENT_USER_STOPPED)) { LOGI("subscribe service event success"); } + softbusConnector_->GetSoftbusSession()->UnRegisterSessionCallback(); + hiChainConnector_->UnRegisterHiChainCallback(); } int32_t DeviceManagerService::Init() @@ -59,6 +61,13 @@ int32_t DeviceManagerService::Init() return DM_MAKE_SHARED_FAIL; } } + if (hiChainConnector_ == nullptr) { + hiChainConnector_ = std::make_shared(); + if (hiChainConnector_ == nullptr) { + LOGE("Init failed, hiChainConnector_ apply for failure"); + return DM_MAKE_SHARED_FAIL; + } + } if (deviceInfoMgr_ == nullptr) { deviceInfoMgr_ = std::make_shared(softbusConnector_); if (deviceInfoMgr_ == nullptr) { @@ -82,12 +91,13 @@ int32_t DeviceManagerService::Init() } } if (authMgr_ == nullptr) { - authMgr_ = std::make_shared(softbusConnector_, listener_); + authMgr_ = std::make_shared(softbusConnector_, listener_, hiChainConnector_); if (authMgr_ == nullptr) { LOGE("Init failed, authMgr_ apply for failure"); return DM_MAKE_SHARED_FAIL; } - authMgr_->RegisterCallback(); + softbusConnector_->GetSoftbusSession()->RegisterSessionCallback(authMgr_); + hiChainConnector_->RegisterHiChainCallback(authMgr_); } DmCommonEventManager &dmCommonEventManager = DmCommonEventManager::GetInstance(); CommomEventCallback callback = std::bind(&DmAuthManager::UserSwitchEventCallback, *authMgr_.get()); diff --git a/services/devicemanagerservice/src/devicestate/dm_device_state_manager.cpp b/services/devicemanagerservice/src/devicestate/dm_device_state_manager.cpp index fc63c20a3..5cf62a062 100644 --- a/services/devicemanagerservice/src/devicestate/dm_device_state_manager.cpp +++ b/services/devicemanagerservice/src/devicestate/dm_device_state_manager.cpp @@ -31,7 +31,7 @@ DmDeviceStateManager::DmDeviceStateManager(std::shared_ptr sof DmDeviceStateManager::~DmDeviceStateManager() { LOGI("DmDeviceStateManager destructor"); - softbusConnector_->UnRegisterSoftbusStateCallback(""); + softbusConnector_->UnRegisterSoftbusStateCallback("DM_PKG_NAME"); } void DmDeviceStateManager::OnDeviceOnline(const std::string &pkgName, const DmDeviceInfo &info) -- Gitee From dc46fbfebd2228cbf89310a5a2de0452c52eaf33 Mon Sep 17 00:00:00 2001 From: puhui Date: Tue, 18 Jan 2022 22:33:59 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BC=96=E7=A8=8B?= =?UTF-8?q?=E8=A7=84=E8=8C=83=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: puhui --- .../include/authentication/dm_auth_manager.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/devicemanagerservice/include/authentication/dm_auth_manager.h b/services/devicemanagerservice/include/authentication/dm_auth_manager.h index 054ffe072..2ea42c9b7 100644 --- a/services/devicemanagerservice/include/authentication/dm_auth_manager.h +++ b/services/devicemanagerservice/include/authentication/dm_auth_manager.h @@ -122,7 +122,7 @@ class DmAuthManager final : public ISoftbusSessionCallback, public std::enable_shared_from_this { public: DmAuthManager(std::shared_ptr softbusConnector, - std::shared_ptr listener, + std::shared_ptr listener, std::shared_ptr hiChainConnector_); ~DmAuthManager(); int32_t AuthenticateDevice(const std::string &pkgName, int32_t authType, const std::string &deviceId, -- Gitee From d62eb4ab2743056c59e4465bf88a9af42ffe1ef2 Mon Sep 17 00:00:00 2001 From: puhui Date: Tue, 18 Jan 2022 23:11:58 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9UT=E7=BC=96=E8=AF=91?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: puhui --- .../UTTest_auth_message_processor.cpp | 41 +++++++++-------- test/unittest/UTTest_auth_request_state.cpp | 44 +++++++++---------- test/unittest/UTTest_auth_response_state.cpp | 27 ++++++------ .../UTTest_device_manager_service.cpp | 2 +- test/unittest/UTTest_dm_auth_manager.cpp | 24 +++++----- test/unittest/UTTest_hichain_connector.cpp | 2 +- test/unittest/UTTest_softbus_session.cpp | 2 +- 7 files changed, 70 insertions(+), 72 deletions(-) diff --git a/test/unittest/UTTest_auth_message_processor.cpp b/test/unittest/UTTest_auth_message_processor.cpp index b0e7dc352..2aa55bf3f 100644 --- a/test/unittest/UTTest_auth_message_processor.cpp +++ b/test/unittest/UTTest_auth_message_processor.cpp @@ -48,8 +48,9 @@ namespace { HWTEST_F(AuthMessageProcessorTest, CreateNegotiateMessage_001, testing::ext::TestSize.Level0) { std::shared_ptr softbusConnector = std::make_shared(); + std::shared_ptr hiChainConnector = std::make_shared(); std::shared_ptr listener = std::make_shared(); - std::shared_ptr data = std::make_shared(softbusConnector, listener); + std::shared_ptr data = std::make_shared(softbusConnector, listener, hiChainConnector); std::shared_ptr authMessageProcessor = std::make_shared(data); std::shared_ptr authResponseContext = std::make_shared(); authMessageProcessor->authResponseContext_ = std::make_shared(); @@ -84,8 +85,9 @@ HWTEST_F(AuthMessageProcessorTest, CreateNegotiateMessage_001, testing::ext::Tes HWTEST_F(AuthMessageProcessorTest, CreateSyncGroupMessage_001, testing::ext::TestSize.Level0) { std::shared_ptr softbusConnector = std::make_shared(); + std::shared_ptr hiChainConnector = std::make_shared(); std::shared_ptr listener = std::make_shared(); - std::shared_ptr data = std::make_shared(softbusConnector, listener); + std::shared_ptr data = std::make_shared(softbusConnector, listener, hiChainConnector); std::shared_ptr authMessageProcessor = std::make_shared(data); authMessageProcessor->authRequestContext_ = std::make_shared(); nlohmann::json jsona; @@ -112,8 +114,9 @@ HWTEST_F(AuthMessageProcessorTest, CreateSyncGroupMessage_001, testing::ext::Tes HWTEST_F(AuthMessageProcessorTest, CreateResponseAuthMessage_001, testing::ext::TestSize.Level0) { std::shared_ptr softbusConnector = std::make_shared(); + std::shared_ptr hiChainConnector = std::make_shared(); std::shared_ptr listener = std::make_shared(); - std::shared_ptr data = std::make_shared(softbusConnector, listener); + std::shared_ptr data = std::make_shared(softbusConnector, listener, hiChainConnector); std::shared_ptr authMessageProcessor = std::make_shared(data); authMessageProcessor->authResponseContext_ = std::make_shared(); nlohmann::json jsona; @@ -153,7 +156,7 @@ HWTEST_F(AuthMessageProcessorTest, CreateResponseFinishMessage_001, testing::ext { std::shared_ptr softbusConnector = std::make_shared(); std::shared_ptr listener = std::make_shared(); - std::shared_ptr data = std::make_shared(softbusConnector, listener); + std::shared_ptr data = std::make_shared(softbusConnector, listener, nullptr); std::shared_ptr authMessageProcessor = std::make_shared(data); authMessageProcessor->authResponseContext_ = std::make_shared(); nlohmann::json jsona; @@ -177,7 +180,7 @@ HWTEST_F(AuthMessageProcessorTest, ParseResponseFinishMessage_001, testing::ext: { std::shared_ptr softbusConnector = std::make_shared(); std::shared_ptr listener = std::make_shared(); - std::shared_ptr data = std::make_shared(softbusConnector, listener); + std::shared_ptr data = std::make_shared(softbusConnector, listener, nullptr); std::shared_ptr authMessageProcessor = std::make_shared(data); std::shared_ptr authResponseContext = std::make_shared(); authMessageProcessor->authResponseContext_ = std::make_shared(); @@ -200,7 +203,7 @@ HWTEST_F(AuthMessageProcessorTest, ParseAuthResponseMessage_001, testing::ext::T { std::shared_ptr softbusConnector = std::make_shared(); std::shared_ptr listener = std::make_shared(); - std::shared_ptr data = std::make_shared(softbusConnector, listener); + std::shared_ptr data = std::make_shared(softbusConnector, listener, nullptr); std::shared_ptr authMessageProcessor = std::make_shared(data); std::shared_ptr authResponseContext = std::make_shared(); nlohmann::json jsona; @@ -236,7 +239,7 @@ HWTEST_F(AuthMessageProcessorTest, ParseAuthRequestMessage_001, testing::ext::Te { std::shared_ptr softbusConnector = std::make_shared(); std::shared_ptr listener = std::make_shared(); - std::shared_ptr data = std::make_shared(softbusConnector, listener); + std::shared_ptr data = std::make_shared(softbusConnector, listener, nullptr); std::shared_ptr authMessageProcessor = std::make_shared(data); std::shared_ptr authResponseContext = std::make_shared(); authMessageProcessor->SetResponseContext(authResponseContext); @@ -272,7 +275,7 @@ HWTEST_F(AuthMessageProcessorTest, ParseAuthRequestMessage_002, testing::ext::Te { std::shared_ptr softbusConnector = std::make_shared(); std::shared_ptr listener = std::make_shared(); - std::shared_ptr data = std::make_shared(softbusConnector, listener); + std::shared_ptr data = std::make_shared(softbusConnector, listener, nullptr); std::shared_ptr authMessageProcessor = std::make_shared(data); std::shared_ptr authResponseContext = std::make_shared(); authMessageProcessor->SetResponseContext(authResponseContext); @@ -308,7 +311,7 @@ HWTEST_F(AuthMessageProcessorTest, ParseNegotiateMessage_001, testing::ext::Test { std::shared_ptr softbusConnector = std::make_shared(); std::shared_ptr listener = std::make_shared(); - std::shared_ptr data = std::make_shared(softbusConnector, listener); + std::shared_ptr data = std::make_shared(softbusConnector, listener, nullptr); std::shared_ptr authMessageProcessor = std::make_shared(data); std::shared_ptr authResponseContext = std::make_shared(); authMessageProcessor->authResponseContext_ = std::make_shared(); @@ -337,7 +340,7 @@ HWTEST_F(AuthMessageProcessorTest, ParseNegotiateMessage_002, testing::ext::Test { std::shared_ptr softbusConnector = std::make_shared(); std::shared_ptr listener = std::make_shared(); - std::shared_ptr data = std::make_shared(softbusConnector, listener); + std::shared_ptr data = std::make_shared(softbusConnector, listener, nullptr); std::shared_ptr authMessageProcessor = std::make_shared(data); std::shared_ptr authResponseContext = std::make_shared(); authMessageProcessor->authResponseContext_ = std::make_shared(); @@ -366,7 +369,7 @@ HWTEST_F(AuthMessageProcessorTest, ParseNegotiateMessage_003, testing::ext::Test { std::shared_ptr softbusConnector = std::make_shared(); std::shared_ptr listener = std::make_shared(); - std::shared_ptr data = std::make_shared(softbusConnector, listener); + std::shared_ptr data = std::make_shared(softbusConnector, listener, nullptr); std::shared_ptr authMessageProcessor = std::make_shared(data); std::shared_ptr authResponseContext = std::make_shared(); authMessageProcessor->authResponseContext_ = std::make_shared(); @@ -395,7 +398,7 @@ HWTEST_F(AuthMessageProcessorTest, ParseNegotiateMessage_004, testing::ext::Test { std::shared_ptr softbusConnector = std::make_shared(); std::shared_ptr listener = std::make_shared(); - std::shared_ptr data = std::make_shared(softbusConnector, listener); + std::shared_ptr data = std::make_shared(softbusConnector, listener, nullptr); std::shared_ptr authMessageProcessor = std::make_shared(data); std::shared_ptr authResponseContext = std::make_shared(); authMessageProcessor->authResponseContext_ = std::make_shared(); @@ -424,7 +427,7 @@ HWTEST_F(AuthMessageProcessorTest, ParseNegotiateMessage_005, testing::ext::Test { std::shared_ptr softbusConnector = std::make_shared(); std::shared_ptr listener = std::make_shared(); - std::shared_ptr data = std::make_shared(softbusConnector, listener); + std::shared_ptr data = std::make_shared(softbusConnector, listener, nullptr); std::shared_ptr authMessageProcessor = std::make_shared(data); std::shared_ptr authResponseContext = std::make_shared(); authMessageProcessor->authResponseContext_ = std::make_shared(); @@ -453,7 +456,7 @@ HWTEST_F(AuthMessageProcessorTest, SetRequestContext_001, testing::ext::TestSize { std::shared_ptr softbusConnector = std::make_shared(); std::shared_ptr listener = std::make_shared(); - std::shared_ptr data = std::make_shared(softbusConnector, listener); + std::shared_ptr data = std::make_shared(softbusConnector, listener, nullptr); std::shared_ptr authMessageProcessor = std::make_shared(data); std::shared_ptr authRequestContext = std::make_shared(); authMessageProcessor->SetRequestContext(authRequestContext); @@ -471,7 +474,7 @@ HWTEST_F(AuthMessageProcessorTest, SetRequestContext_002, testing::ext::TestSize { std::shared_ptr softbusConnector = std::make_shared(); std::shared_ptr listener = std::make_shared(); - std::shared_ptr data = std::make_shared(softbusConnector, listener); + std::shared_ptr data = std::make_shared(softbusConnector, listener, nullptr); std::shared_ptr authMessageProcessor = std::make_shared(data); std::shared_ptr authRequestContext = std::make_shared(); authMessageProcessor->SetRequestContext(nullptr); @@ -489,7 +492,7 @@ HWTEST_F(AuthMessageProcessorTest, SetResponseContext_001, testing::ext::TestSiz { std::shared_ptr softbusConnector = std::make_shared(); std::shared_ptr listener = std::make_shared(); - std::shared_ptr data = std::make_shared(softbusConnector, listener); + std::shared_ptr data = std::make_shared(softbusConnector, listener, nullptr); std::shared_ptr authMessageProcessor = std::make_shared(data); std::shared_ptr authResponseContext = std::make_shared(); authMessageProcessor->SetResponseContext(authResponseContext); @@ -507,7 +510,7 @@ HWTEST_F(AuthMessageProcessorTest, SetResponseContext_002, testing::ext::TestSiz { std::shared_ptr softbusConnector = std::make_shared(); std::shared_ptr listener = std::make_shared(); - std::shared_ptr data = std::make_shared(softbusConnector, listener); + std::shared_ptr data = std::make_shared(softbusConnector, listener, nullptr); std::shared_ptr authMessageProcessor = std::make_shared(data); std::shared_ptr authResponseContext = std::make_shared(); authMessageProcessor->SetResponseContext(nullptr); @@ -525,7 +528,7 @@ HWTEST_F(AuthMessageProcessorTest, GetResponseContext_001, testing::ext::TestSiz { std::shared_ptr softbusConnector = std::make_shared(); std::shared_ptr listener = std::make_shared(); - std::shared_ptr data = std::make_shared(softbusConnector, listener); + std::shared_ptr data = std::make_shared(softbusConnector, listener, nullptr); std::shared_ptr authMessageProcessor = std::make_shared(data); authMessageProcessor->authResponseContext_ = std::make_shared(); std::shared_ptr authResponseContext = authMessageProcessor->GetResponseContext(); @@ -543,7 +546,7 @@ HWTEST_F(AuthMessageProcessorTest, GetResponseContext_002, testing::ext::TestSiz { std::shared_ptr softbusConnector = std::make_shared(); std::shared_ptr listener = std::make_shared(); - std::shared_ptr data = std::make_shared(softbusConnector, listener); + std::shared_ptr data = std::make_shared(softbusConnector, listener, nullptr); std::shared_ptr authMessageProcessor = std::make_shared(data); authMessageProcessor->authResponseContext_ = std::make_shared(); std::shared_ptr authResponseContext = authMessageProcessor->GetResponseContext(); diff --git a/test/unittest/UTTest_auth_request_state.cpp b/test/unittest/UTTest_auth_request_state.cpp index 8beb4ea3b..92cf2951f 100644 --- a/test/unittest/UTTest_auth_request_state.cpp +++ b/test/unittest/UTTest_auth_request_state.cpp @@ -52,8 +52,10 @@ std::string ADD_TIMEOUT_TASK = "addTimeoutTask"; HWTEST_F(AuthRequestStateTest, SetAuthManager_001, testing::ext::TestSize.Level0) { std::shared_ptr softbusConnector = std::make_shared(); + std::shared_ptr hiChainConnector = std::make_shared(); std::shared_ptr listener = std::make_shared(); - std::shared_ptr authManager = std::make_shared(softbusConnector, listener); + std::shared_ptr authManager = + std::make_shared(softbusConnector, listener, hiChainConnector); std::shared_ptr authRequestState = std::make_shared(); authRequestState->SetAuthManager(authManager); int32_t ret = authRequestState->authManager_.use_count(); @@ -90,7 +92,7 @@ HWTEST_F(AuthRequestStateTest, TransitionTo_001, testing::ext::TestSize.Level0) { std::shared_ptr softbusConnector = std::make_shared(); std::shared_ptr listener = std::make_shared(); - std::shared_ptr authManager = std::make_shared(softbusConnector, listener); + std::shared_ptr authManager = std::make_shared(softbusConnector, listener, nullptr); std::shared_ptr authRequestState = std::make_shared(); authManager = nullptr; authRequestState->authManager_ = authManager; @@ -111,7 +113,7 @@ HWTEST_F(AuthRequestStateTest, TransitionTo_002, testing::ext::TestSize.Level0) { std::shared_ptr softbusConnector = std::make_shared(); std::shared_ptr listener = std::make_shared(); - std::shared_ptr authManager = std::make_shared(softbusConnector, listener); + std::shared_ptr authManager = std::make_shared(softbusConnector, listener, nullptr); std::shared_ptr context = std::make_shared(); std::shared_ptr authRequestState = std::make_shared(); std::shared_ptr negotiateStartTimer = std::make_shared(NEGOTIATE_TIMEOUT_TASK); @@ -124,7 +126,6 @@ HWTEST_F(AuthRequestStateTest, TransitionTo_002, testing::ext::TestSize.Level0) authManager->authMessageProcessor_->SetRequestContext(authManager->authRequestContext_); context->sessionId = 123456; authManager->SetAuthRequestState(authRequestState); - authManager->RegisterCallback(); authRequestState->SetAuthContext(context); authRequestState->SetAuthManager(authManager); int32_t ret = authRequestState->TransitionTo(std::make_shared()); @@ -159,7 +160,7 @@ HWTEST_F(AuthRequestStateTest, Enter_001, testing::ext::TestSize.Level0) { std::shared_ptr softbusConnector = std::make_shared(); std::shared_ptr listener = std::make_shared(); - std::shared_ptr authManager = std::make_shared(softbusConnector, listener); + std::shared_ptr authManager = std::make_shared(softbusConnector, listener, nullptr); std::shared_ptr authRequestState = std::make_shared(); authManager = nullptr; authRequestState->SetAuthManager(authManager); @@ -180,7 +181,7 @@ HWTEST_F(AuthRequestStateTest, Enter_002, testing::ext::TestSize.Level0) { std::shared_ptr softbusConnector = std::make_shared(); std::shared_ptr listener = std::make_shared(); - std::shared_ptr authManager = std::make_shared(softbusConnector, listener); + std::shared_ptr authManager = std::make_shared(softbusConnector, listener, nullptr); std::shared_ptr authRequestState = std::make_shared(); authManager->authResponseContext_ = std::make_shared(); authManager->authRequestContext_ = std::make_shared(); @@ -221,7 +222,7 @@ HWTEST_F(AuthRequestStateTest, Enter_003, testing::ext::TestSize.Level0) { std::shared_ptr softbusConnector = std::make_shared(); std::shared_ptr listener = std::make_shared(); - std::shared_ptr authManager = std::make_shared(softbusConnector, listener); + std::shared_ptr authManager = std::make_shared(softbusConnector, listener, nullptr); std::shared_ptr authRequestState = std::make_shared(); authRequestState->SetAuthManager(nullptr); int32_t ret = authRequestState->Enter(); @@ -241,7 +242,7 @@ HWTEST_F(AuthRequestStateTest, Enter_004, testing::ext::TestSize.Level0) { std::shared_ptr softbusConnector = std::make_shared(); std::shared_ptr listener = std::make_shared(); - std::shared_ptr authManager = std::make_shared(softbusConnector, listener); + std::shared_ptr authManager = std::make_shared(softbusConnector, listener, nullptr); std::shared_ptr authRequestState = std::make_shared(); std::shared_ptr hiChainConnector = std::make_shared(); authManager->authMessageProcessor_ = std::make_shared(authManager); @@ -288,7 +289,7 @@ HWTEST_F(AuthRequestStateTest, Enter_005, testing::ext::TestSize.Level0) { std::shared_ptr softbusConnector = std::make_shared(); std::shared_ptr listener = std::make_shared(); - std::shared_ptr authManager = std::make_shared(softbusConnector, listener); + std::shared_ptr authManager = std::make_shared(softbusConnector, listener, nullptr); std::shared_ptr authRequestState = std::make_shared(); authRequestState->SetAuthManager(nullptr); int32_t ret = authRequestState->Enter(); @@ -308,7 +309,7 @@ HWTEST_F(AuthRequestStateTest, Enter_006, testing::ext::TestSize.Level0) { std::shared_ptr softbusConnector = std::make_shared(); std::shared_ptr listener = std::make_shared(); - std::shared_ptr authManager = std::make_shared(softbusConnector, listener); + std::shared_ptr authManager = std::make_shared(softbusConnector, listener, nullptr); std::shared_ptr authRequestState = std::make_shared(); std::shared_ptr hiChainConnector = std::make_shared(); std::shared_ptr negotiateStartTimer = std::make_shared(NEGOTIATE_TIMEOUT_TASK); @@ -318,7 +319,6 @@ HWTEST_F(AuthRequestStateTest, Enter_006, testing::ext::TestSize.Level0) authManager->authRequestContext_ = std::make_shared(); authManager->authMessageProcessor_->SetRequestContext(authManager->authRequestContext_); authManager->authMessageProcessor_->SetResponseContext(authManager->authResponseContext_); - authManager->RegisterCallback(); authManager->SetAuthRequestState(authRequestState); authRequestState->SetAuthManager(authManager); std::shared_ptr context = std::make_shared(); @@ -356,7 +356,7 @@ HWTEST_F(AuthRequestStateTest, Enter_007, testing::ext::TestSize.Level0) { std::shared_ptr softbusConnector = std::make_shared(); std::shared_ptr listener = std::make_shared(); - std::shared_ptr authManager = std::make_shared(softbusConnector, listener); + std::shared_ptr authManager = std::make_shared(softbusConnector, listener, nullptr); std::shared_ptr authRequestState = std::make_shared(); authRequestState->SetAuthManager(nullptr); int32_t ret = authRequestState->Enter(); @@ -376,7 +376,7 @@ HWTEST_F(AuthRequestStateTest, Enter_008, testing::ext::TestSize.Level0) { std::shared_ptr softbusConnector = std::make_shared(); std::shared_ptr listener = std::make_shared(); - std::shared_ptr authManager = std::make_shared(softbusConnector, listener); + std::shared_ptr authManager = std::make_shared(softbusConnector, listener, nullptr); std::shared_ptr authRequestState = std::make_shared(); std::shared_ptr hiChainConnector = std::make_shared(); std::shared_ptr inputStartTimer = std::make_shared(CONFIRM_TIMEOUT_TASK); @@ -425,7 +425,7 @@ HWTEST_F(AuthRequestStateTest, Enter_009, testing::ext::TestSize.Level0) { std::shared_ptr softbusConnector = std::make_shared(); std::shared_ptr listener = std::make_shared(); - std::shared_ptr authManager = std::make_shared(softbusConnector, listener); + std::shared_ptr authManager = std::make_shared(softbusConnector, listener, nullptr); std::shared_ptr authRequestState = std::make_shared(); authRequestState->SetAuthManager(nullptr); int32_t ret = authRequestState->Enter(); @@ -445,7 +445,7 @@ HWTEST_F(AuthRequestStateTest, Enter_010, testing::ext::TestSize.Level0) { std::shared_ptr softbusConnector = std::make_shared(); std::shared_ptr listener = std::make_shared(); - std::shared_ptr authManager = std::make_shared(softbusConnector, listener); + std::shared_ptr authManager = std::make_shared(softbusConnector, listener, nullptr); std::shared_ptr authRequestState = std::make_shared(); authRequestState->SetAuthManager(authManager); int32_t ret = authRequestState->Enter(); @@ -480,7 +480,7 @@ HWTEST_F(AuthRequestStateTest, Enter_011, testing::ext::TestSize.Level0) { std::shared_ptr softbusConnector = std::make_shared(); std::shared_ptr listener = std::make_shared(); - std::shared_ptr authManager = std::make_shared(softbusConnector, listener); + std::shared_ptr authManager = std::make_shared(softbusConnector, listener, nullptr); std::shared_ptr authRequestState = std::make_shared(); authRequestState->SetAuthManager(nullptr); int32_t ret = authRequestState->Enter(); @@ -501,7 +501,7 @@ HWTEST_F(AuthRequestStateTest, Enter_012, testing::ext::TestSize.Level0) printf("1\n"); std::shared_ptr softbusConnector = std::make_shared(); std::shared_ptr listener = std::make_shared(); - std::shared_ptr authManager = std::make_shared(softbusConnector, listener); + std::shared_ptr authManager = std::make_shared(softbusConnector, listener, nullptr); std::shared_ptr authRequestState = std::make_shared(); authManager->authRequestContext_ = std::make_shared(); authManager->authMessageProcessor_ = std::make_shared(authManager); @@ -514,7 +514,6 @@ HWTEST_F(AuthRequestStateTest, Enter_012, testing::ext::TestSize.Level0) printf("3\n"); authRequestState->SetAuthManager(authManager); authManager->SetAuthRequestState(authRequestState); - authManager->RegisterCallback(); std::shared_ptr context = std::make_shared(); printf("4\n"); context->deviceId = "44444"; @@ -553,7 +552,7 @@ HWTEST_F(AuthRequestStateTest, Enter_013, testing::ext::TestSize.Level0) { std::shared_ptr softbusConnector = std::make_shared(); std::shared_ptr listener = std::make_shared(); - std::shared_ptr authManager = std::make_shared(softbusConnector, listener); + std::shared_ptr authManager = std::make_shared(softbusConnector, listener, nullptr); std::shared_ptr authRequestState = std::make_shared(); authRequestState->SetAuthManager(nullptr); int32_t ret = authRequestState->Enter(); @@ -574,7 +573,7 @@ HWTEST_F(AuthRequestStateTest, Enter_014, testing::ext::TestSize.Level0) printf("1\n"); std::shared_ptr softbusConnector = std::make_shared(); std::shared_ptr listener = std::make_shared(); - std::shared_ptr authManager = std::make_shared(softbusConnector, listener); + std::shared_ptr authManager = std::make_shared(softbusConnector, listener, nullptr); std::shared_ptr authRequestState = std::make_shared(); std::shared_ptr authenticateStartTimer = std::make_shared(AUTHENTICATE_TIMEOUT_TASK); authManager->timerMap_[AUTHENTICATE_TIMEOUT_TASK] = authenticateStartTimer; @@ -584,7 +583,6 @@ HWTEST_F(AuthRequestStateTest, Enter_014, testing::ext::TestSize.Level0) authManager->authRequestState_ = std::make_shared(); authManager->authMessageProcessor_->SetResponseContext(authManager->authResponseContext_); authManager->authMessageProcessor_->SetRequestContext(authManager->authRequestContext_); - authManager->RegisterCallback(); authManager->SetAuthRequestState(authRequestState); printf("3\n"); authRequestState->SetAuthManager(authManager); @@ -621,7 +619,7 @@ HWTEST_F(AuthRequestStateTest, Enter_015, testing::ext::TestSize.Level0) { std::shared_ptr softbusConnector = std::make_shared(); std::shared_ptr listener = std::make_shared(); - std::shared_ptr authManager = std::make_shared(softbusConnector, listener); + std::shared_ptr authManager = std::make_shared(softbusConnector, listener, nullptr); std::shared_ptr authRequestState = std::make_shared(); authRequestState->SetAuthManager(nullptr); int32_t ret = authRequestState->Enter(); @@ -641,7 +639,7 @@ HWTEST_F(AuthRequestStateTest, Enter_016, testing::ext::TestSize.Level0) { std::shared_ptr softbusConnector = std::make_shared(); std::shared_ptr listener = std::make_shared(); - std::shared_ptr authManager = std::make_shared(softbusConnector, listener); + std::shared_ptr authManager = std::make_shared(softbusConnector, listener, nullptr); std::shared_ptr authRequestState = std::make_shared(); std::shared_ptr hiChainConnector = std::make_shared(); std::shared_ptr inputStartTimer = std::make_shared(CONFIRM_TIMEOUT_TASK); diff --git a/test/unittest/UTTest_auth_response_state.cpp b/test/unittest/UTTest_auth_response_state.cpp index 60b68ec2d..ace33012d 100644 --- a/test/unittest/UTTest_auth_response_state.cpp +++ b/test/unittest/UTTest_auth_response_state.cpp @@ -49,7 +49,7 @@ HWTEST_F(AuthResponseStateTest, SetAuthManager_001, testing::ext::TestSize.Level { std::shared_ptr softbusConnector = std::make_shared(); std::shared_ptr listener = std::make_shared(); - std::shared_ptr authManager = std::make_shared(softbusConnector, listener); + std::shared_ptr authManager = std::make_shared(softbusConnector, listener, nullptr); std::shared_ptr authResponseState = std::make_shared(); authResponseState->SetAuthManager(authManager); int32_t ret = authResponseState->authManager_.use_count(); @@ -86,7 +86,7 @@ HWTEST_F(AuthResponseStateTest, TransitionTo_001, testing::ext::TestSize.Level0) { std::shared_ptr softbusConnector = std::make_shared(); std::shared_ptr listener = std::make_shared(); - std::shared_ptr authManager = std::make_shared(softbusConnector, listener); + std::shared_ptr authManager = std::make_shared(softbusConnector, listener, nullptr); std::shared_ptr authResponseState = std::make_shared(); authManager = nullptr; authResponseState->authManager_ = authManager; @@ -107,7 +107,7 @@ HWTEST_F(AuthResponseStateTest, TransitionTo_002, testing::ext::TestSize.Level0) { std::shared_ptr softbusConnector = std::make_shared(); std::shared_ptr listener = std::make_shared(); - std::shared_ptr authManager = std::make_shared(softbusConnector, listener); + std::shared_ptr authManager = std::make_shared(softbusConnector, listener, nullptr); std::shared_ptr context = std::make_shared(); std::shared_ptr authResponseState = std::make_shared(); authManager->authResponseState_ = std::make_shared(); @@ -178,7 +178,7 @@ HWTEST_F(AuthResponseStateTest, Enter_002, testing::ext::TestSize.Level0) { std::shared_ptr softbusConnector = std::make_shared(); std::shared_ptr listener = std::make_shared(); - std::shared_ptr authManager = std::make_shared(softbusConnector, listener); + std::shared_ptr authManager = std::make_shared(softbusConnector, listener, nullptr); std::shared_ptr authResponseState = std::make_shared(); authManager = nullptr; authResponseState->SetAuthManager(authManager); @@ -199,7 +199,7 @@ HWTEST_F(AuthResponseStateTest, Enter_003, testing::ext::TestSize.Level0) { std::shared_ptr softbusConnector = std::make_shared(); std::shared_ptr listener = std::make_shared(); - std::shared_ptr authManager = std::make_shared(softbusConnector, listener); + std::shared_ptr authManager = std::make_shared(softbusConnector, listener, nullptr); std::shared_ptr authResponseState = std::make_shared(); std::shared_ptr hiChainConnector = std::make_shared(); authManager->authMessageProcessor_ = std::make_shared(authManager); @@ -211,7 +211,6 @@ HWTEST_F(AuthResponseStateTest, Enter_003, testing::ext::TestSize.Level0) authManager->authResponseContext_->localDeviceId = "222"; authManager->authMessageProcessor_->SetResponseContext(authManager->authResponseContext_); authManager->authMessageProcessor_->SetRequestContext(authManager->authRequestContext_); - authManager->RegisterCallback(); authResponseState->SetAuthManager(authManager); std::shared_ptr context = std::make_shared(); context->deviceId = "123456"; @@ -248,7 +247,7 @@ HWTEST_F(AuthResponseStateTest, Enter_004, testing::ext::TestSize.Level0) { std::shared_ptr softbusConnector = std::make_shared(); std::shared_ptr listener = std::make_shared(); - std::shared_ptr authManager = std::make_shared(softbusConnector, listener); + std::shared_ptr authManager = std::make_shared(softbusConnector, listener, nullptr); std::shared_ptr authResponseState = std::make_shared(); authResponseState->SetAuthManager(nullptr); int32_t ret = authResponseState->Enter(); @@ -268,7 +267,7 @@ HWTEST_F(AuthResponseStateTest, Enter_005, testing::ext::TestSize.Level0) { std::shared_ptr softbusConnector = std::make_shared(); std::shared_ptr listener = std::make_shared(); - std::shared_ptr authManager = std::make_shared(softbusConnector, listener); + std::shared_ptr authManager = std::make_shared(softbusConnector, listener, nullptr); std::shared_ptr authResponseState = std::make_shared(); authResponseState->SetAuthManager(authManager); int32_t ret = authResponseState->Enter(); @@ -303,7 +302,7 @@ HWTEST_F(AuthResponseStateTest, Enter_006, testing::ext::TestSize.Level0) { std::shared_ptr softbusConnector = std::make_shared(); std::shared_ptr listener = std::make_shared(); - std::shared_ptr authManager = std::make_shared(softbusConnector, listener); + std::shared_ptr authManager = std::make_shared(softbusConnector, listener, nullptr); std::shared_ptr authResponseState = std::make_shared(); authResponseState->SetAuthManager(nullptr); int32_t ret = authResponseState->Enter(); @@ -324,7 +323,7 @@ HWTEST_F(AuthResponseStateTest, Enter_007, testing::ext::TestSize.Level0) printf("1\n"); std::shared_ptr softbusConnector = std::make_shared(); std::shared_ptr listener = std::make_shared(); - std::shared_ptr authManager = std::make_shared(softbusConnector, listener); + std::shared_ptr authManager = std::make_shared(softbusConnector, listener, nullptr); std::shared_ptr authResponseState = std::make_shared(); authManager->authResponseContext_ = std::make_shared(); authManager->authResponseState_ = std::make_shared(); @@ -363,7 +362,7 @@ HWTEST_F(AuthResponseStateTest, Enter_008, testing::ext::TestSize.Level0) { std::shared_ptr softbusConnector = std::make_shared(); std::shared_ptr listener = std::make_shared(); - std::shared_ptr authManager = std::make_shared(softbusConnector, listener); + std::shared_ptr authManager = std::make_shared(softbusConnector, listener, nullptr); std::shared_ptr authResponseState = std::make_shared(); authResponseState->SetAuthManager(nullptr); int32_t ret = authResponseState->Enter(); @@ -383,7 +382,7 @@ HWTEST_F(AuthResponseStateTest, Enter_009, testing::ext::TestSize.Level0) { std::shared_ptr softbusConnector = std::make_shared(); std::shared_ptr listener = std::make_shared(); - std::shared_ptr authManager = std::make_shared(softbusConnector, listener); + std::shared_ptr authManager = std::make_shared(softbusConnector, listener, nullptr); std::shared_ptr authResponseState = std::make_shared(); authResponseState->SetAuthManager(authManager); int32_t ret = authResponseState->Enter(); @@ -418,7 +417,7 @@ HWTEST_F(AuthResponseStateTest, Enter_010, testing::ext::TestSize.Level0) { std::shared_ptr softbusConnector = std::make_shared(); std::shared_ptr listener = std::make_shared(); - std::shared_ptr authManager = std::make_shared(softbusConnector, listener); + std::shared_ptr authManager = std::make_shared(softbusConnector, listener, nullptr); std::shared_ptr authResponseState = std::make_shared(); authResponseState->SetAuthManager(nullptr); int32_t ret = authResponseState->Enter(); @@ -438,7 +437,7 @@ HWTEST_F(AuthResponseStateTest, Enter_011, testing::ext::TestSize.Level0) { std::shared_ptr softbusConnector = std::make_shared(); std::shared_ptr listener = std::make_shared(); - std::shared_ptr authManager = std::make_shared(softbusConnector, listener); + std::shared_ptr authManager = std::make_shared(softbusConnector, listener, nullptr); std::shared_ptr authResponseState = std::make_shared(); authManager->authRequestState_ = std::make_shared(); authManager->authResponseState_ = std::make_shared(); diff --git a/test/unittest/UTTest_device_manager_service.cpp b/test/unittest/UTTest_device_manager_service.cpp index f2af9ddb1..400919a47 100644 --- a/test/unittest/UTTest_device_manager_service.cpp +++ b/test/unittest/UTTest_device_manager_service.cpp @@ -350,7 +350,7 @@ HWTEST_F(DeviceManagerServiceTest, VerifyAuthentication_002, testing::ext::TestS std::string authParam = "jdjjjj"; std::shared_ptr softbusConnector = std::make_shared(); std::shared_ptr listener_ = std::make_shared(); - DeviceManagerService::GetInstance().authMgr_ = std::make_shared(softbusConnector, listener_); + DeviceManagerService::GetInstance().authMgr_ = std::make_shared(softbusConnector, listener_, nullptr); std::shared_ptr inputStartTimer = std::make_shared(INPUT_TIMEOUT_TASK); DeviceManagerService::GetInstance().authMgr_->timerMap_[INPUT_TIMEOUT_TASK] = inputStartTimer; int ret = DeviceManagerService::GetInstance().VerifyAuthentication(authParam); diff --git a/test/unittest/UTTest_dm_auth_manager.cpp b/test/unittest/UTTest_dm_auth_manager.cpp index c3da111c0..651f58aff 100644 --- a/test/unittest/UTTest_dm_auth_manager.cpp +++ b/test/unittest/UTTest_dm_auth_manager.cpp @@ -54,7 +54,7 @@ HWTEST_F(DmAuthManagerTest, UnAuthenticateDevice_001, testing::ext::TestSize.Lev { std::shared_ptr softbusConnector = std::make_shared(); std::shared_ptr listener = std::make_shared(); - std::shared_ptr authManager = std::make_shared(softbusConnector, listener); + std::shared_ptr authManager = std::make_shared(softbusConnector, listener, nullptr); std::shared_ptr sessionSession = std::shared_ptr(); std::shared_ptr authRequestContext = std::make_shared(); std::string pkgName = ""; @@ -73,7 +73,7 @@ HWTEST_F(DmAuthManagerTest, HandleAuthenticateTimeout_001, testing::ext::TestSiz { std::shared_ptr softbusConnector = std::make_shared(); std::shared_ptr listener = std::make_shared(); - std::shared_ptr authManager = std::make_shared(softbusConnector, listener); + std::shared_ptr authManager = std::make_shared(softbusConnector, listener, nullptr); std::shared_ptr authRequestState = std::make_shared(); authManager->authResponseContext_ = std::make_shared(); authManager->authRequestContext_ = std::make_shared(); @@ -94,7 +94,7 @@ HWTEST_F(DmAuthManagerTest, HandleAuthenticateTimeout_002, testing::ext::TestSiz { std::shared_ptr softbusConnector = std::make_shared(); std::shared_ptr listener = std::make_shared(); - std::shared_ptr authManager = std::make_shared(softbusConnector, listener); + std::shared_ptr authManager = std::make_shared(softbusConnector, listener, nullptr); std::shared_ptr authRequestState = std::make_shared(); authManager->authResponseContext_ = std::make_shared(); authManager->authRequestContext_ = std::make_shared(); @@ -114,7 +114,7 @@ HWTEST_F(DmAuthManagerTest, EstablishAuthChannel_001, testing::ext::TestSize.Lev { std::shared_ptr softbusConnector = std::make_shared(); std::shared_ptr listener = std::make_shared(); - std::shared_ptr authManager = std::make_shared(softbusConnector, listener); + std::shared_ptr authManager = std::make_shared(softbusConnector, listener, nullptr); std::shared_ptr sessionSession = std::shared_ptr(); std::shared_ptr authRequestContext = std::make_shared(); authManager->authResponseContext_ = std::make_shared(); @@ -135,7 +135,7 @@ HWTEST_F(DmAuthManagerTest, StartAuthProcess_001, testing::ext::TestSize.Level0) { std::shared_ptr softbusConnector = std::make_shared(); std::shared_ptr listener = std::make_shared(); - std::shared_ptr authManager = std::make_shared(softbusConnector, listener); + std::shared_ptr authManager = std::make_shared(softbusConnector, listener, nullptr); std::shared_ptr authResponseState = std::make_shared(); authManager->authResponseContext_ = std::make_shared(); authManager->authRequestContext_ = std::make_shared(); @@ -156,14 +156,13 @@ HWTEST_F(DmAuthManagerTest, StartAuthProcess_002, testing::ext::TestSize.Level0) { std::shared_ptr softbusConnector = std::make_shared(); std::shared_ptr listener = std::make_shared(); - std::shared_ptr authManager = std::make_shared(softbusConnector, listener); + std::shared_ptr authManager = std::make_shared(softbusConnector, listener, nullptr); std::shared_ptr authResponseState = std::make_shared(); authManager->authResponseContext_ = std::make_shared(); authManager->authRequestContext_ = std::make_shared(); authManager->authResponseState_ = std::make_shared(); authManager->authMessageProcessor_ = std::make_shared(authManager); authManager->SetAuthResponseState(authResponseState); - authManager->RegisterCallback(); authManager->authResponseContext_->sessionId = 111; int32_t action = 1; int32_t ret = authManager->StartAuthProcess(action); @@ -180,7 +179,7 @@ HWTEST_F(DmAuthManagerTest, CreateGroup_001, testing::ext::TestSize.Level0) { std::shared_ptr softbusConnector = std::make_shared(); std::shared_ptr listener = std::make_shared(); - std::shared_ptr authManager = std::make_shared(softbusConnector, listener); + std::shared_ptr authManager = std::make_shared(softbusConnector, listener, nullptr); std::shared_ptr authResponseState = std::make_shared(); std::shared_ptr hiChainConnector = std::make_shared(); authManager->authResponseContext_ = std::make_shared(); @@ -204,7 +203,7 @@ HWTEST_F(DmAuthManagerTest, AddMember_001, testing::ext::TestSize.Level0) { std::shared_ptr softbusConnector = std::make_shared(); std::shared_ptr listener = std::make_shared(); - std::shared_ptr authManager = std::make_shared(softbusConnector, listener); + std::shared_ptr authManager = std::make_shared(softbusConnector, listener, nullptr); std::shared_ptr authResponseState = std::make_shared(); authManager->authRequestContext_ = std::make_shared(); std::shared_ptr hiChainConnector = std::make_shared(); @@ -224,7 +223,6 @@ HWTEST_F(DmAuthManagerTest, AddMember_001, testing::ext::TestSize.Level0) jsonObject[TAG_REQUEST_ID] = authManager->authResponseContext_->requestId; jsonObject[TAG_DEVICE_ID] = authManager->authResponseContext_->deviceId; std::string deviceId = "44444"; - authManager->RegisterCallback(); authManager->SetAuthResponseState(authResponseState); int32_t ret = authManager->AddMember(deviceId); ASSERT_EQ(ret, DM_OK); @@ -241,7 +239,7 @@ HWTEST_F(DmAuthManagerTest, JoinNetwork_001, testing::ext::TestSize.Level0) { std::shared_ptr softbusConnector = std::make_shared(); std::shared_ptr listener = std::make_shared(); - std::shared_ptr authManager = std::make_shared(softbusConnector, listener); + std::shared_ptr authManager = std::make_shared(softbusConnector, listener, nullptr); std::shared_ptr authRequestState = std::make_shared(); std::shared_ptr authenticateStartTimer = std::make_shared(AUTHENTICATE_TIMEOUT_TASK); authManager->timerMap_[AUTHENTICATE_TIMEOUT_TASK] = authenticateStartTimer; @@ -264,7 +262,7 @@ HWTEST_F(DmAuthManagerTest, SetAuthResponseState_001, testing::ext::TestSize.Lev { std::shared_ptr softbusConnector = std::make_shared(); std::shared_ptr listener = std::make_shared(); - std::shared_ptr authManager = std::make_shared(softbusConnector, listener); + std::shared_ptr authManager = std::make_shared(softbusConnector, listener, nullptr); std::shared_ptr authResponseState = std::make_shared(); authManager->authResponseState_ = std::make_shared(); authManager->SetAuthResponseState(authResponseState); @@ -282,7 +280,7 @@ HWTEST_F(DmAuthManagerTest, GetPinCode_001, testing::ext::TestSize.Level0) { std::shared_ptr softbusConnector = std::make_shared(); std::shared_ptr listener = std::make_shared(); - std::shared_ptr authManager = std::make_shared(softbusConnector, listener); + std::shared_ptr authManager = std::make_shared(softbusConnector, listener, nullptr); authManager->authResponseContext_ = std::make_shared(); ; int32_t ret = authManager->GetPinCode(); diff --git a/test/unittest/UTTest_hichain_connector.cpp b/test/unittest/UTTest_hichain_connector.cpp index 3395fda45..3e1ea6e67 100644 --- a/test/unittest/UTTest_hichain_connector.cpp +++ b/test/unittest/UTTest_hichain_connector.cpp @@ -43,7 +43,7 @@ void HichainConnectorTest::TearDownTestCase() namespace { std::shared_ptr listener_ = std::make_shared(); std::shared_ptr softbusConnector = std::make_shared(); -std::shared_ptr discoveryMgr_ = std::make_shared(softbusConnector, listener_); +std::shared_ptr discoveryMgr_ = std::make_shared(softbusConnector, listener_, nullptr); /** * @tc.name: CreateGroup_001 diff --git a/test/unittest/UTTest_softbus_session.cpp b/test/unittest/UTTest_softbus_session.cpp index 377c4ed8f..b0d6e66a3 100644 --- a/test/unittest/UTTest_softbus_session.cpp +++ b/test/unittest/UTTest_softbus_session.cpp @@ -40,7 +40,7 @@ namespace { std::shared_ptr softbusSession = std::make_shared(); std::shared_ptr listener_ = std::make_shared(); std::shared_ptr softbusConnector = std::make_shared(); -std::shared_ptr discoveryMgr_ = std::make_shared(softbusConnector, listener_); +std::shared_ptr discoveryMgr_ = std::make_shared(softbusConnector, listener_, nullptr); /** * @tc.name: OpenAuthSession_001 -- Gitee From e98dc8b2cb6af5d7a12d4ede73b96ff3626b0743 Mon Sep 17 00:00:00 2001 From: puhui Date: Tue, 18 Jan 2022 23:16:13 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BC=96=E7=A8=8B?= =?UTF-8?q?=E8=A7=84=E8=8C=83=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: puhui --- test/unittest/UTTest_device_manager_service.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/unittest/UTTest_device_manager_service.cpp b/test/unittest/UTTest_device_manager_service.cpp index 400919a47..3a995051d 100644 --- a/test/unittest/UTTest_device_manager_service.cpp +++ b/test/unittest/UTTest_device_manager_service.cpp @@ -350,7 +350,8 @@ HWTEST_F(DeviceManagerServiceTest, VerifyAuthentication_002, testing::ext::TestS std::string authParam = "jdjjjj"; std::shared_ptr softbusConnector = std::make_shared(); std::shared_ptr listener_ = std::make_shared(); - DeviceManagerService::GetInstance().authMgr_ = std::make_shared(softbusConnector, listener_, nullptr); + DeviceManagerService::GetInstance().authMgr_ = + std::make_shared(softbusConnector, listener_, nullptr); std::shared_ptr inputStartTimer = std::make_shared(INPUT_TIMEOUT_TASK); DeviceManagerService::GetInstance().authMgr_->timerMap_[INPUT_TIMEOUT_TASK] = inputStartTimer; int ret = DeviceManagerService::GetInstance().VerifyAuthentication(authParam); -- Gitee