From 26693f050f8391605b3dd99ff0cebff5d316ce07 Mon Sep 17 00:00:00 2001 From: liupeng298 Date: Thu, 31 Jul 2025 12:17:33 +0000 Subject: [PATCH 01/15] add test/unittest/host/include/host_uds_server_test.h. Signed-off-by: liupeng298 --- .../host/include/host_uds_server_test.h | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 test/unittest/host/include/host_uds_server_test.h diff --git a/test/unittest/host/include/host_uds_server_test.h b/test/unittest/host/include/host_uds_server_test.h new file mode 100644 index 00000000..12ca0b6b --- /dev/null +++ b/test/unittest/host/include/host_uds_server_test.h @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2025 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 HDC_HOST_UDS_SERVER_TEST_H +#define HDC_HOST_UDS_SERVER_TEST_H +#include +namespace Hdc { +class HdcHostUdsServerTest : public ::testing::Test { +public: + static void SetUpTestCase(); + static void TearDownTestCase(); + void SetUp(); + void TearDown(); +}; +} // namespace Hdc +#endif // HDC_HOST_UDS_SERVER_TEST_H \ No newline at end of file -- Gitee From b57f3af196d67b4063a9150d3543a3a0493b189f Mon Sep 17 00:00:00 2001 From: liupeng298 Date: Thu, 31 Jul 2025 12:18:12 +0000 Subject: [PATCH 02/15] add test/unittest/host/host_uds_server_test.cpp. Signed-off-by: liupeng298 --- test/unittest/host/host_uds_server_test.cpp | 56 +++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 test/unittest/host/host_uds_server_test.cpp diff --git a/test/unittest/host/host_uds_server_test.cpp b/test/unittest/host/host_uds_server_test.cpp new file mode 100644 index 00000000..304fd2e8 --- /dev/null +++ b/test/unittest/host/host_uds_server_test.cpp @@ -0,0 +1,56 @@ +/* + * Copyright (c) 2025 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. + */ +#include "host_uds_server_test.h" +#ifdef __OHOS__ +#include "server_for_client.h" +#include "uv.h" +#include +#include "define_enum.h" +#endif + +#include + +using namespace testing::ext; + +namespace Hdc { +void HdcHostUdsServerTest::SetUpTestCase() {} +void HdcHostUdsServerTest::TearDownTestCase() {} +void HdcHostUdsServerTest::SetUp() +{ +} +void HdcHostUdsServerTest::TearDown() {} + + +HWTEST_F(HdcHostUdsServerTest, Test_AcceptUdsClient, TestSize.Level0) +{ + printf("0000\n"); +#ifdef __OHOS__ + printf("1111"); + uv_loop_t loopMain; + uv_loop_init(&loopMain); + printf("222"); + HdcServerForClient *cls = new HdcServerForClient(true, std::string("uds"), nullptr, &loopMain); + printf("333"); + uv_pipe_t udsListen; + udsListen.data = cls; + printf("4444"); + HdcServerForClient::AcceptUdsClient((uv_stream_t *)&udsListen, 0); + printf("55555"); + + delete cls; +#endif +} + +} \ No newline at end of file -- Gitee From 729d9f6296b7a4c72843084a1caf20dea8f81701 Mon Sep 17 00:00:00 2001 From: liupeng298 Date: Thu, 31 Jul 2025 12:19:45 +0000 Subject: [PATCH 03/15] update test/BUILD.gn. Signed-off-by: liupeng298 --- test/BUILD.gn | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/test/BUILD.gn b/test/BUILD.gn index 019d748d..ab388510 100644 --- a/test/BUILD.gn +++ b/test/BUILD.gn @@ -309,10 +309,28 @@ ohos_unittest("hdc_host_base_unittest") { module_out_path = module_output_path resource_config_file = "unittest/resource/ohos_test.xml" defines = [ "HDC_HOST" ] + if (is_ohos) { + defines += [ "HOST_OHOS" ] + } + if (hdc_support_uart) { + defines += [ "HDC_SUPPORT_UART" ] + } sources = hdc_common_sources sources += [ "${hdc_path}/src/daemon/daemon_app.cpp", "${hdc_path}/src/host/host_app.cpp", + + "${hdc_path}/src/host/server_for_client.cpp", + "${hdc_path}/src/host/server.cpp", + "${hdc_path}/src/host/host_tcp.cpp", + "${hdc_path}/src/host/host_uart.cpp", + "${hdc_path}/src/host/host_usb.cpp", + "${hdc_path}/src/host/host_updater.cpp", + "${hdc_path}/src/host/host_shell_option.cpp", + "${hdc_path}/src/host/translate.cpp", + "${hdc_path}/src/common/server_cmd_log.cpp", + "${hdc_path}/src/common/uart.cpp", + "unittest/daemon/daemon_app_test.cpp", "unittest/common/define_test.cpp", "unittest/host/host_app_test.cpp", -- Gitee From 28a42847c6d94f1ecd8635b8a76576295ca98e32 Mon Sep 17 00:00:00 2001 From: liupeng298 Date: Thu, 31 Jul 2025 15:20:38 +0000 Subject: [PATCH 04/15] update test/unittest/host/host_uds_server_test.cpp. Signed-off-by: liupeng298 --- test/unittest/host/host_uds_server_test.cpp | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/test/unittest/host/host_uds_server_test.cpp b/test/unittest/host/host_uds_server_test.cpp index 304fd2e8..06860f2f 100644 --- a/test/unittest/host/host_uds_server_test.cpp +++ b/test/unittest/host/host_uds_server_test.cpp @@ -35,19 +35,14 @@ void HdcHostUdsServerTest::TearDown() {} HWTEST_F(HdcHostUdsServerTest, Test_AcceptUdsClient, TestSize.Level0) { - printf("0000\n"); #ifdef __OHOS__ - printf("1111"); uv_loop_t loopMain; uv_loop_init(&loopMain); - printf("222"); HdcServerForClient *cls = new HdcServerForClient(true, std::string("uds"), nullptr, &loopMain); - printf("333"); - uv_pipe_t udsListen; - udsListen.data = cls; - printf("4444"); - HdcServerForClient::AcceptUdsClient((uv_stream_t *)&udsListen, 0); - printf("55555"); + EXPECT_TRUE(!cls->SetUdsListen()); // uv_pipe_bind失败 + sleep(1); + HdcServerForClient::AcceptUdsClient((uv_stream_t *)&cls->udsListen, 0); // 添加channel成功，uv_accept失败 -》 FreeChannel没有真正释放channel + EXPECT_TRUE(cls->mapChannel.size() == 1); delete cls; #endif -- Gitee From 1ca733fcd4bbaa7fbe599f63966df1030675264c Mon Sep 17 00:00:00 2001 From: liupeng298 Date: Thu, 31 Jul 2025 15:21:19 +0000 Subject: [PATCH 05/15] update test/BUILD.gn. Signed-off-by: liupeng298 --- test/BUILD.gn | 1 + 1 file changed, 1 insertion(+) diff --git a/test/BUILD.gn b/test/BUILD.gn index ab388510..09bf2054 100644 --- a/test/BUILD.gn +++ b/test/BUILD.gn @@ -335,6 +335,7 @@ ohos_unittest("hdc_host_base_unittest") { "unittest/common/define_test.cpp", "unittest/host/host_app_test.cpp", "unittest/host/main_test.cpp", + "unittest/host/host_uds_server_test.cpp", ] configs = [ -- Gitee From 39a20560e46d201308334d1d1060baea9b832d60 Mon Sep 17 00:00:00 2001 From: liupeng298 Date: Thu, 31 Jul 2025 15:24:00 +0000 Subject: [PATCH 06/15] update test/unittest/host/host_uds_server_test.cpp. Signed-off-by: liupeng298 --- test/unittest/host/host_uds_server_test.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/test/unittest/host/host_uds_server_test.cpp b/test/unittest/host/host_uds_server_test.cpp index 06860f2f..2639dc5f 100644 --- a/test/unittest/host/host_uds_server_test.cpp +++ b/test/unittest/host/host_uds_server_test.cpp @@ -20,8 +20,6 @@ #include "define_enum.h" #endif -#include - using namespace testing::ext; namespace Hdc { -- Gitee From 962f32d1d081a3f1345f0827dbda758a29e719d6 Mon Sep 17 00:00:00 2001 From: liupeng298 Date: Fri, 1 Aug 2025 01:35:43 +0000 Subject: [PATCH 07/15] update test/unittest/host/host_uds_server_test.cpp. Signed-off-by: liupeng298 --- test/unittest/host/host_uds_server_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/unittest/host/host_uds_server_test.cpp b/test/unittest/host/host_uds_server_test.cpp index 2639dc5f..22decf5a 100644 --- a/test/unittest/host/host_uds_server_test.cpp +++ b/test/unittest/host/host_uds_server_test.cpp @@ -39,7 +39,7 @@ HWTEST_F(HdcHostUdsServerTest, Test_AcceptUdsClient, TestSize.Level0) HdcServerForClient *cls = new HdcServerForClient(true, std::string("uds"), nullptr, &loopMain); EXPECT_TRUE(!cls->SetUdsListen()); // uv_pipe_bind失败 sleep(1); - HdcServerForClient::AcceptUdsClient((uv_stream_t *)&cls->udsListen, 0); // 添加channel成功，uv_accept失败 -》 FreeChannel没有真正释放channel + HdcServerForClient::AcceptUdsClient((uv_stream_t *)&cls->udsListen, 0); EXPECT_TRUE(cls->mapChannel.size() == 1); delete cls; -- Gitee From e50b118d02653b7804a368379951ba5a4ccd5b50 Mon Sep 17 00:00:00 2001 From: liupeng298 Date: Fri, 1 Aug 2025 05:57:46 +0000 Subject: [PATCH 08/15] update test/unittest/host/host_uds_server_test.cpp. Signed-off-by: liupeng298 --- test/unittest/host/host_uds_server_test.cpp | 22 ++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/test/unittest/host/host_uds_server_test.cpp b/test/unittest/host/host_uds_server_test.cpp index 22decf5a..6651038c 100644 --- a/test/unittest/host/host_uds_server_test.cpp +++ b/test/unittest/host/host_uds_server_test.cpp @@ -18,8 +18,11 @@ #include "uv.h" #include #include "define_enum.h" +#include "server.h" #endif +#include + using namespace testing::ext; namespace Hdc { @@ -39,11 +42,28 @@ HWTEST_F(HdcHostUdsServerTest, Test_AcceptUdsClient, TestSize.Level0) HdcServerForClient *cls = new HdcServerForClient(true, std::string("uds"), nullptr, &loopMain); EXPECT_TRUE(!cls->SetUdsListen()); // uv_pipe_bind失败 sleep(1); - HdcServerForClient::AcceptUdsClient((uv_stream_t *)&cls->udsListen, 0); + HdcServerForClient::AcceptUdsClient((uv_stream_t *)&cls->udsListen, 0); // 添加channel成功，uv_accept失败 -》 FreeChannel没有真正释放channel EXPECT_TRUE(cls->mapChannel.size() == 1); delete cls; #endif } +HWTEST_F(HdcHostUdsServerTest, Test_AttachChannelInnerForUds, TestSize.Level0) +{ +#ifdef __OHOS__ + uv_loop_t loopMain; + uv_loop_init(&loopMain); + + HdcServer server(true); + HdcServerForClient *clsServerForClient = new HdcServerForClient(true, "uds", &server, &loopMain); + server.clsServerForClient = clsServerForClient; + HSession hSession = server.MallocSession(true, CONN_USB, nullptr); + HChannel hChannel = new HdcChannel(); + clsServerForClient->AdminChannel(OP_ADD, hChannel->channelId, hChannel); + server.AttachChannelInnerForUds(hSession, hChannel->channelId); + EXPECT_TRUE(hChannel->targetSessionId == hSession->sessionId); +#endif +} + } \ No newline at end of file -- Gitee From 56a6bf773002f467a84593e1b9a018b224dce507 Mon Sep 17 00:00:00 2001 From: liupeng298 Date: Fri, 1 Aug 2025 05:59:02 +0000 Subject: [PATCH 09/15] update test/BUILD.gn. Signed-off-by: liupeng298 --- test/BUILD.gn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/BUILD.gn b/test/BUILD.gn index 09bf2054..41b495df 100644 --- a/test/BUILD.gn +++ b/test/BUILD.gn @@ -325,6 +325,8 @@ ohos_unittest("hdc_host_base_unittest") { "${hdc_path}/src/host/host_tcp.cpp", "${hdc_path}/src/host/host_uart.cpp", "${hdc_path}/src/host/host_usb.cpp", + "${hdc_path}/src/host/host_forward.cpp", + "${hdc_path}/src/host/host_unity.cpp", "${hdc_path}/src/host/host_updater.cpp", "${hdc_path}/src/host/host_shell_option.cpp", "${hdc_path}/src/host/translate.cpp", -- Gitee From eef68ce9ba1908d04ae22bb2c2652a7069f3a318 Mon Sep 17 00:00:00 2001 From: liupeng298 Date: Fri, 1 Aug 2025 06:03:55 +0000 Subject: [PATCH 10/15] update test/unittest/host/host_uds_server_test.cpp. Signed-off-by: liupeng298 --- test/unittest/host/host_uds_server_test.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/unittest/host/host_uds_server_test.cpp b/test/unittest/host/host_uds_server_test.cpp index 6651038c..3dcd8a00 100644 --- a/test/unittest/host/host_uds_server_test.cpp +++ b/test/unittest/host/host_uds_server_test.cpp @@ -40,9 +40,9 @@ HWTEST_F(HdcHostUdsServerTest, Test_AcceptUdsClient, TestSize.Level0) uv_loop_t loopMain; uv_loop_init(&loopMain); HdcServerForClient *cls = new HdcServerForClient(true, std::string("uds"), nullptr, &loopMain); - EXPECT_TRUE(!cls->SetUdsListen()); // uv_pipe_bind失败 + EXPECT_TRUE(!cls->SetUdsListen()); sleep(1); - HdcServerForClient::AcceptUdsClient((uv_stream_t *)&cls->udsListen, 0); // 添加channel成功，uv_accept失败 -》 FreeChannel没有真正释放channel + HdcServerForClient::AcceptUdsClient((uv_stream_t *)&cls->udsListen, 0); EXPECT_TRUE(cls->mapChannel.size() == 1); delete cls; -- Gitee From 5908dc8883753fa49c5b3060793a461e33785eee Mon Sep 17 00:00:00 2001 From: liupeng298 Date: Fri, 1 Aug 2025 08:32:53 +0000 Subject: [PATCH 11/15] update test/unittest/host/host_uds_server_test.cpp. Signed-off-by: liupeng298 --- test/unittest/host/host_uds_server_test.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/test/unittest/host/host_uds_server_test.cpp b/test/unittest/host/host_uds_server_test.cpp index 3dcd8a00..ca48275c 100644 --- a/test/unittest/host/host_uds_server_test.cpp +++ b/test/unittest/host/host_uds_server_test.cpp @@ -21,8 +21,6 @@ #include "server.h" #endif -#include - using namespace testing::ext; namespace Hdc { -- Gitee From d6905e62523c7b425423733c9a5800f0c0636ca4 Mon Sep 17 00:00:00 2001 From: liupeng298 Date: Tue, 5 Aug 2025 08:26:35 +0000 Subject: [PATCH 12/15] update test/unittest/host/host_uds_server_test.cpp. Signed-off-by: liupeng298 --- test/unittest/host/host_uds_server_test.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/test/unittest/host/host_uds_server_test.cpp b/test/unittest/host/host_uds_server_test.cpp index ca48275c..c5853f4c 100644 --- a/test/unittest/host/host_uds_server_test.cpp +++ b/test/unittest/host/host_uds_server_test.cpp @@ -61,6 +61,7 @@ HWTEST_F(HdcHostUdsServerTest, Test_AttachChannelInnerForUds, TestSize.Level0) clsServerForClient->AdminChannel(OP_ADD, hChannel->channelId, hChannel); server.AttachChannelInnerForUds(hSession, hChannel->channelId); EXPECT_TRUE(hChannel->targetSessionId == hSession->sessionId); + delete hChannel; #endif } -- Gitee From 8176b93924da5bd15a62ac406b04ab426f9f6885 Mon Sep 17 00:00:00 2001 From: liupeng298 Date: Wed, 13 Aug 2025 01:43:53 +0000 Subject: [PATCH 13/15] update test/unittest/host/host_uds_server_test.cpp. Signed-off-by: liupeng298 --- test/unittest/host/host_uds_server_test.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/test/unittest/host/host_uds_server_test.cpp b/test/unittest/host/host_uds_server_test.cpp index c5853f4c..c1d65ae2 100644 --- a/test/unittest/host/host_uds_server_test.cpp +++ b/test/unittest/host/host_uds_server_test.cpp @@ -26,9 +26,7 @@ using namespace testing::ext; namespace Hdc { void HdcHostUdsServerTest::SetUpTestCase() {} void HdcHostUdsServerTest::TearDownTestCase() {} -void HdcHostUdsServerTest::SetUp() -{ -} +void HdcHostUdsServerTest::SetUp(){} void HdcHostUdsServerTest::TearDown() {} -- Gitee From 71e2f1bb721a788ed2a19cde6a064d502c8967a9 Mon Sep 17 00:00:00 2001 From: liupeng298 Date: Wed, 13 Aug 2025 01:45:08 +0000 Subject: [PATCH 14/15] update test/BUILD.gn. Signed-off-by: liupeng298 --- test/BUILD.gn | 2 -- 1 file changed, 2 deletions(-) diff --git a/test/BUILD.gn b/test/BUILD.gn index 41b495df..cb570bbc 100644 --- a/test/BUILD.gn +++ b/test/BUILD.gn @@ -319,7 +319,6 @@ ohos_unittest("hdc_host_base_unittest") { sources += [ "${hdc_path}/src/daemon/daemon_app.cpp", "${hdc_path}/src/host/host_app.cpp", - "${hdc_path}/src/host/server_for_client.cpp", "${hdc_path}/src/host/server.cpp", "${hdc_path}/src/host/host_tcp.cpp", @@ -332,7 +331,6 @@ ohos_unittest("hdc_host_base_unittest") { "${hdc_path}/src/host/translate.cpp", "${hdc_path}/src/common/server_cmd_log.cpp", "${hdc_path}/src/common/uart.cpp", - "unittest/daemon/daemon_app_test.cpp", "unittest/common/define_test.cpp", "unittest/host/host_app_test.cpp", -- Gitee From dfbc9702bb133cca4d3947ce6db39409d8c3cae6 Mon Sep 17 00:00:00 2001 From: liupeng298 Date: Wed, 13 Aug 2025 02:25:38 +0000 Subject: [PATCH 15/15] update test/unittest/host/host_uds_server_test.cpp. Signed-off-by: liupeng298 --- test/unittest/host/host_uds_server_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/unittest/host/host_uds_server_test.cpp b/test/unittest/host/host_uds_server_test.cpp index c1d65ae2..c9282691 100644 --- a/test/unittest/host/host_uds_server_test.cpp +++ b/test/unittest/host/host_uds_server_test.cpp @@ -26,7 +26,7 @@ using namespace testing::ext; namespace Hdc { void HdcHostUdsServerTest::SetUpTestCase() {} void HdcHostUdsServerTest::TearDownTestCase() {} -void HdcHostUdsServerTest::SetUp(){} +void HdcHostUdsServerTest::SetUp() {} void HdcHostUdsServerTest::TearDown() {} -- Gitee