From e22d875b27740561815b74b65b8ade38e20cbe63 Mon Sep 17 00:00:00 2001 From: maliang Date: Tue, 29 Apr 2025 19:00:06 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E7=8B=AC=E7=AB=8B=E7=BC=96=E8=AF=91?= =?UTF-8?q?=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: maliang --- BUILD.gn | 10 +- bundle.json | 7 +- src/daemon/jdwp.cpp | 2 +- test/BUILD.gn | 146 +++++++++--------- test/unittest/common/HdcJdwpTest.cpp | 5 +- .../common/include/daemon_uart_test.h | 1 + test/unittest/common/uart_test.cpp | 2 +- 7 files changed, 89 insertions(+), 84 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index fcc1e23b..55ef2ffd 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -121,9 +121,7 @@ template("hdcd_source_set") { } configs = [ ":hdc_config" ] - deps = [] - - deps += [ + deps = [ ":hdc_hash_gen", "src/daemon/etc:daemon_etc", ] @@ -387,8 +385,6 @@ ohos_executable("hdc") { sources += [ "src/host/host_uart.cpp" ] } - deps = [] - external_deps = [ "bounds_checking_function:libsec_static", "libusb:libusb", @@ -404,7 +400,7 @@ ohos_executable("hdc") { external_deps += [ "huks:libhukssdk" ] } - deps += [ ":hdc_hash_gen" ] + deps = [ ":hdc_hash_gen" ] if (!(is_mingw || is_mac) && build_selinux) { external_deps += [ "selinux:libselinux" ] @@ -496,7 +492,6 @@ config("hdc_register_config") { } ohos_shared_library("hdc_register") { - deps = [] defines = [ "JS_JDWP_CONNECT", "HDC_HILOG", @@ -532,7 +527,6 @@ config("hdc_updater_config") { ohos_static_library("hdc_updater") { sources = [] - deps = [] defines = [] public_configs = [ ":hdc_updater_config" ] diff --git a/bundle.json b/bundle.json index 3f75e74a..659a75a4 100644 --- a/bundle.json +++ b/bundle.json @@ -42,7 +42,7 @@ "user_auth_framework", "pin_auth", "rust_rust-openssl", - "huks" + "huks" ], "third_party": [] }, @@ -65,7 +65,10 @@ } } ], - "test": [ "//developtools/hdc/test:hdc_fuzztest" ] + "test": [ + "//developtools/hdc/test:hdc_fuzztest", + "//developtools/hdc/test:hdc_unittest" + ] } } } diff --git a/src/daemon/jdwp.cpp b/src/daemon/jdwp.cpp index 5cf40fc2..7c0e2aa6 100644 --- a/src/daemon/jdwp.cpp +++ b/src/daemon/jdwp.cpp @@ -146,7 +146,7 @@ void HdcJdwp::ReadStream(uv_stream_t *pipe, ssize_t nread, const uv_buf_t *buf) #ifdef JS_JDWP_CONNECT // pid isDebug pkgName/processName struct JsMsgHeader *jsMsg = reinterpret_cast(p); - if (jsMsg->msgLen == nread) { + if (jsMsg->msgLen == static_cast(nread)) { pid = jsMsg->pid; string pkgName = string((char *)p + sizeof(JsMsgHeader), jsMsg->msgLen - sizeof(JsMsgHeader)); ctxJdwp->pkgName = pkgName; diff --git a/test/BUILD.gn b/test/BUILD.gn index 1adda232..a2c95e43 100644 --- a/test/BUILD.gn +++ b/test/BUILD.gn @@ -99,7 +99,7 @@ config("hdc_ut_config") { } config("hdc_common_config") { - defines = [] + defines = [ "HDC_UT" ] include_dirs = [ "${hdc_path}/src/common", "${hdc_path}/src/daemon", @@ -110,8 +110,6 @@ config("hdc_common_config") { if (hdc_support_uart) { defines += [ "HDC_SUPPORT_UART" ] } - - defines += [ "HDC_UT" ] } config("hdc_host_common_config") { @@ -129,8 +127,8 @@ ohos_source_set("hdc_common") { if (hdc_support_uart) { sources += [ "${hdc_path}/src/common/uart.cpp" ] } - public_external_deps = common_external_deps - external_deps = [ "init:libbegetutil" ] + external_deps = common_external_deps + external_deps += [ "init:libbegetutil" ] public_configs = [ ":hdc_common_config", ":hdc_ut_config", @@ -149,35 +147,48 @@ ohos_source_set("hdc_daemon") { use_exceptions = true sources = hdc_common_sources sources += hdc_daemon_sources + subsystem_name = "developtools" + part_name = "hdc" if (hdc_support_uart) { sources += [ "${hdc_path}/src/common/uart.cpp" ] sources += [ "${hdc_path}/src/daemon/daemon_uart.cpp" ] } - public_external_deps = common_external_deps - external_deps = [ "init:libbegetutil" ] + external_deps = common_external_deps + external_deps += [ + "init:libbegetutil", + "c_utils:utils", + ] public_configs = [ ":hdc_common_config", ":hdc_ut_config", ] - defines = [ "OPENSSL_SUPPRESS_DEPRECATED" ] + defines = [ + "HARMONY_PROJECT", + "OPENSSL_SUPPRESS_DEPRECATED", + ] } ohos_source_set("hdc_host") { use_exceptions = true sources = hdc_common_sources sources += hdc_host_sources + subsystem_name = "developtools" + part_name = "hdc" if (hdc_support_uart) { sources += [ "${hdc_path}/src/common/uart.cpp" ] sources += [ "${hdc_path}/src/host/host_uart.cpp" ] } - public_external_deps = common_external_deps - public_external_deps += [ "libusb:libusb" ] + external_deps = common_external_deps + external_deps += [ "libusb:libusb" ] public_configs = [ ":hdc_common_config", ":hdc_host_common_config", ":hdc_ut_config", ] - defines = [ "OPENSSL_SUPPRESS_DEPRECATED" ] + defines = [ + "HARMONY_PROJECT", + "OPENSSL_SUPPRESS_DEPRECATED", + ] } ohos_source_set("hdc_daemon_platform") { @@ -202,15 +213,13 @@ ohos_source_set("hdc_daemon_platform") { "${hdc_path}/src/daemon/jdwp.cpp", ] - public_external_deps = [ + external_deps = [ "bounds_checking_function:libsec_static", "googletest:gtest", "libuv:uv", "openssl:libcrypto_static", ] - external_deps = [ "init:libbegetutil" ] - include_dirs = [ "${hdc_path}/daemon" ] } @@ -229,7 +238,10 @@ ohos_unittest("hdc_jdwp_unittest") { } public_deps = [ ":hdc_daemon_platform" ] - sources = [ "unittest/common/HdcJdwpTest.cpp" ] + sources = [ + "${hdc_path}/src/daemon/system_depend.cpp", + "unittest/common/HdcJdwpTest.cpp", + ] deps = [ ":hdc_common" ] include_dirs = [ @@ -237,34 +249,45 @@ ohos_unittest("hdc_jdwp_unittest") { "${hdc_path}/src/daemon", "${hdc_path}/src/common", ] - external_deps = [ "googletest:gmock_main" ] + + external_deps = common_external_deps + external_deps += [ + "googletest:gmock_main", + "init:libbegetutil", + "hilog:libhilog", + ] if (is_linux) { static_link = false } subsystem_name = "developtools" defines += [ "OPENSSL_SUPPRESS_DEPRECATED" ] - external_deps += [ - "bounds_checking_function:libsec_static", - "libuv:uv", - ] } ohos_unittest("hdc_uart_unittest") { use_exceptions = true module_out_path = module_output_path resource_config_file = "unittest/resource/ohos_test.xml" + public_configs = [ ":hdc_ut_config" ] sources = [ + "${hdc_path}/src/common/header.cpp", + "${hdc_path}/src/common/entry.cpp", + "${hdc_path}/src/common/decompress.cpp", "unittest/common/daemon_uart_test.cpp", "unittest/common/uart_test.cpp", ] - configs = [ ":hdc_common_config" ] - configs += [ ":hdc_ut_code_flag" ] + configs = [ + ":hdc_common_config", + ":hdc_ut_code_flag", + ":hdc_ut_config", + ] deps = [ ":hdc_daemon" ] - defines = [ "OPENSSL_SUPPRESS_DEPRECATED" ] - - external_deps = [ "googletest:gmock_main" ] + external_deps = common_external_deps + external_deps += [ + "libusb:libusb", + "googletest:gmock_main", + ] } ohos_unittest("hdc_host_uart_unittest") { @@ -272,6 +295,9 @@ ohos_unittest("hdc_host_uart_unittest") { module_out_path = module_output_path resource_config_file = "unittest/resource/ohos_test.xml" sources = [ + "${hdc_path}/src/common/header.cpp", + "${hdc_path}/src/common/entry.cpp", + "${hdc_path}/src/common/compress.cpp", "unittest/common/host_uart_test.cpp", "unittest/common/uart_test.cpp", ] @@ -285,8 +311,11 @@ ohos_unittest("hdc_host_uart_unittest") { deps = [ ":hdc_host" ] defines = [ "OPENSSL_SUPPRESS_DEPRECATED" ] - - external_deps = [ "googletest:gmock_main" ] + external_deps = common_external_deps + external_deps += [ + "libusb:libusb", + "googletest:gmock_main", + ] } ohos_unittest("hdc_base_unittest") { @@ -296,11 +325,15 @@ ohos_unittest("hdc_base_unittest") { sources = hdc_common_sources sources += [ "${hdc_path}/src/common/uart.cpp", + "${hdc_path}/src/common/password.cpp", + "${hdc_path}/src/common/hdc_huks.cpp", "unittest/common/heartbeat_ut.cpp", "unittest/common/transfer_ut.cpp", "unittest/common/file_ut.cpp", "unittest/common/tlv_ut.cpp", "unittest/common/uv_status_ut.cpp", + "unittest/common/password_ut.cpp", + "unittest/common/hdc_huks_ut.cpp", ] configs = [ @@ -308,19 +341,12 @@ ohos_unittest("hdc_base_unittest") { ":hdc_ut_code_flag", ":hdc_ut_config", ] - public_external_deps = common_external_deps - external_deps = [ + external_deps = common_external_deps + external_deps += [ "googletest:gmock_main", "init:libbegetutil", - "libuv:uv", + "huks:libhukssdk", ] - - # add for password_ut - sources += [ "${hdc_path}/src/common/password.cpp" ] - sources += [ "${hdc_path}/src/common/hdc_huks.cpp" ] - sources += [ "unittest/common/password_ut.cpp" ] - sources += [ "unittest/common/hdc_huks_ut.cpp" ] - external_deps += [ "huks:libhukssdk" ] defines = [ "HDC_SUPPORT_ENCRYPT_PRIVATE_KEY" ] } @@ -334,11 +360,9 @@ group("hdc_unittest") { deps = [ ":hdc_base_unittest", ":hdc_host_uart_unittest", - ":hdc_host_uart_unittest(${host_toolchain})", ":hdc_jdwp_unittest", ":hdc_register_unittest", ":hdc_uart_unittest", - ":hdc_uart_unittest(${host_toolchain})", ] } @@ -401,15 +425,12 @@ ohos_fuzztest("JdwpReadStreamFuzzTest") { "fuzztest/jdwpreadstream_fuzzer/JdwpReadStream_fuzzer.cpp", ] deps = [ ":hdc_common" ] - external_deps = [ + external_deps = common_external_deps + external_deps += [ "hilog:libhilog", "init:libbeget_proxy", "init:libbegetutil", ] - public_external_deps = [ - "bounds_checking_function:libsec_static", - "libuv:uv", - ] } ohos_fuzztest("ForwardReadStreamFuzzTest") { @@ -421,14 +442,8 @@ ohos_fuzztest("ForwardReadStreamFuzzTest") { deps = [ ":hdc_common" ] subsystem_name = "developtools" part_name = "hdc" - external_deps = [ - "hilog:libhilog", - "libuv:uv", - ] - public_external_deps = [ - "bounds_checking_function:libsec_static", - "libuv:uv", - ] + external_deps = common_external_deps + external_deps += [ "hilog:libhilog" ] } ohos_fuzztest("DaemonUsbReadFuzzTest") { @@ -442,14 +457,11 @@ ohos_fuzztest("DaemonUsbReadFuzzTest") { "fuzztest/daemonusbread_fuzzer/DaemonUsbRead_fuzzer.cpp", ] deps = [ ":hdc_common" ] - external_deps = [ + external_deps = common_external_deps + external_deps += [ "init:libbeget_proxy", "init:libbegetutil", ] - public_external_deps = [ - "bounds_checking_function:libsec_static", - "libuv:uv", - ] } ohos_fuzztest("DecompressToLocalFuzzTest") { @@ -464,15 +476,12 @@ ohos_fuzztest("DecompressToLocalFuzzTest") { "fuzztest/decompresstolocal_fuzzer/DecompressToLocal_fuzzer.cpp", ] deps = [ ":hdc_common" ] - external_deps = [ + external_deps = common_external_deps + external_deps += [ "hilog:libhilog", "init:libbeget_proxy", "init:libbegetutil", ] - public_external_deps = [ - "bounds_checking_function:libsec_static", - "libuv:uv", - ] } group("hdc_fuzztest") { @@ -488,7 +497,8 @@ group("hdc_fuzztest") { ohos_unittest("hdc_register_unittest") { module_out_path = module_output_path resource_config_file = "unittest/resource/ohos_test.xml" - + subsystem_name = "developtools" + part_name = "hdc" sources = [ "${hdc_path}/src/register/hdc_connect.cpp", "${hdc_path}/src/register/hdc_jdwp.cpp", @@ -498,16 +508,12 @@ ohos_unittest("hdc_register_unittest") { include_dirs = [ "${hdc_path}/src/register/" ] configs = [ ":hdc_register_config" ] - - external_deps = [ + external_deps = common_external_deps + external_deps += [ "c_utils:utils", "googletest:gmock_main", "hilog:libhilog", "init:libbeget_proxy", "init:libbegetutil", - "libuv:uv", ] - - subsystem_name = "developtools" - part_name = "hdc" -} +} \ No newline at end of file diff --git a/test/unittest/common/HdcJdwpTest.cpp b/test/unittest/common/HdcJdwpTest.cpp index e4f5ee48..a7112f7f 100644 --- a/test/unittest/common/HdcJdwpTest.cpp +++ b/test/unittest/common/HdcJdwpTest.cpp @@ -29,8 +29,9 @@ std::unique_ptr HdcJdwpTest::InstanceHdcJdwp() { uv_loop_t loopMain; uv_loop_init(&loopMain); + LoopStatus ls(&loopMain, "not support"); // Base::SetLogLevel(Hdc::LOG_FULL); - return std::make_unique(&loopMain); + return std::make_unique(&loopMain, &ls); } /* @@ -85,7 +86,7 @@ HWTEST_F(HdcJdwpTest, TestReadStream, TestSize.Level1) mJdwpTest->ReadStream(stream, (HdcJdwp::JS_PKG_MIN_SIZE - 1), nullptr); ASSERT_EQ(mJdwpTest->mapCtxJdwp.size(), 0u) << "Instanse HdcJdwp fail."; // invalid nread > max - mJdwpTest->ReadStream(stream, (HdcJdwp::JS_PKG_MX_SIZE + 1), nullptr); + mJdwpTest->ReadStream(stream, (HdcJdwp::JS_PKG_MAX_SIZE + 1), nullptr); ASSERT_EQ(mJdwpTest->mapCtxJdwp.size(), 0u) << "Instanse HdcJdwp fail."; // valid parameters diff --git a/test/unittest/common/include/daemon_uart_test.h b/test/unittest/common/include/daemon_uart_test.h index dd0c7747..f52a4f45 100644 --- a/test/unittest/common/include/daemon_uart_test.h +++ b/test/unittest/common/include/daemon_uart_test.h @@ -18,4 +18,5 @@ #include #include #include "daemon_uart.h" +#include "daemon.h" #endif // HDC_DAEMON_UART_TEST_H \ No newline at end of file diff --git a/test/unittest/common/uart_test.cpp b/test/unittest/common/uart_test.cpp index 64efb317..b0a331ea 100644 --- a/test/unittest/common/uart_test.cpp +++ b/test/unittest/common/uart_test.cpp @@ -151,7 +151,7 @@ bool HdcUARTBaseTest::MakeDemoData(std::vector &data, uint32_t sessionI UartHead head; head.option = PKG_OPTION_TAIL; head.sessionId = sessionId; - head.packageIndex = packageIndex; + head.packageIndex = PACKAGE_INDEX; data.resize(sizeof(UartHead) + testString.size()); head.dataSize = testString.size(); -- Gitee