From c6b8f19a9893ad36689098c547f28fcaf7baa84b Mon Sep 17 00:00:00 2001
From: nianyuu <zhouwenqiang12@huawei.com>
Date: Sat, 23 Aug 2025 15:00:28 +0800
Subject: [PATCH] sync test code

Signed-off-by: nianyuu <zhouwenqiang12@huawei.com>
---
 modules/common/appspawn_common.c              |  9 ++++----
 .../sub_startup_appspawn_nativespawn_0100.py  |  4 +++-
 .../sub_startup_appspawn_nativespawn_0200.py  |  4 +++-
 .../sub_startup_appspawn_nativespawn_0300.py  |  4 +++-
 .../sub_startup_appspawn_nativespawn_0400.py  |  4 +++-
 .../sub_startup_appspawn_nativespawn_0500.py  |  4 +++-
 .../sub_startup_appspawn_nativespawn_0700.py  |  4 +++-
 .../sub_startup_appspawn_nativespawn_0900.py  |  4 +++-
 .../sub_startup_appspawn_nativespawn_1000.py  |  4 +++-
 .../sub_startup_appspawn_nativespawn_1100.py  |  4 +++-
 .../sub_startup_appspawn_nativespawn_1200.py  |  4 +++-
 .../sub_startup_appspawn_nativespawn_1300.py  |  4 +++-
 .../sub_startup_appspawn_nativespawn_1400.py  |  4 +++-
 .../sub_startup_appspawn_nativespawn_1500.py  |  4 +++-
 .../sub_startup_appspawn_nativespawn_1600.py  |  4 +++-
 .../sub_startup_appspawn_nativespawn_1700.py  |  4 +++-
 .../sub_startup_appspawn_nativespawn_1800.py  |  4 +++-
 .../sub_startup_appspawn_nativespawn_1900.py  |  4 +++-
 .../app_spawn_client_test.cpp                 |  2 +-
 .../app_spawn_interface_test.cpp              |  4 ++--
 .../unittest/app_spawn_standard_test/BUILD.gn |  4 +++-
 .../app_spawn_sandbox_debug_mode.cpp          |  2 +-
 .../app_spawn_sandbox_new_debug_mode.cpp      | 21 ++++++++++---------
 .../app_spawn_sandboxmgr_test.cpp             |  2 +-
 24 files changed, 74 insertions(+), 38 deletions(-)

diff --git a/modules/common/appspawn_common.c b/modules/common/appspawn_common.c
index 901c06bb..7c6095d7 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 e9ebe366..fea78abc 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 64f2ba3c..94df5ef8 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 32195b39..0cbc0e3e 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 5f0c5173..05c07a60 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 3f9a7bfc..3bcaac1e 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 5486dd66..387c4c3d 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 af214e54..427097fc 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 93161e24..9e0a418d 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 e31c6663..879a0149 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 53100365..8773b0bc 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 ffb58b3e..0c65799e 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 5d72bc5b..00a0c4f2 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 63c6344d..606387c2 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 4c20f740..3223b60a 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 474485a7..8c88da56 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 a99c2ab6..14145410 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 3ea853e4..e6670b74 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 4fa5b75f..d99749cb 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 005db33d..0a387a8e 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 c1624c89..5bfa7924 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 5b4c5d40..c8cea619 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 04396530..05f94524 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 1f736325..219854ad 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);
 }
-- 
Gitee