From bbf123ea99c1e52b1f714ed779ca1babb0665d24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A8=8A=E6=99=AF=E4=B9=90?= Date: Thu, 22 May 2025 14:26:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BC=BA=E5=B0=91=E6=96=AD?= =?UTF-8?q?=E8=A8=80=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 樊景乐 --- .../app_spawn_client_test.cpp | 1 + .../app_spawn_common_test.cpp | 7 +++ .../nweb_spawn_service_test.cpp | 44 ++++++++++++++++--- 3 files changed, 47 insertions(+), 5 deletions(-) diff --git a/test/unittest/app_spawn_client_test/app_spawn_client_test.cpp b/test/unittest/app_spawn_client_test/app_spawn_client_test.cpp index a7c208c9..4fa5b75f 100644 --- a/test/unittest/app_spawn_client_test/app_spawn_client_test.cpp +++ b/test/unittest/app_spawn_client_test/app_spawn_client_test.cpp @@ -1218,6 +1218,7 @@ HWTEST_F(AppSpawnClientTest, App_Spawn_interface001, TestSize.Level0) clientInstance->socketId = 1; clientInstance->maxRetryCount = 1; TryCreateSocket(clientInstance); + EXPECT_EQ(clientInstance->socketId, 1); free(clientInstance); } } // namespace OHOS diff --git a/test/unittest/app_spawn_standard_test/app_spawn_common_test.cpp b/test/unittest/app_spawn_standard_test/app_spawn_common_test.cpp index 3b53cc29..80d5c7aa 100644 --- a/test/unittest/app_spawn_standard_test/app_spawn_common_test.cpp +++ b/test/unittest/app_spawn_standard_test/app_spawn_common_test.cpp @@ -625,6 +625,13 @@ HWTEST_F(AppSpawnCommonTest, App_Spawn_Common_029, TestSize.Level0) { DeleteAppSpawnNamespace(nullptr); FreeAppSpawnNamespace(nullptr); + AppSpawnMgr *mgr = nullptr; + mgr = CreateAppSpawnMgr(MODE_FOR_NWEB_SPAWN); + EXPECT_EQ(mgr != nullptr, 1); + AppSpawnNamespace *appSpawnNamespace = GetAppSpawnNamespace(mgr); + DeleteAppSpawnNamespace(appSpawnNamespace); + DeleteAppSpawnMgr(mgr); + EXPECT_EQ(appSpawnNamespace == nullptr, 1); } HWTEST_F(AppSpawnCommonTest, App_Spawn_Common_030, TestSize.Level0) diff --git a/test/unittest/app_spawn_standard_test/nweb_spawn_service_test.cpp b/test/unittest/app_spawn_standard_test/nweb_spawn_service_test.cpp index ce549992..4d2f723f 100644 --- a/test/unittest/app_spawn_standard_test/nweb_spawn_service_test.cpp +++ b/test/unittest/app_spawn_standard_test/nweb_spawn_service_test.cpp @@ -310,6 +310,35 @@ HWTEST_F(NWebSpawnServiceTest, NWeb_Spawn_Msg_003, TestSize.Level0) ASSERT_EQ(ret, 0); } +int AddProcessTypeExtTlv(uint8_t *buffer, uint32_t bufferLen, uint32_t &realLen, uint32_t &tlvCount) +{ + const char *testData = "render"; + uint32_t currLen = 0; + AppSpawnTlvExt tlv = {}; + tlv.tlvType = TLV_MAX; + int ret = strcpy_s(tlv.tlvName, sizeof(tlv.tlvName), "ProcessType"); + APPSPAWN_CHECK(ret == 0, return -1, "Failed to strcpy"); + tlv.dataLen = strlen(testData) + 1; + tlv.tlvLen = sizeof(AppSpawnTlvExt) + APPSPAWN_ALIGN(tlv.dataLen); + + ret = memcpy_s(buffer, bufferLen, &tlv, sizeof(tlv)); + if (ret != 0) { + APPSPAWN_LOGE("Failed to memcpy_s bufferSize"); + return -1; + } + + ret = memcpy_s(buffer + sizeof(tlv), bufferLen - sizeof(tlv), testData, tlv.dataLen + 1); + if (ret != 0) { + APPSPAWN_LOGE("Failed to memcpy_s bufferSize"); + return -1; + } + + currLen += tlv.tlvLen; + tlvCount++; + realLen = currLen; + return 0; +} + /** * @brief 测试小包发送，随机获取发送大小，发送数据。消息20时，按33发送 * @@ -324,7 +353,8 @@ HWTEST_F(NWebSpawnServiceTest, NWeb_Spawn_Msg_004, TestSize.Level0) std::vector buffer(1024, 0); // 1024 1k uint32_t msgLen = 0; - ret = testServer->CreateSendMsg(buffer, MSG_APP_SPAWN, msgLen, {AppSpawnTestHelper::AddBaseTlv}); + ret = testServer->CreateSendMsg(buffer, MSG_APP_SPAWN, msgLen, + {AppSpawnTestHelper::AddBaseTlv, AddProcessTypeExtTlv}); APPSPAWN_CHECK(ret == 0, break, "Failed to create msg %{public}s", testServer->GetDefaultTestAppBundleName()); // 分片发送 @@ -379,9 +409,11 @@ HWTEST_F(NWebSpawnServiceTest, NWeb_Spawn_Msg_005, TestSize.Level0) std::vector buffer2(1024); // 1024 uint32_t msgLen1 = 0; uint32_t msgLen2 = 0; - ret = testServer->CreateSendMsg(buffer1, MSG_APP_SPAWN, msgLen1, {AppSpawnTestHelper::AddBaseTlv}); + ret = testServer->CreateSendMsg(buffer1, MSG_APP_SPAWN, msgLen1, + {AppSpawnTestHelper::AddBaseTlv, AddProcessTypeExtTlv}); APPSPAWN_CHECK(ret == 0, break, "Failed to create msg %{public}s", testServer->GetDefaultTestAppBundleName()); - ret = testServer->CreateSendMsg(buffer2, MSG_APP_SPAWN, msgLen2, {AppSpawnTestHelper::AddBaseTlv}); + ret = testServer->CreateSendMsg(buffer2, MSG_APP_SPAWN, msgLen2, + {AppSpawnTestHelper::AddBaseTlv, AddProcessTypeExtTlv}); APPSPAWN_CHECK(ret == 0, break, "Failed to create msg %{public}s", testServer->GetDefaultTestAppBundleName()); buffer1.insert(buffer1.begin() + msgLen1, buffer2.begin(), buffer2.end()); @@ -456,7 +488,8 @@ HWTEST_F(NWebSpawnServiceTest, NWeb_Spawn_Msg_007, TestSize.Level0) APPSPAWN_CHECK(socketId >= 0, break, "Failed to create socket %{public}s", NWEBSPAWN_SERVER_NAME); std::vector buffer(1024, 0); // 1024 1k uint32_t msgLen = 0; - ret = testServer->CreateSendMsg(buffer, MSG_APP_SPAWN, msgLen, {AppSpawnTestHelper::AddBaseTlv}); + ret = testServer->CreateSendMsg(buffer, MSG_APP_SPAWN, msgLen, + {AppSpawnTestHelper::AddBaseTlv, AddProcessTypeExtTlv}); APPSPAWN_CHECK(ret == 0, break, "Failed to create msg %{public}s", testServer->GetDefaultTestAppBundleName()); int len = write(socketId, buffer.data(), msgLen); @@ -485,7 +518,8 @@ HWTEST_F(NWebSpawnServiceTest, NWeb_Spawn_Msg_008, TestSize.Level0) APPSPAWN_CHECK(socketId >= 0, break, "Failed to create socket %{public}s", NWEBSPAWN_SERVER_NAME); std::vector buffer(1024, 0); // 1024 1k uint32_t msgLen = 0; - ret = testServer->CreateSendMsg(buffer, MSG_APP_SPAWN, msgLen, {AppSpawnTestHelper::AddBaseTlv}); + ret = testServer->CreateSendMsg(buffer, MSG_APP_SPAWN, msgLen, + {AppSpawnTestHelper::AddBaseTlv, AddProcessTypeExtTlv}); APPSPAWN_CHECK(ret == 0, break, "Failed to create msg %{public}s", testServer->GetDefaultTestAppBundleName()); int len = write(socketId, buffer.data(), msgLen - 20); // 20 test APPSPAWN_CHECK(len > 0, break, "Failed to send msg %{public}s", testServer->GetDefaultTestAppBundleName()); -- Gitee