diff --git a/kits/appkit/napi/bundlemgr/bundle_mgr.cpp b/kits/appkit/napi/bundlemgr/bundle_mgr.cpp
index 4245612309d38edabb9dde4775d30277c7db880b..5607ec980d9c8ef70aaed046478902c8faccfc4d 100644
--- a/kits/appkit/napi/bundlemgr/bundle_mgr.cpp
+++ b/kits/appkit/napi/bundlemgr/bundle_mgr.cpp
@@ -85,7 +85,7 @@ std::map<napi_ref, OHOS::sptr<PermissionCallback>> anyPermissionsCallback;
 
 }  // namespace
 
-napi_value g_classBundleInstaller;
+napi_ref g_classBundleInstaller;
 
 static OHOS::sptr<OHOS::AppExecFwk::IBundleMgr> GetBundleMgr()
 {
@@ -2214,8 +2214,10 @@ napi_value GetBundleInstaller(napi_env env, napi_callback_info info)
                 napi_value callback = 0;
                 napi_value undefined = 0;
                 napi_value callResult = 0;
+                napi_value m_classBundleInstaller = nullptr;
+                napi_get_reference_value(env, g_classBundleInstaller, &m_classBundleInstaller);
                 napi_get_undefined(env, &undefined);
-                napi_new_instance(env, g_classBundleInstaller, 0, nullptr, &result[PARAM1]);
+                napi_new_instance(env, m_classBundleInstaller, 0, nullptr, &result[PARAM1]);
                 result[PARAM0] = GetCallbackErrorValue(env, CODE_SUCCESS);
                 napi_get_reference_value(env, asyncCallbackInfo->callback, &callback);
                 napi_call_function(env, undefined, callback, ARGS_SIZE_TWO, &result[PARAM0], &callResult);
@@ -2257,7 +2259,9 @@ napi_value GetBundleInstaller(napi_env env, napi_callback_info info)
                 HILOG_INFO("=================load=================");
                 AsyncGetBundleInstallerCallbackInfo *asyncCallbackInfo = (AsyncGetBundleInstallerCallbackInfo *)data;
                 napi_value result;
-                napi_new_instance(env, g_classBundleInstaller, 0, nullptr, &result);
+                napi_value m_classBundleInstaller = nullptr;
+                napi_get_reference_value(env, g_classBundleInstaller, &m_classBundleInstaller);
+                napi_new_instance(env, m_classBundleInstaller, 0, nullptr, &result);
                 napi_resolve_deferred(asyncCallbackInfo->env, asyncCallbackInfo->deferred, result);
                 napi_delete_async_work(env, asyncCallbackInfo->asyncWork);
                 delete asyncCallbackInfo;
diff --git a/kits/appkit/napi/bundlemgr/bundle_mgr.h b/kits/appkit/napi/bundlemgr/bundle_mgr.h
index d8c01e8db94c987914262bd60cfed583de9a9810..bf88eda783bd95bd6c6ea11ca62974d7792ef393 100644
--- a/kits/appkit/napi/bundlemgr/bundle_mgr.h
+++ b/kits/appkit/napi/bundlemgr/bundle_mgr.h
@@ -198,7 +198,7 @@ struct AsyncUnregisterPermissions {
     bool ret = false;
 };
 
-extern napi_value g_classBundleInstaller;
+extern napi_ref g_classBundleInstaller;
 
 napi_value GetApplicationInfos(napi_env env, napi_callback_info info);
 napi_value GetApplicationInfo(napi_env env, napi_callback_info info);
diff --git a/kits/appkit/napi/bundlemgr/native_module.cpp b/kits/appkit/napi/bundlemgr/native_module.cpp
index dc62bcdc96a895d8df87f8f3fdbc12c87138b2f7..1f5926988bacf6c20d2312d23ec8d6ef8b20abba 100644
--- a/kits/appkit/napi/bundlemgr/native_module.cpp
+++ b/kits/appkit/napi/bundlemgr/native_module.cpp
@@ -116,6 +116,7 @@ static napi_value Init(napi_env env, napi_value exports)
     };
     NAPI_CALL(env, napi_define_properties(env, exports, sizeof(desc) / sizeof(desc[0]), desc));
 
+    napi_value m_classBundleInstaller;
     napi_property_descriptor properties[] = {
         DECLARE_NAPI_FUNCTION("install", Install),
         DECLARE_NAPI_FUNCTION("uninstall", Uninstall),
@@ -128,7 +129,8 @@ static napi_value Init(napi_env env, napi_value exports)
             nullptr,
             sizeof(properties) / sizeof(*properties),
             properties,
-            &g_classBundleInstaller));
+            &m_classBundleInstaller));
+    napi_create_reference(env, m_classBundleInstaller, 1, &g_classBundleInstaller);
     HILOG_INFO("-----Init end------");
     return exports;
 }
