diff --git a/modules/common/appspawn_common.c b/modules/common/appspawn_common.c index 901c06bbe1cf2ed6d3382ed948e70335a48ffc43..7c6095d776e9c7bed2e24c42a0d5ec0dcee0ad2f 100644 --- a/modules/common/appspawn_common.c +++ b/modules/common/appspawn_common.c @@ -137,7 +137,7 @@ static int SetAmbientCapabilities(const AppSpawningCtx *property) { const int caps[] = {CAP_DAC_OVERRIDE, CAP_DAC_READ_SEARCH, CAP_FOWNER}; size_t capCount = sizeof(caps) / sizeof(caps[0]); - for (size_t i = 0;i < capCount; ++i) { + for (size_t i = 0; i < capCount; ++i) { if (SetAmbientCapability(caps[i]) != 0) { APPSPAWN_LOGE("set cap failed: %{public}d", caps[i]); return -1; @@ -160,7 +160,7 @@ APPSPAWN_STATIC int SetCapabilities(const AppSpawnMgr *content, const AppSpawnin capHeader.version = _LINUX_CAPABILITY_VERSION_3; capHeader.pid = 0; - struct __user_cap_data_struct capData[2]; // 2 is data number + struct __user_cap_data_struct capData[2]; isRet = memset_s(&capData, sizeof(capData), 0, sizeof(capData)) != EOK; APPSPAWN_CHECK(!isRet, return -EINVAL, "Failed to memset cap data"); @@ -195,10 +195,9 @@ APPSPAWN_STATIC int SetCapabilities(const AppSpawnMgr *content, const AppSpawnin capData[1].permitted = (__u32)(permitted >> BITLEN32); capData[0].effective = (__u32)(effective); capData[1].effective = (__u32)(effective >> BITLEN32); - - // set capabilities isRet = capset(&capHeader, &capData[0]) != 0; APPSPAWN_CHECK(!isRet, return -errno, "Failed to capset errno: %{public}d", errno); + #ifdef APPSPAWN_SUPPORT_NOSHAREFS if (!CheckAppMsgFlagsSet(property, APP_FLAGS_ISOLATED_SANDBOX_TYPE) && (IsAppSpawnMode(content) || IsNativeSpawnMode(content))) { @@ -558,7 +557,7 @@ APPSPAWN_STATIC int FilterAppSpawnTrace(AppSpawnMgr *content, AppSpawningCtx *pr APPSPAWN_LOGV("processName: %{public}s pid: %{public}d", processName, pid); FilterAppTrace(processName, pid); } else { - APPSPAWN_LOGV("processName is NULL"); + APPSPAWN_LOGI("processName is NULL"); } return 0; diff --git a/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_0100.py b/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_0100.py index e9ebe3660f7ed10781beb92d14da841874014922..fea78abc69e921137f9ab44bead50dbcccf4ef47 100644 --- a/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_0100.py +++ b/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_0100.py @@ -1,4 +1,6 @@ -# Copyright (c) 2024 Huawei Device Co., Ltd. +#!/usr/bin/env python +# -*- coding: utf-8 -*- +# 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 diff --git a/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_0200.py b/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_0200.py index 64f2ba3cf883f89dfb1b3892f0384dc4e0ab8a48..94df5ef8c9e3ee4a9b5b3d5411eb5a2cd1ed29ad 100644 --- a/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_0200.py +++ b/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_0200.py @@ -1,4 +1,6 @@ -# Copyright (c) 2024 Huawei Device Co., Ltd. +#!/usr/bin/env python +# -*- coding: utf-8 -*- +# 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 diff --git a/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_0300.py b/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_0300.py index 32195b3941aff343fcd5bbb578e091cc4b967539..0cbc0e3eb56b5cb6c6b13350d277c40790f4c76a 100644 --- a/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_0300.py +++ b/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_0300.py @@ -1,4 +1,6 @@ -# Copyright (c) 2024 Huawei Device Co., Ltd. +#!/usr/bin/env python +# -*- coding: utf-8 -*- +# 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 diff --git a/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_0400.py b/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_0400.py index 5f0c517349913a3b7fe74e5866851df63e7b562d..05c07a6092bd880e111481500dbc7f2547e54102 100644 --- a/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_0400.py +++ b/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_0400.py @@ -1,4 +1,6 @@ -# Copyright (c) 2024 Huawei Device Co., Ltd. +#!/usr/bin/env python +# -*- coding: utf-8 -*- +# 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 diff --git a/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_0500.py b/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_0500.py index 3f9a7bfc905eccc10496dbb37d518cda32fb7dcf..3bcaac1e4aaceb19018579ad03a0dd0b631bb0a0 100644 --- a/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_0500.py +++ b/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_0500.py @@ -1,4 +1,6 @@ -# Copyright (c) 2024 Huawei Device Co., Ltd. +#!/usr/bin/env python +# -*- coding: utf-8 -*- +# 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 diff --git a/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_0700.py b/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_0700.py index 5486dd660f3dbb8a9f2140c3f0bde38559df014f..387c4c3ddd4a23efd49db4af843d04c9863ea5d8 100644 --- a/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_0700.py +++ b/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_0700.py @@ -1,4 +1,6 @@ -# Copyright (c) 2024 Huawei Device Co., Ltd. +#!/usr/bin/env python +# -*- coding: utf-8 -*- +# 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 diff --git a/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_0900.py b/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_0900.py index af214e5421b7a2705409b29a4e5c11997670d3ed..427097fca177600a9b70eb746c8ed347db708f88 100644 --- a/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_0900.py +++ b/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_0900.py @@ -1,4 +1,6 @@ -# Copyright (c) 2024 Huawei Device Co., Ltd. +#!/usr/bin/env python +# -*- coding: utf-8 -*- +# 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 diff --git a/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_1000.py b/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_1000.py index 93161e242263537eb03fd14456d743e97a51975d..9e0a418de6de9ce3109798802c65be116678a49c 100644 --- a/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_1000.py +++ b/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_1000.py @@ -1,4 +1,6 @@ -# Copyright (c) 2024 Huawei Device Co., Ltd. +#!/usr/bin/env python +# -*- coding: utf-8 -*- +# 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 diff --git a/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_1100.py b/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_1100.py index e31c666312a3b1a310a11334224b09a3d96ff0b2..879a01497312a15919b07ff45b2c879d0a35745f 100644 --- a/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_1100.py +++ b/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_1100.py @@ -1,4 +1,6 @@ -# Copyright (c) 2024 Huawei Device Co., Ltd. +#!/usr/bin/env python +# -*- coding: utf-8 -*- +# 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 diff --git a/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_1200.py b/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_1200.py index 531003651bdafebbf96b9b84c1b096f6c17862a3..8773b0bc4be35ee5504f3d2393ad51c3f6f4d99e 100644 --- a/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_1200.py +++ b/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_1200.py @@ -1,4 +1,6 @@ -# Copyright (c) 2024 Huawei Device Co., Ltd. +#!/usr/bin/env python +# -*- coding: utf-8 -*- +# 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 diff --git a/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_1300.py b/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_1300.py index ffb58b3e876b22f085d351aae23b85f7513360be..0c65799e6ff09f765626556b6a69c007d882fa11 100644 --- a/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_1300.py +++ b/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_1300.py @@ -1,4 +1,6 @@ -# Copyright (c) 2024 Huawei Device Co., Ltd. +#!/usr/bin/env python +# -*- coding: utf-8 -*- +# 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 diff --git a/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_1400.py b/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_1400.py index 5d72bc5bdb6d82e1e7df3b7b5df72a4cc691e790..00a0c4f25f6d091722d7241cabfb415b88882c24 100644 --- a/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_1400.py +++ b/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_1400.py @@ -1,4 +1,6 @@ -# Copyright (c) 2024 Huawei Device Co., Ltd. +#!/usr/bin/env python +# -*- coding: utf-8 -*- +# 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 diff --git a/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_1500.py b/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_1500.py index 63c6344dcc15834726572034eaaff3d0e63843fb..606387c25476d86dcb5ff3f4f02ceb1c2018b899 100644 --- a/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_1500.py +++ b/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_1500.py @@ -1,4 +1,6 @@ -# Copyright (c) 2024 Huawei Device Co., Ltd. +#!/usr/bin/env python +# -*- coding: utf-8 -*- +# 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 diff --git a/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_1600.py b/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_1600.py index 4c20f740443892961d52e0b2d3b9befaf53574d8..3223b60a62a3682a5abae14322b697b5eef17857 100644 --- a/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_1600.py +++ b/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_1600.py @@ -1,4 +1,6 @@ -# Copyright (c) 2024 Huawei Device Co., Ltd. +#!/usr/bin/env python +# -*- coding: utf-8 -*- +# 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 diff --git a/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_1700.py b/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_1700.py index 474485a7a3d58ca83c2e42527c426b1f467411e3..8c88da567b7d2b7107977e4a8500e2d1cf0aac3e 100644 --- a/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_1700.py +++ b/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_1700.py @@ -1,4 +1,6 @@ -# Copyright (c) 2024 Huawei Device Co., Ltd. +#!/usr/bin/env python +# -*- coding: utf-8 -*- +# 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 diff --git a/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_1800.py b/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_1800.py index a99c2ab6f487d4931ce8830f31c43377fc919bb3..14145410c7b4fbc57db195921976a376570d7185 100644 --- a/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_1800.py +++ b/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_1800.py @@ -1,4 +1,6 @@ -# Copyright (c) 2024 Huawei Device Co., Ltd. +#!/usr/bin/env python +# -*- coding: utf-8 -*- +# 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 diff --git a/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_1900.py b/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_1900.py index 3ea853e4d3de3bc7a9d10a31737d3f8afed178f7..e6670b74334cb5aec6c8a09238b9165606692ac1 100644 --- a/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_1900.py +++ b/test/autotest/sub_startup_appspawn_nativespawn/sub_startup_appspawn_nativespawn_1900.py @@ -1,4 +1,6 @@ -# Copyright (c) 2024 Huawei Device Co., Ltd. +#!/usr/bin/env python +# -*- coding: utf-8 -*- +# 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 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 4fa5b75fb165ede5509aafe9a5ee7934e0053776..d99749cb7e6b906ca22f9ddccdfa3f9e9d6a9fe4 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 @@ -1199,7 +1199,7 @@ HWTEST_F(AppSpawnClientTest, App_Spawn_Permission_006, TestSize.Level0) // for old sandbox, only one config #ifdef APPSPAWN_SANDBOX_NEW int max = GetMaxPermissionIndex(clientHandle); - EXPECT_EQ(max, 0); + EXPECT_EQ(max, sizeof(g_spawnerPermissionList) / sizeof(g_spawnerPermissionList[0])); int index = GetPermissionIndex(clientHandle, nullptr); EXPECT_EQ(index, INVALID_PERMISSION_INDEX); diff --git a/test/unittest/app_spawn_client_test/app_spawn_interface_test.cpp b/test/unittest/app_spawn_client_test/app_spawn_interface_test.cpp index 005db33db56ffdc94d118f2a1dfc404c3891373d..0a387a8ecd9b5b8e94b1005f5b63f46fa5128141 100644 --- a/test/unittest/app_spawn_client_test/app_spawn_interface_test.cpp +++ b/test/unittest/app_spawn_client_test/app_spawn_interface_test.cpp @@ -617,7 +617,7 @@ HWTEST_F(AppSpawnInterfaceTest, App_SpawnListenFdSet_001, TestSize.Level0) ret = SpawnListenFdSet(pipefd[1]); EXPECT_EQ(ret, 0); - + close(pipefd[0]); close(pipefd[1]); } @@ -646,7 +646,7 @@ HWTEST_F(AppSpawnInterfaceTest, Native_SpawnListenFdSet_001, TestSize.Level0) ret = NativeSpawnListenFdSet(pipefd[1]); EXPECT_EQ(ret, 0); - + close(pipefd[0]); close(pipefd[1]); } diff --git a/test/unittest/app_spawn_standard_test/BUILD.gn b/test/unittest/app_spawn_standard_test/BUILD.gn index c1624c89753c5908494bd982cbd058e05e5dd3bd..5bfa7924a8b21f0b653a905b3f54aa064a12151a 100644 --- a/test/unittest/app_spawn_standard_test/BUILD.gn +++ b/test/unittest/app_spawn_standard_test/BUILD.gn @@ -140,7 +140,9 @@ ohos_unittest("AppSpawn_ut") { ] defines += [ "APPSPAWN_SANDBOX_NEW" ] } else { - sources += [ "${appspawn_path}/test/unittest/app_spawn_standard_test/app_spawn_sandbox_test.cpp" ] + sources += [ + "${appspawn_path}/test/unittest/app_spawn_standard_test/app_spawn_sandbox_test.cpp", + ] } configs = [ "${appspawn_path}:appspawn_config" ] diff --git a/test/unittest/app_spawn_standard_test/app_spawn_sandbox_debug_mode.cpp b/test/unittest/app_spawn_standard_test/app_spawn_sandbox_debug_mode.cpp index 5b4c5d40f755c325c96f8fec883c820e94e0e03c..c8cea6191bbbff50e3dc019ffea3874902eaff9b 100644 --- a/test/unittest/app_spawn_standard_test/app_spawn_sandbox_debug_mode.cpp +++ b/test/unittest/app_spawn_standard_test/app_spawn_sandbox_debug_mode.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2025-2025 Huawei Device Co., Ltd. + * 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 diff --git a/test/unittest/app_spawn_standard_test/app_spawn_sandbox_new_debug_mode.cpp b/test/unittest/app_spawn_standard_test/app_spawn_sandbox_new_debug_mode.cpp index 04396530ace616249e7019c55741bf04439fc0be..05f9452407d643737ab3e1741d6da769298bc6b7 100644 --- a/test/unittest/app_spawn_standard_test/app_spawn_sandbox_new_debug_mode.cpp +++ b/test/unittest/app_spawn_standard_test/app_spawn_sandbox_new_debug_mode.cpp @@ -46,7 +46,7 @@ extern "C" { } namespace OHOS { -AppSpawnTestHelper g_testHelper; +static AppSpawnTestHelper g_testHelper; class AppSpawnDebugSandboxTest : public testing::Test { public: static void SetUpTestCase() {} @@ -80,7 +80,7 @@ static AppSpawningCtx *AppSpawnDebugSandboxTestCreateAppSpawningCtx(int base) return nullptr; } -static SandboxContext *AppSpawnDebugSandboxTestGetSandboxContext(const AppSpawningCtx *property, int newbspawn) +static SandboxContext *AppSpawnDebugSandboxTestGetSandboxContext(const AppSpawningCtx *property, int nwebspawn) { AppSpawnMsgFlags *msgFlags = (AppSpawnMsgFlags *)GetAppProperty(property, TLV_MSG_FLAGS); APPSPAWN_CHECK(msgFlags != nullptr, return nullptr, "No msg flags in msg %{public}s", GetProcessName(property)); @@ -88,7 +88,7 @@ static SandboxContext *AppSpawnDebugSandboxTestGetSandboxContext(const AppSpawni SandboxContext *context = GetSandboxContext(); APPSPAWN_CHECK(context != nullptr, return nullptr, "Failed to get context"); - context->nwebspawn = newbspawn; + context->nwebspawn = nwebspawn; context->bundleName = GetBundleName(property); context->bundleHasWps = strstr(context->bundleName, "wps") != nullptr; context->dlpBundle = strcmp(GetProcessName(property), "com.ohos.dlpmanager") == 0; @@ -104,7 +104,7 @@ static SandboxContext *AppSpawnDebugSandboxTestGetSandboxContext(const AppSpawni /** * @tc.name: InstallDebugSandbox_ShouldReturnInvalidArg_WhenPropertyIsNull - * @tc.desc: 测试当 property 为NULL 时, 函数应返回 APPSPAWN_ARG_INVAILD. + * @tc.desc: 测试当 property 为 NULL 时,函数应返回 APPSPAWN_ARG_INVAILD. * @tc.number: InstallDebugSandboxTest_001 */ HWTEST_F(AppSpawnDebugSandboxTest, ATC_InstallDebugSandbox_ShouldReturnInvalidArg_WhenPropertyIsNull, TestSize.Level0) @@ -119,7 +119,7 @@ HWTEST_F(AppSpawnDebugSandboxTest, ATC_InstallDebugSandbox_ShouldReturnInvalidAr /** * @tc.name: InstallDebugSandbox_ShouldReturnInvalidArg_WhenContentIsNull - * @tc.desc: 测试当 content 为NULL 时, 函数应返回 APPSPAWN_ARG_INVAILD. + * @tc.desc: 测试当 content 为 NULL 时,函数应返回 APPSPAWN_ARG_INVAILD. * @tc.number: InstallDebugSandboxTest_002 */ HWTEST_F(AppSpawnDebugSandboxTest, ATC_InstallDebugSandbox_ShouldReturnInvalidArg_WhenContentIsNull, TestSize.Level0) @@ -137,7 +137,7 @@ HWTEST_F(AppSpawnDebugSandboxTest, ATC_InstallDebugSandbox_ShouldReturnInvalidAr * @tc.desc: 测试当不在开发者模式时,函数应返回 0. * @tc.number: InstallDebugSandboxTest_003 */ -HWTEST_F(AppSpawnDebugSandboxTest, ATC_InstallDebugSandbox_ShouldReturnZero_WhenNotDeveloperMode, TestSize.Level0) +HWTEST_F(AppSpawnDebugSandboxTest, InstallDebugSandbox_ShouldReturnZero_WhenNotDeveloperMode, TestSize.Level0) { AppSpawnMgr *mgr = CreateAppSpawnMgr(MODE_FOR_APP_SPAWN); AppSpawningCtx *property = AppSpawnDebugSandboxTestCreateAppSpawningCtx(0); @@ -167,11 +167,11 @@ HWTEST_F(AppSpawnDebugSandboxTest, ATC_InstallDebugSandbox_ShouldReturnZero_When /** * @tc.name: InstallDebugSandbox_ShouldReturnSandboxInvalid_WhenSandboxConfigNotFound - * @tc.desc: 测试当找不到沙箱配置时,函数3应返回 APPSPAWN_SANDBOX_INVALID. + * @tc.desc: 测试当找不到沙箱配置时,函数应返回 APPSPAWN_SANDBOX_INVALID. * @tc.number: InstallDebugSandboxTest_005 */ HWTEST_F(AppSpawnDebugSandboxTest, - ATC_InstallDebugSandbox_ShouldReturnSandboxInvalid_WhenSandboxConfigNotFound, TestSize.Level0) + InstallDebugSandbox_ShouldReturnSandboxInvalid_WhenSandboxConfigNotFound, TestSize.Level0) { AppSpawnMgr *mgr = CreateAppSpawnMgr(MODE_FOR_APP_SPAWN); AppSpawningCtx *property = AppSpawnDebugSandboxTestCreateAppSpawningCtx(1); @@ -185,11 +185,11 @@ HWTEST_F(AppSpawnDebugSandboxTest, /** * @tc.name: InstallDebugSandbox_ShouldReturnSystemError_WhenSandboxContextIsNull - * @tc.desc: 测试当沙箱上下文获取失败时,函数应返回 APPSPAWN_SYSTEM_ERROR + * @tc.desc: 测试当沙箱上下文获取失败时,函数应返回 APPSPAWN_SYSTEM_ERROR. * @tc.number: InstallDebugSandboxTest_006 */ HWTEST_F(AppSpawnDebugSandboxTest, - ATC_InstallDebugSandbox_ShouldReturnSystemError_WhenSandboxContextIsNull, TestSize.Level0) + InstallDebugSandbox_ShouldReturnSystemError_WhenSandboxContextIsNull, TestSize.Level0) { AppSpawnMgr *mgr = CreateAppSpawnMgr(MODE_FOR_APP_SPAWN); AppSpawningCtx *property = AppSpawnDebugSandboxTestCreateAppSpawningCtx(1); @@ -201,4 +201,5 @@ HWTEST_F(AppSpawnDebugSandboxTest, // delete DeleteAppSpawningCtx(property); DeleteAppSpawnMgr(mgr); +} } \ No newline at end of file diff --git a/test/unittest/app_spawn_standard_test/app_spawn_sandboxmgr_test.cpp b/test/unittest/app_spawn_standard_test/app_spawn_sandboxmgr_test.cpp index 1f736325f2171b9ff1fdf2ce2baa5a075843f295..219854ad59007fdfed09ef447e9aa5a007602e88 100644 --- a/test/unittest/app_spawn_standard_test/app_spawn_sandboxmgr_test.cpp +++ b/test/unittest/app_spawn_standard_test/app_spawn_sandboxmgr_test.cpp @@ -724,7 +724,7 @@ HWTEST_F(AppSpawnSandboxMgrTest, App_Spawn_Permission_003, TestSize.Level0) #else // nweb no permission, so max = 0 max = GetMaxPermissionIndex(clientHandle); - EXPECT_EQ(max, 0); + EXPECT_EQ(max, sizeof(g_spawnerPermissionList) / sizeof(g_spawnerPermissionList[0])); #endif AppSpawnClientDestroy(clientHandle); }