diff --git a/services/implementation/BUILD.gn b/services/implementation/BUILD.gn index 877a06acc9472ee92ceeffb77a8465ad735bcebc..492dfa88296ae000012b3e220fccd11afa624859 100644 --- a/services/implementation/BUILD.gn +++ b/services/implementation/BUILD.gn @@ -120,7 +120,6 @@ if (defined(ohos_lite)) { "include/dependency/multipleuser", "include/dependency/hichain", "include/dependency/softbus", - "include/pinholder", "${common_path}/include", "${common_path}/include/ipc", "${common_path}/include/ipc/model", @@ -173,8 +172,6 @@ if (defined(ohos_lite)) { "src/devicestate/dm_device_state_manager.cpp", "src/discovery/dm_discovery_filter.cpp", "src/discovery/dm_discovery_manager.cpp", - "src/pinholder/dm_pin_holder.cpp", - "src/pinholder/pin_holder_session.cpp", "src/publish/dm_publish_manager.cpp", ] diff --git a/services/implementation/include/device_manager_service_impl.h b/services/implementation/include/device_manager_service_impl.h index bb17cd052fe95b4426e7f3f913163bc142249d47..ce6a35ee87c228bbb7cbde677c759aeacd222de5 100644 --- a/services/implementation/include/device_manager_service_impl.h +++ b/services/implementation/include/device_manager_service_impl.h @@ -27,7 +27,6 @@ #include "dm_device_info.h" #include "dm_device_state_manager.h" #include "dm_discovery_manager.h" -#include "dm_pin_holder.h" #include "dm_publish_manager.h" #include "idevice_manager_service_impl.h" #include "single_instance.h" @@ -123,11 +122,6 @@ public: int32_t BindTarget(const std::string &pkgName, const PeerTargetId &targetId, const std::map &bindParam); - int32_t RegisterPinHolderCallback(const std::string &pkgName); - int32_t CreatePinHolder(const std::string &pkgName, const PeerTargetId &targetId, - DmPinType pinType, const std::string &payload); - int32_t DestroyPinHolder(const std::string &pkgName, const PeerTargetId &targetId, - DmPinType pinType, const std::string &payload); std::map GetAppTrustDeviceIdList(std::string pkgname); void OnUnbindSessionOpened(int32_t sessionId, int32_t result); void OnUnbindSessionCloseed(int32_t sessionId); @@ -152,7 +146,6 @@ private: std::shared_ptr mineHiChainConnector_; std::shared_ptr credentialMgr_; std::shared_ptr commonEventManager_; - std::shared_ptr pinHolder_; std::shared_ptr hiChainAuthConnector_; }; diff --git a/services/implementation/src/device_manager_service_impl.cpp b/services/implementation/src/device_manager_service_impl.cpp index bdad391a99552c99b759039ea91176b55a3d608a..11288a8bc1c421e761c332809fee2bec7ce0635f 100644 --- a/services/implementation/src/device_manager_service_impl.cpp +++ b/services/implementation/src/device_manager_service_impl.cpp @@ -80,9 +80,6 @@ int32_t DeviceManagerServiceImpl::Initialize(const std::shared_ptr(hiChainConnector_, listener); } - if (pinHolder_ == nullptr) { - pinHolder_ = std::make_shared(listener); - } int32_t userId = MultipleUserConnector::GetCurrentAccountUserID(); if (userId > 0) { @@ -361,21 +358,6 @@ void DeviceManagerServiceImpl::OnBytesReceived(int sessionId, const void *data, SoftbusSession::OnBytesReceived(sessionId, data, dataLen); } -int DeviceManagerServiceImpl::OnPinHolderSessionOpened(int sessionId, int result) -{ - return PinHolderSession::OnSessionOpened(sessionId, result); -} - -void DeviceManagerServiceImpl::OnPinHolderSessionClosed(int sessionId) -{ - PinHolderSession::OnSessionClosed(sessionId); -} - -void DeviceManagerServiceImpl::OnPinHolderBytesReceived(int sessionId, const void *data, unsigned int dataLen) -{ - PinHolderSession::OnBytesReceived(sessionId, data, dataLen); -} - int32_t DeviceManagerServiceImpl::RequestCredential(const std::string &reqJsonStr, std::string &returnJsonStr) { if (reqJsonStr.empty()) { @@ -628,37 +610,6 @@ int32_t DeviceManagerServiceImpl::ExportAuthCode(std::string &authCode) return DM_OK; } -int32_t DeviceManagerServiceImpl::RegisterPinHolderCallback(const std::string &pkgName) -{ - if (pkgName.empty()) { - LOGE("RegisterPinHolderCallback failed, pkgName is empty"); - return ERR_DM_INPUT_PARA_INVALID; - } - return pinHolder_->RegisterPinHolderCallback(pkgName); -} - -int32_t DeviceManagerServiceImpl::CreatePinHolder(const std::string &pkgName, const PeerTargetId &targetId, - DmPinType pinType, const std::string &payload) -{ - if (pkgName.empty()) { - LOGE("CreatePinHolder failed, pkgName is empty"); - return ERR_DM_INPUT_PARA_INVALID; - } - - return pinHolder_->CreatePinHolder(pkgName, targetId, pinType, payload); -} - -int32_t DeviceManagerServiceImpl::DestroyPinHolder(const std::string &pkgName, const PeerTargetId &targetId, - DmPinType pinType, const std::string &payload) -{ - if (pkgName.empty()) { - LOGE("DestroyPinHolder failed, pkgName is empty"); - return ERR_DM_INPUT_PARA_INVALID; - } - - return pinHolder_->DestroyPinHolder(pkgName, targetId, pinType, payload); -} - int32_t DeviceManagerServiceImpl::BindTarget(const std::string &pkgName, const PeerTargetId &targetId, const std::map &bindParam) { diff --git a/services/service/BUILD.gn b/services/service/BUILD.gn index c740fb0dc344f44a3056c0e7d05991abe7ddef71..647bfb4832b527ff608e82ec13523284a89337b0 100644 --- a/services/service/BUILD.gn +++ b/services/service/BUILD.gn @@ -29,6 +29,7 @@ if (defined(ohos_lite)) { "include/softbus", "include/ipc/lite", "include/permission/lite", + "include/pinholder", "${common_path}/include", "${common_path}/include/ipc", "${common_path}/include/ipc/lite", @@ -65,6 +66,8 @@ if (defined(ohos_lite)) { "src/ipc/lite/ipc_server_main.cpp", "src/ipc/lite/ipc_server_stub.cpp", "src/permission/lite/permission_manager.cpp", + "src/pinholder/pin_holder.cpp", + "src/pinholder/pin_holder_session.cpp", "src/softbus/softbus_listener.cpp", ] @@ -112,6 +115,7 @@ if (defined(ohos_lite)) { "include/ipc", "include/ipc/standard", "include/permission/standard", + "include/pinholder", "include/softbus", "${common_path}/include", "${common_path}/include/dfx", @@ -157,6 +161,8 @@ if (defined(ohos_lite)) { "src/ipc/standard/ipc_server_listener.cpp", "src/ipc/standard/ipc_server_stub.cpp", "src/permission/standard/permission_manager.cpp", + "src/pinholder/pin_holder.cpp", + "src/pinholder/pin_holder_session.cpp", "src/softbus/softbus_listener.cpp", ] diff --git a/services/service/include/device_manager_service.h b/services/service/include/device_manager_service.h index b22fefb2bde54bce296df9773fbfce456b9a2c93..35ec0e50daa859d965a4d7a7a8f8951914078b0c 100644 --- a/services/service/include/device_manager_service.h +++ b/services/service/include/device_manager_service.h @@ -26,6 +26,7 @@ #include "advertise_manager.h" #include "discovery_manager.h" +#include "pin_holder.h" #include "device_manager_service_listener.h" #include "idevice_manager_service_impl.h" #include "i_dm_service_impl_ext.h" @@ -209,6 +210,7 @@ private: std::shared_ptr dmServiceImpl_; std::shared_ptr dmServiceImplExt_; std::string localDeviceId_; + std::shared_ptr pinHolder_; }; } // namespace DistributedHardware } // namespace OHOS diff --git a/services/service/include/idevice_manager_service_impl.h b/services/service/include/idevice_manager_service_impl.h index 21dc8d0fbd2514737b6c7d2f548ac4cf7b4fd55a..689a747da08b4330c4986cc5ebe361d2a8d66d89 100644 --- a/services/service/include/idevice_manager_service_impl.h +++ b/services/service/include/idevice_manager_service_impl.h @@ -145,27 +145,6 @@ public: */ virtual void OnBytesReceived(int sessionId, const void *data, unsigned int dataLen) = 0; - /** - * @tc.name: IDeviceManagerServiceImpl::OnPinHolderSessionOpened - * @tc.desc: Send Session Opened event to the device manager service impl - * @tc.type: FUNC - */ - virtual int OnPinHolderSessionOpened(int sessionId, int result) = 0; - - /** - * @tc.name: IDeviceManagerServiceImpl::OnPinHolderSessionClosed - * @tc.desc: Send Session Closed event to the device manager service impl - * @tc.type: FUNC - */ - virtual void OnPinHolderSessionClosed(int sessionId) = 0; - - /** - * @tc.name: IDeviceManagerServiceImpl::OnPinHolderBytesReceived - * @tc.desc: Send Bytes Received event to the device manager service impl - * @tc.type: FUNC - */ - virtual void OnPinHolderBytesReceived(int sessionId, const void *data, unsigned int dataLen) = 0; - /** * @tc.name: IDeviceManagerServiceImpl::RequestCredential * @tc.desc: RequestCredential of the Device Manager Service @@ -288,28 +267,6 @@ public: */ virtual int32_t UnRegisterUiStateCallback(const std::string &pkgName) = 0; - /** - * @tc.name: IDeviceManagerServiceImpl::RegisterPinHolderCallback - * @tc.desc: RegisterPinHolderCallback - * @tc.type: FUNC - */ - virtual int32_t RegisterPinHolderCallback(const std::string &pkgName) = 0; - - /** - * @tc.name: IDeviceManagerServiceImpl::CreatePinHolder - * @tc.desc: CreatePinHolder - * @tc.type: FUNC - */ - virtual int32_t CreatePinHolder(const std::string &pkgName, const PeerTargetId &targetId, - DmPinType pinType, const std::string &payload) = 0; - - /** - * @tc.name: IDeviceManagerServiceImpl::DestroyPinHolder - * @tc.desc: DestroyPinHolder - * @tc.type: FUNC - */ - virtual int32_t DestroyPinHolder(const std::string &pkgName, const PeerTargetId &targetId, - DmPinType pinType, const std::string &payload) = 0; virtual std::map GetAppTrustDeviceIdList(std::string pkgname) = 0; virtual void OnUnbindSessionOpened(int32_t sessionId, int32_t result) = 0; virtual void OnUnbindSessionCloseed(int32_t sessionId) = 0; diff --git a/services/implementation/include/pinholder/dm_pin_holder.h b/services/service/include/pinholder/pin_holder.h similarity index 71% rename from services/implementation/include/pinholder/dm_pin_holder.h rename to services/service/include/pinholder/pin_holder.h index 0123e81de638e94567f30e8835c7937de21eb076..c9ba1b9669a116668d02fe3f0d605e2ae7fcc427 100644 --- a/services/implementation/include/pinholder/dm_pin_holder.h +++ b/services/service/include/pinholder/pin_holder.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2024 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -13,19 +13,13 @@ * limitations under the License. */ -#ifndef OHOS_DM_PIN_HOLDER_H -#define OHOS_DM_PIN_HOLDER_H +#ifndef OHOS_PIN_HOLDER_H +#define OHOS_PIN_HOLDER_H -#include "device_manager.h" -#include "dm_adapter_crypto.h" -#include "softbus_bus_center.h" -#include "dm_device_info.h" -#include "dm_subscribe_info.h" #include "dm_timer.h" #include "idevice_manager_service_listener.h" -#include "inner_session.h" #include "pin_holder_session.h" -#include "session.h" +#include "pinholder_session_callback.h" #include #include @@ -41,11 +35,11 @@ typedef enum PinHolderState { SINK_DESTROY, } PinHolderState; -class DmPinHolder final : public ISoftbusSessionCallback, - public std::enable_shared_from_this { +class PinHolder final : public IPinholderSessionCallback, + public std::enable_shared_from_this { public: - DmPinHolder(std::shared_ptr listener); - ~DmPinHolder(); + PinHolder(std::shared_ptr listener); + ~PinHolder(); int32_t RegisterPinHolderCallback(const std::string &pkgName); int32_t CreatePinHolder(const std::string &pkgName, const PeerTargetId &targetId, DmPinType pinType, const std::string &payload); @@ -55,23 +49,6 @@ public: void OnSessionOpened(int32_t sessionId, int32_t sessionSide, int32_t result); void OnSessionClosed(int32_t sessionId); void OnDataReceived(int32_t sessionId, std::string message); - bool GetIsCryptoSupport() - { - return false; - } - AesGcmCipherKey GetSessionKeyAndLen() - { - AesGcmCipherKey cipherKey = { 0 }; - return cipherKey; - } - void OnUnbindSessionOpened(int sessionId, int32_t sessionSide, int result) - { - return; - } - void OnAuthDeviceDataReceived(int32_t sessionId, std::string message) - { - return; - } private: int32_t CreateGeneratePinHolderMsg(); @@ -98,4 +75,4 @@ private: }; } } -#endif // OHOS_DM_PIN_HOLDER_H \ No newline at end of file +#endif // OHOS_PIN_HOLDER_H \ No newline at end of file diff --git a/services/implementation/include/pinholder/pin_holder_session.h b/services/service/include/pinholder/pin_holder_session.h similarity index 89% rename from services/implementation/include/pinholder/pin_holder_session.h rename to services/service/include/pinholder/pin_holder_session.h index d0c526ddd87b2d345a41a5c7ef2c32fbaa022fab..fbeef1db895a7c0e7b38c1d932c85dccfcae5261 100644 --- a/services/implementation/include/pinholder/pin_holder_session.h +++ b/services/service/include/pinholder/pin_holder_session.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2024 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,13 +16,12 @@ #ifndef OHOS_PIN_HOLDER_SESSION_H #define OHOS_PIN_HOLDER_SESSION_H -#include "device_manager.h" - -#include "softbus_bus_center.h" #include "dm_device_info.h" -#include "softbus_session_callback.h" +#include "pinholder_session_callback.h" + #include "inner_session.h" #include "session.h" +#include "softbus_bus_center.h" namespace OHOS { namespace DistributedHardware { @@ -41,7 +40,7 @@ public: * @tc.desc: RegisterSessionCallback of the Softbus Session * @tc.type: FUNC */ - int32_t RegisterSessionCallback(std::shared_ptr callback); + int32_t RegisterSessionCallback(std::shared_ptr callback); /** * @tc.name: PinHolderSession::UnRegisterSessionCallback @@ -75,7 +74,7 @@ private: int32_t GetAddrByTargetId(const PeerTargetId &targetId, ConnectionAddr &addrInfo); private: - static std::shared_ptr sessionCallback_; + static std::shared_ptr pinholderSessionCallback_; }; } } diff --git a/services/service/include/softbus/pinholder_session_callback.h b/services/service/include/softbus/pinholder_session_callback.h new file mode 100644 index 0000000000000000000000000000000000000000..13dd1fc8d80d7558574dfee4e42f5e135c710a38 --- /dev/null +++ b/services/service/include/softbus/pinholder_session_callback.h @@ -0,0 +1,29 @@ +/* + * Copyright (c) 2024 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef OHOS_PIN_HOLDER_SESSION_CALLBACK_H +#define OHOS_PIN_HOLDER_SESSION_CALLBACK_H + +namespace OHOS { +namespace DistributedHardware { +class IPinholderSessionCallback { +public: + virtual void OnSessionOpened(int32_t sessionId, int32_t sessionSide, int32_t result) = 0; + virtual void OnSessionClosed(int32_t sessionId) = 0; + virtual void OnDataReceived(int32_t sessionId, std::string message) = 0; +}; +} // namespace DistributedHardware +} // namespace OHOS +#endif // OHOS_PIN_HOLDER_SESSION_CALLBACK_H diff --git a/services/service/src/device_manager_service.cpp b/services/service/src/device_manager_service.cpp index 5fdbbf6cf89986c47b4a8dc77b58eeca57bae26b..1603ef1991d0da65df3efa3c7fba0a13349b47a9 100755 --- a/services/service/src/device_manager_service.cpp +++ b/services/service/src/device_manager_service.cpp @@ -80,6 +80,10 @@ int32_t DeviceManagerService::InitDMServiceListener() if (discoveryMgr_ == nullptr) { discoveryMgr_ = std::make_shared(softbusListener_, listener_); } + if (pinHolder_ == nullptr) { + pinHolder_ = std::make_shared(listener_); + } + LOGI("DeviceManagerServiceListener init success."); return DM_OK; } @@ -573,29 +577,20 @@ void DeviceManagerService::OnBytesReceived(int sessionId, const void *data, unsi int DeviceManagerService::OnPinHolderSessionOpened(int sessionId, int result) { - if (!IsDMServiceImplReady()) { - LOGE("OnPinHolderSessionOpened failed, instance not init or init failed."); - return ERR_DM_NOT_INIT; - } - return dmServiceImpl_->OnPinHolderSessionOpened(sessionId, result); + LOGI("DeviceManagerService::OnPinHolderSessionOpened"); + return PinHolderSession::OnSessionOpened(sessionId, result); } void DeviceManagerService::OnPinHolderSessionClosed(int sessionId) { - if (!IsDMServiceImplReady()) { - LOGE("OnPinHolderSessionClosed failed, instance not init or init failed."); - return; - } - dmServiceImpl_->OnPinHolderSessionClosed(sessionId); + LOGI("DeviceManagerService::OnPinHolderSessionClosed"); + PinHolderSession::OnSessionClosed(sessionId); } void DeviceManagerService::OnPinHolderBytesReceived(int sessionId, const void *data, unsigned int dataLen) { - if (!IsDMServiceImplReady()) { - LOGE("OnPinHolderBytesReceived failed, instance not init or init failed."); - return; - } - dmServiceImpl_->OnPinHolderBytesReceived(sessionId, data, dataLen); + LOGI("DeviceManagerService::OnPinHolderBytesReceived"); + PinHolderSession::OnBytesReceived(sessionId, data, dataLen); } int32_t DeviceManagerService::RequestCredential(const std::string &reqJsonStr, std::string &returnJsonStr) @@ -1228,11 +1223,7 @@ int32_t DeviceManagerService::RegisterPinHolderCallback(const std::string &pkgNa LOGE("Invalid parameter, pkgName: %s.", pkgName.c_str()); return ERR_DM_INPUT_PARA_INVALID; } - if (!IsDMServiceImplReady()) { - LOGE("RegisterPinHolderCallback failed, instance not init or init failed."); - return ERR_DM_NOT_INIT; - } - return dmServiceImpl_->RegisterPinHolderCallback(pkgName); + return pinHolder_->RegisterPinHolderCallback(pkgName); } int32_t DeviceManagerService::CreatePinHolder(const std::string &pkgName, const PeerTargetId &targetId, @@ -1256,11 +1247,7 @@ int32_t DeviceManagerService::CreatePinHolder(const std::string &pkgName, const LOGE("Invalid parameter, pkgName: %s.", pkgName.c_str()); return ERR_DM_INPUT_PARA_INVALID; } - if (!IsDMServiceImplReady()) { - LOGE("CreatePinHolder failed, instance not init or init failed."); - return ERR_DM_NOT_INIT; - } - return dmServiceImpl_->CreatePinHolder(pkgName, targetId, pinType, payload); + return pinHolder_->CreatePinHolder(pkgName, targetId, pinType, payload); } int32_t DeviceManagerService::DestroyPinHolder(const std::string &pkgName, const PeerTargetId &targetId, @@ -1284,11 +1271,7 @@ int32_t DeviceManagerService::DestroyPinHolder(const std::string &pkgName, const LOGE("Invalid parameter, pkgName: %s.", pkgName.c_str()); return ERR_DM_INPUT_PARA_INVALID; } - if (!IsDMServiceImplReady()) { - LOGE("DestroyPinHolder failed, instance not init or init failed."); - return ERR_DM_NOT_INIT; - } - return dmServiceImpl_->DestroyPinHolder(pkgName, targetId, pinType, payload); + return pinHolder_->DestroyPinHolder(pkgName, targetId, pinType, payload); } void DeviceManagerService::OnUnbindSessionOpened(int32_t sessionId, int32_t result) diff --git a/services/implementation/src/pinholder/dm_pin_holder.cpp b/services/service/src/pinholder/pin_holder.cpp similarity index 90% rename from services/implementation/src/pinholder/dm_pin_holder.cpp rename to services/service/src/pinholder/pin_holder.cpp index 9a775736bc4e3b0755323ea1d8e16329c9fa9767..8b8afce791a982a86bac783049ae7d27132916c6 100644 --- a/services/implementation/src/pinholder/dm_pin_holder.cpp +++ b/services/service/src/pinholder/pin_holder.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023-2024 Huawei Device Co., Ltd. + * Copyright (c) 2024 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "dm_pin_holder.h" +#include "pin_holder.h" #include "dm_anonymous.h" #include "dm_constants.h" @@ -21,7 +21,6 @@ #include "dm_softbus_adapter_crypto.h" #include "nlohmann/json.hpp" #include "parameter.h" -#include "softbus_connector.h" namespace OHOS { namespace DistributedHardware { @@ -41,7 +40,7 @@ constexpr int32_t PIN_HOLDER_SESSION_CREATE_TIMEOUT = 60; constexpr const char* TAG_PIN_TYPE = "PIN_TYPE"; constexpr const char* TAG_PAYLOAD = "PAYLOAD"; constexpr const char* TAG_REPLY = "REPLY"; -DmPinHolder::DmPinHolder(std::shared_ptr listener): listener_(listener) +PinHolder::PinHolder(std::shared_ptr listener): listener_(listener) { if (session_ == nullptr) { session_ = std::make_shared(); @@ -53,7 +52,7 @@ DmPinHolder::DmPinHolder(std::shared_ptr listener sourceState_ = SOURCE_INIT; } -DmPinHolder::~DmPinHolder() +PinHolder::~PinHolder() { if (session_ != nullptr) { session_->UnRegisterSessionCallback(); @@ -65,7 +64,7 @@ DmPinHolder::~DmPinHolder() } } -int32_t DmPinHolder::RegisterPinHolderCallback(const std::string &pkgName) +int32_t PinHolder::RegisterPinHolderCallback(const std::string &pkgName) { if (session_ == nullptr) { LOGE("RegisterPinHolderCallback session is nullptr."); @@ -76,7 +75,7 @@ int32_t DmPinHolder::RegisterPinHolderCallback(const std::string &pkgName) return DM_OK; } -int32_t DmPinHolder::CreatePinHolder(const std::string &pkgName, +int32_t PinHolder::CreatePinHolder(const std::string &pkgName, const PeerTargetId &targetId, DmPinType pinType, const std::string &payload) { LOGI("CreatePinHolder."); @@ -118,7 +117,7 @@ int32_t DmPinHolder::CreatePinHolder(const std::string &pkgName, return DM_OK; } -int32_t DmPinHolder::DestroyPinHolder(const std::string &pkgName, const PeerTargetId &targetId, DmPinType pinType, +int32_t PinHolder::DestroyPinHolder(const std::string &pkgName, const PeerTargetId &targetId, DmPinType pinType, const std::string &payload) { LOGI("DestroyPinHolder."); @@ -166,7 +165,7 @@ int32_t DmPinHolder::DestroyPinHolder(const std::string &pkgName, const PeerTarg return ret; } -int32_t DmPinHolder::CreateGeneratePinHolderMsg() +int32_t PinHolder::CreateGeneratePinHolderMsg() { if (listener_ == nullptr || session_ == nullptr) { LOGE("CreateGeneratePinHolderMsg listener or session is nullptr."); @@ -176,7 +175,7 @@ int32_t DmPinHolder::CreateGeneratePinHolderMsg() timer_->DeleteAll(); timer_->StartTimer(std::string(PINHOLDER_CREATE_TIMEOUT_TASK), PIN_HOLDER_SESSION_CREATE_TIMEOUT, [this] (std::string name) { - DmPinHolder::CloseSession(name); + PinHolder::CloseSession(name); }); nlohmann::json jsonObj; jsonObj[TAG_PIN_TYPE] = pinType_; @@ -193,7 +192,7 @@ int32_t DmPinHolder::CreateGeneratePinHolderMsg() return ret; } -int32_t DmPinHolder::ParseMsgType(const std::string &message) +int32_t PinHolder::ParseMsgType(const std::string &message) { nlohmann::json jsonObject = nlohmann::json::parse(message, nullptr, false); if (jsonObject.is_discarded()) { @@ -208,7 +207,7 @@ int32_t DmPinHolder::ParseMsgType(const std::string &message) return msgType; } -void DmPinHolder::ProcessCreateMsg(const std::string &message) +void PinHolder::ProcessCreateMsg(const std::string &message) { if (listener_ == nullptr || session_ == nullptr) { LOGE("ProcessCreateMsg listener or session is nullptr."); @@ -246,7 +245,7 @@ void DmPinHolder::ProcessCreateMsg(const std::string &message) } } -void DmPinHolder::ProcessCreateRespMsg(const std::string &message) +void PinHolder::ProcessCreateRespMsg(const std::string &message) { nlohmann::json jsonObject = nlohmann::json::parse(message, nullptr, false); if (jsonObject.is_discarded()) { @@ -273,7 +272,7 @@ void DmPinHolder::ProcessCreateRespMsg(const std::string &message) } } -void DmPinHolder::ProcessDestroyMsg(const std::string &message) +void PinHolder::ProcessDestroyMsg(const std::string &message) { if (listener_ == nullptr || session_ == nullptr) { LOGE("ProcessDestroyMsg listener or session is nullptr."); @@ -311,9 +310,9 @@ void DmPinHolder::ProcessDestroyMsg(const std::string &message) } } -void DmPinHolder::CloseSession(const std::string &name) +void PinHolder::CloseSession(const std::string &name) { - LOGI("DmPinHolder::CloseSession start timer name %s.", name.c_str()); + LOGI("PinHolder::CloseSession start timer name %s.", name.c_str()); if (session_ == nullptr) { LOGE("CloseSession session is nullptr."); return; @@ -332,7 +331,7 @@ void DmPinHolder::CloseSession(const std::string &name) remoteDeviceId_ = ""; } -void DmPinHolder::ProcessDestroyResMsg(const std::string &message) +void PinHolder::ProcessDestroyResMsg(const std::string &message) { nlohmann::json jsonObject = nlohmann::json::parse(message, nullptr, false); if (jsonObject.is_discarded()) { @@ -360,7 +359,7 @@ void DmPinHolder::ProcessDestroyResMsg(const std::string &message) } } -void DmPinHolder::OnDataReceived(int32_t sessionId, std::string message) +void PinHolder::OnDataReceived(int32_t sessionId, std::string message) { int32_t msgType = ParseMsgType(message); LOGI("OnDataReceived, msgType: %d.", msgType); @@ -383,7 +382,7 @@ void DmPinHolder::OnDataReceived(int32_t sessionId, std::string message) } } -void DmPinHolder::GetPeerDeviceId(int32_t sessionId, std::string &udidHash) +void PinHolder::GetPeerDeviceId(int32_t sessionId, std::string &udidHash) { char peerDeviceId[DEVICE_UUID_LENGTH] = {0}; int32_t ret = ::GetPeerDeviceId(sessionId, &peerDeviceId[0], DEVICE_UUID_LENGTH); @@ -403,7 +402,7 @@ void DmPinHolder::GetPeerDeviceId(int32_t sessionId, std::string &udidHash) LOGI("GetPeerDeviceId udid hash: %s success.", GetAnonyString(udidHash).c_str()); } -void DmPinHolder::OnSessionOpened(int32_t sessionId, int32_t sessionSide, int32_t result) +void PinHolder::OnSessionOpened(int32_t sessionId, int32_t sessionSide, int32_t result) { sessionId_ = sessionId; if (sessionSide == SESSION_SIDE_SERVER) { @@ -423,7 +422,7 @@ void DmPinHolder::OnSessionOpened(int32_t sessionId, int32_t sessionSide, int32_ return; } -void DmPinHolder::OnSessionClosed(int32_t sessionId) +void PinHolder::OnSessionClosed(int32_t sessionId) { LOGI("[SOFTBUS]OnSessionClosed sessionId: %d.", sessionId); sessionId_ = SESSION_ID_INVALID; @@ -442,7 +441,7 @@ void DmPinHolder::OnSessionClosed(int32_t sessionId) return; } -int32_t DmPinHolder::CheckTargetIdVaild(const PeerTargetId &targetId) +int32_t PinHolder::CheckTargetIdVaild(const PeerTargetId &targetId) { if (targetId.deviceId.empty() && targetId.brMac.empty() && targetId.bleMac.empty() && targetId.wifiIp.empty()) { LOGE("CheckTargetIdVaild failed. targetId is empty."); diff --git a/services/implementation/src/pinholder/pin_holder_session.cpp b/services/service/src/pinholder/pin_holder_session.cpp similarity index 80% rename from services/implementation/src/pinholder/pin_holder_session.cpp rename to services/service/src/pinholder/pin_holder_session.cpp index 9bc60d11504db5b1ed001f87e757eb8f21d31b68..5d4a668e9ec06b3062570ef00581d1beaf96fcef 100644 --- a/services/implementation/src/pinholder/pin_holder_session.cpp +++ b/services/service/src/pinholder/pin_holder_session.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023-2024 Huawei Device Co., Ltd. + * Copyright (c) 2024 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -20,11 +20,10 @@ #include "dm_log.h" #include "dm_softbus_adapter_crypto.h" #include "nlohmann/json.hpp" -#include "softbus_connector.h" namespace OHOS { namespace DistributedHardware { -std::shared_ptr PinHolderSession::sessionCallback_ = nullptr; +std::shared_ptr PinHolderSession::pinholderSessionCallback_ = nullptr; PinHolderSession::PinHolderSession() { LOGD("PinHolderSession constructor."); @@ -35,15 +34,15 @@ PinHolderSession::~PinHolderSession() LOGD("PinHolderSession destructor."); } -int32_t PinHolderSession::RegisterSessionCallback(std::shared_ptr callback) +int32_t PinHolderSession::RegisterSessionCallback(std::shared_ptr callback) { - sessionCallback_ = callback; + pinholderSessionCallback_ = callback; return DM_OK; } int32_t PinHolderSession::UnRegisterSessionCallback() { - sessionCallback_ = nullptr; + pinholderSessionCallback_ = nullptr; return DM_OK; } @@ -72,12 +71,12 @@ int32_t PinHolderSession::CloseSessionServer(int32_t sessionId) int PinHolderSession::OnSessionOpened(int sessionId, int result) { - if (sessionCallback_ == nullptr) { - LOGE("OnSessionOpened error, sessionCallback_ is nullptr."); + if (pinholderSessionCallback_ == nullptr) { + LOGE("OnSessionOpened error, pinholderSessionCallback_ is nullptr."); return ERR_DM_FAILED; } int32_t sessionSide = GetSessionSide(sessionId); - sessionCallback_->OnSessionOpened(sessionId, sessionSide, result); + pinholderSessionCallback_->OnSessionOpened(sessionId, sessionSide, result); LOGI("OnSessionOpened, success, sessionId: %d.", sessionId); return DM_OK; } @@ -85,11 +84,11 @@ int PinHolderSession::OnSessionOpened(int sessionId, int result) void PinHolderSession::OnSessionClosed(int sessionId) { LOGI("[SOFTBUS]OnSessionClosed sessionId: %d", sessionId); - if (sessionCallback_ == nullptr) { - LOGE("OnSessionClosed error, sessionCallback_ is nullptr."); + if (pinholderSessionCallback_ == nullptr) { + LOGE("OnSessionClosed error, pinholderSessionCallback_ is nullptr."); return; } - sessionCallback_->OnSessionClosed(sessionId); + pinholderSessionCallback_->OnSessionClosed(sessionId); return; } @@ -99,13 +98,13 @@ void PinHolderSession::OnBytesReceived(int sessionId, const void *data, unsigned LOGE("[SOFTBUS]fail to receive data from softbus with sessionId: %d, dataLen: %d.", sessionId, dataLen); return; } - if (sessionCallback_ == nullptr) { - LOGE("OnBytesReceived error, sessionCallback_ is nullptr."); + if (pinholderSessionCallback_ == nullptr) { + LOGE("OnBytesReceived error, pinholderSessionCallback_ is nullptr."); return; } LOGI("start, sessionId: %d, dataLen: %d.", sessionId, dataLen); std::string message = std::string(reinterpret_cast(data), dataLen); - sessionCallback_->OnDataReceived(sessionId, message); + pinholderSessionCallback_->OnDataReceived(sessionId, message); return; } @@ -146,14 +145,6 @@ int32_t PinHolderSession::GetAddrByTargetId(const PeerTargetId &targetId, Connec DmSoftbusAdapterCrypto::ConvertHexStringToBytes(addr.info.ble.udidHash, UDID_HASH_LEN, targetId.deviceId.c_str(), targetId.deviceId.length()); } - } else if (!targetId.deviceId.empty()) { - std::string connectAddr; - ConnectionAddr *addrInfo = SoftbusConnector::GetConnectAddr(targetId.deviceId, connectAddr); - if (addrInfo == nullptr) { - LOGE("GetConnectAddr failed."); - return ERR_DM_INPUT_PARA_INVALID; - } - addr = *addrInfo; } return DM_OK; } diff --git a/test/commonfuzztest/pinholder_fuzzer/pinholder_fuzzer.cpp b/test/commonfuzztest/pinholder_fuzzer/pinholder_fuzzer.cpp index e8fe73a7718b966d2fd02a1a85d1ee202fa36142..2b8b6b06c827fd7a774e8c6536281d835a1ac9ae 100644 --- a/test/commonfuzztest/pinholder_fuzzer/pinholder_fuzzer.cpp +++ b/test/commonfuzztest/pinholder_fuzzer/pinholder_fuzzer.cpp @@ -15,11 +15,12 @@ #include "pinholder_fuzzer.h" +#include "device_manager.h" #include "device_manager_callback.h" #include "dm_ability_manager.h" #include "dm_constants.h" #include "dm_log.h" -#include "dm_pin_holder.h" +#include "pin_holder.h" #include "nlohmann/json.hpp" #include "parameter.h" #include "device_manager_service_listener.h" diff --git a/test/unittest/BUILD.gn b/test/unittest/BUILD.gn index 7dc1646325ab25df3b8b760d0fae450316d33047..9f4aeabbd481c501252c4170156ffca502d8cd13 100644 --- a/test/unittest/BUILD.gn +++ b/test/unittest/BUILD.gn @@ -126,7 +126,11 @@ ohos_unittest("UTTest_ipc_cmd_register") { ohos_unittest("UTTest_dm_pin_holder") { module_out_path = module_out_path - sources = [ "UTTest_dm_pin_holder.cpp" ] + sources = [ + "${services_path}/src/pinholder/pin_holder.cpp", + "${services_path}/src/pinholder/pin_holder_session.cpp", + "UTTest_dm_pin_holder.cpp", + ] deps = [ ":device_manager_test_common" ] @@ -906,10 +910,12 @@ config("device_manager_test_common_public_config") { "${servicesimpl_path}/include/devicestate", "${services_path}/include", "${services_path}/include/softbus", + "${services_path}/include/pinholder", "${devicemanager_path}/test/unittest/mock", "${servicesimpl_path}/include/ability", "${servicesimpl_path}/include/config", "${servicesimpl_path}/include/dependency/multipleuser", + "${servicesimpl_path}/include/pinholder", "${devicemanager_path}/test/unittest/mock/", "//third_party/json/include", ] diff --git a/test/unittest/UTTest_device_manager_service.h b/test/unittest/UTTest_device_manager_service.h index fd9df250a1c849acfbcb492d78ac35dd8217c24c..b215753074647ee241d78796a8264253e64c6170 100644 --- a/test/unittest/UTTest_device_manager_service.h +++ b/test/unittest/UTTest_device_manager_service.h @@ -26,13 +26,7 @@ #undef private #include "device_manager_service_listener.h" -#include "dm_auth_manager.h" -#include "dm_device_state_manager.h" -#include "dm_discovery_manager.h" -#include "dm_publish_manager.h" #include "single_instance.h" -#include "softbus_connector.h" - namespace OHOS { namespace DistributedHardware { class DeviceManagerServiceTest : public testing::Test { diff --git a/test/unittest/UTTest_dm_pin_holder.cpp b/test/unittest/UTTest_dm_pin_holder.cpp index 88ae4eec9bbdc9bc6871dc8b019f0a8e6efb381c..1723dd78048e65614b8f4423eb535ec9a7a500c7 100644 --- a/test/unittest/UTTest_dm_pin_holder.cpp +++ b/test/unittest/UTTest_dm_pin_holder.cpp @@ -40,6 +40,8 @@ #include "nlohmann/json.hpp" #include "securec.h" #include "token_setproc.h" +#include "pin_holder.h" +#include "pinholder_session_callback.h" namespace OHOS { namespace DistributedHardware { @@ -146,9 +148,9 @@ HWTEST_F(DmPinHolderTest, RegisterPinHolderCallback_102, testing::ext::TestSize. { std::string packName = "com.ohos.dmtest"; std::shared_ptr listener = std::make_shared(); - std::shared_ptr dmPinHolder = std::make_shared(listener); - dmPinHolder->session_ = nullptr; - int32_t ret = dmPinHolder->RegisterPinHolderCallback(packName); + std::shared_ptr pinHolder = std::make_shared(listener); + pinHolder->session_ = nullptr; + int32_t ret = pinHolder->RegisterPinHolderCallback(packName); ASSERT_EQ(ret, ERR_DM_FAILED); } @@ -156,9 +158,9 @@ HWTEST_F(DmPinHolderTest, RegisterPinHolderCallback_103, testing::ext::TestSize. { std::string packName = "com.ohos.dmtest"; std::shared_ptr listener = std::make_shared(); - std::shared_ptr dmPinHolder = std::make_shared(listener); - dmPinHolder->session_ = std::make_shared(); - int32_t ret = dmPinHolder->RegisterPinHolderCallback(packName); + std::shared_ptr pinHolder = std::make_shared(listener); + pinHolder->session_ = std::make_shared(); + int32_t ret = pinHolder->RegisterPinHolderCallback(packName); ASSERT_EQ(ret, DM_OK); } @@ -185,9 +187,9 @@ HWTEST_F(DmPinHolderTest, CreatePinholder_102, testing::ext::TestSize.Level0) DmPinType pinType = DmPinType::NUMBER_PIN_CODE; std::string payload; std::shared_ptr listener = std::make_shared(); - std::shared_ptr dmPinHolder = std::make_shared(listener); - dmPinHolder->registerPkgName_ = ""; - int32_t ret = dmPinHolder->CreatePinHolder(packName, targetId, pinType, payload); + std::shared_ptr pinHolder = std::make_shared(listener); + pinHolder->registerPkgName_ = ""; + int32_t ret = pinHolder->CreatePinHolder(packName, targetId, pinType, payload); ASSERT_EQ(ret, ERR_DM_FAILED); } @@ -198,9 +200,9 @@ HWTEST_F(DmPinHolderTest, CreatePinholder_103, testing::ext::TestSize.Level0) DmPinType pinType = DmPinType::NUMBER_PIN_CODE; std::string payload; std::shared_ptr listener = std::make_shared(); - std::shared_ptr dmPinHolder = std::make_shared(listener); - dmPinHolder->registerPkgName_ = "dmtest"; - int32_t ret = dmPinHolder->CreatePinHolder(packName, targetId, pinType, payload); + std::shared_ptr pinHolder = std::make_shared(listener); + pinHolder->registerPkgName_ = "dmtest"; + int32_t ret = pinHolder->CreatePinHolder(packName, targetId, pinType, payload); ASSERT_EQ(ret, ERR_DM_FAILED); } @@ -217,9 +219,9 @@ HWTEST_F(DmPinHolderTest, CreatePinholder_105, testing::ext::TestSize.Level0) DmPinType pinType = DmPinType::NUMBER_PIN_CODE; std::string payload; std::shared_ptr listener = std::make_shared(); - std::shared_ptr dmPinHolder = std::make_shared(listener); - dmPinHolder->registerPkgName_ = packName; - int32_t ret = dmPinHolder->CreatePinHolder(packName, targetId, pinType, payload); + std::shared_ptr pinHolder = std::make_shared(listener); + pinHolder->registerPkgName_ = packName; + int32_t ret = pinHolder->CreatePinHolder(packName, targetId, pinType, payload); ASSERT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); } @@ -236,10 +238,10 @@ HWTEST_F(DmPinHolderTest, CreatePinholder_106, testing::ext::TestSize.Level0) DmPinType pinType = DmPinType::NUMBER_PIN_CODE; std::string payload; std::shared_ptr listener = std::make_shared(); - std::shared_ptr dmPinHolder = std::make_shared(listener); - dmPinHolder->registerPkgName_ = packName; - dmPinHolder->listener_ = nullptr; - int32_t ret = dmPinHolder->CreatePinHolder(packName, targetId, pinType, payload); + std::shared_ptr pinHolder = std::make_shared(listener); + pinHolder->registerPkgName_ = packName; + pinHolder->listener_ = nullptr; + int32_t ret = pinHolder->CreatePinHolder(packName, targetId, pinType, payload); ASSERT_EQ(ret, ERR_DM_FAILED); } @@ -256,10 +258,10 @@ HWTEST_F(DmPinHolderTest, CreatePinholder_107, testing::ext::TestSize.Level0) DmPinType pinType = DmPinType::NUMBER_PIN_CODE; std::string payload; std::shared_ptr listener = std::make_shared(); - std::shared_ptr dmPinHolder = std::make_shared(listener); - dmPinHolder->registerPkgName_ = packName; - dmPinHolder->session_ = nullptr; - int32_t ret = dmPinHolder->CreatePinHolder(packName, targetId, pinType, payload); + std::shared_ptr pinHolder = std::make_shared(listener); + pinHolder->registerPkgName_ = packName; + pinHolder->session_ = nullptr; + int32_t ret = pinHolder->CreatePinHolder(packName, targetId, pinType, payload); ASSERT_EQ(ret, ERR_DM_FAILED); } @@ -276,10 +278,10 @@ HWTEST_F(DmPinHolderTest, CreatePinholder_108, testing::ext::TestSize.Level0) DmPinType pinType = DmPinType::NUMBER_PIN_CODE; std::string payload; std::shared_ptr listener = std::make_shared(); - std::shared_ptr dmPinHolder = std::make_shared(listener); - dmPinHolder->registerPkgName_ = packName; - dmPinHolder->sourceState_ = SOURCE_CREATE; - int32_t ret = dmPinHolder->CreatePinHolder(packName, targetId, pinType, payload); + std::shared_ptr pinHolder = std::make_shared(listener); + pinHolder->registerPkgName_ = packName; + pinHolder->sourceState_ = SOURCE_CREATE; + int32_t ret = pinHolder->CreatePinHolder(packName, targetId, pinType, payload); ASSERT_EQ(ret, ERR_DM_FAILED); } @@ -295,9 +297,9 @@ HWTEST_F(DmPinHolderTest, DestroyPinHolder_101, testing::ext::TestSize.Level0) DmPinType pinType = DmPinType::NUMBER_PIN_CODE; std::string payload; std::shared_ptr listener = std::make_shared(); - std::shared_ptr dmPinHolder = std::make_shared(listener); - dmPinHolder->listener_ = nullptr; - int32_t ret = dmPinHolder->DestroyPinHolder(packName, targetId, pinType, payload); + std::shared_ptr pinHolder = std::make_shared(listener); + pinHolder->listener_ = nullptr; + int32_t ret = pinHolder->DestroyPinHolder(packName, targetId, pinType, payload); ASSERT_EQ(ret, ERR_DM_FAILED); } @@ -313,9 +315,9 @@ HWTEST_F(DmPinHolderTest, DestroyPinHolder_102, testing::ext::TestSize.Level0) DmPinType pinType = DmPinType::NUMBER_PIN_CODE; std::string payload; std::shared_ptr listener = std::make_shared(); - std::shared_ptr dmPinHolder = std::make_shared(listener); - dmPinHolder->session_ = nullptr; - int32_t ret = dmPinHolder->DestroyPinHolder(packName, targetId, pinType, payload); + std::shared_ptr pinHolder = std::make_shared(listener); + pinHolder->session_ = nullptr; + int32_t ret = pinHolder->DestroyPinHolder(packName, targetId, pinType, payload); ASSERT_EQ(ret, ERR_DM_FAILED); } @@ -331,9 +333,9 @@ HWTEST_F(DmPinHolderTest, DestroyPinHolder_103, testing::ext::TestSize.Level0) DmPinType pinType = DmPinType::NUMBER_PIN_CODE; std::string payload; std::shared_ptr listener = std::make_shared(); - std::shared_ptr dmPinHolder = std::make_shared(listener); - dmPinHolder->registerPkgName_ = ""; - int32_t ret = dmPinHolder->DestroyPinHolder(packName, targetId, pinType, payload); + std::shared_ptr pinHolder = std::make_shared(listener); + pinHolder->registerPkgName_ = ""; + int32_t ret = pinHolder->DestroyPinHolder(packName, targetId, pinType, payload); ASSERT_EQ(ret, ERR_DM_FAILED); } @@ -349,9 +351,9 @@ HWTEST_F(DmPinHolderTest, DestroyPinHolder_104, testing::ext::TestSize.Level0) DmPinType pinType = DmPinType::NUMBER_PIN_CODE; std::string payload; std::shared_ptr listener = std::make_shared(); - std::shared_ptr dmPinHolder = std::make_shared(listener); - dmPinHolder->registerPkgName_ = "dmtest"; - int32_t ret = dmPinHolder->DestroyPinHolder(packName, targetId, pinType, payload); + std::shared_ptr pinHolder = std::make_shared(listener); + pinHolder->registerPkgName_ = "dmtest"; + int32_t ret = pinHolder->DestroyPinHolder(packName, targetId, pinType, payload); ASSERT_EQ(ret, ERR_DM_FAILED); } @@ -367,9 +369,9 @@ HWTEST_F(DmPinHolderTest, DestroyPinHolder_105, testing::ext::TestSize.Level0) DmPinType pinType = DmPinType::NUMBER_PIN_CODE; std::string payload; std::shared_ptr listener = std::make_shared(); - std::shared_ptr dmPinHolder = std::make_shared(listener); - dmPinHolder->registerPkgName_ = packName; - int32_t ret = dmPinHolder->DestroyPinHolder(packName, targetId, pinType, payload); + std::shared_ptr pinHolder = std::make_shared(listener); + pinHolder->registerPkgName_ = packName; + int32_t ret = pinHolder->DestroyPinHolder(packName, targetId, pinType, payload); ASSERT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); } @@ -385,325 +387,324 @@ HWTEST_F(DmPinHolderTest, DestroyPinHolder_106, testing::ext::TestSize.Level0) DmPinType pinType = DmPinType::NUMBER_PIN_CODE; std::string payload; std::shared_ptr listener = std::make_shared(); - std::shared_ptr dmPinHolder = std::make_shared(listener); - dmPinHolder->registerPkgName_ = packName; - int32_t sessionId = 0; - dmPinHolder->sessionId_ = sessionId; - dmPinHolder->sourceState_ = SOURCE_DESTROY; - dmPinHolder->listener_ = std::make_shared(); - int32_t ret = dmPinHolder->DestroyPinHolder(packName, targetId, pinType, payload); + std::shared_ptr pinHolder = std::make_shared(listener); + pinHolder->registerPkgName_ = packName; + pinHolder->sessionId_ = 0; + pinHolder->sourceState_ = SOURCE_DESTROY; + pinHolder->listener_ = std::make_shared(); + int32_t ret = pinHolder->DestroyPinHolder(packName, targetId, pinType, payload); ASSERT_EQ(ret, ERR_DM_FAILED); } HWTEST_F(DmPinHolderTest, CreateGeneratePinHolderMsg_101, testing::ext::TestSize.Level0) { std::shared_ptr listener = std::make_shared(); - std::shared_ptr dmPinHolder = std::make_shared(listener); - dmPinHolder->listener_ = nullptr; - int32_t ret = dmPinHolder->CreateGeneratePinHolderMsg(); + std::shared_ptr pinHolder = std::make_shared(listener); + pinHolder->listener_ = nullptr; + int32_t ret = pinHolder->CreateGeneratePinHolderMsg(); ASSERT_EQ(ret, ERR_DM_FAILED); } HWTEST_F(DmPinHolderTest, CreateGeneratePinHolderMsg_102, testing::ext::TestSize.Level0) { std::shared_ptr listener = std::make_shared(); - std::shared_ptr dmPinHolder = std::make_shared(listener); - dmPinHolder->session_ = nullptr; - int32_t ret = dmPinHolder->CreateGeneratePinHolderMsg(); + std::shared_ptr pinHolder = std::make_shared(listener); + pinHolder->session_ = nullptr; + int32_t ret = pinHolder->CreateGeneratePinHolderMsg(); ASSERT_EQ(ret, ERR_DM_FAILED); } HWTEST_F(DmPinHolderTest, ParseMsgType_101, testing::ext::TestSize.Level0) { std::shared_ptr listener = std::make_shared(); - std::shared_ptr dmPinHolder = std::make_shared(listener); + std::shared_ptr pinHolder = std::make_shared(listener); std::string message; - int32_t ret = dmPinHolder->ParseMsgType(message); + int32_t ret = pinHolder->ParseMsgType(message); ASSERT_EQ(ret, ERR_DM_FAILED); } HWTEST_F(DmPinHolderTest, ProcessCreateMsg_101, testing::ext::TestSize.Level0) { std::shared_ptr listener = std::make_shared(); - std::shared_ptr dmPinHolder = std::make_shared(listener); + std::shared_ptr pinHolder = std::make_shared(listener); std::string message; - dmPinHolder->listener_ = nullptr; - dmPinHolder->ProcessCreateMsg(message); - ASSERT_NE(dmPinHolder->timer_, nullptr); + pinHolder->listener_ = nullptr; + pinHolder->ProcessCreateMsg(message); + ASSERT_NE(pinHolder->timer_, nullptr); } HWTEST_F(DmPinHolderTest, ProcessCreateMsg_102, testing::ext::TestSize.Level0) { std::shared_ptr listener = std::make_shared(); - std::shared_ptr dmPinHolder = std::make_shared(listener); + std::shared_ptr pinHolder = std::make_shared(listener); std::string message; - dmPinHolder->session_ = nullptr; - dmPinHolder->ProcessCreateMsg(message); - ASSERT_NE(dmPinHolder->timer_, nullptr); + pinHolder->session_ = nullptr; + pinHolder->ProcessCreateMsg(message); + ASSERT_NE(pinHolder->timer_, nullptr); } HWTEST_F(DmPinHolderTest, ProcessCreateMsg_103, testing::ext::TestSize.Level0) { std::shared_ptr listener = std::make_shared(); - std::shared_ptr dmPinHolder = std::make_shared(listener); + std::shared_ptr pinHolder = std::make_shared(listener); nlohmann::json jsonObject; std::string message = jsonObject.dump(); - dmPinHolder->ProcessCreateMsg(message); - ASSERT_NE(dmPinHolder->timer_, nullptr); + pinHolder->ProcessCreateMsg(message); + ASSERT_NE(pinHolder->timer_, nullptr); } HWTEST_F(DmPinHolderTest, ProcessCreateMsg_104, testing::ext::TestSize.Level0) { std::shared_ptr listener = std::make_shared(); - std::shared_ptr dmPinHolder = std::make_shared(listener); + std::shared_ptr pinHolder = std::make_shared(listener); nlohmann::json jsonObject; jsonObject[TAG_PIN_TYPE] = "TAG_PIN_TYPE"; std::string message = jsonObject.dump(); - dmPinHolder->ProcessCreateMsg(message); - ASSERT_NE(dmPinHolder->timer_, nullptr); + pinHolder->ProcessCreateMsg(message); + ASSERT_NE(pinHolder->timer_, nullptr); } HWTEST_F(DmPinHolderTest, ProcessCreateMsg_105, testing::ext::TestSize.Level0) { std::shared_ptr listener = std::make_shared(); - std::shared_ptr dmPinHolder = std::make_shared(listener); + std::shared_ptr pinHolder = std::make_shared(listener); nlohmann::json jsonObject; jsonObject[TAG_PIN_TYPE] = DmPinType::SUPER_SONIC; jsonObject[TAG_PAYLOAD] = DmPinType::SUPER_SONIC; std::string message = jsonObject.dump(); - dmPinHolder->ProcessCreateMsg(message); - ASSERT_NE(dmPinHolder->timer_, nullptr); + pinHolder->ProcessCreateMsg(message); + ASSERT_NE(pinHolder->timer_, nullptr); } HWTEST_F(DmPinHolderTest, ProcessCreateRespMsg_101, testing::ext::TestSize.Level0) { std::shared_ptr listener = std::make_shared(); - std::shared_ptr dmPinHolder = std::make_shared(listener); + std::shared_ptr pinHolder = std::make_shared(listener); nlohmann::json jsonObject; std::string message = jsonObject.dump(); - dmPinHolder->ProcessCreateRespMsg(message); - ASSERT_NE(dmPinHolder->timer_, nullptr); + pinHolder->ProcessCreateRespMsg(message); + ASSERT_NE(pinHolder->timer_, nullptr); } HWTEST_F(DmPinHolderTest, ProcessCreateRespMsg_102, testing::ext::TestSize.Level0) { std::shared_ptr listener = std::make_shared(); - std::shared_ptr dmPinHolder = std::make_shared(listener); + std::shared_ptr pinHolder = std::make_shared(listener); nlohmann::json jsonObject; jsonObject[TAG_REPLY] = DmPinType::NUMBER_PIN_CODE; std::string message = jsonObject.dump(); - dmPinHolder->listener_ = nullptr; - dmPinHolder->ProcessCreateRespMsg(message); - ASSERT_NE(dmPinHolder->timer_, nullptr); + pinHolder->listener_ = nullptr; + pinHolder->ProcessCreateRespMsg(message); + ASSERT_NE(pinHolder->timer_, nullptr); } HWTEST_F(DmPinHolderTest, ProcessCreateRespMsg_103, testing::ext::TestSize.Level0) { std::shared_ptr listener = std::make_shared(); - std::shared_ptr dmPinHolder = std::make_shared(listener); + std::shared_ptr pinHolder = std::make_shared(listener); nlohmann::json jsonObject; jsonObject[TAG_REPLY] = DmPinType::SUPER_SONIC; std::string message = jsonObject.dump(); - dmPinHolder->session_ = nullptr; - dmPinHolder->ProcessCreateRespMsg(message); - ASSERT_NE(dmPinHolder->timer_, nullptr); + pinHolder->session_ = nullptr; + pinHolder->ProcessCreateRespMsg(message); + ASSERT_NE(pinHolder->timer_, nullptr); } HWTEST_F(DmPinHolderTest, ProcessCreateRespMsg_104, testing::ext::TestSize.Level0) { std::shared_ptr listener = std::make_shared(); - std::shared_ptr dmPinHolder = std::make_shared(listener); + std::shared_ptr pinHolder = std::make_shared(listener); nlohmann::json jsonObject; jsonObject[TAG_REPLY] = DmPinType::NUMBER_PIN_CODE; std::string message = jsonObject.dump(); - dmPinHolder->session_ = nullptr; - dmPinHolder->ProcessCreateRespMsg(message); - ASSERT_NE(dmPinHolder->timer_, nullptr); + pinHolder->session_ = nullptr; + pinHolder->ProcessCreateRespMsg(message); + ASSERT_NE(pinHolder->timer_, nullptr); } HWTEST_F(DmPinHolderTest, ProcessDestroyMsg_101, testing::ext::TestSize.Level0) { std::shared_ptr listener = std::make_shared(); - std::shared_ptr dmPinHolder = std::make_shared(listener); + std::shared_ptr pinHolder = std::make_shared(listener); std::string message; - dmPinHolder->listener_ = nullptr; - dmPinHolder->ProcessDestroyMsg(message); - ASSERT_NE(dmPinHolder->timer_, nullptr); + pinHolder->listener_ = nullptr; + pinHolder->ProcessDestroyMsg(message); + ASSERT_NE(pinHolder->timer_, nullptr); } HWTEST_F(DmPinHolderTest, ProcessDestroyMsg_102, testing::ext::TestSize.Level0) { std::shared_ptr listener = std::make_shared(); - std::shared_ptr dmPinHolder = std::make_shared(listener); + std::shared_ptr pinHolder = std::make_shared(listener); std::string message; - dmPinHolder->session_ = nullptr; - dmPinHolder->ProcessDestroyMsg(message); - ASSERT_NE(dmPinHolder->timer_, nullptr); + pinHolder->session_ = nullptr; + pinHolder->ProcessDestroyMsg(message); + ASSERT_NE(pinHolder->timer_, nullptr); } HWTEST_F(DmPinHolderTest, ProcessDestroyMsg_103, testing::ext::TestSize.Level0) { std::shared_ptr listener = std::make_shared(); - std::shared_ptr dmPinHolder = std::make_shared(listener); + std::shared_ptr pinHolder = std::make_shared(listener); nlohmann::json jsonObject; std::string message = jsonObject.dump(); - dmPinHolder->ProcessDestroyMsg(message); - ASSERT_NE(dmPinHolder->timer_, nullptr); + pinHolder->ProcessDestroyMsg(message); + ASSERT_NE(pinHolder->timer_, nullptr); } HWTEST_F(DmPinHolderTest, ProcessDestroyMsg_104, testing::ext::TestSize.Level0) { std::shared_ptr listener = std::make_shared(); - std::shared_ptr dmPinHolder = std::make_shared(listener); + std::shared_ptr pinHolder = std::make_shared(listener); nlohmann::json jsonObject; jsonObject[TAG_PIN_TYPE] = "TAG_PIN_TYPE"; std::string message = jsonObject.dump(); - dmPinHolder->ProcessDestroyMsg(message); - ASSERT_NE(dmPinHolder->timer_, nullptr); + pinHolder->ProcessDestroyMsg(message); + ASSERT_NE(pinHolder->timer_, nullptr); } HWTEST_F(DmPinHolderTest, ProcessDestroyMsg_105, testing::ext::TestSize.Level0) { std::shared_ptr listener = std::make_shared(); - std::shared_ptr dmPinHolder = std::make_shared(listener); + std::shared_ptr pinHolder = std::make_shared(listener); nlohmann::json jsonObject; jsonObject[TAG_PIN_TYPE] = DmPinType::SUPER_SONIC; jsonObject[TAG_PAYLOAD] = DmPinType::SUPER_SONIC; std::string message = jsonObject.dump(); - dmPinHolder->ProcessDestroyMsg(message); - ASSERT_NE(dmPinHolder->timer_, nullptr); + pinHolder->ProcessDestroyMsg(message); + ASSERT_NE(pinHolder->timer_, nullptr); } HWTEST_F(DmPinHolderTest, CloseSession_101, testing::ext::TestSize.Level0) { std::shared_ptr listener = std::make_shared(); - std::shared_ptr dmPinHolder = std::make_shared(listener); + std::shared_ptr pinHolder = std::make_shared(listener); std::string name; - dmPinHolder->session_ = nullptr; - dmPinHolder->CloseSession(name); - ASSERT_NE(dmPinHolder->timer_, nullptr); + pinHolder->session_ = nullptr; + pinHolder->CloseSession(name); + ASSERT_NE(pinHolder->timer_, nullptr); } HWTEST_F(DmPinHolderTest, OnDataReceived_101, testing::ext::TestSize.Level0) { std::shared_ptr listener = std::make_shared(); - std::shared_ptr dmPinHolder = std::make_shared(listener); + std::shared_ptr pinHolder = std::make_shared(listener); int32_t sessionId = 1; nlohmann::json jsonObject; jsonObject[TAG_MSG_TYPE] = MSG_TYPE_CREATE_PIN_HOLDER; std::string message = jsonObject.dump(); - dmPinHolder->OnDataReceived(sessionId, message); - ASSERT_NE(dmPinHolder->timer_, nullptr); + pinHolder->OnDataReceived(sessionId, message); + ASSERT_NE(pinHolder->timer_, nullptr); } HWTEST_F(DmPinHolderTest, OnDataReceived_102, testing::ext::TestSize.Level0) { std::shared_ptr listener = std::make_shared(); - std::shared_ptr dmPinHolder = std::make_shared(listener); + std::shared_ptr pinHolder = std::make_shared(listener); int32_t sessionId = 1; nlohmann::json jsonObject; jsonObject[TAG_MSG_TYPE] = MSG_TYPE_CREATE_PIN_HOLDER_RESP; std::string message = jsonObject.dump(); - dmPinHolder->OnDataReceived(sessionId, message); - ASSERT_NE(dmPinHolder->timer_, nullptr); + pinHolder->OnDataReceived(sessionId, message); + ASSERT_NE(pinHolder->timer_, nullptr); } HWTEST_F(DmPinHolderTest, OnDataReceived_103, testing::ext::TestSize.Level0) { std::shared_ptr listener = std::make_shared(); - std::shared_ptr dmPinHolder = std::make_shared(listener); + std::shared_ptr pinHolder = std::make_shared(listener); int32_t sessionId = 1; nlohmann::json jsonObject; jsonObject[TAG_MSG_TYPE] = MSG_TYPE_DESTROY_PIN_HOLDER; std::string message = jsonObject.dump(); - dmPinHolder->OnDataReceived(sessionId, message); - ASSERT_NE(dmPinHolder->timer_, nullptr); + pinHolder->OnDataReceived(sessionId, message); + ASSERT_NE(pinHolder->timer_, nullptr); } HWTEST_F(DmPinHolderTest, OnDataReceived_104, testing::ext::TestSize.Level0) { std::shared_ptr listener = std::make_shared(); - std::shared_ptr dmPinHolder = std::make_shared(listener); + std::shared_ptr pinHolder = std::make_shared(listener); int32_t sessionId = 1; nlohmann::json jsonObject; jsonObject[TAG_MSG_TYPE] = MSG_TYPE_DESTROY_PIN_HOLDER_RESP; std::string message = jsonObject.dump(); - dmPinHolder->OnDataReceived(sessionId, message); - ASSERT_NE(dmPinHolder->timer_, nullptr); + pinHolder->OnDataReceived(sessionId, message); + ASSERT_NE(pinHolder->timer_, nullptr); } HWTEST_F(DmPinHolderTest, OnDataReceived_105, testing::ext::TestSize.Level0) { std::shared_ptr listener = std::make_shared(); - std::shared_ptr dmPinHolder = std::make_shared(listener); + std::shared_ptr pinHolder = std::make_shared(listener); int32_t sessionId = 1; int32_t data = 300; nlohmann::json jsonObject; jsonObject[TAG_MSG_TYPE] = data; std::string message = jsonObject.dump(); - dmPinHolder->OnDataReceived(sessionId, message); - ASSERT_NE(dmPinHolder->timer_, nullptr); + pinHolder->OnDataReceived(sessionId, message); + ASSERT_NE(pinHolder->timer_, nullptr); } HWTEST_F(DmPinHolderTest, GetPeerDeviceId_101, testing::ext::TestSize.Level0) { std::shared_ptr listener = std::make_shared(); - std::shared_ptr dmPinHolder = std::make_shared(listener); + std::shared_ptr pinHolder = std::make_shared(listener); int32_t sessionId = 1; std::string udidHash; - dmPinHolder->GetPeerDeviceId(sessionId, udidHash); - ASSERT_NE(dmPinHolder->timer_, nullptr); + pinHolder->GetPeerDeviceId(sessionId, udidHash); + ASSERT_NE(pinHolder->timer_, nullptr); } HWTEST_F(DmPinHolderTest, OnSessionOpened_101, testing::ext::TestSize.Level0) { std::shared_ptr listener = std::make_shared(); - std::shared_ptr dmPinHolder = std::make_shared(listener); + std::shared_ptr pinHolder = std::make_shared(listener); int32_t sessionId = 1; int32_t sessionSide = 0; int32_t result = 0; - dmPinHolder->OnSessionOpened(sessionId, sessionSide, result); - ASSERT_NE(dmPinHolder->timer_, nullptr); + pinHolder->OnSessionOpened(sessionId, sessionSide, result); + ASSERT_NE(pinHolder->timer_, nullptr); } HWTEST_F(DmPinHolderTest, OnSessionOpened_102, testing::ext::TestSize.Level0) { std::shared_ptr listener = std::make_shared(); - std::shared_ptr dmPinHolder = std::make_shared(listener); + std::shared_ptr pinHolder = std::make_shared(listener); int32_t sessionId = 1; int32_t sessionSide = 1; int32_t result = 1; - dmPinHolder ->listener_ = nullptr; - dmPinHolder->OnSessionOpened(sessionId, sessionSide, result); - ASSERT_NE(dmPinHolder->timer_, nullptr); + pinHolder ->listener_ = nullptr; + pinHolder->OnSessionOpened(sessionId, sessionSide, result); + ASSERT_NE(pinHolder->timer_, nullptr); } HWTEST_F(DmPinHolderTest, CheckTargetIdVaild_101, testing::ext::TestSize.Level0) { std::shared_ptr listener = std::make_shared(); - std::shared_ptr dmPinHolder = std::make_shared(listener); + std::shared_ptr pinHolder = std::make_shared(listener); PeerTargetId targetId = { .deviceId = "", .brMac = "", .bleMac = "", .wifiIp = "", }; - int32_t ret = dmPinHolder->CheckTargetIdVaild(targetId); + int32_t ret = pinHolder->CheckTargetIdVaild(targetId); ASSERT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); } HWTEST_F(DmPinHolderTest, CheckTargetIdVaild_102, testing::ext::TestSize.Level0) { std::shared_ptr listener = std::make_shared(); - std::shared_ptr dmPinHolder = std::make_shared(listener); + std::shared_ptr pinHolder = std::make_shared(listener); PeerTargetId targetId = { .deviceId = "deviceId", .brMac = "brMac", .bleMac = "bleMac", .wifiIp = "wifiIp", }; - int32_t ret = dmPinHolder->CheckTargetIdVaild(targetId); + int32_t ret = pinHolder->CheckTargetIdVaild(targetId); ASSERT_EQ(ret, DM_OK); } } // namespace diff --git a/test/unittest/UTTest_dm_pin_holder.h b/test/unittest/UTTest_dm_pin_holder.h index 1a002adb2b24691315f308112ed949e1189d1f72..b18006aa3202be6a639ef4d5c276645a2e2c0f59 100644 --- a/test/unittest/UTTest_dm_pin_holder.h +++ b/test/unittest/UTTest_dm_pin_holder.h @@ -24,7 +24,7 @@ #include "mock/mock_ipc_client_proxy.h" #include "device_manager.h" #include "single_instance.h" -#include "dm_pin_holder.h" +#include "idevice_manager_service_listener.h" namespace OHOS { namespace DistributedHardware {