diff --git a/test/systemtest/common/ams/BUILD.gn b/test/systemtest/common/ams/BUILD.gn
index af5964d1072ac13744f10dd58f98e91128c3dc31..97e7c287b550b4eb09893a5e7606346f07f7e1b7 100755
--- a/test/systemtest/common/ams/BUILD.gn
+++ b/test/systemtest/common/ams/BUILD.gn
@@ -34,12 +34,11 @@ group("systemtest") {
     "ams_ability_append_test:systemtest",
     "ams_ability_visible_test:systemtest",
     "ams_app_process_manage_test:systemtest",
-
-    #"ams_configuration_updated_test:ams_configuration_updated_test",
+    "ams_configuration_updated_test:systemtest",
     "ams_data_ability_test:systemtest",
     "ams_dfx_test:systemtest",
     "ams_kit_test:systemtest",
-    "ams_missionstack_test:ams_missionstack_test",
+    "ams_missionstack_test:systemtest",
     "ams_page_ability_test:systemtest",
     "ams_power_test:systemtest",
     "ams_service_ability_test:systemtest",
diff --git a/test/systemtest/common/ams/ams_aa_command_test/BUILD.gn b/test/systemtest/common/ams/ams_aa_command_test/BUILD.gn
index 8a75f96226cd1b39e1c19bf35b20054efaf05a2a..51bc76ed8113cf2fc85a92edb137d26cf29418f6 100755
--- a/test/systemtest/common/ams/ams_aa_command_test/BUILD.gn
+++ b/test/systemtest/common/ams/ams_aa_command_test/BUILD.gn
@@ -29,8 +29,8 @@ ohos_systemtest("ams_aa_command_test") {
   sources = [
     "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/event.cpp",
     "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/module_test_dump_util.cpp",
+    "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/st_ability_util.cpp",
     "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/stoperator.cpp",
-    "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/system_test_ability_util.cpp",
     "ams_aa_command_test.cpp",
   ]
 
diff --git a/test/systemtest/common/ams/ams_ability_append_test/BUILD.gn b/test/systemtest/common/ams/ams_ability_append_test/BUILD.gn
index 1f6c17236362249d656cfbf55d0d7530c8b1fbd2..3da99602b2346e7e0d5cbb2aee84041568a2fe6f 100755
--- a/test/systemtest/common/ams/ams_ability_append_test/BUILD.gn
+++ b/test/systemtest/common/ams/ams_ability_append_test/BUILD.gn
@@ -27,8 +27,8 @@ ohos_systemtest("ams_ability_append_test") {
   sources = [
     "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/event.cpp",
     "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/module_test_dump_util.cpp",
+    "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/st_ability_util.cpp",
     "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/stoperator.cpp",
-    "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/system_test_ability_util.cpp",
     "ams_ability_append_test.cpp",
   ]
 
diff --git a/test/systemtest/common/ams/ams_ability_visible_test/BUILD.gn b/test/systemtest/common/ams/ams_ability_visible_test/BUILD.gn
index 3b4a98c8048e1d41975825a5de869f0dc89d5d5c..658c2ff0acdb0c27ed292ec60bdb19547807fb28 100755
--- a/test/systemtest/common/ams/ams_ability_visible_test/BUILD.gn
+++ b/test/systemtest/common/ams/ams_ability_visible_test/BUILD.gn
@@ -27,8 +27,8 @@ ohos_systemtest("ams_ability_visible_test") {
   sources = [
     "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/event.cpp",
     "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/module_test_dump_util.cpp",
+    "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/st_ability_util.cpp",
     "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/stoperator.cpp",
-    "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/system_test_ability_util.cpp",
     "ams_ability_visible_test.cpp",
   ]
 
diff --git a/test/systemtest/common/ams/ams_app_process_manage_test/BUILD.gn b/test/systemtest/common/ams/ams_app_process_manage_test/BUILD.gn
index 658d8d9153d97698d54e289c03b1e8b67a42c1e5..8220c1d887bf028bd74148f2fef4b1753e87fb39 100755
--- a/test/systemtest/common/ams/ams_app_process_manage_test/BUILD.gn
+++ b/test/systemtest/common/ams/ams_app_process_manage_test/BUILD.gn
@@ -27,8 +27,8 @@ ohos_systemtest("ams_app_process_manage_test") {
   sources = [
     "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/event.cpp",
     "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/module_test_dump_util.cpp",
+    "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/st_ability_util.cpp",
     "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/stoperator.cpp",
-    "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/system_test_ability_util.cpp",
     "ams_app_process_manage_test.cpp",
   ]
 
diff --git a/test/systemtest/common/ams/ams_configuration_updated_test/BUILD.gn b/test/systemtest/common/ams/ams_configuration_updated_test/BUILD.gn
index 173f0d0fed868221351c03619570bb2c0c7495e2..cc937993f8386fb1096ee847f90897d36cf55d24 100755
--- a/test/systemtest/common/ams/ams_configuration_updated_test/BUILD.gn
+++ b/test/systemtest/common/ams/ams_configuration_updated_test/BUILD.gn
@@ -27,8 +27,8 @@ ohos_systemtest("ams_configuration_updated_test") {
   sources = [
     "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/event.cpp",
     "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/module_test_dump_util.cpp",
+    "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/st_ability_util.cpp",
     "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/stoperator.cpp",
-    "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/system_test_ability_util.cpp",
     "ams_configuration_updated_test.cpp",
   ]
 
diff --git a/test/systemtest/common/ams/ams_configuration_updated_test/ams_configuration_updated_test.cpp b/test/systemtest/common/ams/ams_configuration_updated_test/ams_configuration_updated_test.cpp
index b9d9b19175cd23d1379e641dfa44d3f9dbba86f6..238f40186fb775afd397f05b4c90ea394d4485da 100644
--- a/test/systemtest/common/ams/ams_configuration_updated_test/ams_configuration_updated_test.cpp
+++ b/test/systemtest/common/ams/ams_configuration_updated_test/ams_configuration_updated_test.cpp
@@ -32,6 +32,7 @@ using namespace OHOS::STABUtil;
 using namespace testing::ext;
 
 using MAP_STR_STR = std::map<std::string, std::string>;
+namespace {
 static const string KIT_BUNDLE_NAME = "com.ohos.amsst.ConfigurationUpdated";
 static const string KIT_HAP_NAME = "amsConfigurationUpdatedTest";
 static const string MAIN_ABILITY = "MainAbility";
@@ -46,6 +47,7 @@ static constexpr int WAIT_SETUP_TIME = 1;
 static constexpr int WAIT_TEARDOWN_TIME = 1;
 static string g_eventMessage = "";
 static string g_tempDataStr = "";
+}
 
 std::vector<std::string> eventList = {
     g_EVENT_RESP_MAIN_LIFECYCLE,
@@ -74,13 +76,13 @@ public:
         ~AppEventSubscriber(){};
     };
 
-    static sptr<IAbilityManager> g_abilityMs;
+    static sptr<IAbilityManager> abilityMgrService;
     static Event event;
     static std::shared_ptr<AppEventSubscriber> subscriber_;
 };
 
 Event AmsConfigurationUpdatedTest::event = Event();
-sptr<IAbilityManager> AmsConfigurationUpdatedTest::g_abilityMs = nullptr;
+sptr<IAbilityManager> AmsConfigurationUpdatedTest::abilityMgrService = nullptr;
 std::shared_ptr<AmsConfigurationUpdatedTest::AppEventSubscriber> AmsConfigurationUpdatedTest::subscriber_ = nullptr;
 
 void AmsConfigurationUpdatedTest::AppEventSubscriber::OnReceiveEvent(const CommonEventData &data)
@@ -157,15 +159,15 @@ HWTEST_F(AmsConfigurationUpdatedTest, AMS_UpdateConfiguration_0100, Function | M
     MAP_STR_STR params;
     Want want = STAbilityUtil::MakeWant("device", MAIN_ABILITY, KIT_BUNDLE_NAME, params);
     // start first ability
-    ErrCode eCode = STAbilityUtil::StartAbility(want, g_abilityMs, WAIT_TIME);
+    ErrCode eCode = STAbilityUtil::StartAbility(want, abilityMgrService, WAIT_TIME);
     GTEST_LOG_(INFO) << "\nStartAbility ====>> " << eCode;
 
     g_tempDataStr = "OnStartOnActive";
     EXPECT_EQ(TestWaitCompleted(event, "OnStartOnActive", MAIN_ABILITY_CODE, WAIT_LAUNCHER_TIME), 0);
 
     DummyConfiguration mDummyConfiguration("orientation");
-    g_abilityMs->UpdateConfiguration(mDummyConfiguration);
-    g_abilityMs->UpdateConfiguration(mDummyConfiguration);
+    abilityMgrService->UpdateConfiguration(mDummyConfiguration);
+    abilityMgrService->UpdateConfiguration(mDummyConfiguration);
 
     g_tempDataStr = "UpdatedUpdated";
     EXPECT_EQ(TestWaitCompleted(event, "UpdatedUpdated", MAIN_ABILITY_CODE, WAIT_LAUNCHER_TIME), 0);
@@ -186,15 +188,15 @@ HWTEST_F(AmsConfigurationUpdatedTest, AMS_UpdateConfiguration_0200, Function | M
     MAP_STR_STR params;
     Want want = STAbilityUtil::MakeWant("device", SECOND_ABILITY, KIT_BUNDLE_NAME, params);
     // start first ability
-    ErrCode eCode = STAbilityUtil::StartAbility(want, g_abilityMs, WAIT_TIME);
+    ErrCode eCode = STAbilityUtil::StartAbility(want, abilityMgrService, WAIT_TIME);
     GTEST_LOG_(INFO) << "\nStartAbility ====>> " << eCode;
 
     g_tempDataStr = "OnStartOnActive";
     EXPECT_EQ(TestWaitCompleted(event, "OnStartOnActive", SECOND_ABILITY_CODE, WAIT_LAUNCHER_TIME), 0);
 
     DummyConfiguration mDummyConfiguration("locale");
-    g_abilityMs->UpdateConfiguration(mDummyConfiguration);
-    g_abilityMs->UpdateConfiguration(mDummyConfiguration);
+    abilityMgrService->UpdateConfiguration(mDummyConfiguration);
+    abilityMgrService->UpdateConfiguration(mDummyConfiguration);
 
     g_tempDataStr = "UpdatedUpdated";
     EXPECT_EQ(TestWaitCompleted(event, "UpdatedUpdated", SECOND_ABILITY_CODE, WAIT_LAUNCHER_TIME), 0);
@@ -215,16 +217,16 @@ HWTEST_F(AmsConfigurationUpdatedTest, AMS_UpdateConfiguration_0300, Function | M
     MAP_STR_STR params;
     Want want = STAbilityUtil::MakeWant("device", THIRD_ABILITY, KIT_BUNDLE_NAME, params);
     // start first ability
-    g_abilityMs = nullptr;
-    ErrCode eCode = STAbilityUtil::StartAbility(want, g_abilityMs, WAIT_TIME);
+    abilityMgrService = nullptr;
+    ErrCode eCode = STAbilityUtil::StartAbility(want, abilityMgrService, WAIT_TIME);
     GTEST_LOG_(INFO) << "\nStartAbility ====>> " << eCode;
 
     g_tempDataStr = "OnStartOnActive";
     EXPECT_EQ(TestWaitCompleted(event, "OnStartOnActive", THIRD_ABILITY_CODE, WAIT_LAUNCHER_TIME), 0);
 
     DummyConfiguration mDummyConfiguration("layout");
-    g_abilityMs->UpdateConfiguration(mDummyConfiguration);
-    g_abilityMs->UpdateConfiguration(mDummyConfiguration);
+    abilityMgrService->UpdateConfiguration(mDummyConfiguration);
+    abilityMgrService->UpdateConfiguration(mDummyConfiguration);
 
     g_tempDataStr = "UpdatedUpdated";
     EXPECT_EQ(TestWaitCompleted(event, "UpdatedUpdated", THIRD_ABILITY_CODE, WAIT_LAUNCHER_TIME), 0);
@@ -245,15 +247,15 @@ HWTEST_F(AmsConfigurationUpdatedTest, AMS_UpdateConfiguration_0400, Function | M
     MAP_STR_STR params;
     Want want = STAbilityUtil::MakeWant("device", FOURTH_ABILITY, KIT_BUNDLE_NAME, params);
     // start first ability
-    ErrCode eCode = STAbilityUtil::StartAbility(want, g_abilityMs, WAIT_TIME);
+    ErrCode eCode = STAbilityUtil::StartAbility(want, abilityMgrService, WAIT_TIME);
     GTEST_LOG_(INFO) << "\nStartAbility ====>> " << eCode;
 
     g_tempDataStr = "OnStartOnActive";
     EXPECT_EQ(TestWaitCompleted(event, "OnStartOnActive", FOURTH_ABILITY_CODE, WAIT_LAUNCHER_TIME), 0);
 
     DummyConfiguration mDummyConfiguration("density#fontSize#");
-    g_abilityMs->UpdateConfiguration(mDummyConfiguration);
-    g_abilityMs->UpdateConfiguration(mDummyConfiguration);
+    abilityMgrService->UpdateConfiguration(mDummyConfiguration);
+    abilityMgrService->UpdateConfiguration(mDummyConfiguration);
 
     g_tempDataStr = "UpdatedUpdated";
     EXPECT_EQ(TestWaitCompleted(event, "UpdatedUpdated", FOURTH_ABILITY_CODE, WAIT_LAUNCHER_TIME), 0);
@@ -274,15 +276,15 @@ HWTEST_F(AmsConfigurationUpdatedTest, AMS_UpdateConfiguration_0500, Function | M
     MAP_STR_STR params;
     Want want = STAbilityUtil::MakeWant("device", FIFTH_ABILITY, KIT_BUNDLE_NAME, params);
     // start first ability
-    ErrCode eCode = STAbilityUtil::StartAbility(want, g_abilityMs, WAIT_TIME);
+    ErrCode eCode = STAbilityUtil::StartAbility(want, abilityMgrService, WAIT_TIME);
     GTEST_LOG_(INFO) << "\nStartAbility ====>> " << eCode;
 
     g_tempDataStr = "OnStartOnActive";
     EXPECT_EQ(TestWaitCompleted(event, "OnStartOnActive", FIFTH_ABILITY_CODE, WAIT_LAUNCHER_TIME), 0);
 
     DummyConfiguration mDummyConfiguration("fontSize#density");
-    g_abilityMs->UpdateConfiguration(mDummyConfiguration);
-    g_abilityMs->UpdateConfiguration(mDummyConfiguration);
+    abilityMgrService->UpdateConfiguration(mDummyConfiguration);
+    abilityMgrService->UpdateConfiguration(mDummyConfiguration);
 
     g_tempDataStr = "UpdatedUpdated";
     EXPECT_EQ(TestWaitCompleted(event, "UpdatedUpdated", FIFTH_ABILITY_CODE, WAIT_LAUNCHER_TIME), 0);
@@ -303,15 +305,15 @@ HWTEST_F(AmsConfigurationUpdatedTest, AMS_UpdateConfiguration_0600, Function | M
     MAP_STR_STR params;
     Want want = STAbilityUtil::MakeWant("device", MAIN_ABILITY, KIT_BUNDLE_NAME, params);
     // start first ability
-    ErrCode eCode = STAbilityUtil::StartAbility(want, g_abilityMs, WAIT_TIME);
+    ErrCode eCode = STAbilityUtil::StartAbility(want, abilityMgrService, WAIT_TIME);
     GTEST_LOG_(INFO) << "\nStartAbility ====>> " << eCode;
 
     g_tempDataStr = "OnStartOnActive";
     EXPECT_EQ(TestWaitCompleted(event, "OnStartOnActive", MAIN_ABILITY_CODE, WAIT_LAUNCHER_TIME), 0);
 
     DummyConfiguration mDummyConfiguration("locale#layout#fontSize#density");
-    g_abilityMs->UpdateConfiguration(mDummyConfiguration);
-    g_abilityMs->UpdateConfiguration(mDummyConfiguration);
+    abilityMgrService->UpdateConfiguration(mDummyConfiguration);
+    abilityMgrService->UpdateConfiguration(mDummyConfiguration);
 
     g_tempDataStr = "OnInactiveOnBackgroundOnStop";
     EXPECT_EQ(TestWaitCompleted(event, "OnInactiveOnBackgroundOnStop", MAIN_ABILITY_CODE, WAIT_LAUNCHER_TIME), 0);
@@ -337,15 +339,15 @@ HWTEST_F(AmsConfigurationUpdatedTest, AMS_UpdateConfiguration_0700, Function | M
     MAP_STR_STR params;
     Want want = STAbilityUtil::MakeWant("device", SECOND_ABILITY, KIT_BUNDLE_NAME, params);
     // start first ability
-    ErrCode eCode = STAbilityUtil::StartAbility(want, g_abilityMs, WAIT_TIME);
+    ErrCode eCode = STAbilityUtil::StartAbility(want, abilityMgrService, WAIT_TIME);
     GTEST_LOG_(INFO) << "\nStartAbility ====>> " << eCode;
 
     g_tempDataStr = "OnStartOnActive";
     EXPECT_EQ(TestWaitCompleted(event, "OnStartOnActive", SECOND_ABILITY_CODE, WAIT_LAUNCHER_TIME), 0);
 
     DummyConfiguration mDummyConfiguration("layout#fontSize#density");
-    g_abilityMs->UpdateConfiguration(mDummyConfiguration);
-    g_abilityMs->UpdateConfiguration(mDummyConfiguration);
+    abilityMgrService->UpdateConfiguration(mDummyConfiguration);
+    abilityMgrService->UpdateConfiguration(mDummyConfiguration);
 
     g_tempDataStr = "OnInactiveOnBackgroundOnStop";
     EXPECT_EQ(TestWaitCompleted(event, "OnInactiveOnBackgroundOnStop", SECOND_ABILITY_CODE, WAIT_LAUNCHER_TIME), 0);
@@ -371,14 +373,14 @@ HWTEST_F(AmsConfigurationUpdatedTest, AMS_UpdateConfiguration_0800, Function | M
     MAP_STR_STR params;
     Want want = STAbilityUtil::MakeWant("device", SIXTH_ABILITY, KIT_BUNDLE_NAME, params);
     // start first ability
-    ErrCode eCode = STAbilityUtil::StartAbility(want, g_abilityMs, WAIT_TIME);
+    ErrCode eCode = STAbilityUtil::StartAbility(want, abilityMgrService, WAIT_TIME);
     GTEST_LOG_(INFO) << "\nStartAbility ====>> " << eCode;
 
     g_tempDataStr = "OnStartOnActive";
     EXPECT_EQ(TestWaitCompleted(event, "OnStartOnActive", SIXTH_ABILITY_CODE, WAIT_LAUNCHER_TIME), 0);
 
     DummyConfiguration mDummyConfiguration("orientation");
-    g_abilityMs->UpdateConfiguration(mDummyConfiguration);
+    abilityMgrService->UpdateConfiguration(mDummyConfiguration);
 
     g_tempDataStr = "OnInactiveOnBackgroundOnStop";
     EXPECT_EQ(TestWaitCompleted(event, "OnInactiveOnBackgroundOnStop", SIXTH_ABILITY_CODE, WAIT_LAUNCHER_TIME), 0);
@@ -404,14 +406,14 @@ HWTEST_F(AmsConfigurationUpdatedTest, AMS_UpdateConfiguration_0900, Function | M
     MAP_STR_STR params;
     Want want = STAbilityUtil::MakeWant("device", SIXTH_ABILITY, KIT_BUNDLE_NAME, params);
     // start first ability
-    ErrCode eCode = STAbilityUtil::StartAbility(want, g_abilityMs, WAIT_TIME);
+    ErrCode eCode = STAbilityUtil::StartAbility(want, abilityMgrService, WAIT_TIME);
     GTEST_LOG_(INFO) << "\nStartAbility ====>> " << eCode;
 
     g_tempDataStr = "OnStartOnActive";
     EXPECT_EQ(TestWaitCompleted(event, "OnStartOnActive", SIXTH_ABILITY_CODE, WAIT_LAUNCHER_TIME), 0);
 
     DummyConfiguration mDummyConfiguration("orientation#locale");
-    g_abilityMs->UpdateConfiguration(mDummyConfiguration);
+    abilityMgrService->UpdateConfiguration(mDummyConfiguration);
 
     g_tempDataStr = "OnInactiveOnBackgroundOnStop";
     EXPECT_EQ(TestWaitCompleted(event, "OnInactiveOnBackgroundOnStop", SIXTH_ABILITY_CODE, WAIT_LAUNCHER_TIME), 0);
@@ -437,14 +439,14 @@ HWTEST_F(AmsConfigurationUpdatedTest, AMS_UpdateConfiguration_1000, Function | M
     MAP_STR_STR params;
     Want want = STAbilityUtil::MakeWant("device", SIXTH_ABILITY, KIT_BUNDLE_NAME, params);
     // start first ability
-    ErrCode eCode = STAbilityUtil::StartAbility(want, g_abilityMs, WAIT_TIME);
+    ErrCode eCode = STAbilityUtil::StartAbility(want, abilityMgrService, WAIT_TIME);
     GTEST_LOG_(INFO) << "\nStartAbility ====>> " << eCode;
 
     g_tempDataStr = "OnStartOnActive";
     EXPECT_EQ(TestWaitCompleted(event, "OnStartOnActive", SIXTH_ABILITY_CODE, WAIT_LAUNCHER_TIME), 0);
 
     DummyConfiguration mDummyConfiguration("orientation#locale#layout");
-    g_abilityMs->UpdateConfiguration(mDummyConfiguration);
+    abilityMgrService->UpdateConfiguration(mDummyConfiguration);
 
     g_tempDataStr = "OnInactiveOnBackgroundOnStop";
     EXPECT_EQ(TestWaitCompleted(event, "OnInactiveOnBackgroundOnStop", SIXTH_ABILITY_CODE, WAIT_LAUNCHER_TIME), 0);
@@ -470,14 +472,14 @@ HWTEST_F(AmsConfigurationUpdatedTest, AMS_UpdateConfiguration_1100, Function | M
     MAP_STR_STR params;
     Want want = STAbilityUtil::MakeWant("device", SIXTH_ABILITY, KIT_BUNDLE_NAME, params);
     // start first ability
-    ErrCode eCode = STAbilityUtil::StartAbility(want, g_abilityMs, WAIT_TIME);
+    ErrCode eCode = STAbilityUtil::StartAbility(want, abilityMgrService, WAIT_TIME);
     GTEST_LOG_(INFO) << "\nStartAbility ====>> " << eCode;
 
     g_tempDataStr = "OnStartOnActive";
     EXPECT_EQ(TestWaitCompleted(event, "OnStartOnActive", SIXTH_ABILITY_CODE, WAIT_LAUNCHER_TIME), 0);
 
     DummyConfiguration mDummyConfiguration("orientation#locale#layout#fontSize");
-    g_abilityMs->UpdateConfiguration(mDummyConfiguration);
+    abilityMgrService->UpdateConfiguration(mDummyConfiguration);
 
     g_tempDataStr = "OnInactiveOnBackgroundOnStop";
     EXPECT_EQ(TestWaitCompleted(event, "OnInactiveOnBackgroundOnStop", SIXTH_ABILITY_CODE, WAIT_LAUNCHER_TIME), 0);
@@ -503,14 +505,14 @@ HWTEST_F(AmsConfigurationUpdatedTest, AMS_UpdateConfiguration_1200, Function | M
     MAP_STR_STR params;
     Want want = STAbilityUtil::MakeWant("device", SIXTH_ABILITY, KIT_BUNDLE_NAME, params);
     // start first ability
-    ErrCode eCode = STAbilityUtil::StartAbility(want, g_abilityMs, WAIT_TIME);
+    ErrCode eCode = STAbilityUtil::StartAbility(want, abilityMgrService, WAIT_TIME);
     GTEST_LOG_(INFO) << "\nStartAbility ====>> " << eCode;
 
     g_tempDataStr = "OnStartOnActive";
     EXPECT_EQ(TestWaitCompleted(event, "OnStartOnActive", SIXTH_ABILITY_CODE, WAIT_LAUNCHER_TIME), 0);
 
     DummyConfiguration mDummyConfiguration("orientation#locale#layout#fontSize#density");
-    g_abilityMs->UpdateConfiguration(mDummyConfiguration);
+    abilityMgrService->UpdateConfiguration(mDummyConfiguration);
 
     g_tempDataStr = "OnInactiveOnBackgroundOnStop";
     EXPECT_EQ(TestWaitCompleted(event, "OnInactiveOnBackgroundOnStop", SIXTH_ABILITY_CODE, WAIT_LAUNCHER_TIME), 0);
@@ -536,7 +538,7 @@ HWTEST_F(AmsConfigurationUpdatedTest, AMS_UpdateConfiguration_1300, Function | M
     MAP_STR_STR params;
     Want want = STAbilityUtil::MakeWant("device", MAIN_ABILITY, KIT_BUNDLE_NAME, params);
     // start first ability
-    ErrCode eCode = STAbilityUtil::StartAbility(want, g_abilityMs, WAIT_TIME);
+    ErrCode eCode = STAbilityUtil::StartAbility(want, abilityMgrService, WAIT_TIME);
     GTEST_LOG_(INFO) << "\nStartAbility ====>> " << eCode;
 
     g_tempDataStr = "OnStartOnActive";
@@ -544,17 +546,17 @@ HWTEST_F(AmsConfigurationUpdatedTest, AMS_UpdateConfiguration_1300, Function | M
 
     Want wantEntity;
     wantEntity.AddEntity(Want::FLAG_HOME_INTENT_FROM_SYSTEM);
-    STAbilityUtil::StartAbility(wantEntity, g_abilityMs);
+    STAbilityUtil::StartAbility(wantEntity, abilityMgrService);
     GTEST_LOG_(INFO) << "====>Want::FLAG_HOME_INTENT_FROM_SYSTEM";
     DummyConfiguration mDummyConfiguration("orientation");
-    g_abilityMs->UpdateConfiguration(mDummyConfiguration);
-    g_abilityMs->UpdateConfiguration(mDummyConfiguration);
-    g_abilityMs->UpdateConfiguration(mDummyConfiguration);
-    g_abilityMs->UpdateConfiguration(mDummyConfiguration);
-    g_abilityMs->UpdateConfiguration(mDummyConfiguration);
+    abilityMgrService->UpdateConfiguration(mDummyConfiguration);
+    abilityMgrService->UpdateConfiguration(mDummyConfiguration);
+    abilityMgrService->UpdateConfiguration(mDummyConfiguration);
+    abilityMgrService->UpdateConfiguration(mDummyConfiguration);
+    abilityMgrService->UpdateConfiguration(mDummyConfiguration);
 
     want = STAbilityUtil::MakeWant("device", MAIN_ABILITY, KIT_BUNDLE_NAME, params);
-    eCode = STAbilityUtil::StartAbility(want, g_abilityMs, WAIT_TIME);
+    eCode = STAbilityUtil::StartAbility(want, abilityMgrService, WAIT_TIME);
     GTEST_LOG_(INFO) << "\nStartAbility S ====>> " << eCode;
 
     g_tempDataStr = "OnInactiveOnBackgroundOnForegroundOnActive";
@@ -578,20 +580,22 @@ HWTEST_F(AmsConfigurationUpdatedTest, AMS_UpdateConfiguration_1400, Function | M
     MAP_STR_STR params;
     Want want = STAbilityUtil::MakeWant("device", MAIN_ABILITY, KIT_BUNDLE_NAME, params);
     // start first ability
-    ErrCode eCode = STAbilityUtil::StartAbility(want, g_abilityMs, WAIT_TIME);
+    ErrCode eCode = STAbilityUtil::StartAbility(want, abilityMgrService, WAIT_TIME);
     GTEST_LOG_(INFO) << "\nStartAbility ====>> " << eCode;
 
     g_tempDataStr = "OnStartOnActive";
     EXPECT_EQ(TestWaitCompleted(event, "OnStartOnActive", MAIN_ABILITY_CODE), 0);
 
     DummyConfiguration mDummyConfiguration("orientation#locale");
-    g_abilityMs->UpdateConfiguration(mDummyConfiguration);
-    g_abilityMs->UpdateConfiguration(mDummyConfiguration);
+    abilityMgrService->UpdateConfiguration(mDummyConfiguration);
+    abilityMgrService->UpdateConfiguration(mDummyConfiguration);
 
     g_tempDataStr = "UpdatedUpdated";
     EXPECT_EQ(TestWaitCompleted(event, "UpdatedUpdated", MAIN_ABILITY_CODE, WAIT_LAUNCHER_TIME), 0);
 
     GTEST_LOG_(INFO) << "\nAmsConfigurationUpdatedTest AMS_UpdateConfiguration_1400 end=========<";
 }
-
 }  // namespace
+
+
+
diff --git a/test/systemtest/common/ams/ams_data_ability_test/BUILD.gn b/test/systemtest/common/ams/ams_data_ability_test/BUILD.gn
index c3b3641afa23a07e3ce259f65311f22ec6d35c0a..81a0f931d4083ac22d628d64af8c7fb21e4f781a 100755
--- a/test/systemtest/common/ams/ams_data_ability_test/BUILD.gn
+++ b/test/systemtest/common/ams/ams_data_ability_test/BUILD.gn
@@ -28,8 +28,8 @@ ohos_systemtest("ams_data_ability_test") {
   sources = [
     "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/event.cpp",
     "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/module_test_dump_util.cpp",
+    "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/st_ability_util.cpp",
     "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/stoperator.cpp",
-    "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/system_test_ability_util.cpp",
     "ams_data_ability_test.cpp",
   ]
 
diff --git a/test/systemtest/common/ams/ams_dfx_test/BUILD.gn b/test/systemtest/common/ams/ams_dfx_test/BUILD.gn
index 8d4f04ed0a87e3021e1f8309dbd589e11f87e4c5..9283133aa7eb67e4230e5f28822175979d1185e8 100755
--- a/test/systemtest/common/ams/ams_dfx_test/BUILD.gn
+++ b/test/systemtest/common/ams/ams_dfx_test/BUILD.gn
@@ -27,8 +27,8 @@ ohos_systemtest("ams_dfx_test") {
   sources = [
     "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/event.cpp",
     "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/module_test_dump_util.cpp",
+    "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/st_ability_util.cpp",
     "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/stoperator.cpp",
-    "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/system_test_ability_util.cpp",
     "ams_dfx_test.cpp",
   ]
 
diff --git a/test/systemtest/common/ams/ams_kit_test/BUILD.gn b/test/systemtest/common/ams/ams_kit_test/BUILD.gn
index 9a3ebe55097f18445962a3fe814fb8f02ffb2d92..165763c967571c9a645be3e1086b82557242580d 100755
--- a/test/systemtest/common/ams/ams_kit_test/BUILD.gn
+++ b/test/systemtest/common/ams/ams_kit_test/BUILD.gn
@@ -27,8 +27,8 @@ ohos_systemtest("ams_kit_test") {
   sources = [
     "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/event.cpp",
     "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/module_test_dump_util.cpp",
+    "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/st_ability_util.cpp",
     "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/stoperator.cpp",
-    "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/system_test_ability_util.cpp",
     "acts_ams_kit_test.cpp",
   ]
   configs = [
@@ -70,8 +70,8 @@ ohos_systemtest("ams_kit_service_ability_test") {
   sources = [
     "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/event.cpp",
     "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/module_test_dump_util.cpp",
+    "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/st_ability_util.cpp",
     "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/stoperator.cpp",
-    "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/system_test_ability_util.cpp",
     "acts_ams_kit_service_ability_test.cpp",
   ]
   configs = [
@@ -113,8 +113,8 @@ ohos_systemtest("ams_kit_data_test") {
   sources = [
     "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/event.cpp",
     "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/module_test_dump_util.cpp",
+    "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/st_ability_util.cpp",
     "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/stoperator.cpp",
-    "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/system_test_ability_util.cpp",
     "acts_ams_kit_data_test.cpp",
   ]
   configs = [
@@ -160,8 +160,8 @@ ohos_systemtest("ams_kit_a_test") {
   sources = [
     "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/event.cpp",
     "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/module_test_dump_util.cpp",
+    "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/st_ability_util.cpp",
     "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/stoperator.cpp",
-    "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/system_test_ability_util.cpp",
     "acts_ams_kit_a_test.cpp",
   ]
   configs = [
@@ -205,8 +205,8 @@ ohos_systemtest("ams_kit_want_test") {
   sources = [
     "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/event.cpp",
     "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/module_test_dump_util.cpp",
+    "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/st_ability_util.cpp",
     "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/stoperator.cpp",
-    "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/system_test_ability_util.cpp",
     "acts_ams_kit_want_test.cpp",
   ]
   configs = [
@@ -249,8 +249,8 @@ ohos_systemtest("ams_kit_skills_test") {
   sources = [
     "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/event.cpp",
     "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/module_test_dump_util.cpp",
+    "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/st_ability_util.cpp",
     "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/stoperator.cpp",
-    "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/system_test_ability_util.cpp",
     "acts_ams_kit_skills_test.cpp",
   ]
   configs = [
@@ -293,8 +293,8 @@ ohos_systemtest("ams_kit_lifecycle_test") {
   sources = [
     "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/event.cpp",
     "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/module_test_dump_util.cpp",
+    "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/st_ability_util.cpp",
     "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/stoperator.cpp",
-    "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/system_test_ability_util.cpp",
     "acts_ams_kit_lifecycle_test.cpp",
   ]
   configs = [
@@ -337,8 +337,8 @@ ohos_systemtest("ams_kit_processinfo_test") {
   sources = [
     "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/event.cpp",
     "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/module_test_dump_util.cpp",
+    "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/st_ability_util.cpp",
     "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/stoperator.cpp",
-    "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/system_test_ability_util.cpp",
     "acts_ams_kit_processinfo_test.cpp",
   ]
   configs = [
diff --git a/test/systemtest/common/ams/ams_kit_test/acts_ams_kit_data_test.cpp b/test/systemtest/common/ams/ams_kit_test/acts_ams_kit_data_test.cpp
index 33f155c1b84933124d3679e3c75f25ae2ba1cc27..816cd682f011cba0dc36ccd89f587ab1381f999f 100644
--- a/test/systemtest/common/ams/ams_kit_test/acts_ams_kit_data_test.cpp
+++ b/test/systemtest/common/ams/ams_kit_test/acts_ams_kit_data_test.cpp
@@ -197,7 +197,6 @@ void ActsAmsKitDataTest::AppEventSubscriber::OnReceiveEvent(const CommonEventDat
     GTEST_LOG_(INFO) << "OnReceiveEvent: event=" << data.GetWant().GetAction();
     GTEST_LOG_(INFO) << "OnReceiveEvent: data=" << data.GetData();
     GTEST_LOG_(INFO) << "OnReceiveEvent: code=" << data.GetCode();
-
     std::string eventName = data.GetWant().GetAction();
     if (eventName.compare(ABILITY_EVENT_NAME) == 0) {
         std::string target = data.GetData();
@@ -205,7 +204,6 @@ void ActsAmsKitDataTest::AppEventSubscriber::OnReceiveEvent(const CommonEventDat
             ActsAmsKitDataTest::TestCompleted(event, target, data.GetCode());
             return;
         }
-
         if (PAGE_ABILITY_CODE == data.GetCode() / ABILITY_CODE_BASE) {  // page ability
             ActsAmsKitDataTest::TestCompleted(event, target, data.GetCode());
             return;
diff --git a/test/systemtest/common/ams/ams_kit_test/acts_ams_kit_test.cpp b/test/systemtest/common/ams/ams_kit_test/acts_ams_kit_test.cpp
index 5e3acade4475b8a4e2538a5f70a8db8068bac2f5..1b8bda86d209ab12d3f403308484eec265474c8f 100644
--- a/test/systemtest/common/ams/ams_kit_test/acts_ams_kit_test.cpp
+++ b/test/systemtest/common/ams/ams_kit_test/acts_ams_kit_test.cpp
@@ -111,7 +111,7 @@ Event ActsAmsKitTest::event = Event();
 Event ActsAmsKitTest::abilityEvent = Event();
 sptr<IAppMgr> ActsAmsKitTest::appMs = nullptr;
 sptr<IAbilityManager> ActsAmsKitTest::abilityMs = nullptr;
-StressTestLevel ActsAmsKitTest::stLevel_{};
+StressTestLevel ActsAmsKitTest::stLevel_ {};
 std::shared_ptr<ActsAmsKitTest::AppEventSubscriber> ActsAmsKitTest::subscriber_ = nullptr;
 
 void ActsAmsKitTest::AppEventSubscriber::OnReceiveEvent(const CommonEventData &data)
diff --git a/test/systemtest/common/ams/ams_missionstack_test/BUILD.gn b/test/systemtest/common/ams/ams_missionstack_test/BUILD.gn
index 3b493d5a5532b4f902d1c395b73f466b18e523a8..2977fe7b9af54c2ea0c7a04f7d5dfd43b972e948 100644
--- a/test/systemtest/common/ams/ams_missionstack_test/BUILD.gn
+++ b/test/systemtest/common/ams/ams_missionstack_test/BUILD.gn
@@ -28,8 +28,8 @@ ohos_systemtest("ams_missionstack_test") {
   sources = [
     "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/event.cpp",
     "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/module_test_dump_util.cpp",
+    "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/st_ability_util.cpp",
     "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/stoperator.cpp",
-    "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/system_test_ability_util.cpp",
     "ams_missionstack_test.cpp",
   ]
 
diff --git a/test/systemtest/common/ams/ams_missionstack_test/ams_missionstack_test.cpp b/test/systemtest/common/ams/ams_missionstack_test/ams_missionstack_test.cpp
index 9ffac8ca8162d73d13cb1f960fa02440008ed675..acf9cb343b322d5d2eb055d451dbf3d74df59341 100644
--- a/test/systemtest/common/ams/ams_missionstack_test/ams_missionstack_test.cpp
+++ b/test/systemtest/common/ams/ams_missionstack_test/ams_missionstack_test.cpp
@@ -12,44 +12,25 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-// #include <chrono>
-// #include <cstdio>
-// #include <condition_variable>
 #include <gtest/gtest.h>
-//#include <mutex>
-//#include <queue>
-//#include <set>
-//#include <thread>
-
 #include "ability_append_test_info.h"
-// #include "ability_lifecycle.h"
-// #include "ability_lifecycle_executor.h"
-// #include "ability_manager_errors.h"
-// #include "ability_manager_service.h"
-// #include "app_mgr_service.h"
 #include "common_event.h"
 #include "common_event_manager.h"
-//#include "event.h"
 #include "hilog_wrapper.h"
-// #include "module_test_dump_util.h"
-// #include "sa_mgr_client.h"
-// #include "semaphore_ex.h"
-// #include "skills.h"
 #include "stoperator.h"
-//#include "system_ability_definition.h"
 #include "system_test_ability_util.h"
-//#include "uri.h"
+
 namespace {
 using namespace OHOS;
 using namespace OHOS::AAFwk;
 using namespace OHOS::AppExecFwk;
 using namespace OHOS::EventFwk;
-//using namespace OHOS::MTUtil;
 using namespace OHOS::STtools;
 using namespace OHOS::STABUtil;
 using namespace testing::ext;
 
 using MAP_STR_STR = std::map<std::string, std::string>;
+namespace {
 static const string KIT_BUNDLE_NAME = "com.ohos.amsst.MissionStack";
 static const string KIT_HAP_NAME = "amsMissionStackTest";
 static const string KIT_BUNDLE_NAME_SUBSIDIARY = "com.ohos.amsst.MissionStackSubsidiary";
@@ -59,7 +40,7 @@ static const string SECOND_ABILITY_NAME = "SecondAbility";
 static const string THIRD_ABILITY_NAME = "ThirdAbility";
 static constexpr int WAIT_TIME = 1;
 static constexpr int WAIT_LAUNCHER_TIME = 5;
-
+}
 
 static string g_eventMessage = "";
 class AmsMissionStackTest : public testing::Test {
@@ -82,12 +63,12 @@ public:
         ~AppEventSubscriber(){};
     };
 
-    static sptr<IAbilityManager> g_abilityMs;
+    static sptr<IAbilityManager> abilityMgrService;
     static Event event;
 };
 
 Event AmsMissionStackTest::event = Event();
-sptr<IAbilityManager> AmsMissionStackTest::g_abilityMs = nullptr;
+sptr<IAbilityManager> AmsMissionStackTest::abilityMgrService = nullptr;
 
 void AmsMissionStackTest::AppEventSubscriber::OnReceiveEvent(const CommonEventData &data)
 {
@@ -106,7 +87,7 @@ void AmsMissionStackTest::AppEventSubscriber::OnReceiveEvent(const CommonEventDa
                data.GetWant().GetAction() == g_EVENT_RESP_THIRD  ||
                data.GetWant().GetAction() == g_EVENT_RESP_MAIN_SUBSIDIARY   ||
                data.GetWant().GetAction() == g_EVENT_RESP_SECOND_SUBSIDIARY
-               ) {
+        ) {
         g_eventMessage = data.GetData();
         TestCompleted(event, data.GetWant().GetAction(), data.GetCode());
         GTEST_LOG_(INFO) << "OnReceiveEvent: g_eventMessage=" << data.GetData();
@@ -195,7 +176,7 @@ HWTEST_F(AmsMissionStackTest, FWK_MissionStack_0100, Function | MediumTest | Lev
     MAP_STR_STR params;
     Want want = STAbilityUtil::MakeWant("device", MAIN_ABILITY_NAME, KIT_BUNDLE_NAME, params);
     // start first ability
-    ErrCode eCode = STAbilityUtil::StartAbility(want, g_abilityMs, WAIT_TIME);
+    ErrCode eCode = STAbilityUtil::StartAbility(want, abilityMgrService, WAIT_TIME);
     GTEST_LOG_(INFO) << eCode;
 
     EXPECT_EQ(TestWaitCompleted(event, "OnStart", MAIN_ABILITY_CODE), 0);
@@ -230,7 +211,7 @@ HWTEST_F(AmsMissionStackTest, FWK_MissionStack_0200, Function | MediumTest | Lev
     MAP_STR_STR params;
     Want want = STAbilityUtil::MakeWant("device", MAIN_ABILITY_NAME, KIT_BUNDLE_NAME, params);
     // start first ability
-    ErrCode eCode = STAbilityUtil::StartAbility(want, g_abilityMs, WAIT_TIME);
+    ErrCode eCode = STAbilityUtil::StartAbility(want, abilityMgrService, WAIT_TIME);
     GTEST_LOG_(INFO) << eCode;
 
     EXPECT_EQ(TestWaitCompleted(event, "OnStart", MAIN_ABILITY_CODE), 0);
@@ -240,7 +221,7 @@ HWTEST_F(AmsMissionStackTest, FWK_MissionStack_0200, Function | MediumTest | Lev
         g_EVENT_REQU_MAIN, CODE_, "MissionStack_" + std::to_string((int)MissionStackApi::LockMission) + "_1");
     EXPECT_EQ(TestWaitCompleted(event, g_EVENT_RESP_MAIN, CODE_), 0);
 
-    EXPECT_NE(TestWaitCompleted(event, "OnBackground", MAIN_ABILITY_CODE,WAIT_LAUNCHER_TIME), 0);
+    EXPECT_NE(TestWaitCompleted(event, "OnBackground", MAIN_ABILITY_CODE, WAIT_LAUNCHER_TIME), 0);
 
     GTEST_LOG_(INFO) << "AmsMissionStackTest FWK_MissionStack_0200 end";
 }
@@ -256,7 +237,7 @@ HWTEST_F(AmsMissionStackTest, FWK_MissionStack_0300, Function | MediumTest | Lev
     MAP_STR_STR params;
     Want want = STAbilityUtil::MakeWant("device", MAIN_ABILITY_NAME, KIT_BUNDLE_NAME, params);
     // start first ability
-    ErrCode eCode = STAbilityUtil::StartAbility(want, g_abilityMs, WAIT_TIME);
+    ErrCode eCode = STAbilityUtil::StartAbility(want, abilityMgrService, WAIT_TIME);
     GTEST_LOG_(INFO) << eCode;
 
     EXPECT_EQ(TestWaitCompleted(event, "OnStart", MAIN_ABILITY_CODE), 0);
@@ -268,7 +249,7 @@ HWTEST_F(AmsMissionStackTest, FWK_MissionStack_0300, Function | MediumTest | Lev
     
     Want wantEntity;
     wantEntity.AddEntity(Want::FLAG_HOME_INTENT_FROM_SYSTEM);
-    STAbilityUtil::StartAbility(wantEntity, g_abilityMs);
+    STAbilityUtil::StartAbility(wantEntity, abilityMgrService);
 
     EXPECT_NE(TestWaitCompleted(event, "OnBackground", MAIN_ABILITY_CODE), 0);
 
@@ -283,7 +264,7 @@ HWTEST_F(AmsMissionStackTest, FWK_MissionStack_0300, Function | MediumTest | Lev
 HWTEST_F(AmsMissionStackTest, FWK_MissionStack_0400, Function | MediumTest | Level1)
 {
     GTEST_LOG_(INFO) << "AmsMissionStackTest FWK_MissionStack_0400 start";
-    //GTEST_LOG_(INFO) << "需要使用JS环境测试";
+    // need js test environment
     GTEST_LOG_(INFO) << "AmsMissionStackTest FWK_MissionStack_0400 end";
 }
 
@@ -298,7 +279,7 @@ HWTEST_F(AmsMissionStackTest, FWK_MissionStack_0500, Function | MediumTest | Lev
     MAP_STR_STR params;
     Want want = STAbilityUtil::MakeWant("device", THIRD_ABILITY_NAME, KIT_BUNDLE_NAME, params);
     // start third ability
-    ErrCode eCode = STAbilityUtil::StartAbility(want, g_abilityMs, WAIT_TIME);
+    ErrCode eCode = STAbilityUtil::StartAbility(want, abilityMgrService, WAIT_TIME);
     GTEST_LOG_(INFO) << eCode;
 
     EXPECT_EQ(TestWaitCompleted(event, "OnStart", THIRD_ABILITY_CODE), 0);
@@ -324,7 +305,7 @@ HWTEST_F(AmsMissionStackTest, FWK_MissionStack_0600, Function | MediumTest | Lev
     MAP_STR_STR params;
     Want want = STAbilityUtil::MakeWant("device", MAIN_ABILITY_NAME, KIT_BUNDLE_NAME, params);
     // start third ability
-    ErrCode eCode = STAbilityUtil::StartAbility(want, g_abilityMs, WAIT_TIME);
+    ErrCode eCode = STAbilityUtil::StartAbility(want, abilityMgrService, WAIT_TIME);
     GTEST_LOG_(INFO) << eCode;
 
     EXPECT_EQ(TestWaitCompleted(event, "OnStart", MAIN_ABILITY_CODE), 0);
@@ -350,7 +331,7 @@ HWTEST_F(AmsMissionStackTest, FWK_MissionStack_0700, Function | MediumTest | Lev
     MAP_STR_STR params;
     Want want = STAbilityUtil::MakeWant("device", MAIN_ABILITY_NAME, KIT_BUNDLE_NAME, params);
     // start first ability
-    ErrCode eCode = STAbilityUtil::StartAbility(want, g_abilityMs, WAIT_TIME);
+    ErrCode eCode = STAbilityUtil::StartAbility(want, abilityMgrService, WAIT_TIME);
     GTEST_LOG_(INFO) << eCode;
 
     EXPECT_EQ(TestWaitCompleted(event, "OnStart", MAIN_ABILITY_CODE), 0);
@@ -362,10 +343,9 @@ HWTEST_F(AmsMissionStackTest, FWK_MissionStack_0700, Function | MediumTest | Lev
     
     Want wantEntity;
     wantEntity.AddEntity(Want::FLAG_HOME_INTENT_FROM_SYSTEM);
-    STAbilityUtil::StartAbility(wantEntity, g_abilityMs);
-
-    EXPECT_EQ(TestWaitCompleted(event, "OnBackground", MAIN_ABILITY_CODE,WAIT_LAUNCHER_TIME), 0);
+    STAbilityUtil::StartAbility(wantEntity, abilityMgrService);
 
+    EXPECT_EQ(TestWaitCompleted(event, "OnBackground", MAIN_ABILITY_CODE, WAIT_LAUNCHER_TIME), 0);
     GTEST_LOG_(INFO) << "AmsMissionStackTest FWK_MissionStack_0700 end";
 }
 
@@ -377,7 +357,7 @@ HWTEST_F(AmsMissionStackTest, FWK_MissionStack_0700, Function | MediumTest | Lev
 HWTEST_F(AmsMissionStackTest, FWK_MissionStack_0800, Function | MediumTest | Level1)
 {
     GTEST_LOG_(INFO) << "AmsMissionStackTest FWK_MissionStack_0800 start";
-    //GTEST_LOG_(INFO) << "需要使用JS环境测试";
+    // need js test environment
     GTEST_LOG_(INFO) << "AmsMissionStackTest FWK_MissionStack_0800 end";
 }
 
@@ -392,7 +372,7 @@ HWTEST_F(AmsMissionStackTest, FWK_MissionStack_0900, Function | MediumTest | Lev
     MAP_STR_STR params;
     Want want = STAbilityUtil::MakeWant("device", MAIN_ABILITY_NAME, KIT_BUNDLE_NAME, params);
     // start first ability
-    ErrCode eCode = STAbilityUtil::StartAbility(want, g_abilityMs, WAIT_TIME);
+    ErrCode eCode = STAbilityUtil::StartAbility(want, abilityMgrService, WAIT_TIME);
     GTEST_LOG_(INFO) << eCode;
 
     EXPECT_EQ(TestWaitCompleted(event, "OnStart", MAIN_ABILITY_CODE), 0);
@@ -410,9 +390,7 @@ HWTEST_F(AmsMissionStackTest, FWK_MissionStack_0900, Function | MediumTest | Lev
         g_EVENT_REQU_SECOND, CODE_, "MissionStack_" + std::to_string((int)MissionStackApi::LockMission) + "_8");
     EXPECT_EQ(TestWaitCompleted(event, g_EVENT_RESP_SECOND, CODE_), 0);
     EXPECT_EQ(TestWaitCompleted(event, "OnStop", SECOND_ABILITY_CODE), 0);
-
     EXPECT_EQ(TestWaitCompleted(event, "OnActive", MAIN_ABILITY_CODE), 0);
-
     GTEST_LOG_(INFO) << "AmsMissionStackTest FWK_MissionStack_0900 end";
 }
 
@@ -427,7 +405,7 @@ HWTEST_F(AmsMissionStackTest, FWK_MissionStack_1000, Function | MediumTest | Lev
     MAP_STR_STR params;
     Want want = STAbilityUtil::MakeWant("device", MAIN_ABILITY_NAME, KIT_BUNDLE_NAME, params);
     // start first ability
-    ErrCode eCode = STAbilityUtil::StartAbility(want, g_abilityMs, WAIT_TIME);
+    ErrCode eCode = STAbilityUtil::StartAbility(want, abilityMgrService, WAIT_TIME);
     GTEST_LOG_(INFO) << eCode;
 
     EXPECT_EQ(TestWaitCompleted(event, "OnStart", MAIN_ABILITY_CODE), 0);
@@ -439,8 +417,6 @@ HWTEST_F(AmsMissionStackTest, FWK_MissionStack_1000, Function | MediumTest | Lev
     string appInfo = g_eventMessage;
 
     GTEST_LOG_(INFO) << "id=" << appInfo;
-    //EXPECT_EQ(appInfo, "1");
-
     GTEST_LOG_(INFO) << "AmsMissionStackTest FWK_MissionStack_1000 end";
 }
 
@@ -452,7 +428,7 @@ HWTEST_F(AmsMissionStackTest, FWK_MissionStack_1000, Function | MediumTest | Lev
 HWTEST_F(AmsMissionStackTest, FWK_MissionStack_1100, Function | MediumTest | Level1)
 {
     GTEST_LOG_(INFO) << "AmsMissionStackTest FWK_MissionStack_1100 start";
-    //GTEST_LOG_(INFO) << "需要使用JS环境测试";
+    // need js test environment
     GTEST_LOG_(INFO) << "AmsMissionStackTest FWK_MissionStack_1100 end";
 }
 
@@ -467,7 +443,7 @@ HWTEST_F(AmsMissionStackTest, FWK_MissionStack_1200, Function | MediumTest | Lev
     MAP_STR_STR params;
     Want want = STAbilityUtil::MakeWant("device", MAIN_ABILITY_NAME, KIT_BUNDLE_NAME, params);
     // start first ability
-    ErrCode eCode = STAbilityUtil::StartAbility(want, g_abilityMs, WAIT_TIME);
+    ErrCode eCode = STAbilityUtil::StartAbility(want, abilityMgrService, WAIT_TIME);
     GTEST_LOG_(INFO) << eCode;
 
     EXPECT_EQ(TestWaitCompleted(event, "OnStart", MAIN_ABILITY_CODE), 0);
@@ -477,7 +453,7 @@ HWTEST_F(AmsMissionStackTest, FWK_MissionStack_1200, Function | MediumTest | Lev
         g_EVENT_REQU_MAIN, CODE_, "MissionStack_" + std::to_string((int)MissionStackApi::LockMission) + "_11");
     EXPECT_EQ(TestWaitCompleted(event, g_EVENT_RESP_MAIN, CODE_), 0);
     
-    EXPECT_EQ(TestWaitCompleted(event, "OnBackground", MAIN_ABILITY_CODE,WAIT_LAUNCHER_TIME), 0);
+    EXPECT_EQ(TestWaitCompleted(event, "OnBackground", MAIN_ABILITY_CODE, WAIT_LAUNCHER_TIME), 0);
 
     GTEST_LOG_(INFO) << "AmsMissionStackTest FWK_MissionStack_1200 end";
 }
@@ -493,7 +469,7 @@ HWTEST_F(AmsMissionStackTest, FWK_MissionStack_1300, Function | MediumTest | Lev
     MAP_STR_STR params;
     Want want = STAbilityUtil::MakeWant("device", MAIN_ABILITY_NAME, KIT_BUNDLE_NAME, params);
     // start first ability
-    ErrCode eCode = STAbilityUtil::StartAbility(want, g_abilityMs, WAIT_TIME);
+    ErrCode eCode = STAbilityUtil::StartAbility(want, abilityMgrService, WAIT_TIME);
     GTEST_LOG_(INFO) << eCode;
 
     EXPECT_EQ(TestWaitCompleted(event, "OnStart", MAIN_ABILITY_CODE), 0);
@@ -503,7 +479,7 @@ HWTEST_F(AmsMissionStackTest, FWK_MissionStack_1300, Function | MediumTest | Lev
         g_EVENT_REQU_MAIN, CODE_, "MissionStack_" + std::to_string((int)MissionStackApi::LockMission) + "_12");
     EXPECT_EQ(TestWaitCompleted(event, g_EVENT_RESP_MAIN, CODE_), 0);
     
-    EXPECT_EQ(TestWaitCompleted(event, "OnBackground", MAIN_ABILITY_CODE,WAIT_LAUNCHER_TIME), 0);
+    EXPECT_EQ(TestWaitCompleted(event, "OnBackground", MAIN_ABILITY_CODE, WAIT_LAUNCHER_TIME), 0);
 
     GTEST_LOG_(INFO) << "AmsMissionStackTest FWK_MissionStack_1300 end";
 }
@@ -519,7 +495,7 @@ HWTEST_F(AmsMissionStackTest, FWK_MissionStack_1400, Function | MediumTest | Lev
     MAP_STR_STR params;
     Want want = STAbilityUtil::MakeWant("device", MAIN_ABILITY_NAME, KIT_BUNDLE_NAME, params);
     // start first ability
-    ErrCode eCode = STAbilityUtil::StartAbility(want, g_abilityMs, WAIT_TIME);
+    ErrCode eCode = STAbilityUtil::StartAbility(want, abilityMgrService, WAIT_TIME);
     GTEST_LOG_(INFO) << eCode;
 
     EXPECT_EQ(TestWaitCompleted(event, "OnStart", MAIN_ABILITY_CODE), 0);
@@ -536,7 +512,7 @@ HWTEST_F(AmsMissionStackTest, FWK_MissionStack_1400, Function | MediumTest | Lev
     STAbilityUtil::PublishEvent(
         g_EVENT_REQU_SECOND, CODE_, "MissionStack_" + std::to_string((int)MissionStackApi::LockMission) + "_13");
     EXPECT_EQ(TestWaitCompleted(event, g_EVENT_RESP_SECOND, CODE_), 0);
-    EXPECT_EQ(TestWaitCompleted(event, "OnBackground", SECOND_ABILITY_CODE,WAIT_LAUNCHER_TIME), 0);
+    EXPECT_EQ(TestWaitCompleted(event, "OnBackground", SECOND_ABILITY_CODE, WAIT_LAUNCHER_TIME), 0);
 
     GTEST_LOG_(INFO) << "AmsMissionStackTest FWK_MissionStack_1400 end";
 }
@@ -552,7 +528,7 @@ HWTEST_F(AmsMissionStackTest, FWK_MissionStack_1500, Function | MediumTest | Lev
     MAP_STR_STR params;
     Want want = STAbilityUtil::MakeWant("device", MAIN_ABILITY_NAME, KIT_BUNDLE_NAME, params);
     // start first ability
-    ErrCode eCode = STAbilityUtil::StartAbility(want, g_abilityMs, WAIT_TIME);
+    ErrCode eCode = STAbilityUtil::StartAbility(want, abilityMgrService, WAIT_TIME);
     GTEST_LOG_(INFO) << eCode;
 
     EXPECT_EQ(TestWaitCompleted(event, "OnStart", MAIN_ABILITY_CODE), 0);
@@ -569,7 +545,7 @@ HWTEST_F(AmsMissionStackTest, FWK_MissionStack_1500, Function | MediumTest | Lev
     STAbilityUtil::PublishEvent(
         g_EVENT_REQU_SECOND, CODE_, "MissionStack_" + std::to_string((int)MissionStackApi::LockMission) + "_14");
     EXPECT_EQ(TestWaitCompleted(event, g_EVENT_RESP_SECOND, CODE_), 0);
-    EXPECT_NE(TestWaitCompleted(event, "OnBackground", SECOND_ABILITY_CODE,WAIT_LAUNCHER_TIME), 0);
+    EXPECT_NE(TestWaitCompleted(event, "OnBackground", SECOND_ABILITY_CODE, WAIT_LAUNCHER_TIME), 0);
 
     GTEST_LOG_(INFO) << "AmsMissionStackTest FWK_MissionStack_1500 end";
 }
@@ -585,14 +561,14 @@ HWTEST_F(AmsMissionStackTest, FWK_MissionStack_1600, Function | MediumTest | Lev
     MAP_STR_STR params;
     Want want = STAbilityUtil::MakeWant("device", MAIN_ABILITY_NAME, KIT_BUNDLE_NAME, params);
     // start first ability
-    ErrCode eCode = STAbilityUtil::StartAbility(want, g_abilityMs, WAIT_TIME);
+    ErrCode eCode = STAbilityUtil::StartAbility(want, abilityMgrService, WAIT_TIME);
     GTEST_LOG_(INFO) << eCode;
 
     EXPECT_EQ(TestWaitCompleted(event, "OnStart", MAIN_ABILITY_CODE), 0);
     EXPECT_EQ(TestWaitCompleted(event, "OnActive", MAIN_ABILITY_CODE), 0);
     Want wantEntity;
     wantEntity.AddEntity(Want::FLAG_HOME_INTENT_FROM_SYSTEM);
-    STAbilityUtil::StartAbility(wantEntity, g_abilityMs);
+    STAbilityUtil::StartAbility(wantEntity, abilityMgrService);
     sleep(WAIT_LAUNCHER_TIME);
     STAbilityUtil::CleanMsg(event);
 
@@ -601,50 +577,52 @@ HWTEST_F(AmsMissionStackTest, FWK_MissionStack_1600, Function | MediumTest | Lev
     sleep(WAIT_LAUNCHER_TIME);
     want = STAbilityUtil::MakeWant("device", MAIN_ABILITY_NAME, KIT_BUNDLE_NAME_SUBSIDIARY, params);
     // start first ability
-    eCode = STAbilityUtil::StartAbility(want, g_abilityMs, WAIT_TIME);
+    eCode = STAbilityUtil::StartAbility(want, abilityMgrService, WAIT_TIME);
     GTEST_LOG_(INFO) <<"SUBSIDIARY:StartAbility:eCode=" << eCode;
 
     EXPECT_EQ(TestWaitCompleted(event, "OnStart", MAIN_ABILITY_CODE_SUBSIDIARY), 0);
     EXPECT_EQ(TestWaitCompleted(event, "OnActive", MAIN_ABILITY_CODE_SUBSIDIARY), 0);
 
     STAbilityUtil::PublishEvent(
-        g_EVENT_REQU_MAIN_SUBSIDIARY, CODE_, "MissionStack_" + std::to_string((int)MissionStackApi::LockMission) + "_0");
+        g_EVENT_REQU_MAIN_SUBSIDIARY, CODE_, 
+        "MissionStack_" + std::to_string((int)MissionStackApi::LockMission) + "_0");
     EXPECT_EQ(TestWaitCompleted(event, g_EVENT_RESP_MAIN_SUBSIDIARY, CODE_), 0);
 
-    EXPECT_EQ(TestWaitCompleted(event, "OnBackground", MAIN_ABILITY_CODE,WAIT_LAUNCHER_TIME), 0);
-    EXPECT_EQ(TestWaitCompleted(event, "OnBackground", MAIN_ABILITY_CODE_SUBSIDIARY,WAIT_LAUNCHER_TIME), 0);
+    EXPECT_EQ(TestWaitCompleted(event, "OnBackground", MAIN_ABILITY_CODE, WAIT_LAUNCHER_TIME), 0);
+    EXPECT_EQ(TestWaitCompleted(event, "OnBackground", MAIN_ABILITY_CODE_SUBSIDIARY, WAIT_LAUNCHER_TIME), 0);
     EXPECT_EQ(TestWaitCompleted(event, "OnStart", SECOND_ABILITY_CODE_SUBSIDIARY), 0);
     EXPECT_EQ(TestWaitCompleted(event, "OnActive", SECOND_ABILITY_CODE_SUBSIDIARY), 0);
 
     STAbilityUtil::PublishEvent(
-        g_EVENT_REQU_MAIN_SUBSIDIARY, CODE_, "MissionStack_" + std::to_string((int)MissionStackApi::LockMission) + "_1");
+        g_EVENT_REQU_MAIN_SUBSIDIARY, CODE_, 
+        "MissionStack_" + std::to_string((int)MissionStackApi::LockMission) + "_1");
     EXPECT_EQ(TestWaitCompleted(event, g_EVENT_RESP_MAIN_SUBSIDIARY, CODE_), 0);
-    EXPECT_EQ(TestWaitCompleted(event, "OnBackground", SECOND_ABILITY_CODE_SUBSIDIARY,WAIT_LAUNCHER_TIME), 0);
+    EXPECT_EQ(TestWaitCompleted(event, "OnBackground", SECOND_ABILITY_CODE_SUBSIDIARY, WAIT_LAUNCHER_TIME), 0);
 
     STAbilityUtil::Uninstall(KIT_BUNDLE_NAME_SUBSIDIARY);
     STAbilityUtil::CleanMsg(event);
     GTEST_LOG_(INFO) << "AmsMissionStackTest FWK_MissionStack_1600 end";
 }
 
-// /**
-//  * @tc.number    : FWK_MissionStack_1700
-//  * @tc.name      : test MoveMissionToEnd in ability_context.h
-//  * @tc.desc      : Verify that the result of MoveMissionToEnd function is correct.
-//  */
+/**
+ * @tc.number    : FWK_MissionStack_1700
+ * @tc.name      : test MoveMissionToEnd in ability_context.h
+ * @tc.desc      : Verify that the result of MoveMissionToEnd function is correct.
+ */
 HWTEST_F(AmsMissionStackTest, FWK_MissionStack_1700, Function | MediumTest | Level1)
 {
     GTEST_LOG_(INFO) << "AmsMissionStackTest FWK_MissionStack_1700 start";
     MAP_STR_STR params;
     Want want = STAbilityUtil::MakeWant("device", MAIN_ABILITY_NAME, KIT_BUNDLE_NAME, params);
     // start first ability
-    ErrCode eCode = STAbilityUtil::StartAbility(want, g_abilityMs, WAIT_TIME);
+    ErrCode eCode = STAbilityUtil::StartAbility(want, abilityMgrService, WAIT_TIME);
     GTEST_LOG_(INFO) << eCode;
 
     EXPECT_EQ(TestWaitCompleted(event, "OnStart", MAIN_ABILITY_CODE), 0);
     EXPECT_EQ(TestWaitCompleted(event, "OnActive", MAIN_ABILITY_CODE), 0);
     Want wantEntity;
     wantEntity.AddEntity(Want::FLAG_HOME_INTENT_FROM_SYSTEM);
-    STAbilityUtil::StartAbility(wantEntity, g_abilityMs);
+    STAbilityUtil::StartAbility(wantEntity, abilityMgrService);
     sleep(WAIT_LAUNCHER_TIME);
     STAbilityUtil::CleanMsg(event);
 
@@ -653,25 +631,27 @@ HWTEST_F(AmsMissionStackTest, FWK_MissionStack_1700, Function | MediumTest | Lev
     sleep(WAIT_LAUNCHER_TIME);
     want = STAbilityUtil::MakeWant("device", MAIN_ABILITY_NAME, KIT_BUNDLE_NAME_SUBSIDIARY, params);
     // start first ability
-    eCode = STAbilityUtil::StartAbility(want, g_abilityMs, WAIT_TIME);
+    eCode = STAbilityUtil::StartAbility(want, abilityMgrService, WAIT_TIME);
     GTEST_LOG_(INFO) <<"SUBSIDIARY:StartAbility:eCode=" << eCode;
 
     EXPECT_EQ(TestWaitCompleted(event, "OnStart", MAIN_ABILITY_CODE_SUBSIDIARY), 0);
     EXPECT_EQ(TestWaitCompleted(event, "OnActive", MAIN_ABILITY_CODE_SUBSIDIARY), 0);
 
     STAbilityUtil::PublishEvent(
-        g_EVENT_REQU_MAIN_SUBSIDIARY, CODE_, "MissionStack_" + std::to_string((int)MissionStackApi::LockMission) + "_0");
+        g_EVENT_REQU_MAIN_SUBSIDIARY, CODE_,
+        "MissionStack_" + std::to_string((int)MissionStackApi::LockMission) + "_0");
     EXPECT_EQ(TestWaitCompleted(event, g_EVENT_RESP_MAIN_SUBSIDIARY, CODE_), 0);
 
-    EXPECT_EQ(TestWaitCompleted(event, "OnBackground", MAIN_ABILITY_CODE,WAIT_LAUNCHER_TIME), 0);
-    EXPECT_EQ(TestWaitCompleted(event, "OnBackground", MAIN_ABILITY_CODE_SUBSIDIARY,WAIT_LAUNCHER_TIME), 0);
+    EXPECT_EQ(TestWaitCompleted(event, "OnBackground", MAIN_ABILITY_CODE, WAIT_LAUNCHER_TIME), 0);
+    EXPECT_EQ(TestWaitCompleted(event, "OnBackground", MAIN_ABILITY_CODE_SUBSIDIARY, WAIT_LAUNCHER_TIME), 0);
     EXPECT_EQ(TestWaitCompleted(event, "OnStart", SECOND_ABILITY_CODE_SUBSIDIARY), 0);
     EXPECT_EQ(TestWaitCompleted(event, "OnActive", SECOND_ABILITY_CODE_SUBSIDIARY), 0);
 
     STAbilityUtil::PublishEvent(
-        g_EVENT_REQU_MAIN_SUBSIDIARY, CODE_, "MissionStack_" + std::to_string((int)MissionStackApi::LockMission) + "_2");
+        g_EVENT_REQU_MAIN_SUBSIDIARY, CODE_,
+        "MissionStack_" + std::to_string((int)MissionStackApi::LockMission) + "_2");
     EXPECT_EQ(TestWaitCompleted(event, g_EVENT_RESP_MAIN_SUBSIDIARY, CODE_), 0);
-    EXPECT_NE(TestWaitCompleted(event, "OnBackground", SECOND_ABILITY_CODE_SUBSIDIARY,WAIT_LAUNCHER_TIME), 0);
+    EXPECT_NE(TestWaitCompleted(event, "OnBackground", SECOND_ABILITY_CODE_SUBSIDIARY, WAIT_LAUNCHER_TIME), 0);
 
     STAbilityUtil::Uninstall(KIT_BUNDLE_NAME_SUBSIDIARY);
     STAbilityUtil::CleanMsg(event);
@@ -689,7 +669,7 @@ HWTEST_F(AmsMissionStackTest, FWK_MissionStack_1800, Function | MediumTest | Lev
     MAP_STR_STR params;
     Want want = STAbilityUtil::MakeWant("device", MAIN_ABILITY_NAME, KIT_BUNDLE_NAME, params);
     // start first ability
-    ErrCode eCode = STAbilityUtil::StartAbility(want, g_abilityMs, WAIT_TIME);
+    ErrCode eCode = STAbilityUtil::StartAbility(want, abilityMgrService, WAIT_TIME);
     GTEST_LOG_(INFO) << eCode;
 
     EXPECT_EQ(TestWaitCompleted(event, "OnStart", MAIN_ABILITY_CODE), 0);
@@ -699,152 +679,8 @@ HWTEST_F(AmsMissionStackTest, FWK_MissionStack_1800, Function | MediumTest | Lev
         g_EVENT_REQU_MAIN, CODE_, "MissionStack_" + std::to_string((int)MissionStackApi::LockMission) + "_17");
     EXPECT_EQ(TestWaitCompleted(event, g_EVENT_RESP_MAIN, CODE_), 0);
     
-    EXPECT_NE(TestWaitCompleted(event, "OnBackground", MAIN_ABILITY_CODE,WAIT_LAUNCHER_TIME), 0);
+    EXPECT_NE(TestWaitCompleted(event, "OnBackground", MAIN_ABILITY_CODE, WAIT_LAUNCHER_TIME), 0);
 
     GTEST_LOG_(INFO) << "AmsMissionStackTest FWK_MissionStack_1800 end";
 }
-
-// /**
-//  * @tc.number    : FWK_SaveAbilityState_0100
-//  * @tc.name      : 
-//  * @tc.desc      : 
-//  */
-// HWTEST_F(AmsMissionStackTest, FWK_SaveAbilityState_0100, Function | MediumTest | Level1)
-// {
-//     GTEST_LOG_(INFO) << "AmsMissionStackTest FWK_SaveAbilityState_0100 start";
-//     MAP_STR_STR params;
-//     Want want = STAbilityUtil::MakeWant("device", MAIN_ABILITY_NAME, KIT_BUNDLE_NAME, params);
-//     // start first ability
-//     ErrCode eCode = STAbilityUtil::StartAbility(want, g_abilityMs, WAIT_TIME);
-//     GTEST_LOG_(INFO) << eCode;
-
-//     EXPECT_EQ(TestWaitCompleted(event, "OnStart", MAIN_ABILITY_CODE), 0);
-//     EXPECT_EQ(TestWaitCompleted(event, "OnActive", MAIN_ABILITY_CODE), 0);
-    
-//     Want wantEntity;
-//     wantEntity.AddEntity(Want::FLAG_HOME_INTENT_FROM_SYSTEM);
-//     STAbilityUtil::StartAbility(wantEntity, g_abilityMs);
-
-//     EXPECT_NE(TestWaitCompleted(event, "OnSaveAbilityState", MAIN_ABILITY_CODE), 0);
-//     GTEST_LOG_(INFO) << "AmsMissionStackTest FWK_SaveAbilityState_0100 end";
-// }
-
-// /**
-//  * @tc.number    : FWK_SaveAbilityState_0200
-//  * @tc.name      : 
-//  * @tc.desc      : 
-//  */
-// HWTEST_F(AmsMissionStackTest, FWK_SaveAbilityState_0200, Function | MediumTest | Level1)
-// {
-//     GTEST_LOG_(INFO) << "AmsMissionStackTest FWK_SaveAbilityState_0200 start";
-
-//     // 该case需要屏幕翻转事件
-//     GTEST_LOG_(INFO) << "AmsMissionStackTest FWK_SaveAbilityState_0200 end";
-// }
-
-// /**
-//  * @tc.number    : FWK_SaveAbilityState_0300
-//  * @tc.name      : 
-//  * @tc.desc      : 
-//  */
-// HWTEST_F(AmsMissionStackTest, FWK_SaveAbilityState_0300, Function | MediumTest | Level1)
-// {
-//     GTEST_LOG_(INFO) << "AmsMissionStackTest FWK_SaveAbilityState_0300 start";
-//     MAP_STR_STR params;
-//     Want want = STAbilityUtil::MakeWant("device", MAIN_ABILITY_NAME, KIT_BUNDLE_NAME, params);
-//     // start first ability
-//     ErrCode eCode = STAbilityUtil::StartAbility(want, g_abilityMs, WAIT_TIME);
-//     GTEST_LOG_(INFO) << eCode;
-
-//     EXPECT_EQ(TestWaitCompleted(event, "OnStart", MAIN_ABILITY_CODE), 0);
-//     EXPECT_EQ(TestWaitCompleted(event, "OnActive", MAIN_ABILITY_CODE), 0);
-//     STAbilityUtil::CleanMsg(event);
-//     STAbilityUtil::PublishEvent(
-//         g_EVENT_REQU_MAIN, CODE_, "AbilityState_" + std::to_string((int)TestAbilityState::OnSaveAbilityState) + "_2");
-//     EXPECT_EQ(TestWaitCompleted(event, g_EVENT_RESP_MAIN, CODE_), 0);
-    
-//     EXPECT_EQ(TestWaitCompleted(event, "OnStart", SECOND_ABILITY_CODE), 0);
-//     EXPECT_EQ(TestWaitCompleted(event, "OnActive", SECOND_ABILITY_CODE), 0);
-
-//     EXPECT_NE(TestWaitCompleted(event, "OnSaveAbilityState", MAIN_ABILITY_CODE), 0);
-//     GTEST_LOG_(INFO) << "AmsMissionStackTest FWK_SaveAbilityState_0300 end";
-// }
-
-// /**
-//  * @tc.number    : FWK_RestoreAbilityState_0100
-//  * @tc.name      : 
-//  * @tc.desc      : 
-//  */
-// HWTEST_F(AmsMissionStackTest, FWK_RestoreAbilityState_0100, Function | MediumTest | Level1)
-// {
-//     GTEST_LOG_(INFO) << "AmsMissionStackTest FWK_RestoreAbilityState_0100 start";
-
-//     MAP_STR_STR params;
-//     Want want = STAbilityUtil::MakeWant("device", THIRD_ABILITY_NAME, KIT_BUNDLE_NAME, params);
-//     // start first ability
-//     ErrCode eCode = STAbilityUtil::StartAbility(want, g_abilityMs, WAIT_TIME);
-//     GTEST_LOG_(INFO) << eCode;
-
-//     EXPECT_EQ(TestWaitCompleted(event, "OnStart", THIRD_ABILITY_CODE), 0);
-//     EXPECT_EQ(TestWaitCompleted(event, "OnActive", THIRD_ABILITY_CODE), 0);
-
-//     Want wantEntity;
-//     wantEntity.AddEntity(Want::FLAG_HOME_INTENT_FROM_SYSTEM);
-//     STAbilityUtil::StartAbility(wantEntity, g_abilityMs);
-
-//     sleep(WAIT_LAUNCHER_TIME);
-//     eCode = STAbilityUtil::StartAbility(want, g_abilityMs, WAIT_TIME);
-//     GTEST_LOG_(INFO) << eCode;
-//     EXPECT_EQ(TestWaitCompleted(event, "OnActive", THIRD_ABILITY_CODE), 0);
-
-//     EXPECT_NE(TestWaitCompleted(event, "OnRestoreAbilityState", THIRD_ABILITY_CODE), 0);
-
-//     GTEST_LOG_(INFO) << "AmsMissionStackTest FWK_RestoreAbilityState_0100 end";
-// }
-
-// /**
-//  * @tc.number    : FWK_RestoreAbilityState_0200
-//  * @tc.name      : 
-//  * @tc.desc      : 
-//  */
-// HWTEST_F(AmsMissionStackTest, FWK_RestoreAbilityState_0200, Function | MediumTest | Level1)
-// {
-//     GTEST_LOG_(INFO) << "AmsMissionStackTest FWK_RestoreAbilityState_0200 start";
-//     // 该case需要屏幕翻转事件
-//     GTEST_LOG_(INFO) << "AmsMissionStackTest FWK_RestoreAbilityState_0200 end";
-// }
-
-// /**
-//  * @tc.number    : FWK_RestoreAbilityState_0300
-//  * @tc.name      : 
-//  * @tc.desc      : 
-//  */
-// HWTEST_F(AmsMissionStackTest, FWK_RestoreAbilityState_0300, Function | MediumTest | Level1)
-// {
-//     GTEST_LOG_(INFO) << "AmsMissionStackTest FWK_RestoreAbilityState_0300 start";
-//     MAP_STR_STR params;
-//     Want want = STAbilityUtil::MakeWant("device", MAIN_ABILITY_NAME, KIT_BUNDLE_NAME, params);
-//     // start first ability
-//     ErrCode eCode = STAbilityUtil::StartAbility(want, g_abilityMs, WAIT_TIME);
-//     GTEST_LOG_(INFO) << eCode;
-
-//     EXPECT_EQ(TestWaitCompleted(event, "OnStart", MAIN_ABILITY_CODE), 0);
-//     EXPECT_EQ(TestWaitCompleted(event, "OnActive", MAIN_ABILITY_CODE), 0);
-//     STAbilityUtil::CleanMsg(event);
-//     STAbilityUtil::PublishEvent(
-//         g_EVENT_REQU_MAIN, CODE_, "AbilityState_" + std::to_string((int)TestAbilityState::OnRestoreAbilityState) + "_2");
-//     EXPECT_EQ(TestWaitCompleted(event, g_EVENT_RESP_MAIN, CODE_), 0);
-    
-//     EXPECT_EQ(TestWaitCompleted(event, "OnStart", SECOND_ABILITY_CODE), 0);
-//     EXPECT_EQ(TestWaitCompleted(event, "OnActive", SECOND_ABILITY_CODE), 0);
-//     STAbilityUtil::PublishEvent(
-//         g_EVENT_REQU_SECOND, CODE_, "AbilityState_" + std::to_string((int)TestAbilityState::OnRestoreAbilityState) + "_2");
-//     EXPECT_EQ(TestWaitCompleted(event, g_EVENT_RESP_SECOND, CODE_), 0);
-//     EXPECT_EQ(TestWaitCompleted(event, "OnStop", SECOND_ABILITY_CODE), 0);
-
-//     EXPECT_NE(TestWaitCompleted(event, "OnRestoreAbilityState", MAIN_ABILITY_CODE), 0);
-
-//     GTEST_LOG_(INFO) << "AmsMissionStackTest FWK_RestoreAbilityState_0300 end";
-// }
-
 }  // namespace
diff --git a/test/systemtest/common/ams/ams_page_ability_test/BUILD.gn b/test/systemtest/common/ams/ams_page_ability_test/BUILD.gn
index 17487b999aebbec2bf1c572c1ac537f60feb86b4..1e2e88a2912b336721f0d0cb1dad8430872b714a 100755
--- a/test/systemtest/common/ams/ams_page_ability_test/BUILD.gn
+++ b/test/systemtest/common/ams/ams_page_ability_test/BUILD.gn
@@ -26,8 +26,8 @@ ohos_systemtest("ams_page_ability_test") {
   sources = [
     "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/event.cpp",
     "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/module_test_dump_util.cpp",
+    "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/st_ability_util.cpp",
     "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/stoperator.cpp",
-    "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/system_test_ability_util.cpp",
     "ams_page_ability_test.cpp",
   ]
 
diff --git a/test/systemtest/common/ams/ams_page_ability_test/ams_page_ability_test.cpp b/test/systemtest/common/ams/ams_page_ability_test/ams_page_ability_test.cpp
index eeccbd9dd7a32749693f82303a744515800354a6..a5963ebe46cac2c55b0ecb273ec08831d1d26ad2 100644
--- a/test/systemtest/common/ams/ams_page_ability_test/ams_page_ability_test.cpp
+++ b/test/systemtest/common/ams/ams_page_ability_test/ams_page_ability_test.cpp
@@ -36,7 +36,6 @@ using namespace OHOS::AppExecFwk;
 using namespace OHOS::MTUtil;
 using namespace OHOS::STABUtil;
 using namespace OHOS::EventFwk;
-namespace {
 typedef std::map<std::string, std::string> MAP_STR_STR;
 std::vector<std::string> bundleNameSuffix = {"A", "B", "C", "D", "E", "F", "G", "H", "I", "M", "N", "O", "P"};
 std::vector<std::string> uninstallBundleNameSuffix = {"A", "B", "C", "D", "E", "F", "G", "H", "I", "M", "N", "O"};
@@ -51,18 +50,6 @@ std::string abilityEventName = "resp_st_page_ability_callback";
 std::string pidEventName = "resp_st_page_ability_pid_callback";
 const int amsStAbilityO1Code = 10;
 const int amsStAbilityP1Code = 11;
-static const std::string DUMP_STACK_LIST = "--stack-list";
-static const std::string DUMP_STACK = "--stack";
-static const std::string DUMP_MISSION = "--mission";
-static const std::string DUMP_TOP = "--top";
-static const std::string DUMP_ALL = "-a";
-static const std::string lifecycleStateUninitialized =
-    std::to_string(AbilityLifecycleExecutor::LifecycleState::UNINITIALIZED);
-static const std::string lifecycleStateActive = std::to_string(AbilityLifecycleExecutor::LifecycleState::ACTIVE);
-static const std::string lifecycleStateBackground =
-    std::to_string(AbilityLifecycleExecutor::LifecycleState::BACKGROUND);
-static const std::string lifecycleStateInactive = std::to_string(AbilityLifecycleExecutor::LifecycleState::INACTIVE);
-static const std::string lifecycleStateInitial = std::to_string(AbilityLifecycleExecutor::LifecycleState::INITIAL);
 constexpr int WAIT_TIME = 3 * 1000;
 constexpr int WAIT_LAUNCHER_OK = 5 * 1000;
 enum AbilityState_Test {
@@ -77,6 +64,19 @@ enum AbilityState_Test {
     TERMINATING,
     ALLSUM,
 };
+namespace {
+static const std::string DUMP_STACK_LIST = "--stack-list";
+static const std::string DUMP_STACK = "--stack";
+static const std::string DUMP_MISSION = "--mission";
+static const std::string DUMP_TOP = "--top";
+static const std::string DUMP_ALL = "-a";
+static const std::string lifecycleStateUninitialized =
+    std::to_string(AbilityLifecycleExecutor::LifecycleState::UNINITIALIZED);
+static const std::string lifecycleStateActive = std::to_string(AbilityLifecycleExecutor::LifecycleState::ACTIVE);
+static const std::string lifecycleStateBackground =
+    std::to_string(AbilityLifecycleExecutor::LifecycleState::BACKGROUND);
+static const std::string lifecycleStateInactive = std::to_string(AbilityLifecycleExecutor::LifecycleState::INACTIVE);
+static const std::string lifecycleStateInitial = std::to_string(AbilityLifecycleExecutor::LifecycleState::INITIAL);
 static const std::vector<std::string> abilityStateVec = {
     "INITIAL",
     "INACTIVE",
diff --git a/test/systemtest/common/ams/ams_power_test/BUILD.gn b/test/systemtest/common/ams/ams_power_test/BUILD.gn
index b7e7aa63e1f7f5629463b011cb82ccc1a3f3bfb2..6e693299063efc9539f06291f5ea6ac7e378d786 100755
--- a/test/systemtest/common/ams/ams_power_test/BUILD.gn
+++ b/test/systemtest/common/ams/ams_power_test/BUILD.gn
@@ -27,8 +27,8 @@ ohos_systemtest("ams_power_test") {
   sources = [
     "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/event.cpp",
     "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/module_test_dump_util.cpp",
+    "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/st_ability_util.cpp",
     "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/stoperator.cpp",
-    "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/system_test_ability_util.cpp",
     "ams_power_test.cpp",
   ]
 
diff --git a/test/systemtest/common/ams/ams_service_ability_test/BUILD.gn b/test/systemtest/common/ams/ams_service_ability_test/BUILD.gn
index e293251fc1af36a4391d50308f79e460ea7080e6..b9af84ecda01e76743b43d6ec152c5e16fc41f1d 100755
--- a/test/systemtest/common/ams/ams_service_ability_test/BUILD.gn
+++ b/test/systemtest/common/ams/ams_service_ability_test/BUILD.gn
@@ -28,8 +28,8 @@ ohos_systemtest("ams_service_ability_test") {
   sources = [
     "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/event.cpp",
     "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/module_test_dump_util.cpp",
+    "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/st_ability_util.cpp",
     "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/stoperator.cpp",
-    "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/system_test_ability_util.cpp",
     "ams_service_ability_test.cpp",
   ]
 
diff --git a/test/systemtest/common/ams/ams_service_ability_test/ams_service_ability_test.cpp b/test/systemtest/common/ams/ams_service_ability_test/ams_service_ability_test.cpp
index d8c9c3d871734bde157106cb320bb57b48562bd3..20090dd057bb69da8777f70a62de25a0c613af0d 100644
--- a/test/systemtest/common/ams/ams_service_ability_test/ams_service_ability_test.cpp
+++ b/test/systemtest/common/ams/ams_service_ability_test/ams_service_ability_test.cpp
@@ -1965,9 +1965,8 @@ HWTEST_F(AmsServiceAbilityTest, AMS_Service_Ability_2300, Function | MediumTest
 /**
  * @tc.number    : AppSpawn_TEST_0100
  * @tc.name      : Check appspawn process information
- * @tc.desc      : The system rc is started, and based on root privileges, the AppSpawn process is created, and
- related
- * resources are loaded.
+ * @tc.desc      : The system rc is started, and based on root privileges, the AppSpawn process is created,
+ *                 and related resources are loaded.
  */
 HWTEST_F(AmsServiceAbilityTest, AppSpawn_TEST_0100, Function | MediumTest | Level1)
 {
diff --git a/test/systemtest/common/ams/tool/BUILD.gn b/test/systemtest/common/ams/tool/BUILD.gn
index f63448383715c80efc0b4817af64bd66daa482db..397212613af4a4eeaacc9e57fd75c54ca33b2778 100755
--- a/test/systemtest/common/ams/tool/BUILD.gn
+++ b/test/systemtest/common/ams/tool/BUILD.gn
@@ -30,8 +30,8 @@ ohos_shared_library("system_test_ability_util_lib") {
   sources = [
     "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/event.cpp",
     "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/module_test_dump_util.cpp",
+    "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/st_ability_util.cpp",
     "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/stoperator.cpp",
-    "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/system_test_ability_util.cpp",
   ]
 
   configs = [
diff --git a/test/systemtest/common/ams/tool/src/system_test_ability_util.cpp b/test/systemtest/common/ams/tool/src/st_ability_util.cpp
similarity index 100%
rename from test/systemtest/common/ams/tool/src/system_test_ability_util.cpp
rename to test/systemtest/common/ams/tool/src/st_ability_util.cpp
diff --git a/test/systemtest/common/task_dispatcher/BUILD.gn b/test/systemtest/common/task_dispatcher/BUILD.gn
index d381007b930dd0804707a3d084df9a2fa44128ff..38e1b3ccaae598eafff4b721d4c03683fa89293d 100755
--- a/test/systemtest/common/task_dispatcher/BUILD.gn
+++ b/test/systemtest/common/task_dispatcher/BUILD.gn
@@ -42,8 +42,8 @@ ohos_systemtest("task_dispatcher_test") {
   sources = [
     "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/event.cpp",
     "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/module_test_dump_util.cpp",
+    "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/st_ability_util.cpp",
     "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/stoperator.cpp",
-    "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/system_test_ability_util.cpp",
     "src/task_dispatcher_test.cpp",
     "src/task_dispatcher_tools.cpp",
   ]