From 502b87b465b2e71afd09f48490e21d33d2b5fdc2 Mon Sep 17 00:00:00 2001 From: xxxx Date: Wed, 15 Feb 2023 15:34:12 +0800 Subject: [PATCH] Description: modify input UT error Match-id-7d6beea235428434ef3174c77600ecc95c6095da --- common/test/mock/session_mock.cpp | 48 ++++++++++++++++--- common/test/mock/session_mock.h | 24 +++++----- common/test/mock/softbus_bus_center_mock.cpp | 11 +++++ common/test/mock/softbus_bus_center_mock.h | 16 +++++++ services/sink/transport/BUILD.gn | 4 +- .../transport/test/sinktransunittest/BUILD.gn | 10 ++-- .../src/distributed_input_source_manager.cpp | 1 - .../test/sourcemanagerunittest/BUILD.gn | 8 +++- services/source/transport/BUILD.gn | 3 -- .../distributed_input_source_transport.cpp | 4 -- .../test/sourcetransunittest/BUILD.gn | 5 +- .../src/distributed_input_transport_base.cpp | 11 +++++ .../test/transbaseunittest/BUILD.gn | 5 +- utils/src/dinput_utils_tool.cpp | 5 ++ utils/test/unittest/BUILD.gn | 14 +++++- 15 files changed, 128 insertions(+), 41 deletions(-) diff --git a/common/test/mock/session_mock.cpp b/common/test/mock/session_mock.cpp index 3503b84..3134de7 100644 --- a/common/test/mock/session_mock.cpp +++ b/common/test/mock/session_mock.cpp @@ -30,6 +30,7 @@ static char g_peerSessionName[CHAR_ARRAY_SIZE + 1]; static char g_mySessionName[CHAR_ARRAY_SIZE + 1]; int CreateSessionServer(const char *pkgName, const char *sessionName, const ISessionListener *listener) { + (void)pkgName; std::cout << "CreateSessionServer start sessionName:" << sessionName << std::endl; if (strlen(sessionName) == 0) { std::cout << "CreateSessionServer sessionName is empty." << std::endl; @@ -43,22 +44,27 @@ int CreateSessionServer(const char *pkgName, const char *sessionName, const ISes std::cout << "strcpy_s faild" << std::endl; return DH_ERROR; } - g_listener.onBytesReceived = listener->onBytesReceived; - g_listener.onMessageReceived = listener->onMessageReceived; - g_listener.onSessionClosed = listener->onSessionClosed; - g_listener.onSessionOpened = listener->onSessionOpened; - g_listener.onStreamReceived = listener->onStreamReceived; + g_listener.OnBytesReceived = listener->OnBytesReceived; + g_listener.OnMessageReceived = listener->OnMessageReceived; + g_listener.OnSessionClosed = listener->OnSessionClosed; + g_listener.OnSessionOpened = listener->OnSessionOpened; + g_listener.OnStreamReceived = listener->OnStreamReceived; return DH_SUCCESS; } int RemoveSessionServer(const char *pkgName, const char *sessionName) { + (void)pkgName; + (void)sessionName; return DH_SUCCESS; } int OpenSession(const char *mySessionName, const char *peerSessionName, const char *peerDeviceId, const char *groupId, const SessionAttribute *attr) { + (void)mySessionName; + (void)groupId; + (void)attr; if (strlen(peerSessionName) == 0) { return DH_ERROR; } @@ -80,28 +86,42 @@ int OpenSession(const char *mySessionName, const char *peerSessionName, const ch void OpenSessionResult() { - g_listener.onSessionOpened(MOCK_SESSION_ID, DH_SUCCESS); + g_listener.OnSessionOpened(MOCK_SESSION_ID, DH_SUCCESS); } -void CloseSession(int sessionId) {} +void CloseSession(int sessionId) +{ + (void)sessionId; +} int SendBytes(int sessionId, const void *data, unsigned int len) { + (void)sessionId; + (void)data; + (void)len; return DH_SUCCESS; } int SendMessage(int sessionId, const void *data, unsigned int len) { + (void)sessionId; + (void)data; + (void)len; return DH_SUCCESS; } int SendStream(int sessionId, const StreamData *data, const StreamData *ext, const FrameInfo *param) { + (void)sessionId; + (void)data; + (void)ext; + (void)param; return DH_SUCCESS; } int GetMySessionName(int sessionId, char *sessionName, unsigned int len) { + (void)sessionId; if (strncpy_s(sessionName, len + 1, g_mySessionName, CHAR_ARRAY_SIZE) != EOK) { std::cout << "strncpy_s faild" << std::endl; return DH_ERROR; @@ -111,6 +131,7 @@ int GetMySessionName(int sessionId, char *sessionName, unsigned int len) int GetPeerSessionName(int sessionId, char *sessionName, unsigned int len) { + (void)sessionId; if (strncpy_s(sessionName, len + 1, g_peerSessionName, CHAR_ARRAY_SIZE) != EOK) { std::cout << "strncpy_s faild" << std::endl; return DH_ERROR; @@ -120,6 +141,7 @@ int GetPeerSessionName(int sessionId, char *sessionName, unsigned int len) int GetPeerDeviceId(int sessionId, char *devId, unsigned int len) { + (void)sessionId; if (strncpy_s(devId, len + 1, g_peerDeviceId, DEVICE_ID_SIZE_MAX) != EOK) { std::cout << "strncpy_s faild" << std::endl; return DH_ERROR; @@ -129,21 +151,33 @@ int GetPeerDeviceId(int sessionId, char *devId, unsigned int len) int GetSessionSide(int sessionId) { + (void)sessionId; return AUTH_SESSION_SIDE_CLIENT; } int SetFileReceiveListener(const char *pkgName, const char *sessionName, const IFileReceiveListener *recvListener, const char *rootDir) { + (void)pkgName; + (void)sessionName; + (void)recvListener; + (void)rootDir; return DH_SUCCESS; } int SetFileSendListener(const char *pkgName, const char *sessionName, const IFileSendListener *sendListener) { + (void)pkgName; + (void)sessionName; + (void)sendListener; return DH_SUCCESS; } int SendFile(int sessionId, const char *sFileList[], const char *dFileList[], uint32_t fileCnt) { + (void)sessionId; + (void)sFileList; + (void)dFileList; + (void)fileCnt; return DH_SUCCESS; } \ No newline at end of file diff --git a/common/test/mock/session_mock.h b/common/test/mock/session_mock.h index 3fdd941..c71ee83 100644 --- a/common/test/mock/session_mock.h +++ b/common/test/mock/session_mock.h @@ -146,25 +146,25 @@ constexpr uint32_t DEVICE_ID_SIZE_MAX = 65; constexpr uint32_t CHAR_ARRAY_SIZE = 100; typedef struct { - int (*onSessionOpened)(int sessionId, int result); - void (*onSessionClosed)(int sessionId); - void (*onBytesReceived)(int sessionId, const void *data, unsigned int dataLen); - void (*onMessageReceived)(int sessionId, const void *data, unsigned int dataLen); - void (*onStreamReceived)(int sessionId, const StreamData *data, const StreamData *ext, + int (*OnSessionOpened)(int sessionId, int result); + void (*OnSessionClosed)(int sessionId); + void (*OnBytesReceived)(int sessionId, const void *data, unsigned int dataLen); + void (*OnMessageReceived)(int sessionId, const void *data, unsigned int dataLen); + void (*OnStreamReceived)(int sessionId, const StreamData *data, const StreamData *ext, const StreamFrameInfo *param); } ISessionListener; typedef struct { - int (*onReceiveFileStarted)(int sessionId, const char *files, int fileCnt); - int (*onReceiveFileProcess)(int sessionId, const char *firstFile, uint64_t bytesUpload, uint64_t bytesTotal); - void (*onReceiveFileFinished)(int sessionId, const char *files, int fileCnt); - void (*onFileTransError)(int sessionId); + int (*OnReceiveFileStarted)(int sessionId, const char *files, int fileCnt); + int (*OnReceiveFileProcess)(int sessionId, const char *firstFile, uint64_t bytesUpload, uint64_t bytesTotal); + void (*OnReceiveFileFinished)(int sessionId, const char *files, int fileCnt); + void (*OnFileTransError)(int sessionId); } IFileReceiveListener; typedef struct { - int (*onSendFileProcess)(int sessionId, uint64_t bytesUpload, uint64_t bytesTotal); - int (*onSendFileFinished)(int sessionId, const char *firstFile); - void (*onFileTransError)(int sessionId); + int (*OnSendFileProcess)(int sessionId, uint64_t bytesUpload, uint64_t bytesTotal); + int (*OnSendFileFinished)(int sessionId, const char *firstFile); + void (*OnFileTransError)(int sessionId); } IFileSendListener; int CreateSessionServer(const char *pkgName, const char *sessionName, const ISessionListener *listener); diff --git a/common/test/mock/softbus_bus_center_mock.cpp b/common/test/mock/softbus_bus_center_mock.cpp index 11dd347..57b9439 100644 --- a/common/test/mock/softbus_bus_center_mock.cpp +++ b/common/test/mock/softbus_bus_center_mock.cpp @@ -25,4 +25,15 @@ int32_t GetLocalNodeDeviceInfo(const char *pkgName, NodeBasicInfo *info) (void)pkgName; *info = nodeBasicInfo; return DH_SUCCESS; +} + +int32_t GetNodeKeyInfo(const char *pkgName, const char *networkId, + NodeDeviceInfoKey key, uint8_t *info, int32_t infoLen) +{ + (void)pkgName; + (void)networkId; + (void)key; + (void)info; + (void)infoLen; + return DH_SUCCESS; } \ No newline at end of file diff --git a/common/test/mock/softbus_bus_center_mock.h b/common/test/mock/softbus_bus_center_mock.h index 50e07bc..51d1261 100644 --- a/common/test/mock/softbus_bus_center_mock.h +++ b/common/test/mock/softbus_bus_center_mock.h @@ -23,6 +23,7 @@ extern "C" { #endif constexpr uint32_t MOCK_NETWORK_ID_BUF_LEN = 65; constexpr uint32_t MOCK_DEVICE_NAME_BUF_LEN = 65; +constexpr uint32_t UUID_BUF_LEN = 65; /** * @brief Defines the basic information about a device. * @since 1.0 @@ -34,7 +35,22 @@ typedef struct { uint16_t deviceTypeId; } NodeBasicInfo; +typedef enum { + NODE_KEY_UDID = 0, /**< UDID in string format*/ + NODE_KEY_UUID, /**< UUID in string format */ + NODE_KEY_MASTER_UDID, /**< UDID of master node in string format */ + NODE_KEY_BR_MAC, /**< BR MAC in string format */ + NODE_KEY_IP_ADDRESS, /**< IP address in string format */ + NODE_KEY_DEV_NAME, /**< Device name in string format */ + NODE_KEY_NETWORK_CAPABILITY, /**< Network capability in number format */ + NODE_KEY_NETWORK_TYPE, /**< Network type in number format */ + NODE_KEY_BLE_OFFLINE_CODE, /**< Ble offlinecode in string format */ + NODE_KEY_DATA_CHANGE_FLAG, +} NodeDeviceInfoKey; + int32_t GetLocalNodeDeviceInfo(const char *pkgName, NodeBasicInfo *info); +int32_t GetNodeKeyInfo(const char *pkgName, const char *networkId, + NodeDeviceInfoKey key, uint8_t *info, int32_t infoLen); #ifdef __cplusplus } #endif diff --git a/services/sink/transport/BUILD.gn b/services/sink/transport/BUILD.gn index fab00a1..9f929f6 100644 --- a/services/sink/transport/BUILD.gn +++ b/services/sink/transport/BUILD.gn @@ -28,17 +28,17 @@ ohos_shared_library("libdinput_sink_trans") { "${fwk_utils_path}/include/log", "${fwk_utils_path}/include", "//third_party/json/include", - "//foundation/communication/dsoftbus/interfaces/kits/transport", "${service_common}/include", "${dfx_utils_path}/include", "${utils_path}/include", "${fwk_interfaces_path}/include", "${fwk_interfaces_path}/include/ipc", "//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/include", "//third_party/libevdev/libevdev/", "//foundation/distributedhardware/distributed_input/services/transportbase/include", + "//foundation/communication/dsoftbus/interfaces/kits/transport", + "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", ] sources = [ diff --git a/services/sink/transport/test/sinktransunittest/BUILD.gn b/services/sink/transport/test/sinktransunittest/BUILD.gn index 2571b59..2298600 100755 --- a/services/sink/transport/test/sinktransunittest/BUILD.gn +++ b/services/sink/transport/test/sinktransunittest/BUILD.gn @@ -44,7 +44,7 @@ ohos_unittest("distributed_input_sinktrans_test") { "${dfx_utils_path}/include", "${utils_path}/include", "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", - "${common_path}/mock", + "${common_path}/test/mock", "//foundation/distributedhardware/distributed_input/services/sink/sinkmanager/include", "${fwk_interfaces_path}/include/ipc", "//foundation/window/window_manager/interfaces/innerkits/dm", @@ -62,15 +62,18 @@ ohos_unittest("distributed_input_sinktrans_test") { "${ipc_path}/include", "${ipc_path}/src", "${services_sink_path}/inputcollector/include", + "${services_source_path}/inputinject/include", + "//foundation/distributedhardware/distributed_input/inputdevicehandler/include", ] sources = [ "//foundation/distributedhardware/distributed_input/services/sink/transport/src/distributed_input_sink_switch.cpp", "//foundation/distributedhardware/distributed_input/services/sink/transport/src/distributed_input_sink_transport.cpp", + "//foundation/distributedhardware/distributed_input/services/sink/sinkmanager/src/distributed_input_sink_manager.cpp", + "//foundation/distributedhardware/distributed_input/services/transportbase/src/distributed_input_transport_base.cpp", "distributed_input_sinktrans_test.cpp", "${common_path}/test/mock/session_mock.cpp", "${common_path}/test/mock/softbus_bus_center_mock.cpp", - "//foundation/distributedhardware/distributed_input/services/sink/sinkmanager/src/distributed_input_sink_manager.cpp", ] cflags = [ @@ -85,6 +88,7 @@ ohos_unittest("distributed_input_sinktrans_test") { "HI_LOG_ENABLE", "DH_LOG_TAG=\"distributedinpututtest\"", "LOG_DOMAIN=0xD004100", + "COMPILE_TEST_MODE" ] deps = [ @@ -95,7 +99,6 @@ ohos_unittest("distributed_input_sinktrans_test") { "//base/notification/eventhandler/frameworks/eventhandler:libeventhandler", "${services_sink_path}/sinkmanager:libdinput_sink", "${services_sink_path}/inputcollector:libdinput_collector", - "//foundation/distributedhardware/distributed_input/services/transportbase:libdinput_trans_base", "//foundation/window/window_manager/dm:libdm", "//third_party/libevdev:libevdev", ] @@ -104,6 +107,7 @@ ohos_unittest("distributed_input_sinktrans_test") { "c_utils:utils", "ipc:ipc_core", "safwk:system_ability_fwk", + "hitrace_native:hitrace_meter", ] cflags_cc = [ "-DHILOG_ENABLE" ] diff --git a/services/source/sourcemanager/src/distributed_input_source_manager.cpp b/services/source/sourcemanager/src/distributed_input_source_manager.cpp index 1d2708a..b7e2737 100644 --- a/services/source/sourcemanager/src/distributed_input_source_manager.cpp +++ b/services/source/sourcemanager/src/distributed_input_source_manager.cpp @@ -27,7 +27,6 @@ #include "nlohmann/json.hpp" #include "system_ability_definition.h" #include "string_ex.h" -#include "softbus_bus_center.h" #include "distributed_hardware_fwk_kit.h" #include "ipublisher_listener.h" diff --git a/services/source/sourcemanager/test/sourcemanagerunittest/BUILD.gn b/services/source/sourcemanager/test/sourcemanagerunittest/BUILD.gn index 75f4db1..43a03ed 100755 --- a/services/source/sourcemanager/test/sourcemanagerunittest/BUILD.gn +++ b/services/source/sourcemanager/test/sourcemanagerunittest/BUILD.gn @@ -60,6 +60,7 @@ ohos_unittest("distributed_input_sourcemanager_test") { "//base/security/access_token/interfaces/innerkits/nativetoken/include", "//base/security/access_token/interfaces/innerkits/token_setproc/include", "//foundation/distributedhardware/distributed_input/services/transportbase/include", + "${distributedinput_path}/utils/include", ] sources = [ @@ -93,9 +94,13 @@ ohos_unittest("distributed_input_sourcemanager_test") { "//foundation/distributedhardware/distributed_input/services/source/sourcemanager/src/distributed_input_source_manager.cpp", "//foundation/distributedhardware/distributed_input/services/source/sourcemanager/src/distributed_input_source_sa_cli_mgr.cpp", "//foundation/distributedhardware/distributed_input/services/source/transport/src/distributed_input_source_transport.cpp", + "//foundation/distributedhardware/distributed_input/services/transportbase/src/distributed_input_transport_base.cpp", "distributed_input_sourcemanager_test.cpp", "${common_path}/test/mock/session_mock.cpp", "${common_path}/test/mock/softbus_bus_center_mock.cpp", + "${distributedinput_path}/utils/src/dinput_utils_tool.cpp", + "${distributedinput_path}/utils/src/dinput_context.cpp", + "${distributedinput_path}/utils/src/dinput_sa_process_state.cpp", ] cflags = [ @@ -110,12 +115,12 @@ ohos_unittest("distributed_input_sourcemanager_test") { "HI_LOG_ENABLE", "DH_LOG_TAG=\"distributedinpututtest\"", "LOG_DOMAIN=0xD004100", + "COMPILE_TEST_MODE" ] deps = [ "${dfx_utils_path}:libdinput_dfx_utils", "${fwk_utils_path}:distributedhardwareutils", - "${utils_path}:libdinput_utils", "//base/notification/eventhandler/frameworks/eventhandler:libeventhandler", "//third_party/libevdev:libevdev", "//third_party/openssl:libcrypto_static", @@ -125,7 +130,6 @@ ohos_unittest("distributed_input_sourcemanager_test") { "//base/security/access_token/interfaces/innerkits/accesstoken:libaccesstoken_sdk", "//base/security/access_token/interfaces/innerkits/nativetoken:libnativetoken", "//base/security/access_token/interfaces/innerkits/token_setproc:libtoken_setproc", - "//foundation/distributedhardware/distributed_input/services/transportbase:libdinput_trans_base", ] external_deps = [ diff --git a/services/source/transport/BUILD.gn b/services/source/transport/BUILD.gn index a7dd63b..9765c12 100755 --- a/services/source/transport/BUILD.gn +++ b/services/source/transport/BUILD.gn @@ -27,7 +27,6 @@ ohos_shared_library("libdinput_source_trans") { "${fwk_utils_path}/include/log", "${fwk_utils_path}/include", "//third_party/json/include", - "//foundation/communication/dsoftbus/interfaces/kits/transport", "${service_common}/include", "//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp/include", "${services_source_path}/inputinject/include", @@ -36,7 +35,6 @@ ohos_shared_library("libdinput_source_trans") { "${utils_path}/include", "${frameworks_path}/include", "${distributedinput_path}/inputdevicehandler/include", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/include", "//third_party/libevdev/libevdev/", "//foundation/distributedhardware/distributed_input/services/transportbase/include", @@ -56,7 +54,6 @@ ohos_shared_library("libdinput_source_trans") { "${fwk_utils_path}:distributedhardwareutils", "${utils_path}:libdinput_utils", "//base/notification/eventhandler/frameworks/eventhandler:libeventhandler", - "//foundation/communication/dsoftbus/sdk:softbus_client", "//foundation/distributedhardware/distributed_input/services/source/inputinject:libdinput_inject", "//third_party/libevdev:libevdev", "//foundation/distributedhardware/distributed_input/services/transportbase:libdinput_trans_base", diff --git a/services/source/transport/src/distributed_input_source_transport.cpp b/services/source/transport/src/distributed_input_source_transport.cpp index 7a9564a..2ce3a0c 100644 --- a/services/source/transport/src/distributed_input_source_transport.cpp +++ b/services/source/transport/src/distributed_input_source_transport.cpp @@ -33,9 +33,6 @@ #include "dinput_utils_tool.h" #include "distributed_input_inject.h" #include "hidumper.h" -#include "session.h" -#include "softbus_bus_center.h" -#include "softbus_common.h" #include "distributed_input_transport_base.h" @@ -575,7 +572,6 @@ int32_t DistributedInputSourceTransport::NotifyOriginStopTypeResult(int32_t srcT return DH_SUCCESS; } - int32_t DistributedInputSourceTransport::StartRemoteInput(const std::string& deviceId, const uint32_t& inputTypes) { int32_t sessionId = DistributedInputTransportBase::GetInstance().GetSessionIdByDevId(deviceId); diff --git a/services/source/transport/test/sourcetransunittest/BUILD.gn b/services/source/transport/test/sourcetransunittest/BUILD.gn index bce567b..87ee625 100755 --- a/services/source/transport/test/sourcetransunittest/BUILD.gn +++ b/services/source/transport/test/sourcetransunittest/BUILD.gn @@ -46,20 +46,19 @@ ohos_unittest("distributed_input_sourcetrans_test") { "${services_source_path}/inputinject/include", "${services_source_path}/transport/include", "${services_source_path}/sourcemanager/include", - "//foundation/communication/dsoftbus/interfaces/kits/transport", "//base/hiviewdfx/hitrace/interfaces/native/innerkits/include/hitrace_meter", "${dfx_utils_path}/include", "${utils_path}/include", "${ipc_path}/include", "${frameworks_path}/include", "${distributedinput_path}/inputdevicehandler/include", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", "//base/notification/eventhandler/interfaces/inner_api", "${common_path}/test/mock", ] sources = [ "//foundation/distributedhardware/distributed_input/services/source/transport/src/distributed_input_source_transport.cpp", + "//foundation/distributedhardware/distributed_input/services/transportbase/src/distributed_input_transport_base.cpp", "distributed_input_sourcetrans_test.cpp", "${common_path}/test/mock/session_mock.cpp", "${common_path}/test/mock/softbus_bus_center_mock.cpp", @@ -77,6 +76,7 @@ ohos_unittest("distributed_input_sourcetrans_test") { "HI_LOG_ENABLE", "DH_LOG_TAG=\"distributedinpututtest\"", "LOG_DOMAIN=0xD004100", + "COMPILE_TEST_MODE" ] deps = [ @@ -87,7 +87,6 @@ ohos_unittest("distributed_input_sourcetrans_test") { "//foundation/distributedhardware/distributed_input/services/source/sourcemanager:libdinput_source", "//foundation/distributedhardware/distributed_input/services/source/inputinject:libdinput_inject", "//third_party/libevdev:libevdev", - "//foundation/distributedhardware/distributed_input/services/transportbase:libdinput_trans_base", ] external_deps = [ diff --git a/services/transportbase/src/distributed_input_transport_base.cpp b/services/transportbase/src/distributed_input_transport_base.cpp index 7544274..e39b2ff 100644 --- a/services/transportbase/src/distributed_input_transport_base.cpp +++ b/services/transportbase/src/distributed_input_transport_base.cpp @@ -33,8 +33,19 @@ #include "dinput_utils_tool.h" #include "distributed_input_inject.h" #include "hidumper.h" + +#ifndef COMPILE_TEST_MODE #include "session.h" +#else +#include "session_mock.h" +#endif + +#ifndef COMPILE_TEST_MODE #include "softbus_bus_center.h" +#else +#include "softbus_bus_center_mock.h" +#endif + #include "softbus_common.h" namespace OHOS { diff --git a/services/transportbase/test/transbaseunittest/BUILD.gn b/services/transportbase/test/transbaseunittest/BUILD.gn index cf2f6a3..8ede4ae 100644 --- a/services/transportbase/test/transbaseunittest/BUILD.gn +++ b/services/transportbase/test/transbaseunittest/BUILD.gn @@ -46,8 +46,6 @@ ohos_unittest("distributed_input_transbase_test") { "//third_party/json/include", "//third_party/libevdev/libevdev/", "${distributedinput_path}/inputdevicehandler/include", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", - "//foundation/communication/dsoftbus/interfaces/kits/transport", "//base/hiviewdfx/hitrace/interfaces/native/innerkits/include/hitrace_meter", "//base/notification/eventhandler/interfaces/inner_api", "${common_path}/test/mock", @@ -57,6 +55,7 @@ ohos_unittest("distributed_input_transbase_test") { "//foundation/distributedhardware/distributed_input/services/source/transport/src/distributed_input_source_transport.cpp", "//foundation/distributedhardware/distributed_input/services/sink/transport/src/distributed_input_sink_transport.cpp", "//foundation/distributedhardware/distributed_input/services/sink/transport/src/distributed_input_sink_switch.cpp", + "//foundation/distributedhardware/distributed_input/services/transportbase/src/distributed_input_transport_base.cpp", "distributed_input_transbase_test.cpp", "${common_path}/test/mock/session_mock.cpp", "${common_path}/test/mock/softbus_bus_center_mock.cpp", @@ -74,6 +73,7 @@ ohos_unittest("distributed_input_transbase_test") { "HI_LOG_ENABLE", "DH_LOG_TAG=\"distributedinpututtest\"", "LOG_DOMAIN=0xD004100", + "COMPILE_TEST_MODE" ] deps = [ @@ -84,7 +84,6 @@ ohos_unittest("distributed_input_transbase_test") { "//third_party/libevdev:libevdev", "//base/notification/eventhandler/frameworks/eventhandler:libeventhandler", "//foundation/distributedhardware/distributed_input/services/source/inputinject:libdinput_inject", - "//foundation/distributedhardware/distributed_input/services/transportbase:libdinput_trans_base", ] external_deps = [ diff --git a/utils/src/dinput_utils_tool.cpp b/utils/src/dinput_utils_tool.cpp index f8532a8..4121ec8 100644 --- a/utils/src/dinput_utils_tool.cpp +++ b/utils/src/dinput_utils_tool.cpp @@ -23,7 +23,12 @@ #include "anonymous_string.h" #include "nlohmann/json.hpp" + +#ifndef COMPILE_TEST_MODE #include "softbus_bus_center.h" +#else +#include "softbus_bus_center_mock.h" +#endif #include "constants_dinput.h" #include "dinput_errcode.h" diff --git a/utils/test/unittest/BUILD.gn b/utils/test/unittest/BUILD.gn index 96d077a..0dd27e9 100644 --- a/utils/test/unittest/BUILD.gn +++ b/utils/test/unittest/BUILD.gn @@ -42,10 +42,14 @@ ohos_unittest("distributed_input_utils_test") { "//third_party/json/include", "${common_path}/test/mock", "${service_common}/include", + "//base/hiviewdfx/hisysevent/interfaces/native/innerkits/hisysevent/include", ] sources = [ "dinput_context_test.cpp", + "${distributedinput_path}/utils/src/dinput_context.cpp", + "${distributedinput_path}/utils/src/dinput_utils_tool.cpp", + "${distributedinput_path}/utils/src/dinput_log.cpp", "${common_path}/test/mock/softbus_bus_center_mock.cpp", ] @@ -61,10 +65,18 @@ ohos_unittest("distributed_input_utils_test") { "HI_LOG_ENABLE", "DH_LOG_TAG=\"distributedinpututtest\"", "LOG_DOMAIN=0xD004100", + "COMPILE_TEST_MODE" ] deps = [ - "${utils_path}:libdinput_utils", + "${fwk_utils_path}:distributedhardwareutils", + "//third_party/openssl:libcrypto_static", + ] + + external_deps = [ + "samgr:samgr_proxy", + "c_utils:utils", + "hiviewdfx_hilog_native:libhilog", ] cflags_cc = [ "-DHILOG_ENABLE" ]