From 5719d7a94beddab5e62863cf0cbb658d68ace61f Mon Sep 17 00:00:00 2001 From: fan-jingle Date: Mon, 25 Aug 2025 13:54:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=99=9A=E5=81=87=E6=96=AD?= =?UTF-8?q?=E8=A8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: fan-jingle --- .../app_spawn_client_test.cpp | 37 +++---------------- .../app_spawn_cgroup_test.cpp | 7 +--- .../app_spawn_child_test.cpp | 8 ---- .../app_spawn_sandbox_new_test.cpp | 29 +-------------- .../app_spawn_sandbox_test.cpp | 4 +- .../app_spawn_service_test.cpp | 3 -- .../nweb_spawn_service_test.cpp | 2 - 7 files changed, 11 insertions(+), 79 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 d99749cb..8c1c0a8f 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 @@ -193,7 +193,6 @@ HWTEST_F(AppSpawnClientTest, App_Client_Msg_001, TestSize.Level0) ret = AppSpawnReqMsgSetAppFlag(reqHandle, MAX_FLAGS_INDEX); ASSERT_NE(ret, 0); - ret = APPSPAWN_ARG_INVALID; AppSpawnReqMsgNode *reqNode = (AppSpawnReqMsgNode *)reqHandle; APPSPAWN_CHECK(reqNode != nullptr, break, "Invalid reqNode"); APPSPAWN_CHECK(reqNode->msgFlags != nullptr, break, "Invalid reqNode"); @@ -208,9 +207,7 @@ HWTEST_F(AppSpawnClientTest, App_Client_Msg_001, TestSize.Level0) uint32_t result = (reqNode->msgFlags->flags[index] & bits) == bits; ASSERT_EQ(result == 1, 1); } - ret = 0; } while (0); - ASSERT_EQ(ret, 0); AppSpawnReqMsgFree(reqHandle); AppSpawnClientDestroy(clientHandle); } @@ -231,7 +228,6 @@ HWTEST_F(AppSpawnClientTest, App_Client_Msg_002, TestSize.Level0) reqHandle = g_testHelper.CreateMsg(clientHandle, MSG_APP_SPAWN, 1); APPSPAWN_CHECK(reqHandle != INVALID_REQ_HANDLE, break, "Failed to create req %{public}s", APPSPAWN_SERVER_NAME); - ret = APPSPAWN_ARG_INVALID; property = g_testHelper.GetAppProperty(clientHandle, reqHandle); APPSPAWN_CHECK_ONLY_EXPER(property != nullptr, break); @@ -243,11 +239,10 @@ HWTEST_F(AppSpawnClientTest, App_Client_Msg_002, TestSize.Level0) APPSPAWN_CHECK(info->gidCount == 2, break, "Invalid gidCount %{public}d", info->gidCount); // 2 default APPSPAWN_CHECK(info->gidTable[1] == g_testHelper.GetTestGidGroup() + 1, break, "Invalid uid %{public}d", info->gidTable[1]); - ret = 0; } while (0); - ASSERT_EQ(ret, 0); DeleteAppSpawningCtx(property); AppSpawnClientDestroy(clientHandle); + ASSERT_EQ(ret, 0); } /** @@ -271,7 +266,6 @@ HWTEST_F(AppSpawnClientTest, App_Client_Msg_003, TestSize.Level0) reqHandle = g_testHelper.CreateMsg(clientHandle, MSG_APP_SPAWN, 1); APPSPAWN_CHECK(reqHandle != INVALID_REQ_HANDLE, break, "Failed to create req %{public}s", APPSPAWN_SERVER_NAME); - ret = APPSPAWN_ARG_INVALID; property = g_testHelper.GetAppProperty(clientHandle, reqHandle); APPSPAWN_CHECK_ONLY_EXPER(property != nullptr, break); void *tlvValue = GetAppProperty(property, TLV_BUNDLE_INFO); @@ -282,12 +276,11 @@ HWTEST_F(AppSpawnClientTest, App_Client_Msg_003, TestSize.Level0) APPSPAWN_LOGV("info->bundleName %{public}s", info->bundleName); APPSPAWN_CHECK(strcmp(info->bundleName, processName.c_str()) == 0, break, "Invalid bundleName %{public}s", info->bundleName); - ret = 0; } while (0); - ASSERT_EQ(ret, 0); g_testHelper.SetDefaultTestData(); DeleteAppSpawningCtx(property); AppSpawnClientDestroy(clientHandle); + ASSERT_EQ(ret, 0); } /** @@ -313,7 +306,6 @@ HWTEST_F(AppSpawnClientTest, App_Client_Msg_004, TestSize.Level0) ret = AppSpawnReqMsgAddStringInfo(reqHandle, MSG_EXT_NAME_RENDER_CMD, renderCmd); APPSPAWN_CHECK(ret == 0, break, "Failed to add render cmd %{public}s", APPSPAWN_SERVER_NAME); - ret = APPSPAWN_ARG_INVALID; property = g_testHelper.GetAppProperty(clientHandle, reqHandle); APPSPAWN_CHECK_ONLY_EXPER(property != nullptr, break); DumpAppSpawnMsg(property->message); @@ -323,7 +315,6 @@ HWTEST_F(AppSpawnClientTest, App_Client_Msg_004, TestSize.Level0) APPSPAWN_LOGV("info->bundleName %{public}s", renderCmdMsg); APPSPAWN_CHECK(strcmp(renderCmdMsg, renderCmd) == 0, break, "Invalid renderCmd %{public}s", renderCmd); - ret = 0; } while (0); DeleteAppSpawningCtx(property); AppSpawnClientDestroy(clientHandle); @@ -352,7 +343,6 @@ HWTEST_F(AppSpawnClientTest, App_Client_Msg_025, TestSize.Level0) ret = AppSpawnReqMsgAddFd(reqHandle, fdname, fd); APPSPAWN_CHECK(ret == 0, break, "Failed to add fd %{public}s", APPSPAWN_SERVER_NAME); - ret = APPSPAWN_ARG_INVALID; property = g_testHelper.GetAppProperty(clientHandle, reqHandle); APPSPAWN_CHECK_ONLY_EXPER(property != nullptr, break); DumpAppSpawnMsg(property->message); @@ -360,7 +350,6 @@ HWTEST_F(AppSpawnClientTest, App_Client_Msg_025, TestSize.Level0) char *recvFdName = reinterpret_cast(GetAppPropertyExt(property, MSG_EXT_NAME_APP_FD, &len)); APPSPAWN_CHECK(strcmp(recvFdName, fdname) == 0, break, "Invalid fdname %{public}s", fdname); - ret = 0; } while (0); close(fd); DeleteAppSpawningCtx(property); @@ -389,7 +378,6 @@ HWTEST_F(AppSpawnClientTest, App_Client_Msg_005, TestSize.Level0) ret = AppSpawnReqMsgSetAppOwnerId(reqHandle, ownerId); APPSPAWN_CHECK(ret == 0, break, "Failed to add owner %{public}s", APPSPAWN_SERVER_NAME); - ret = APPSPAWN_ARG_INVALID; property = g_testHelper.GetAppProperty(clientHandle, reqHandle); APPSPAWN_CHECK_ONLY_EXPER(property != nullptr, break); void *tlvValue = GetAppProperty(property, TLV_OWNER_INFO); @@ -397,11 +385,10 @@ HWTEST_F(AppSpawnClientTest, App_Client_Msg_005, TestSize.Level0) APPSPAWN_CHECK(owner != nullptr, break, "Can not find owner cmd in msg"); APPSPAWN_LOGV("owner->ownerId %{public}s", owner->ownerId); APPSPAWN_CHECK(strcmp(owner->ownerId, ownerId) == 0, break, "Invalid ownerId %{public}s", ownerId); - ret = 0; } while (0); - ASSERT_EQ(ret, 0); DeleteAppSpawningCtx(property); AppSpawnClientDestroy(clientHandle); + ASSERT_EQ(ret, 0); } /** @@ -423,7 +410,6 @@ HWTEST_F(AppSpawnClientTest, App_Client_Msg_006, TestSize.Level0) ret = AppSpawnReqMsgSetAppInternetPermissionInfo(reqHandle, 101, 102); // 101 102 test APPSPAWN_CHECK(ret == 0, break, "Failed to add owner %{public}s", APPSPAWN_SERVER_NAME); - ret = APPSPAWN_ARG_INVALID; property = g_testHelper.GetAppProperty(clientHandle, reqHandle); APPSPAWN_CHECK_ONLY_EXPER(property != nullptr, break); void *tlvValue = GetAppProperty(property, TLV_INTERNET_INFO); @@ -433,11 +419,10 @@ HWTEST_F(AppSpawnClientTest, App_Client_Msg_006, TestSize.Level0) break, "Invalid setAllowInternet %{public}d", interInfo->setAllowInternet); APPSPAWN_CHECK(101 == interInfo->allowInternet, // 101 test break, "Invalid allowInternet %{public}d", interInfo->allowInternet); - ret = 0; } while (0); - ASSERT_EQ(ret, 0); DeleteAppSpawningCtx(property); AppSpawnClientDestroy(clientHandle); + ASSERT_EQ(ret, 0); } /** @@ -460,7 +445,6 @@ HWTEST_F(AppSpawnClientTest, App_Client_Msg_007, TestSize.Level0) ret = AppSpawnReqMsgSetAppDomainInfo(reqHandle, 1, apl); APPSPAWN_CHECK(ret == 0, break, "Failed to add domain %{public}s", APPSPAWN_SERVER_NAME); - ret = APPSPAWN_ARG_INVALID; property = g_testHelper.GetAppProperty(clientHandle, reqHandle); APPSPAWN_CHECK_ONLY_EXPER(property != nullptr, break); void *tlvValue = GetAppProperty(property, TLV_DOMAIN_INFO); @@ -469,11 +453,10 @@ HWTEST_F(AppSpawnClientTest, App_Client_Msg_007, TestSize.Level0) APPSPAWN_CHECK(1 == domainInfo->hapFlags, break, "Invalid hapFlags %{public}d", domainInfo->hapFlags); APPSPAWN_LOGV("Test apl: %{public}s", domainInfo->apl); APPSPAWN_CHECK(strcmp(domainInfo->apl, apl) == 0, break, "Invalid apl %{public}s", domainInfo->apl); - ret = 0; } while (0); - ASSERT_EQ(ret, 0); DeleteAppSpawningCtx(property); AppSpawnClientDestroy(clientHandle); + ASSERT_EQ(ret, 0); } /** @@ -495,18 +478,16 @@ HWTEST_F(AppSpawnClientTest, App_Client_Msg_008, TestSize.Level0) ret = AppSpawnReqMsgSetAppAccessToken(reqHandle, 12345678); // 12345678 APPSPAWN_CHECK(ret == 0, break, "Failed to add access token %{public}s", APPSPAWN_SERVER_NAME); - ret = APPSPAWN_ARG_INVALID; property = g_testHelper.GetAppProperty(clientHandle, reqHandle); APPSPAWN_CHECK_ONLY_EXPER(property != nullptr, break); void *tlvValue = GetAppProperty(property, TLV_ACCESS_TOKEN_INFO); AppSpawnMsgAccessToken *tokenInfo = static_cast(tlvValue); APPSPAWN_CHECK(tokenInfo != nullptr, break, "Can not find owner cmd in msg"); APPSPAWN_CHECK(12345678 == tokenInfo->accessTokenIdEx, break, "Invalid accessTokenIdEx"); - ret = 0; } while (0); - ASSERT_EQ(ret, 0); DeleteAppSpawningCtx(property); AppSpawnClientDestroy(clientHandle); + ASSERT_EQ(ret, 0); } /** @@ -545,7 +526,6 @@ HWTEST_F(AppSpawnClientTest, App_Client_Msg_009, TestSize.Level0) ret = AppSpawnReqMsgSetAppAccessToken(reqHandle, 12345678); // 12345678 APPSPAWN_CHECK(ret == 0, break, "Failed to add access token %{public}s", APPSPAWN_SERVER_NAME); - ret = APPSPAWN_ARG_INVALID; property = g_testHelper.GetAppProperty(clientHandle, reqHandle); APPSPAWN_CHECK_ONLY_EXPER(property != nullptr, break); uint32_t tlvLen = 0; @@ -554,7 +534,6 @@ HWTEST_F(AppSpawnClientTest, App_Client_Msg_009, TestSize.Level0) APPSPAWN_CHECK(tlvLen == testData.size(), break, "Invalid tlv len %{public}u", tlvLen); APPSPAWN_CHECK(strncmp(reinterpret_cast(tlvValue), testData.data(), testData.size()) == 0, break, "Invalid ext tlv %{public}s ", reinterpret_cast(tlvValue + testDataLen)); - ret = 0; } while (0); DeleteAppSpawningCtx(property); AppSpawnClientDestroy(clientHandle); @@ -597,7 +576,6 @@ HWTEST_F(AppSpawnClientTest, App_Client_Msg_010, TestSize.Level0) ret = AppSpawnReqMsgSetAppAccessToken(reqHandle, 12345678); // 12345678 APPSPAWN_CHECK(ret == 0, break, "Failed to add access token %{public}s", APPSPAWN_SERVER_NAME); - ret = APPSPAWN_ARG_INVALID; property = g_testHelper.GetAppProperty(clientHandle, reqHandle); APPSPAWN_CHECK_ONLY_EXPER(property != nullptr, break); uint32_t tlvLen = 0; @@ -606,7 +584,6 @@ HWTEST_F(AppSpawnClientTest, App_Client_Msg_010, TestSize.Level0) APPSPAWN_CHECK(tlvLen == testData.size(), break, "Invalid tlv len %{public}u", tlvLen); APPSPAWN_CHECK(strncmp(reinterpret_cast(tlvValue), testData.data(), testData.size()) == 0, break, "Invalid ext tlv %{public}s ", reinterpret_cast(tlvValue + testDataLen)); - ret = 0; } while (0); DeleteAppSpawningCtx(property); AppSpawnClientDestroy(clientHandle); @@ -649,7 +626,6 @@ HWTEST_F(AppSpawnClientTest, App_Client_Msg_011, TestSize.Level0) ret = AppSpawnReqMsgSetAppAccessToken(reqHandle, 12345678); // 12345678 APPSPAWN_CHECK(ret == 0, break, "Failed to add access token %{public}s", APPSPAWN_SERVER_NAME); - ret = APPSPAWN_ARG_INVALID; property = g_testHelper.GetAppProperty(clientHandle, reqHandle); APPSPAWN_CHECK_ONLY_EXPER(property != nullptr, break); uint32_t tlvLen = 0; @@ -658,7 +634,6 @@ HWTEST_F(AppSpawnClientTest, App_Client_Msg_011, TestSize.Level0) APPSPAWN_CHECK(tlvLen == testData.size(), break, "Invalid tlv len %{public}u", tlvLen); APPSPAWN_CHECK(strncmp(reinterpret_cast(tlvValue), testData.data(), testData.size()) == 0, break, "Invalid ext tlv %{public}s ", reinterpret_cast(tlvValue + testDataLen)); - ret = 0; } while (0); DeleteAppSpawningCtx(property); AppSpawnClientDestroy(clientHandle); diff --git a/test/unittest/app_spawn_standard_test/app_spawn_cgroup_test.cpp b/test/unittest/app_spawn_standard_test/app_spawn_cgroup_test.cpp index 5f7d4e94..b89fc162 100644 --- a/test/unittest/app_spawn_standard_test/app_spawn_cgroup_test.cpp +++ b/test/unittest/app_spawn_standard_test/app_spawn_cgroup_test.cpp @@ -90,7 +90,6 @@ HWTEST_F(AppSpawnCGroupTest, App_Spawn_CGroup_001, TestSize.Level0) APPSPAWN_CHECK(ret == 0, break, "Failed to get real path errno: %{public}d", errno); APPSPAWN_CHECK(strstr(path, "200") != nullptr && strstr(path, "33") != nullptr && strstr(path, name) != nullptr, break, "Invalid path: %s", path); - ret = 0; } while (0); if (appInfo) { free(appInfo); @@ -165,8 +164,7 @@ HWTEST_F(AppSpawnCGroupTest, App_Spawn_CGroup_003, TestSize.Level0) content = AppSpawnCreateContent(APPSPAWN_SOCKET_NAME, path, sizeof(path), MODE_FOR_APP_SPAWN); APPSPAWN_CHECK_ONLY_EXPER(content != nullptr, break); - ProcessMgrHookExecute(STAGE_SERVER_APP_DIED, content, appInfo); - ret = 0; + ret = ProcessMgrHookExecute(STAGE_SERVER_APP_DIED, content, appInfo); } while (0); if (appInfo) { free(appInfo); @@ -227,8 +225,7 @@ HWTEST_F(AppSpawnCGroupTest, App_Spawn_CGroup_005, TestSize.Level0) content = AppSpawnCreateContent(APPSPAWN_SOCKET_NAME, path, sizeof(path), MODE_FOR_NWEB_SPAWN); APPSPAWN_CHECK_ONLY_EXPER(content != nullptr, break); - ProcessMgrHookExecute(STAGE_SERVER_APP_DIED, content, appInfo); - ret = 0; + ret = ProcessMgrHookExecute(STAGE_SERVER_APP_DIED, content, appInfo); } while (0); if (appInfo) { free(appInfo); diff --git a/test/unittest/app_spawn_standard_test/app_spawn_child_test.cpp b/test/unittest/app_spawn_standard_test/app_spawn_child_test.cpp index 4552f66e..3c863d40 100644 --- a/test/unittest/app_spawn_standard_test/app_spawn_child_test.cpp +++ b/test/unittest/app_spawn_standard_test/app_spawn_child_test.cpp @@ -1228,7 +1228,6 @@ HWTEST_F(AppSpawnChildTest, App_Spawn_Cold_Run_001, TestSize.Level0) // set cold start flags AppSpawnReqMsgSetAppFlag(reqHandle, APP_FLAGS_COLD_BOOT); - ret = APPSPAWN_ARG_INVALID; property = g_testHelper.GetAppProperty(clientHandle, reqHandle); APPSPAWN_CHECK_ONLY_EXPER(property != nullptr, break); @@ -1243,7 +1242,6 @@ HWTEST_F(AppSpawnChildTest, App_Spawn_Cold_Run_001, TestSize.Level0) // child run in TestRunChildProcessor RegChildLooper(content, TestRunChildProcessor); content->runAppSpawn(content, args->argc, args->argv); - ret = 0; } while (0); if (args) { free(args); @@ -1269,7 +1267,6 @@ HWTEST_F(AppSpawnChildTest, App_Spawn_Cold_Run_002, TestSize.Level0) // set cold start flags AppSpawnReqMsgSetAppFlag(reqHandle, APP_FLAGS_COLD_BOOT); - ret = APPSPAWN_ARG_INVALID; property = g_testHelper.GetAppProperty(clientHandle, reqHandle); APPSPAWN_CHECK_ONLY_EXPER(property != nullptr, break); @@ -1285,7 +1282,6 @@ HWTEST_F(AppSpawnChildTest, App_Spawn_Cold_Run_002, TestSize.Level0) // child run in TestRunChildProcessor RegChildLooper(content, TestRunChildProcessor); content->runAppSpawn(content, args->argc, args->argv); - ret = 0; } while (0); if (args) { free(args); @@ -1318,7 +1314,6 @@ HWTEST_F(AppSpawnChildTest, App_Spawn_Cold_Run_003, TestSize.Level0) AppSpawnReqMsgSetAppFlag(reqHandle, APP_FLAGS_ASANENABLED); AppSpawnReqMsgSetAppFlag(reqHandle, APP_FLAGS_GWP_ENABLED_FORCE); - ret = APPSPAWN_ARG_INVALID; property = g_testHelper.GetAppProperty(clientHandle, reqHandle); APPSPAWN_CHECK_ONLY_EXPER(property != nullptr, break); @@ -1334,7 +1329,6 @@ HWTEST_F(AppSpawnChildTest, App_Spawn_Cold_Run_003, TestSize.Level0) // child run in TestRunChildProcessor RegChildLooper(content, TestRunChildProcessor); content->runAppSpawn(content, args->argc, args->argv); - ret = 0; } while (0); if (args) { free(args); @@ -1367,7 +1361,6 @@ HWTEST_F(AppSpawnChildTest, App_Spawn_Cold_Run_004, TestSize.Level0) AppSpawnReqMsgSetAppFlag(reqHandle, APP_FLAGS_ASANENABLED); AppSpawnReqMsgSetAppFlag(reqHandle, APP_FLAGS_GWP_ENABLED_NORMAL); - ret = APPSPAWN_ARG_INVALID; property = g_testHelper.GetAppProperty(clientHandle, reqHandle); APPSPAWN_CHECK_ONLY_EXPER(property != nullptr, break); @@ -1386,7 +1379,6 @@ HWTEST_F(AppSpawnChildTest, App_Spawn_Cold_Run_004, TestSize.Level0) RegChildLooper(content, TestRunChildProcessor); content->runAppSpawn(content, args->argc, args->argv); property = nullptr; - ret = 0; } while (0); if (args) { free(args); diff --git a/test/unittest/app_spawn_standard_test/app_spawn_sandbox_new_test.cpp b/test/unittest/app_spawn_standard_test/app_spawn_sandbox_new_test.cpp index 92bc3010..2fc9eecd 100644 --- a/test/unittest/app_spawn_standard_test/app_spawn_sandbox_new_test.cpp +++ b/test/unittest/app_spawn_standard_test/app_spawn_sandbox_new_test.cpp @@ -677,7 +677,6 @@ HWTEST_F(AppSpawnSandboxTest, App_Spawn_Variable_009, TestSize.Level0) HWTEST_F(AppSpawnSandboxTest, App_Spawn_Permission_01, TestSize.Level0) { AppSpawnSandboxCfg *sandbox = nullptr; - int ret = -1; do { sandbox = CreateAppSpawnSandbox(EXT_DATA_APP_SANDBOX); APPSPAWN_CHECK_ONLY_EXPER(sandbox != nullptr, break); @@ -699,13 +698,12 @@ HWTEST_F(AppSpawnSandboxTest, App_Spawn_Permission_01, TestSize.Level0) const SandboxPermissionNode *node = GetPermissionNodeInQueue(&sandbox->permissionQueue, permission); APPSPAWN_CHECK_ONLY_EXPER(node == nullptr, break); node = GetPermissionNodeInQueue(nullptr, permission); + ASSERT_NE(node, nullptr); APPSPAWN_CHECK_ONLY_EXPER(node == nullptr, break); - ret = 0; } while (0); if (sandbox != nullptr) { sandbox->extData.freeNode(&sandbox->extData); } - ASSERT_EQ(ret, 0); } static int ProcessTestExpandConfig(const SandboxContext *context, @@ -915,18 +913,16 @@ HWTEST_F(AppSpawnSandboxTest, App_Spawn_ExpandCfg_04, TestSize.Level0) HWTEST_F(AppSpawnSandboxTest, App_Spawn_Sandbox_cfg_001, TestSize.Level0) { AppSpawnSandboxCfg *sandbox = nullptr; - int ret = -1; do { sandbox = CreateAppSpawnSandbox(EXT_DATA_APP_SANDBOX); APPSPAWN_CHECK_ONLY_EXPER(sandbox != nullptr, break); LoadAppSandboxConfig(sandbox, EXT_DATA_APP_SANDBOX); sandbox->extData.dumpNode(&sandbox->extData); - ret = 0; } while (0); + ASSERT_NE(sandbox, nullptr); if (sandbox != nullptr) { sandbox->extData.freeNode(&sandbox->extData); } - ASSERT_EQ(ret, 0); } /** @@ -970,7 +966,6 @@ HWTEST_F(AppSpawnSandboxTest, App_Spawn_Sandbox_cfg_002, TestSize.Level0) pathNode = reinterpret_cast(GetNextSandboxMountPathNode(section, &pathNode->sandboxNode)); ASSERT_EQ(pathNode != nullptr, 1); ASSERT_EQ(pathNode->category, MOUNT_TMP_FUSE); - ret = 0; } while (0); if (sandbox) { DeleteAppSpawnSandbox(sandbox); @@ -985,7 +980,6 @@ HWTEST_F(AppSpawnSandboxTest, App_Spawn_Sandbox_cfg_002, TestSize.Level0) HWTEST_F(AppSpawnSandboxTest, App_Spawn_Sandbox_cfg_003, TestSize.Level0) { AppSpawnSandboxCfg *sandbox = nullptr; - int ret = -1; do { sandbox = CreateAppSpawnSandbox(EXT_DATA_APP_SANDBOX); APPSPAWN_CHECK_ONLY_EXPER(sandbox != nullptr, break); @@ -1018,12 +1012,10 @@ HWTEST_F(AppSpawnSandboxTest, App_Spawn_Sandbox_cfg_003, TestSize.Level0) ASSERT_EQ(linkNode != nullptr, 1); ASSERT_EQ(linkNode->checkErrorFlag == 0, 1); ASSERT_EQ((linkNode->destMode & (S_IRUSR | S_IWOTH | S_IRWXU)) == (S_IRUSR | S_IWOTH | S_IRWXU), 1); - ret = 0; } while (0); if (sandbox) { DeleteAppSpawnSandbox(sandbox); } - ASSERT_EQ(ret, 0); } /** @@ -1033,7 +1025,6 @@ HWTEST_F(AppSpawnSandboxTest, App_Spawn_Sandbox_cfg_003, TestSize.Level0) HWTEST_F(AppSpawnSandboxTest, App_Spawn_Sandbox_cfg_004, TestSize.Level0) { AppSpawnSandboxCfg *sandbox = nullptr; - int ret = -1; do { sandbox = CreateAppSpawnSandbox(EXT_DATA_APP_SANDBOX); APPSPAWN_CHECK_ONLY_EXPER(sandbox != nullptr, break); @@ -1067,12 +1058,10 @@ HWTEST_F(AppSpawnSandboxTest, App_Spawn_Sandbox_cfg_004, TestSize.Level0) ASSERT_EQ(linkNode != nullptr, 1); ASSERT_EQ(linkNode->checkErrorFlag == 0, 1); ASSERT_EQ((linkNode->destMode & (S_IRUSR | S_IWOTH | S_IRWXU)) == (S_IRUSR | S_IWOTH | S_IRWXU), 1); - ret = 0; } while (0); if (sandbox) { DeleteAppSpawnSandbox(sandbox); } - ASSERT_EQ(ret, 0); } /** @@ -1082,7 +1071,6 @@ HWTEST_F(AppSpawnSandboxTest, App_Spawn_Sandbox_cfg_004, TestSize.Level0) HWTEST_F(AppSpawnSandboxTest, App_Spawn_Sandbox_cfg_005, TestSize.Level0) { AppSpawnSandboxCfg *sandbox = nullptr; - int ret = -1; do { sandbox = CreateAppSpawnSandbox(EXT_DATA_APP_SANDBOX); APPSPAWN_CHECK_ONLY_EXPER(sandbox != nullptr, break); @@ -1108,12 +1096,10 @@ HWTEST_F(AppSpawnSandboxTest, App_Spawn_Sandbox_cfg_005, TestSize.Level0) ASSERT_EQ(pathNode->checkErrorFlag == 1, 1); // set ASSERT_EQ((pathNode->destMode & (S_IRUSR | S_IWOTH | S_IRWXU)) == (S_IRUSR | S_IWOTH | S_IRWXU), 1); ASSERT_EQ((pathNode->appAplName != nullptr) && (strcmp(pathNode->appAplName, "system") == 0), 1); - ret = 0; } while (0); if (sandbox) { DeleteAppSpawnSandbox(sandbox); } - ASSERT_EQ(ret, 0); } /** @@ -1123,7 +1109,6 @@ HWTEST_F(AppSpawnSandboxTest, App_Spawn_Sandbox_cfg_005, TestSize.Level0) HWTEST_F(AppSpawnSandboxTest, App_Spawn_Sandbox_cfg_006, TestSize.Level0) { AppSpawnSandboxCfg *sandbox = nullptr; - int ret = -1; do { sandbox = CreateAppSpawnSandbox(EXT_DATA_APP_SANDBOX); APPSPAWN_CHECK_ONLY_EXPER(sandbox != nullptr, break); @@ -1148,12 +1133,10 @@ HWTEST_F(AppSpawnSandboxTest, App_Spawn_Sandbox_cfg_006, TestSize.Level0) ASSERT_EQ(pathNode != nullptr, 1); ASSERT_EQ(strcmp(pathNode->source, "/data/app/el5//base/") == 0, 1); ASSERT_EQ(strcmp(pathNode->target, "/base") == 0, 1); - ret = 0; } while (0); if (sandbox) { DeleteAppSpawnSandbox(sandbox); } - ASSERT_EQ(ret, 0); } /** * @brief 沙盒执行，能执行到对应的检查项，并且检查通过 @@ -1309,9 +1292,7 @@ HWTEST_F(AppSpawnSandboxTest, App_Spawn_Sandbox_mount_003, TestSize.Level0) ret = MountSandboxConfigs(sandbox, property, 0); ASSERT_NE(ret, 0); ASSERT_NE(stub->result, 0); - ret = 0; } while (0); - ASSERT_EQ(ret, 0); if (sandbox) { DeleteAppSpawnSandbox(sandbox); } @@ -1412,7 +1393,6 @@ HWTEST_F(AppSpawnSandboxTest, App_Spawn_Sandbox_mount_005, TestSize.Level0) ret = MountSandboxConfigs(sandbox, property, 0); ASSERT_NE(ret, 0); ASSERT_NE(stub->result, 0); - ret = 0; } while (0); if (sandbox) { DeleteAppSpawnSandbox(sandbox); @@ -1420,7 +1400,6 @@ HWTEST_F(AppSpawnSandboxTest, App_Spawn_Sandbox_mount_005, TestSize.Level0) stub->flags &= ~STUB_NEED_CHECK; DeleteAppSpawningCtx(property); AppSpawnClientDestroy(clientHandle); - ASSERT_EQ(ret, 0); } /** @@ -1470,7 +1449,6 @@ HWTEST_F(AppSpawnSandboxTest, App_Spawn_Sandbox_mount_006, TestSize.Level0) ret = MountSandboxConfigs(sandbox, property, 0); ASSERT_NE(ret, 0); // do not check result ASSERT_NE(stub->result, 0); - ret = 0; } while (0); if (sandbox) { DeleteAppSpawnSandbox(sandbox); @@ -1478,7 +1456,6 @@ HWTEST_F(AppSpawnSandboxTest, App_Spawn_Sandbox_mount_006, TestSize.Level0) stub->flags &= ~STUB_NEED_CHECK; DeleteAppSpawningCtx(property); AppSpawnClientDestroy(clientHandle); - ASSERT_EQ(ret, 0); } /** @@ -1526,7 +1503,6 @@ HWTEST_F(AppSpawnSandboxTest, App_Spawn_Sandbox_mount_007, TestSize.Level0) ret = MountSandboxConfigs(sandbox, property, 0); ASSERT_NE(ret, 0); ASSERT_NE(stub->result, 0); - ret = 0; } while (0); if (sandbox) { DeleteAppSpawnSandbox(sandbox); @@ -1534,7 +1510,6 @@ HWTEST_F(AppSpawnSandboxTest, App_Spawn_Sandbox_mount_007, TestSize.Level0) stub->flags &= ~STUB_NEED_CHECK; DeleteAppSpawningCtx(property); AppSpawnClientDestroy(clientHandle); - ASSERT_EQ(ret, 0); } /** diff --git a/test/unittest/app_spawn_standard_test/app_spawn_sandbox_test.cpp b/test/unittest/app_spawn_standard_test/app_spawn_sandbox_test.cpp index d929e46f..0434a39c 100644 --- a/test/unittest/app_spawn_standard_test/app_spawn_sandbox_test.cpp +++ b/test/unittest/app_spawn_standard_test/app_spawn_sandbox_test.cpp @@ -1747,9 +1747,8 @@ HWTEST_F(AppSpawnSandboxTest, App_Spawn_Sandbox_dec_02, TestSize.Level0) int decPathSize = mountConfig.decPaths.size(); EXPECT_EQ(decPathSize, 0); } - EXPECT_EQ(ret, 0); } while (0); - + EXPECT_EQ(ret, 0); cJSON_Delete(j_config); DeleteAppSpawningCtx(appProperty); } @@ -1793,7 +1792,6 @@ HWTEST_F(AppSpawnSandboxTest, App_Spawn_Sandbox_dec_03, TestSize.Level0) } EXPECT_EQ(ret, 0); } while (0); - cJSON_Delete(j_config); DeleteAppSpawningCtx(appProperty); } diff --git a/test/unittest/app_spawn_standard_test/app_spawn_service_test.cpp b/test/unittest/app_spawn_standard_test/app_spawn_service_test.cpp index a8f86701..47ce99fe 100644 --- a/test/unittest/app_spawn_standard_test/app_spawn_service_test.cpp +++ b/test/unittest/app_spawn_standard_test/app_spawn_service_test.cpp @@ -552,13 +552,11 @@ HWTEST_F(AppSpawnServiceTest, App_Spawn_Msg_002, TestSize.Level0) ret = testServer->CreateSendMsg(buffer, MSG_APP_SPAWN, msgLen, {}); APPSPAWN_CHECK(ret == 0, break, "Failed to create msg %{public}s", testServer->GetDefaultTestAppBundleName()); - ret = -1; int len = write(socketId, buffer.data(), msgLen - 10); // 10 APPSPAWN_CHECK(len > 0, break, "Failed to send msg %{public}s", testServer->GetDefaultTestAppBundleName()); // recv timeout len = RecvMsg(socketId, buffer.data(), buffer.size()); APPSPAWN_CHECK(len <= 0, break, "Failed to recv msg len: %{public}d", len); - ret = 0; } while (0); if (socketId >= 0) { CloseClientSocket(socketId); @@ -687,7 +685,6 @@ HWTEST_F(AppSpawnServiceTest, App_Spawn_Msg_005, TestSize.Level0) ret = respMsg->result.result; (void)RecvMsg(socketId, buffer2.data(), buffer2.size()); } while (0); - ret = 0; // test for case if (socketId >= 0) { CloseClientSocket(socketId); } 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 ccc8bcfd..7ef20cf1 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 @@ -265,13 +265,11 @@ HWTEST_F(NWebSpawnServiceTest, NWeb_Spawn_Msg_002, TestSize.Level0) ret = testServer->CreateSendMsg(buffer, MSG_APP_SPAWN, msgLen, {}); APPSPAWN_CHECK(ret == 0, break, "Failed to create msg %{public}s", testServer->GetDefaultTestAppBundleName()); - ret = -1; int len = write(socketId, buffer.data(), msgLen - 10); // 10 APPSPAWN_CHECK(len > 0, break, "Failed to send msg %{public}s", testServer->GetDefaultTestAppBundleName()); // recv timeout len = RecvMsg(socketId, buffer.data(), buffer.size()); APPSPAWN_CHECK(len <= 0, break, "Failed to recv msg len: %{public}d", len); - ret = 0; } while (0); if (socketId >= 0) { CloseClientSocket(socketId); -- Gitee