!1354 【社区主干】L2_MASTER_XTS_HAP包_名称规范整改

Merge pull request !1354 from jiyong/master

aafwk/aafwk_standard/BUILD.gn

@@ -18,24 +18,24 @@ group("aafwk_standard") {
   if (is_standard_system) {
     deps = [
       "abilitymanager:actsabilitymanagertest",
-      "amsabilitymanager/amsMissionSnapshotTest:amsMissionSnapshotTest",
+      "amsabilitymanager/amsMissionSnapshotTest:ActsAmsMissionSnapshotTest",
       "amsabilitymanager/amsMissionSnapshotTestSingleton:amsMissionSnapshotTestSingleton",
       "amsabilitymanager/amsMissionSnapshotTestSingletonS:amsMissionSnapshotTestSingletonS",
-      "amsdatauriutils:amsDataUriUtils",
-      "amszipfileunzipfilest:amsZipfileUnzipfileST",
+      "amsdatauriutils:ActsAmsDataUriUtilsTest",
+      "amszipfileunzipfilest:ActsAmsZipfileUnzipfileSTest",
       "context:context",
       "featureability:featureability",
       "formmanager:formmanager",
 
-      #"fwkdataaccessor:FWKDataAccessor",
+      #"fwkdataaccessor:ActsFWKDataAccessorTest",
 
       #"serviceability/actsparticleabilitytest:ActsParticleAbilityTest",
       "serviceability/sceneProject/particlestartability:ParticleStartAbility",
       "serviceability/sceneProject/particletestserver:ParticleTestServer",
 
-      #"serviceability/stserviceabilityclient:amsStServiceAbilityClient",
+      #"serviceability/stserviceabilityclient:ActsAmsStServiceAbilityClientTest",
       "serviceability/stserviceabilityserver:amsStServiceAilityServer",
-      "serviceability/stserviceabilityserversecond:amsStServiceAilityServerSecond",
+      "serviceability/stserviceabilityserversecond:ActsAmsStServiceAilityServerSecondTest",
       "setshowonlockscreen:setshowonlockscreen",
 
       #"verifypermission:verifypermission",

aafwk/aafwk_standard/abilitymanager/BUILD.gn

@@ -27,8 +27,8 @@ group("actsabilitymanagertest") {
       "actsamstestfourthscene:ActsAmsTestFourthSceneTest",
       "actsamstestsecondscene:ActsAmsTestSecondSceneTest",
       "actsamstestthirdscene:ActsAmsTestThirdSceneTest",
-      "clearmissionscallback:ClearMissionsCallBack",
-      "clearmissionspromise:ClearMissionsPromise",
+      "clearmissionscallback:ActsClearMissionsCallBackTest",
+      "clearmissionspromise:ActsClearMissionsPromiseTest",
       "sceneProject/simulateEAbility:simulateEAbility",
       "sceneProject/simulateFAbilityFir:simulateFAbilityFir",
       "sceneProject/simulateFAbilitySed:simulateFAbilitySed",

aafwk/aafwk_standard/abilitymanager/clearmissionscallback/BUILD.gn

@@ -12,14 +12,14 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ClearMissionsCallBack") {
+ohos_js_hap_suite("ActsClearMissionsCallBackTest") {
   hap_profile = "./src/main/config.json"
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/systemui.p7b"
-  hap_name = "ClearMissionsCallBack"
+  hap_name = "ActsClearMissionsCallBackTest"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./src/main/js/default"

aafwk/aafwk_standard/abilitymanager/clearmissionscallback/Test.json

@@ -10,7 +10,7 @@
     "kits": [
         {
             "test-file-name": [
-                "ClearMissionsCallBack.hap",
+                "ActsClearMissionsCallBackTest.hap",
                 "verifyIAbility.hap"
             ],
             "type": "AppInstallKit",

aafwk/aafwk_standard/abilitymanager/clearmissionspromise/BUILD.gn

@@ -12,14 +12,14 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ClearMissionsPromise") {
+ohos_js_hap_suite("ActsClearMissionsPromiseTest") {
   hap_profile = "./src/main/config.json"
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/systemui.p7b"
-  hap_name = "ClearMissionsPromise"
+  hap_name = "ActsClearMissionsPromiseTest"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./src/main/js/default"

aafwk/aafwk_standard/abilitymanager/clearmissionspromise/Test.json

@@ -10,7 +10,7 @@
     "kits": [
         {
             "test-file-name": [
-                "ClearMissionsPromise.hap",
+                "ActsClearMissionsPromiseTest.hap",
                 "verifyIAbility.hap"
             ],
             "type": "AppInstallKit",

aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTest/BUILD.gn

@@ -13,14 +13,14 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("amsMissionSnapshotTest") {
+ohos_js_hap_suite("ActsAmsMissionSnapshotTest") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "amsMissionSnapshotTest"
+  hap_name = "ActsAmsMissionSnapshotTest"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

aafwk/aafwk_standard/amsdatauriutils/BUILD.gn

@@ -13,14 +13,14 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("amsDataUriUtils") {
+ohos_js_hap_suite("ActsAmsDataUriUtilsTest") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "amsDataUriUtils"
+  hap_name = "ActsAmsDataUriUtilsTest"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

aafwk/aafwk_standard/amsdatauriutils/Test.json

@@ -9,7 +9,7 @@
     "kits": [
         {
             "test-file-name": [
-                "amsDataUriUtils.hap"
+                "ActsAmsDataUriUtilsTest.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

aafwk/aafwk_standard/amszipfileunzipfilest/BUILD.gn

@@ -13,14 +13,14 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("amsZipfileUnzipfileST") {
+ohos_js_hap_suite("ActsAmsZipfileUnzipfileSTest") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "amsZipfileUnzipfileST"
+  hap_name = "ActsAmsZipfileUnzipfileSTest"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

aafwk/aafwk_standard/amszipfileunzipfilest/Test.json

@@ -9,7 +9,7 @@
     "kits": [
         {
             "test-file-name": [
-                "amsZipfileUnzipfileST.hap"
+                "ActsAmsZipfileUnzipfileSTest.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

aafwk/aafwk_standard/fwkdataaccessor/BUILD.gn

@@ -13,14 +13,14 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("FWKDataAccessor") {
+ohos_js_hap_suite("ActsFWKDataAccessorTest") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "FWKDataAccessor"
+  hap_name = "ActsFWKDataAccessorTest"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

aafwk/aafwk_standard/fwkdataaccessor/Test.json

@@ -9,7 +9,7 @@
     "kits": [
         {
             "test-file-name": [
-                "FWKDataAccessor.hap",
+                "ActsFWKDataAccessorTest.hap",
                 "./resource/appexecfwk/amsStDataAbility.hap"
             ],
             "type": "AppInstallKit",

aafwk/aafwk_standard/serviceability/stserviceabilityclient/BUILD.gn

@@ -13,14 +13,14 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("amsStServiceAbilityClient") {
+ohos_js_hap_suite("ActsAmsStServiceAbilityClientTest") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "amsStServiceAbilityClient"
+  hap_name = "ActsAmsStServiceAbilityClientTest"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

aafwk/aafwk_standard/serviceability/stserviceabilityclient/Test.json

@@ -9,7 +9,7 @@
     "kits": [
         {
             "test-file-name": [
-                "amsStServiceAbilityClient.hap",
+                "ActsAmsStServiceAbilityClientTest.hap",
                 "amsStServiceAilityServer.hap"
             ],
             "type": "AppInstallKit",

aafwk/aafwk_standard/serviceability/stserviceabilityserversecond/BUILD.gn

@@ -13,9 +13,9 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("amsStServiceAilityServerSecond") {
+ohos_hap("ActsAmsStServiceAilityServerSecondTest") {
   hap_profile = "./entry/src/main/config.json"
-  hap_name = "amsStServiceAilityServerSecond"
+  hap_name = "ActsAmsStServiceAilityServerSecondTest"
   subsystem_name = XTS_SUITENAME
   final_hap_path =
       "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"

aafwk/aafwk_standard/setshowonlockscreen/BUILD.gn

@@ -17,8 +17,8 @@ group("setshowonlockscreen") {
   testonly = true
   if (is_standard_system) {
     deps = [
-      "setshowonlock:setshowonlock",
-      "showsethown:showsethown",
+      "setshowonlock:ActsSetshowonlockTest",
+      "showsethown:ActsShowsethownTest",
     ]
   }
 }

aafwk/aafwk_standard/setshowonlockscreen/setshowonlock/BUILD.gn

@@ -13,14 +13,14 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("setshowonlock") {
+ohos_js_hap_suite("ActsSetshowonlockTest") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "setshowonlock"
+  hap_name = "ActsSetshowonlockTest"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

aafwk/aafwk_standard/setshowonlockscreen/showsethown/BUILD.gn

@@ -13,14 +13,14 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("showsethown") {
+ohos_js_hap_suite("ActsShowsethownTest") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "showsethown"
+  hap_name = "ActsShowsethownTest"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

aafwk/aafwk_standard/verifypermission/AmsJsStMain/BUILD.gn

@@ -13,14 +13,14 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("AmsJsStMain") {
+ohos_js_hap_suite("ActsAmsJsStMainTest") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "AmsJsStMain"
+  hap_name = "ActsAmsJsStMainTest"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

aafwk/aafwk_standard/verifypermission/AmsJsStSubPermission/BUILD.gn

@@ -13,14 +13,14 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("AmsJsStSubPermission") {
+ohos_js_hap_suite("ActsAmsJsStSubPermissionTest") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "AmsJsStSubPermission"
+  hap_name = "ActsAmsJsStSubPermissionTest"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

aafwk/aafwk_standard/verifypermission/BUILD.gn

@@ -17,8 +17,8 @@ group("verifypermission") {
   testonly = true
   if (is_standard_system) {
     deps = [
-      "AmsJsStMain:AmsJsStMain",
-      "AmsJsStSubPermission:AmsJsStSubPermission",
+      "AmsJsStMain:ActsAmsJsStMainTest",
+      "AmsJsStSubPermission:ActsAmsJsStSubPermissionTest",
     ]
   }
 }

account/BUILD.gn

@@ -16,7 +16,7 @@ group("account") {
   testonly = true
   if (is_standard_system) {
     deps = [
-      "OsAccountTest_js:osaccount_js_test",
+      "OsAccountTest_js:ActsOsAccountJSApiTest",
       "appaccount:appaccount_hap",
     ]
   } else {

account/OsAccountTest_js/BUILD.gn

@@ -12,20 +12,15 @@
 # limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
-ohos_js_hap_suite("osaccount_js_test") {
+
+ohos_js_hap_suite("ActsOsAccountJSApiTest") {
   hap_profile = "./src/main/config.json"
   deps = [
     ":osaccount_js_assets",
     ":osaccount_resources",
   ]
-#  shared_libraries = [
-    #    "//third_party/giflib:libgif",
-#    "//third_party/libpng:libpng",
-#  ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "OsAccountJSApiTest"
-#  part_name = "prebuilt_hap"
-#  subsystem_name = "xts"
+  hap_name = "ActsOsAccountJSApiTest"
 }
 ohos_js_assets("osaccount_js_assets") {
   source_dir = "./src/main/js/default"

account/OsAccountTest_js/Test.json

@@ -9,7 +9,7 @@
     "kits": [
         {
             "test-file-name": [
-                "OsAccountJSApiTest.hap"
+                "ActsOsAccountJSApiTest.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

account/appaccount/BUILD.gn

@@ -18,8 +18,8 @@ group("appaccount_hap") {
   if (is_standard_system) {
     deps = [
       "actsaccounttest:ActsAccountTest",
-      "actsgetallaccounts:ActsGetAllAccounts",
-      "actssetchecksyncenable:ActsSetCheckSyncEnable",
+      "actsgetallaccounts:ActsGetAllAccountsTest",
+      "actssetchecksyncenable:ActsSetCheckSyncEnableTest",
       "getallaccessibleaccounts:accessibleaccounts",
       "sceneProject:appaccount_scene",
     ]

account/appaccount/actsgetallaccounts/BUILD.gn

@@ -13,14 +13,14 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ActsGetAllAccounts") {
+ohos_js_hap_suite("ActsGetAllAccountsTest") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "ActsGetAllAccounts"
+  hap_name = "ActsGetAllAccountsTest"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

account/appaccount/actsgetallaccounts/Test.json

@@ -9,7 +9,7 @@
     "kits": [
         {
             "test-file-name": [
-                "ActsGetAllAccounts.hap",
+                "ActsGetAllAccountsTest.hap",
                 "ActsSceneGetAllAccounts.hap"
             ],
             "type": "AppInstallKit",

account/appaccount/actssetchecksyncenable/BUILD.gn

@@ -13,14 +13,14 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ActsSetCheckSyncEnable") {
+ohos_js_hap_suite("ActsSetCheckSyncEnableTest") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "ActsSetCheckSyncEnable"
+  hap_name = "ActsSetCheckSyncEnableTest"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

account/appaccount/actssetchecksyncenable/Test.json

@@ -9,7 +9,7 @@
     "kits": [
         {
             "test-file-name": [
-                "ActsSetCheckSyncEnable.hap"
+                "ActsSetCheckSyncEnableTest.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

account/appaccount/getallaccessibleaccounts/BUILD.gn

@@ -17,8 +17,8 @@ group("accessibleaccounts") {
   testonly = true
   if (is_standard_system) {
     deps = [
-      "actsgetallaccessibleaccounts:ActsGetAllAccessibleAccounts",
-      "actsgetallaccessiblemultiple:ActsGetAllAccessibleMultiple",
+      "actsgetallaccessibleaccounts:ActsGetAllAccessibleAccountsTest",
+      "actsgetallaccessiblemultiple:ActsGetAllAccessibleMultipleTest",
     ]
   }
 }

account/appaccount/getallaccessibleaccounts/actsgetallaccessibleaccounts/BUILD.gn

@@ -13,14 +13,14 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ActsGetAllAccessibleAccounts") {
+ohos_js_hap_suite("ActsGetAllAccessibleAccountsTest") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "ActsGetAllAccessibleAccounts"
+  hap_name = "ActsGetAllAccessibleAccountsTest"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

account/appaccount/getallaccessibleaccounts/actsgetallaccessibleaccounts/Test.json

@@ -9,7 +9,7 @@
     "kits": [
         {
             "test-file-name": [
-                "ActsGetAllAccessibleAccounts.hap",
+                "ActsGetAllAccessibleAccountsTest.hap",
                 "ActsAccountSceneAccessible.hap"
             ],
             "type": "AppInstallKit",

account/appaccount/getallaccessibleaccounts/actsgetallaccessiblemultiple/BUILD.gn

@@ -13,14 +13,14 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ActsGetAllAccessibleMultiple") {
+ohos_js_hap_suite("ActsGetAllAccessibleMultipleTest") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "ActsGetAllAccessibleMultiple"
+  hap_name = "ActsGetAllAccessibleMultipleTest"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

account/appaccount/getallaccessibleaccounts/actsgetallaccessiblemultiple/Test.json

@@ -9,7 +9,7 @@
     "kits": [
         {
             "test-file-name": [
-                "ActsGetAllAccessibleMultiple.hap",
+                "ActsGetAllAccessibleMultipleTest.hap",
                 "ActsAccountAccessibleFirst.hap",
                 "ActsAccountAccessibleSecond.hap"
             ],

ace/BUILD.gn

@@ -13,7 +13,5 @@
 
 group("ace") {
   testonly = true
-  deps = [
-    "ace_standard:ace_standard_test",
-  ]
+  deps = [ "ace_standard:ace_standard_test" ]
 }

ace/ace_standard/BUILD.gn

@@ -11,22 +11,16 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
 import("//test/xts/tools/build/suite.gni")
+
 ohos_js_hap_suite("ace_standard_test") {
   hap_profile = "./src/main/config.json"
   deps = [
     ":ace_js_assets",
     ":ace_resources",
   ]
-#  shared_libraries = [
-    #    "//third_party/giflib:libgif",
-#    "//third_party/libpng:libpng",
-#  ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "ace_standard"
-#  part_name = "prebuilt_hap"
-#  subsystem_name = "xts"
+  hap_name = "ActsAceStandardTest"
 }
 ohos_js_assets("ace_js_assets") {
   source_dir = "./src/main/js/default"
@@ -34,4 +28,4 @@ ohos_js_assets("ace_js_assets") {
 ohos_resources("ace_resources") {
   sources = [ "./src/main/resources" ]
   hap_profile = "./src/main/config.json"
-}
\ No newline at end of file
+}

ace/ace_standard/Test.json

@@ -9,7 +9,7 @@
     "kits": [
         {
             "test-file-name": [
-                "ace_standard.hap"
+                "ActsAceStandardTest.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

ai_lite/ai_engine_posix/base/BUILD.gn

@@ -67,5 +67,6 @@ hcpptest_suite("ActsAiEngineTest") {
   ldflags = [
     "-lstdc++",
     "-ldl",
-    "-lpthread",]
+    "-lpthread",
+  ]
 }

appexecfwk/bundle_standard/bundlemanager/BUILD.gn

@@ -27,9 +27,9 @@ group("bundlemanager") {
       "actsbmsmetadatatest:ActsBmsMetaDataTest",
       "actsbmsmoduleusagerecordtest:ActsBmsModuleUsageRecordTest",
       "actsbundlemanagertest:ActsBundleManagerTest",
-      "actsbundlemanageruninstall:ActsBundleManagerUninstall",
+      "actsbundlemanageruninstall:ActsBundleManagerUninstallTest",
 
-      # "bmscheckpermissiontest:BmsCheckPermissionTest",
+      # "bmscheckpermissiontest:ActsBmsCheckPermissionTest",
       "sceneProject/bmsgetinfosfifthscene:bmsThirdBundleTest5",
       "sceneProject/bmsgetinfosfirstscene:bmsThirdBundleTest1",
       "sceneProject/bmsgetinfosfirstsceneupdate:bmsThirdBundleTestA1",

appexecfwk/bundle_standard/bundlemanager/actsbundlemanageruninstall/BUILD.gn

@@ -13,14 +13,14 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ActsBundleManagerUninstall") {
+ohos_js_hap_suite("ActsBundleManagerUninstallTest") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "ActsBundleManagerUninstall"
+  hap_name = "ActsBundleManagerUninstallTest"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

appexecfwk/bundle_standard/bundlemanager/actsbundlemanageruninstall/Test.json

@@ -9,7 +9,7 @@
     "kits": [
         {
             "test-file-name": [
-                "ActsBundleManagerUninstall.hap"
+                "ActsBundleManagerUninstallTest.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

appexecfwk/bundle_standard/bundlemanager/bmscheckpermissiontest/BUILD.gn

@@ -13,14 +13,14 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("BmsCheckPermissionTest") {
+ohos_js_hap_suite("ActsBmsCheckPermissionTest") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "BmsCheckPermissionTest"
+  hap_name = "ActsBmsCheckPermissionTest"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

communication/ipcrpc_standard/ipcrpcservice/BUILD.gn

@@ -12,16 +12,15 @@
 # limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
+
 ohos_js_hap_suite("ipcrpcService") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":ipcrpcService_assets",
     ":ipcrpcService_resources",
   ]
-
   certificate_profile = "./signature/openharmony_sx.p7b"
-
-  hap_name = "IpcRpcService"
+  hap_name = "ActsIpcRpcServiceTest"
 }
 ohos_js_assets("ipcrpcService_assets") {
   source_dir = "./entry/src/main/js/default"

communication/ipcrpc_standard/ipcrpcservice/Test.json

@@ -9,7 +9,7 @@
     "kits": [
         {
             "test-file-name": [
-				"IpcRpcService.hap"
+				"ActsIpcRpcServiceTest.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

communication/ipcrpc_standard/ipcrpctest/BUILD.gn

@@ -12,16 +12,15 @@
 # limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
+
 ohos_js_hap_suite("ipcrpcTest") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":ipcrpcTest_assets",
     ":ipcrpcTest_resources",
   ]
-
   certificate_profile = "./signature/openharmony_sx.p7b"
-
-  hap_name = "IpcRpcTest"
+  hap_name = "ActsIpcRpcTest"
 }
 ohos_js_assets("ipcrpcTest_assets") {
   source_dir = "./entry/src/main/js/default"

communication/ipcrpc_standard/ipcrpctest/Test.json

@@ -9,7 +9,7 @@
     "kits": [
         {
             "test-file-name": [
-                "IpcRpcTest.hap",
+                "ActsIpcRpcTest.hap",
 				"IpcRpcService.hap"
             ],
             "type": "AppInstallKit",

communication/wifi_standard/BUILD.gn

@@ -12,22 +12,15 @@
 # limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
+
 ohos_js_hap_suite("wifi_standard_test") {
   hap_profile = "./src/main/config.json"
   deps = [
     ":wifi_js_assets",
     ":wifi_resources",
   ]
-
-  #  shared_libraries = [
-  #    "//third_party/giflib:libgif",
-  #    "//third_party/libpng:libpng",
-  #  ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "WifiJSApiTest"
-
-  #  part_name = "prebuilt_hap"
-  #  subsystem_name = "xts"
+  hap_name = "ActsWifiJSApiTest"
 }
 ohos_js_assets("wifi_js_assets") {
   source_dir = "./src/main/js/default"

communication/wifi_standard/Test.json

@@ -9,7 +9,7 @@
     "kits": [
         {
             "test-file-name": [
-                "WifiJSApiTest.hap"
+                "ActsWifiJSApiTest.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

compileruntime/process_lib_standard/BUILD.gn

@@ -12,22 +12,15 @@
 # limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
+
 ohos_js_hap_suite("process_js_test") {
   hap_profile = "./src/main/config.json"
   deps = [
     ":process_js_assets",
     ":process_resources",
   ]
-
-  #  shared_libraries = [
-  #    "//third_party/giflib:libgif",
-  #    "//third_party/libpng:libpng",
-  #  ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "ProcessJSApiTest"
-
-  #  part_name = "prebuilt_hap"
-  #  subsystem_name = "xts"
+  hap_name = "ActsProcessJSApiTest"
 }
 ohos_js_assets("process_js_assets") {
   source_dir = "./src/main/js/default"

compileruntime/process_lib_standard/Test.json

@@ -9,7 +9,7 @@
     "kits": [
         {
             "test-file-name": [
-                "ProcessJSApiTest.hap"
+                "ActsProcessJSApiTest.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

compileruntime/url_lib_standard/BUILD.gn

@@ -12,22 +12,15 @@
 # limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
+
 ohos_js_hap_suite("url_js_test") {
   hap_profile = "./src/main/config.json"
   deps = [
     ":url_js_assets",
     ":url_resources",
   ]
-
-  #  shared_libraries = [
-  #    "//third_party/giflib:libgif",
-  #    "//third_party/libpng:libpng",
-  #  ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "UrlJsTest"
-
-  #  part_name = "prebuilt_hap"
-  #  subsystem_name = "xts"
+  hap_name = "ActsUrlJsTest"
 }
 ohos_js_assets("url_js_assets") {
   source_dir = "./src/main/js/default"

compileruntime/url_lib_standard/Test.json

@@ -9,7 +9,7 @@
     "kits": [
         {
             "test-file-name": [
-                "UrlJsTest.hap"
+                "ActsUrlJsTest.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

compileruntime/util_lib_standard/BUILD.gn

@@ -12,22 +12,15 @@
 # limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
+
 ohos_js_hap_suite("util_js_test") {
   hap_profile = "./src/main/config.json"
   deps = [
     ":util_js_assets",
     ":util_resources",
   ]
-
-  #  shared_libraries = [
-  #    "//third_party/giflib:libgif",
-  #    "//third_party/libpng:libpng",
-  #  ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "UtilJsTest"
-
-  #  part_name = "prebuilt_hap"
-  #  subsystem_name = "xts"
+  hap_name = "ActsUtilJsTest"
 }
 ohos_js_assets("util_js_assets") {
   source_dir = "./src/main/js/default"

compileruntime/util_lib_standard/Test.json

@@ -9,7 +9,7 @@
     "kits": [
         {
             "test-file-name": [
-                "UtilJsTest.hap"
+                "ActsUtilJsTest.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

compileruntime/worker_lib_standard/BUILD.gn

@@ -12,22 +12,15 @@
 # limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
+
 ohos_js_hap_suite("worker_js_hap") {
   hap_profile = "./src/main/config.json"
   deps = [
     ":worker_js_assets",
     ":worker_resources",
   ]
-
-  #  shared_libraries = [
-  #    "//third_party/giflib:libgif",
-  #    "//third_party/libpng:libpng",
-  #  ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "WorkerJSTest"
-
-  #  part_name = "prebuilt_hap"
-  #  subsystem_name = "xts"
+  hap_name = "ActsWorkerJSTest"
 }
 ohos_js_assets("worker_js_assets") {
   source_dir = "./src/main/js/default"

compileruntime/worker_lib_standard/Test.json

@@ -9,7 +9,7 @@
     "kits": [
         {
             "test-file-name": [
-                "WorkerJSTest.hap"
+                "ActsWorkerJSTest.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

demo/BUILD.gn

@@ -16,8 +16,6 @@ import("//build/ohos_var.gni")
 group("demo") {
   testonly = true
   if (is_standard_system) {
-     deps = [
-        "hjsunit_sample:hjs_demo_test",
-     ]
+    deps = [ "hjsunit_sample:hjs_demo_test" ]
   }
 }

demo/hjsunit_sample/BUILD.gn

@@ -12,20 +12,15 @@
 # limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
+
 ohos_js_hap_suite("hjs_demo_test") {
   hap_profile = "./src/main/config.json"
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
-#  shared_libraries = [
-    #    "//third_party/giflib:libgif",
-#    "//third_party/libpng:libpng",
-#  ]
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "Hjsdemotest"
-#  part_name = "prebuilt_hap"
-#  subsystem_name = "xts"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./src/main/js/default"

developtools/hiplugintest/BUILD.gn

@@ -17,14 +17,14 @@ import("../../../../../developtools/profiler/device/base/config.gni")
 
 ###############################################################################
 config("module_private_config") {
-  visibility = [":*"]
+  visibility = [ ":*" ]
 }
 
 ohos_moduletest_suite("hipluginmoduleapitest") {
   deps = [
-    "//third_party/googletest:gtest",
-    "${OHOS_PROFILER_DIR}/protos/types/plugins/memory_data:memory_data_cpp",
     "${OHOS_PROFILER_DIR}/device/plugins/memory_plugin:memdataplugin",
+    "${OHOS_PROFILER_DIR}/protos/types/plugins/memory_data:memory_data_cpp",
+    "//third_party/googletest:gtest",
   ]
   include_dirs = [
     "${OHOS_PROFILER_DIR}/interfaces/kits/",
@@ -42,11 +42,9 @@ ohos_moduletest_suite("hipluginmoduleapitest") {
   cflags = [
     "-pthread",
     "-Wno-inconsistent-missing-override",
-    "-Dprivate=public",   #allow test code access private members
-  ]
-  external_deps = [
-    "hiviewdfx_hilog_native:libhilog",
+    "-Dprivate=public",  #allow test code access private members
   ]
+  external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
   subsystem_name = "${OHOS_PROFILER_SUBSYS_NAME}"
-  defines = [ "HAVE_HILOG", ]
+  defines = [ "HAVE_HILOG" ]
 }

distributed_schedule_lite/distributed_schedule_posix/BUILD.gn

@@ -44,8 +44,8 @@ hcpptest_suite("ActsDMSTest") {
   deps = [
     "${appexecfwk_lite_path}/frameworks/bundle_lite:bundle",
     "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared",
-    "//foundation/distributedschedule/samgr_lite/samgr:samgr",
     "//foundation/distributedschedule/dmsfwk_lite:dtbschedmgr",
+    "//foundation/distributedschedule/samgr_lite/samgr:samgr",
     "//third_party/bounds_checking_function:libsec_shared",
   ]
   cflags = [ "-Wno-error" ]

distributeddatamgr/appdatamgrjstest/hap/BUILD.gn

@@ -12,20 +12,15 @@
 # limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
+
 ohos_js_hap_suite("appdatamgr_js_test") {
   hap_profile = "./src/main/config.json"
   deps = [
     ":appdatamgr_js_assets",
     ":appdatamgr_resources",
   ]
-#  shared_libraries = [
-    #    "//third_party/giflib:libgif",
-#    "//third_party/libpng:libpng",
-#  ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "AppdatamagrJsTest"
-#  part_name = "prebuilt_hap"
-#  subsystem_name = "xts"
+  hap_name = "ActsAppdatamagrJsTest"
 }
 ohos_js_assets("appdatamgr_js_assets") {
   source_dir = "./src/main/js/default"
@@ -33,4 +28,4 @@ ohos_js_assets("appdatamgr_js_assets") {
 ohos_resources("appdatamgr_resources") {
   sources = [ "./src/main/resources" ]
   hap_profile = "./src/main/config.json"
-}
\ No newline at end of file
+}

distributeddatamgr/appdatamgrjstest/hap/Test.json

@@ -10,7 +10,7 @@
     "kits": [
         {
             "test-file-name": [
-                "AppdatamagrJsTest.hap"
+                "ActsAppdatamagrJsTest.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

distributeddatamgr/distributeddatamgrjstest/hap/BUILD.gn

@@ -12,20 +12,15 @@
 # limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
+
 ohos_js_hap_suite("distributeddatamgr_js_test") {
   hap_profile = "./src/main/config.json"
   deps = [
     ":distributeddatamgr_js_assets",
     ":distributeddatamgr_resources",
   ]
-#  shared_libraries = [
-    #    "//third_party/giflib:libgif",
-#    "//third_party/libpng:libpng",
-#  ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "DistributeddatamgrJsTest"
-#  part_name = "prebuilt_hap"
-#  subsystem_name = "xts"
+  hap_name = "ActsDistributedDatamgrJsTest"
 }
 ohos_js_assets("distributeddatamgr_js_assets") {
   source_dir = "./src/main/js/default"
@@ -33,4 +28,4 @@ ohos_js_assets("distributeddatamgr_js_assets") {
 ohos_resources("distributeddatamgr_resources") {
   sources = [ "./src/main/resources" ]
   hap_profile = "./src/main/config.json"
-}
\ No newline at end of file
+}

distributeddatamgr/distributeddatamgrjstest/hap/Test.json

@@ -9,7 +9,7 @@
     "kits": [
         {
             "test-file-name": [
-                "DistributeddatamgrJsTest.hap"
+                "ActsDistributedDatamgrJsTest.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

distributedhardware/devicemanagerjstest/BUILD.gn

@@ -20,7 +20,7 @@ ohos_js_hap_suite("devicemanager_js_test") {
   ]
 
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "devicemanagerjstest"
+  hap_name = "ActsDeviceManagerJsTest"
 }
 ohos_js_assets("devicemanager_js_assets") {
   source_dir = "./src/main/js/default"

distributedhardware/devicemanagerjstest/Test.json

@@ -9,7 +9,7 @@
     "kits": [
         {
             "test-file-name": [
-                "devicemanagerjstest.hap"
+                "ActsDeviceManagerJsTest.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

global/BUILD.gn

@@ -18,7 +18,7 @@ group("global") {
   if (is_standard_system) {
     deps = [
       "i18n_standard/intljs:intljs_test",
-      "i18n_standard/zone/src:ZoneUtiltest",
+      "i18n_standard/zone/src:ActsZoneUtilTest",
       "resmgr_standard/resmgrjs:resmgrjs_test",
     ]
   } else {

global/i18n_standard/intljs/BUILD.gn

@@ -12,20 +12,15 @@
 # limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
+
 ohos_js_hap_suite("intljs_test") {
   hap_profile = "./src/main/config.json"
   deps = [
     ":intljs_assets",
     ":intljs_resources",
   ]
-#  shared_libraries = [
-    #    "//third_party/giflib:libgif",
-#    "//third_party/libpng:libpng",
-#  ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "IntlJsTest"
-#  part_name = "prebuilt_hap"
-#  subsystem_name = "xts"
+  hap_name = "ActsIntlJsTest"
 }
 ohos_js_assets("intljs_assets") {
   source_dir = "./src/main/js/default"
@@ -33,4 +28,4 @@ ohos_js_assets("intljs_assets") {
 ohos_resources("intljs_resources") {
   sources = [ "./src/main/resources" ]
   hap_profile = "./src/main/config.json"
-}
\ No newline at end of file
+}

global/i18n_standard/intljs/Test.json

@@ -9,7 +9,7 @@
     "kits": [
         {
             "test-file-name": [
-                "IntlJsTest.hap"
+                "ActsIntlJsTest.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

global/i18n_standard/zone/src/BUILD.gn

@@ -16,7 +16,7 @@ import("//test/xts/tools/build/suite.gni")
 #SUBSYSTEM_DIR = "//base/global"
 module_output_path = "hit/global"
 
-ohos_moduletest_suite("ZoneUtiltest") {
+ohos_moduletest_suite("ActsZoneUtilTest") {
   module_out_path = module_output_path
 
   sources = [

global/i18n_standard/zone/src/Test.json

@@ -2,7 +2,7 @@
     "kits": [
         {
             "push": [
-                "ZoneUtiltest->/data/local/tmp/ZoneUtiltest"
+                "ActsZoneUtilTest->/data/local/tmp/ActsZoneUtilTest"
             ],
             "type": "PushKit"
         }
@@ -10,9 +10,9 @@
     "driver": {
         "native-test-timeout": "120000",
         "type": "CppTest",
-        "module-name": "ZoneUtiltest",
+        "module-name": "ActsZoneUtilTest",
         "runtime-hint": "1s",
         "native-test-device-path": "/data/local/tmp"
     },
-    "description": "Configuration for ZoneUtiltest Tests"
+    "description": "Configuration for ActsZoneUtilTest Tests"
 }
\ No newline at end of file

global/resmgr_standard/resmgrjs/BUILD.gn

@@ -12,20 +12,15 @@
 # limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
+
 ohos_js_hap_suite("resmgrjs_test") {
   hap_profile = "./src/main/config.json"
   deps = [
     ":resmgrjs_assets",
     ":resmgrjs_resources",
   ]
-#  shared_libraries = [
-    #    "//third_party/giflib:libgif",
-#    "//third_party/libpng:libpng",
-#  ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "resmgrjs"
-#  part_name = "prebuilt_hap"
-#  subsystem_name = "xts"
+  hap_name = "ActsResMgrJsTest"
 }
 ohos_js_assets("resmgrjs_assets") {
   source_dir = "./src/main/js/default"
@@ -33,4 +28,4 @@ ohos_js_assets("resmgrjs_assets") {
 ohos_resources("resmgrjs_resources") {
   sources = [ "./src/main/resources" ]
   hap_profile = "./src/main/config.json"
-}
\ No newline at end of file
+}

global/resmgr_standard/resmgrjs/Test.json

@@ -9,7 +9,7 @@
     "kits": [
         {
             "test-file-name": [
-                "resmgrjs.hap"
+                "ActsResMgrJsTest.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

global_lite/i18n_lite/BUILD.gn

@@ -13,12 +13,12 @@
 
 group("ActsGlobalTest") {
   deps = [
-    "//test/xts/acts/global_lite/i18n_lite/number_posix:ActsNumberTest",
-    "//test/xts/acts/global_lite/i18n_lite/numberrecall_posix:ActsNumberRecallTest",
     "//test/xts/acts/global_lite/i18n_lite/datetime_posix:ActsGlobalDateTimeTest",
     "//test/xts/acts/global_lite/i18n_lite/datetimerecall_posix:ActsGlobalDateTimeRecallTest",
+    "//test/xts/acts/global_lite/i18n_lite/number_posix:ActsNumberTest",
+    "//test/xts/acts/global_lite/i18n_lite/numberrecall_posix:ActsNumberRecallTest",
     "//test/xts/acts/global_lite/i18n_lite/week_plural_number/src:WeekPluralNumbertest",
-   
+
     # depend on the resources
     #"//test/xts/acts/global_lite/i18n_lite/resource_parse_load/src:ResourceParseLoadtest",
   ]

global_lite/i18n_lite/resource_parse_load/src/BUILD.gn

@@ -15,7 +15,7 @@ import("//test/xts/tools/lite/build/suite_lite.gni")
 
 hcpptest_suite("ResourceParseLoadtest") {
   suite_name = "acts"
-  sources = [ 
+  sources = [
     "global_test.cpp",
     "hap_manager_test.cpp",
     "hap_parser_test.cpp",
@@ -28,7 +28,7 @@ hcpptest_suite("ResourceParseLoadtest") {
     "resource_manager_test.cpp",
     "string_utils_test.cpp",
     "test_common.cpp",
-   ]
+  ]
 
   include_dirs = [
     "//base/global/i18n_lite/interfaces/kits/i18n/include",

global_lite/i18n_lite/week_plural_number/src/BUILD.gn

@@ -20,7 +20,6 @@ hcpptest_suite("WeekPluralNumbertest") {
   include_dirs = [
     "//base/global/i18n_lite/interfaces/kits/i18n/include",
     "//third_party/bounds_checking_function/include",
-
   ]
 
   deps = [

graphic/windowstandard/BUILD.gn

@@ -12,20 +12,15 @@
 # limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
+
 ohos_js_hap_suite("window_hap_test") {
   hap_profile = "./src/main/config.json"
   deps = [
     ":window_js_assets",
     ":window_resources",
   ]
-#  shared_libraries = [
-    #    "//third_party/giflib:libgif",
-#    "//third_party/libpng:libpng",
-#  ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "windowhaptest"
-#  part_name = "prebuilt_hap"
-#  subsystem_name = "xts"
+  hap_name = "ActsWindowHapTest"
 }
 ohos_js_assets("window_js_assets") {
   source_dir = "./src/main/js/default"
@@ -33,4 +28,4 @@ ohos_js_assets("window_js_assets") {
 ohos_resources("window_resources") {
   sources = [ "./src/main/resources" ]
   hap_profile = "./src/main/config.json"
-}
\ No newline at end of file
+}

graphic/windowstandard/Test.json

@@ -9,7 +9,7 @@
     "kits": [
         {
             "test-file-name": [
-                "windowhaptest.hap"
+                "ActsWindowHapTest.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

hdf/BUILD.gn

@@ -15,10 +15,10 @@ group("hdfacttest") {
   testonly = true
   if (is_standard_system) {
     deps = [
-      #"audio:hdf_xtstest_audio",
-      "input:hdf_xtstest_input",
-      "sensor:hdf_xtstest_sensor",
-      "wlan/wifi:hdf_xtstest_wifi",
+      #"audio:ActsHdfXtstestAudioTest",
+      "input:ActsHdfXtstestInputTest",
+      "sensor:ActsHdfXtstestSensorTest",
+      "wlan/wifi:ActsHdfXtstestWifiTest",
     ]
   }
 }

hdf/audio/BUILD.gn

@@ -16,7 +16,7 @@ import("//drivers/adapter/uhdf2/uhdf.gni")
 import("//test/xts/tools/build/suite.gni")
 
 #################################group#########################################
-group("hdf_xtstest_audio") {
+group("ActsHdfXtstestAudioTest") {
   if (!defined(ohos_lite)) {
     testonly = true
   }

hdf/audio/Test.json

@@ -2,7 +2,7 @@
     "kits": [
         {
             "push": [
-                "hdf_xtstest_audio->/data/local/tmp/hdf_xtstest_audio"
+                "ActsHdfXtstestAudioTest->/data/local/tmp/ActsHdfXtstestAudioTest"
             ],
             "type": "PushKit"
         }

hdf/input/BUILD.gn

@@ -16,7 +16,7 @@ import("//drivers/adapter/uhdf2/uhdf.gni")
 import("//test/xts/tools/build/suite.gni")
 
 module_output_path = "hdf/input"
-ohos_moduletest_suite("hdf_xtstest_input") {
+ohos_moduletest_suite("ActsHdfXtstestInputTest") {
   module_out_path = module_output_path
   include_dirs = [
     "//drivers/framework/test/unittest/include",

hdf/input/Test.json

@@ -2,7 +2,7 @@
     "kits": [
         {
             "push": [
-                "hdf_xtstest_input->/data/local/tmp/hdf_xtstest_input"
+                "ActsHdfXtstestInputTest->/data/local/tmp/ActsHdfXtstestInputTest"
             ],
             "type": "PushKit"
         }

hdf/sensor/BUILD.gn

@@ -16,7 +16,7 @@ import("//drivers/adapter/uhdf2/uhdf.gni")
 import("//test/xts/tools/build/suite.gni")
 
 module_output_path = "hdf/sensor"
-ohos_moduletest_suite("hdf_xtstest_sensor") {
+ohos_moduletest_suite("ActsHdfXtstestSensorTest") {
   module_out_path = module_output_path
   include_dirs = []
 

hdf/sensor/Test.json

@@ -2,7 +2,7 @@
     "kits": [
         {
             "push": [
-                "hdf_xtstest_sensor->/data/local/tmp/hdf_xtstest_sensor"
+                "ActsHdfXtstestSensorTest->/data/local/tmp/ActsHdfXtstestSensorTest"
             ],
             "type": "PushKit"
         }

hdf/wlan/wifi/BUILD.gn

@@ -16,7 +16,7 @@ import("//drivers/adapter/uhdf2/uhdf.gni")
 import("//test/xts/tools/build/suite.gni")
 
 module_output_path = "hdf/wlan"
-ohos_moduletest_suite("hdf_xtstest_wifi") {
+ohos_moduletest_suite("ActsHdfXtstestWifiTest") {
   module_out_path = module_output_path
   include_dirs = [
     "//drivers/framework/test/unittest/include",

hdf/wlan/wifi/Test.json

@@ -2,7 +2,7 @@
     "kits": [
         {
             "push": [
-                "hdf_xtstest_wifi->/data/local/tmp/hdf_xtstest_wifi"
+                "ActsHdfXtstestWifiTest->/data/local/tmp/ActsHdfXtstestWifiTest"
             ],
             "type": "PushKit"
         }

hiviewdfx/BUILD.gn

@@ -15,13 +15,13 @@ group("hiviewdfxtestacts") {
   testonly = true
   if (is_standard_system) {
     deps = [
-      "faultloggertest/faultloggercpptest:faultloggertest",
-      "hiappeventtest/hiappeventjstest:hiappeventjstest",
-      "hicollietest/hicolliecpptest:HiCollieCppTest",
+      "faultloggertest/faultloggercpptest:ActsFaultLoggerTest",
+      "hiappeventtest/hiappeventjstest:ActsHiAppEventJsTest",
+      "hicollietest/hicolliecpptest:ActsHiCollieCppTest",
       "hilogtest/libhilogtest:libhilogtestacts",
-      "hisyseventtest/hisyseventcpptest:HiSysEventCPPTest",
-      "hitracetest/hitracecpptest:HitraceCPPtest",
-      "hitracetest/hitracectest:HitraceCtest",
+      "hisyseventtest/hisyseventcpptest:ActsHiSysEventCPPTest",
+      "hitracetest/hitracecpptest:ActsHitraceCPPTest",
+      "hitracetest/hitracectest:ActsHitraceCTest",
     ]
   }
 }

hiviewdfx/faultloggertest/faultloggercpptest/BUILD.gn

@@ -24,7 +24,7 @@ config("faultloggertest_config") {
     "genfault.h",
   ]
 }
-ohos_moduletest_suite("faultloggertest") {
+ohos_moduletest_suite("ActsFaultLoggerTest") {
   module_out_path = module_output_path
   sources = [
     "faultloggertest.cpp",

hiviewdfx/faultloggertest/faultloggercpptest/Test.json

@@ -2,7 +2,7 @@
     "kits": [
         {
             "push": [
-                "faultloggertest->/data/local/tmp/faultloggertest"
+                "ActsFaultLoggerTest->/data/local/tmp/ActsFaultLoggerTest"
             ],
             "type": "PushKit"
         }

hiviewdfx/hiappeventtest/hiappeventjstest/BUILD.gn

@@ -12,20 +12,15 @@
 # limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
-ohos_js_hap_suite("hiappeventjstest") {
+
+ohos_js_hap_suite("ActsHiAppEventJsTest") {
   hap_profile = "./src/main/config.json"
   deps = [
     ":hiappevent_js_assets",
     ":hiappevent_resources",
   ]
-#  shared_libraries = [
-    #    "//third_party/giflib:libgif",
-#    "//third_party/libpng:libpng",
-#  ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "HiAppeventTest"
-#  part_name = "prebuilt_hap"
-#  subsystem_name = "xts"
+  hap_name = "ActsHiAppEventJsTest"
 }
 ohos_js_assets("hiappevent_js_assets") {
   source_dir = "./src/main/js/default"
@@ -33,4 +28,4 @@ ohos_js_assets("hiappevent_js_assets") {
 ohos_resources("hiappevent_resources") {
   sources = [ "./src/main/resources" ]
   hap_profile = "./src/main/config.json"
-}
\ No newline at end of file
+}

hiviewdfx/hiappeventtest/hiappeventjstest/Test.json

@@ -9,7 +9,7 @@
     "kits": [
         {
             "test-file-name": [
-                "HiAppeventTest.hap"
+                "ActsHiAppEventJsTest.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

hiviewdfx/hicollietest/hicolliecpptest/BUILD.gn

@@ -24,7 +24,7 @@ config("xcollie_config") {
     "//base/hiviewdfx/hicollie/interfaces/native/innerkits/include",
   ]
 }
-ohos_moduletest_suite("HiCollieCppTest") {
+ohos_moduletest_suite("ActsHiCollieCppTest") {
   module_out_path = module_output_path
   sources = [ "HiCollieCppTest.cpp" ]
   deps = [

hiviewdfx/hicollietest/hicolliecpptest/Test.json

@@ -2,7 +2,7 @@
     "kits": [
         {
             "push": [
-                "HiCollieCppTest->/data/local/tmp/HiCollieCppTest"
+                "ActsHiCollieCppTest->/data/local/tmp/ActsHiCollieCppTest"
             ],
             "type": "PushKit",
             "post-push": [

hiviewdfx/hilogtest/libhilogtest/BUILD.gn

@@ -14,8 +14,8 @@
 group("libhilogtestacts") {
   testonly = true
   deps = [
-    "hilogtest:hilogtest",
-    "libhilogCPPtest:LibhilogCPPtest",
-    "libhilogCtest:libhilogCtest",
+    "hilogtest:ActsHilogTest",
+    "libhilogCPPtest:ActsLibhilogCPPTest",
+    "libhilogCtest:ActsLibhilogCTest",
   ]
 }

hiviewdfx/hilogtest/libhilogtest/hilogtest/BUILD.gn

@@ -23,7 +23,7 @@ config("hilogtest_config") {
     "//base/hiviewdfx/hilog/interfaces/native/innerkits/include",
   ]
 }
-ohos_moduletest_suite("hilogtest") {
+ohos_moduletest_suite("ActsHilogTest") {
   module_out_path = module_output_path
   sources = [ "hilogtest.cpp" ]
   deps = [

hiviewdfx/hilogtest/libhilogtest/hilogtest/Test.json

@@ -2,7 +2,7 @@
     "kits": [
         {
             "push": [
-                "hilogtest->/data/local/tmp/hilogtest"
+                "ActsHilogTest->/data/local/tmp/ActsHilogTest"
             ],
             "type": "PushKit"
         }

hiviewdfx/hilogtest/libhilogtest/libhilogCPPtest/BUILD.gn

@@ -23,7 +23,7 @@ config("hilogtest_config") {
     "//base/hiviewdfx/hilog/interfaces/native/innerkits/include",
   ]
 }
-ohos_moduletest_suite("LibhilogCPPtest") {
+ohos_moduletest_suite("ActsLibhilogCPPTest") {
   module_out_path = module_output_path
   sources = [ "LibhilogCPPtest.cpp" ]
   deps = [

hiviewdfx/hilogtest/libhilogtest/libhilogCPPtest/Test.json

@@ -2,7 +2,7 @@
     "kits": [
         {
             "push": [
-                "LibhilogCPPtest->/data/local/tmp/LibhilogCPPtest"
+                "ActsLibhilogCPPTest->/data/local/tmp/ActsLibhilogCPPTest"
             ],
             "type": "PushKit"
         }

hiviewdfx/hilogtest/libhilogtest/libhilogCtest/BUILD.gn

@@ -23,7 +23,7 @@ config("hilogtest_config") {
     "//base/hiviewdfx/hilog/interfaces/native/innerkits/include",
   ]
 }
-ohos_moduletest_suite("libhilogCtest") {
+ohos_moduletest_suite("ActsLibhilogCTest") {
   module_out_path = module_output_path
   sources = [ "libhilogCtest.cpp" ]
   deps = [

hiviewdfx/hilogtest/libhilogtest/libhilogCtest/Test.json

@@ -2,7 +2,7 @@
     "kits": [
         {
             "push": [
-                "libhilogCtest->/data/local/tmp/libhilogCtest"
+                "ActsLibhilogCTest->/data/local/tmp/ActsLibhilogCTest"
             ],
             "type": "PushKit"
         }

hiviewdfx/hisyseventtest/hisyseventcpptest/BUILD.gn

@@ -25,11 +25,9 @@ config("hilogtest_config") {
     "//base/hiviewdfx/hisysevent/interfaces/native/innerkits/include",
   ]
 }
-ohos_moduletest_suite("HiSysEventCPPTest") {
+ohos_moduletest_suite("ActsHiSysEventCPPTest") {
   module_out_path = module_output_path
-  sources = [
-    "HiSysEventCPPTest.cpp",
-  ]
+  sources = [ "HiSysEventCPPTest.cpp" ]
   deps = [
     "../../utils/native:utilskit",
     "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog",

hiviewdfx/hisyseventtest/hisyseventcpptest/Test.json

@@ -2,7 +2,7 @@
     "kits": [
         {
             "push": [
-                "HiSysEventCPPTest->/data/local/tmp/HiSysEventCPPTest"
+                "ActsHiSysEventCPPTest->/data/local/tmp/ActsHiSysEventCPPTest"
             ],
             "type": "PushKit"
         }

hiviewdfx/hitracetest/hitracecpptest/BUILD.gn

@@ -25,7 +25,7 @@ config("hitrace_config") {
     "//base/hiviewdfx/hisysevent/interfaces/native/innerkits/include",
   ]
 }
-ohos_moduletest_suite("HitraceCPPtest") {
+ohos_moduletest_suite("ActsHitraceCPPTest") {
   module_out_path = module_output_path
   sources = [ "HitraceCPPtest.cpp" ]
   deps = [

hiviewdfx/hitracetest/hitracecpptest/Test.json

@@ -2,7 +2,7 @@
     "kits": [
         {
             "push": [
-                "HitraceCPPtest->/data/local/tmp/HitraceCPPtest"
+                "ActsHitraceCPPTest->/data/local/tmp/ActsHitraceCPPTest"
             ],
             "type": "PushKit",
             "post-push": [

hiviewdfx/hitracetest/hitracectest/BUILD.gn

@@ -24,7 +24,7 @@ config("hitrace_config") {
     "//base/hiviewdfx/hitrace/interfaces/native/innerkits/include",
   ]
 }
-ohos_moduletest_suite("HitraceCtest") {
+ohos_moduletest_suite("ActsHitraceCTest") {
   module_out_path = module_output_path
   sources = [ "HitraceCtest.cpp" ]
   deps = [

hiviewdfx/hitracetest/hitracectest/Test.json

@@ -2,7 +2,7 @@
     "kits": [
         {
             "push": [
-                "HitraceCtest->/data/local/tmp/HitraceCtest"
+                "ActsHitraceCTest->/data/local/tmp/ActsHitraceCTest"
             ],
             "type": "PushKit",
             "post-push": [

hiviewdfx_lite/hievent_hal/BUILD.gn

- # Copyright (c) 2020 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
- #
- #     http://www.apache.org/licenses/LICENSE-2.0
- #
- # Unless required by applicable law or agreed to in writing, software
- # distributed under the License is distributed on an "AS IS" BASIS,
- # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- # See the License for the specific language governing permissions and
- # limitations under the License.
+# Copyright (c) 2020 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
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
 import("//test/xts/tools/lite/build/suite_lite.gni")
 hctest_suite("ActsHieventLiteTest") {
-    suite_name = "acts"
-    sources = [
-        "src/hievent_lite_test.c",
-    ]
+  suite_name = "acts"
+  sources = [ "src/hievent_lite_test.c" ]
 
-    include_dirs = [
-        "src",
-        "//base/hiviewdfx/hievent_lite/interfaces/native/innerkits",
-    ]
+  include_dirs = [
+    "src",
+    "//base/hiviewdfx/hievent_lite/interfaces/native/innerkits",
+  ]
 
-    cflags = [ "-Wno-error" ]
+  cflags = [ "-Wno-error" ]
 }

hiviewdfx_lite/hilog_hal/BUILD.gn

- # Copyright (c) 2020 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
- #
- #     http://www.apache.org/licenses/LICENSE-2.0
- #
- # Unless required by applicable law or agreed to in writing, software
- # distributed under the License is distributed on an "AS IS" BASIS,
- # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- # See the License for the specific language governing permissions and
- # limitations under the License.
+# Copyright (c) 2020 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
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
 import("//test/xts/tools/lite/build/suite_lite.gni")
 hctest_suite("ActsDfxFuncTest") {
-    suite_name = "acts"
-    sources = [
-        "src/dfx_hilog.c",
-    ]
+  suite_name = "acts"
+  sources = [ "src/dfx_hilog.c" ]
 
-    include_dirs = [
-        "src",
-        "//base/hiviewdfx/hiview_lite",
-        "//base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog_lite",
-        "//base/hiviewdfx/hievent_lite/interfaces/native/innerkits",
-        "//base/hiviewdfx/hilog_lite/frameworks/mini",
-        "//vendor/hisi/hi3861/hi3861/include",
-        "//vendor/hisi/hi3861/hi3861/components/lwip_sack/include"
-    ]
+  include_dirs = [
+    "src",
+    "//base/hiviewdfx/hiview_lite",
+    "//base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog_lite",
+    "//base/hiviewdfx/hievent_lite/interfaces/native/innerkits",
+    "//base/hiviewdfx/hilog_lite/frameworks/mini",
+    "//vendor/hisi/hi3861/hi3861/include",
+    "//vendor/hisi/hi3861/hi3861/components/lwip_sack/include",
+  ]
 
-    cflags = [ "-Wno-error" ]
+  cflags = [ "-Wno-error" ]
 }

kernel_lite/fs_posix/BUILD.gn

@@ -13,10 +13,9 @@
 
 group("ActsFSTest") {
   deps = [
-    "./vfat_storage:ActsVFATstorageTest",
     "./jffs:ActsJFFS2Test",
     "./nfs:ActsNFSTest",
     "./vfat:ActsVFATTest",
-
+    "./vfat_storage:ActsVFATstorageTest",
   ]
 }

kernel_lite/net_posix/BUILD.gn

@@ -25,6 +25,6 @@ hcpptest_suite("ActsNetTest") {
 
   deps = [
     "//test/xts/acts/kernel_lite/utils:libutils",
-    "//third_party/bounds_checking_function:libsec_shared", 
+    "//third_party/bounds_checking_function:libsec_shared",
   ]
 }

miscservices/TimeTest_js/BUILD.gn

@@ -12,22 +12,15 @@
 # limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
+
 ohos_js_hap_suite("time_js_test") {
   hap_profile = "./src/main/config.json"
   deps = [
     ":time_js_assets",
     ":time_resources",
   ]
-
-  #  shared_libraries = [
-  #    "//third_party/giflib:libgif",
-  #    "//third_party/libpng:libpng",
-  #  ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "TimeJSApiTest"
-
-  #  part_name = "prebuilt_hap"
-  #  subsystem_name = "xts"
+  hap_name = "ActsTimeJSApiTest"
 }
 ohos_js_assets("time_js_assets") {
   source_dir = "./src/main/js/default"

miscservices/TimeTest_js/Test.json

@@ -9,7 +9,7 @@
     "kits": [
         {
             "test-file-name": [
-                "TimeJSApiTest.hap"
+                "ActsTimeJSApiTest.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

miscservices/TimerTest_js/BUILD.gn

@@ -12,22 +12,15 @@
 # limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
+
 ohos_js_hap_suite("timer_js_test") {
   hap_profile = "./src/main/config.json"
   deps = [
     ":time_js_assets",
     ":time_resources",
   ]
-
-  #  shared_libraries = [
-  #    "//third_party/giflib:libgif",
-  #    "//third_party/libpng:libpng",
-  #  ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "TimerJSApiTest"
-
-  #  part_name = "prebuilt_hap"
-  #  subsystem_name = "xts"
+  hap_name = "ActsTimeJSApiTest"
 }
 ohos_js_assets("time_js_assets") {
   source_dir = "./src/main/js/default"

miscservices/TimerTest_js/Test.json

@@ -9,7 +9,7 @@
     "kits": [
         {
             "test-file-name": [
-                "TimeJSApiTest.hap"
+                "ActsTimeJSApiTest.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

multimedia/audio/audio_js_standard/audioManager/BUILD.gn

@@ -12,20 +12,15 @@
 # limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
+
 ohos_js_hap_suite("audio_manager_js_hap") {
   hap_profile = "./src/main/config.json"
   deps = [
     ":audio_manager_js_assets",
     ":audio_manager_resources",
   ]
-#  shared_libraries = [
-    #    "//third_party/giflib:libgif",
-#    "//third_party/libpng:libpng",
-#  ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "AudioManagerJsTest"
-#  part_name = "prebuilt_hap"
-#  subsystem_name = "xts"
+  hap_name = "ActsAudioManagerJsTest"
 }
 ohos_js_assets("audio_manager_js_assets") {
   source_dir = "./src/main/js/default"
@@ -33,4 +28,4 @@ ohos_js_assets("audio_manager_js_assets") {
 ohos_resources("audio_manager_resources") {
   sources = [ "./src/main/resources" ]
   hap_profile = "./src/main/config.json"
-}
\ No newline at end of file
+}

multimedia/audio/audio_js_standard/audioManager/Test.json

@@ -9,7 +9,7 @@
     "kits": [
         {
             "test-file-name": [
-                "AudioManagerJsTest.hap"
+                "ActsAudioManagerJsTest.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

multimedia/audio/audio_js_standard/audioPlayer/BUILD.gn

@@ -12,20 +12,15 @@
 # limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
+
 ohos_js_hap_suite("audio_player_js_hap") {
   hap_profile = "./src/main/config.json"
   deps = [
     ":audio_player_js_assets",
     ":audio_player_resources",
   ]
-#  shared_libraries = [
-    #    "//third_party/giflib:libgif",
-#    "//third_party/libpng:libpng",
-#  ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "AudioPlayerJsTest"
-#  part_name = "prebuilt_hap"
-#  subsystem_name = "xts"
+  hap_name = "ActsAudioPlayerJsTest"
 }
 ohos_js_assets("audio_player_js_assets") {
   source_dir = "./src/main/js/default"
@@ -33,4 +28,4 @@ ohos_js_assets("audio_player_js_assets") {
 ohos_resources("audio_player_resources") {
   sources = [ "./src/main/resources" ]
   hap_profile = "./src/main/config.json"
-}
\ No newline at end of file
+}

multimedia/audio/audio_js_standard/audioPlayer/Test.json

@@ -50,7 +50,7 @@
         },
         {
             "test-file-name": [
-                "AudioPlayerJsTest.hap"
+                "ActsAudioPlayerJsTest.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

multimedia/audio/audio_js_standard/audioPlayer_API/BUILD.gn

@@ -12,20 +12,15 @@
 # limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
+
 ohos_js_hap_suite("audio_player_api_js_hap") {
   hap_profile = "./src/main/config.json"
   deps = [
     ":audio_player_api_js_assets",
     ":audio_player_api_resources",
   ]
-#  shared_libraries = [
-    #    "//third_party/giflib:libgif",
-#    "//third_party/libpng:libpng",
-#  ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "AudioPlayerApiJsTest"
-#  part_name = "prebuilt_hap"
-#  subsystem_name = "xts"
+  hap_name = "ActsAudioPlayerApiJsTest"
 }
 ohos_js_assets("audio_player_api_js_assets") {
   source_dir = "./src/main/js/default"
@@ -33,4 +28,4 @@ ohos_js_assets("audio_player_api_js_assets") {
 ohos_resources("audio_player_api_resources") {
   sources = [ "./src/main/resources" ]
   hap_profile = "./src/main/config.json"
-}
\ No newline at end of file
+}

multimedia/audio/audio_js_standard/audioPlayer_API/Test.json

@@ -50,7 +50,7 @@
         },
         {
             "test-file-name": [
-                "AudioPlayerApiJsTest.hap"
+                "ActsAudioPlayerApiJsTest.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

multimedia/audio/audio_js_standard/audioRecorder/BUILD.gn

@@ -12,22 +12,15 @@
 # limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
+
 ohos_js_hap_suite("audio_recorder_js_hap") {
   hap_profile = "./src/main/config.json"
   deps = [
     ":audio_recorder_js_assets",
     ":audio_recorder_resources",
   ]
-
-  #  shared_libraries = [
-  #    "//third_party/giflib:libgif",
-  #    "//third_party/libpng:libpng",
-  #  ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "AudioRecorderJsTest"
-
-  #  part_name = "prebuilt_hap"
-  #  subsystem_name = "xts"
+  hap_name = "ActsAudioRecorderJsTest"
 }
 ohos_js_assets("audio_recorder_js_assets") {
   source_dir = "./src/main/js/default"

multimedia/audio/audio_js_standard/audioRecorder/Test.json

@@ -19,7 +19,7 @@
         },
         {
             "test-file-name": [
-                "AudioRecorderJsTest.hap"
+                "ActsAudioRecorderJsTest.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

notification/ans_standard/BUILD.gn

@@ -16,8 +16,8 @@ group("ans_standard") {
   testonly = true
   if (is_standard_system) {
     deps = [
-      "actsansnotificationcancel:ActsAnsNotificationCancel",
-      "actsansnotificationremove:ActsAnsNotificationRemove",
+      "actsansnotificationcancel:ActsAnsNotificationCancelTest",
+      "actsansnotificationremove:ActsAnsNotificationRemoveTest",
       "actsansslottest:ActsAnsSlotTest",
       "publish_test:publish_test",
     ]

notification/ans_standard/actsansnotificationcancel/BUILD.gn

@@ -13,14 +13,14 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ActsAnsNotificationCancel") {
+ohos_js_hap_suite("ActsAnsNotificationCancelTest") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "ActsAnsNotificationCancel"
+  hap_name = "ActsAnsNotificationCancelTest"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

notification/ans_standard/actsansnotificationcancel/Test.json

@@ -9,7 +9,7 @@
     "kits": [
         {
             "test-file-name": [
-                "ActsAnsNotificationCancel.hap"
+                "ActsAnsNotificationCancelTest.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

notification/ans_standard/actsansnotificationremove/BUILD.gn

@@ -13,14 +13,14 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ActsAnsNotificationRemove") {
+ohos_js_hap_suite("ActsAnsNotificationRemoveTest") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "ActsAnsNotificationRemove"
+  hap_name = "ActsAnsNotificationRemoveTest"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

notification/ans_standard/actsansnotificationremove/Test.json

@@ -9,7 +9,7 @@
     "kits": [
         {
             "test-file-name": [
-                "ActsAnsNotificationRemove.hap"
+                "ActsAnsNotificationRemoveTest.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

notification/ans_standard/actsansslottest/BUILD.gn

@@ -17,17 +17,17 @@ group("ActsAnsSlotTest") {
   testonly = true
   if (is_standard_system) {
     deps = [
-      "actsansgetslotWithoutadd:ActsAnsGetSlotWithoutAdd",
-      "actsansgetslottestcallback:ActsAnsGetSlotTestCallback",
-      "actsansgetslottestpromise:ActsAnsGetSlotTestPromise",
+      "actsansgetslotWithoutadd:ActsAnsGetSlotWithoutAddTest",
+      "actsansgetslottestcallback:ActsAnsGetSlotTestCallbackTest",
+      "actsansgetslottestpromise:ActsAnsGetSlotTestPromiseTest",
       "actsansremoveslottest:ActsAnsRemoveSlotTest",
-      "actsansremoveslotwithoutadd:ActsAnsRemoveSlotWithoutAdd",
+      "actsansremoveslotwithoutadd:ActsAnsRemoveSlotWithoutAddTest",
 
-      #"actsansslotbybundle:ActsAnsSlotByBundle",
-      #"actsansaddslotsystem:ActsAnsAddSlotSystem",
-      #"actsansslotsystemcallback:ActsAnsSlotSystemCallback",
-      #"actsansslotsystempromise:ActsAnsSlotSystemPromise",
-      #"actsansslottaddremoveall:ActsAnsSlotAddRemoveAll",
+      #"actsansslotbybundle:ActsAnsSlotByBundleTest",
+      #"actsansaddslotsystem:ActsAnsAddSlotSystemTest",
+      #"actsansslotsystemcallback:ActsAnsSlotSystemCallbackTest",
+      #"actsansslotsystempromise:ActsAnsSlotSystemPromiseTest",
+      #"actsansslottaddremoveall:ActsAnsSlotAddRemoveAllTest",
     ]
   }
 }

notification/ans_standard/actsansslottest/actsansaddslotsystem/BUILD.gn

@@ -13,14 +13,14 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ActsAnsAddSlotSystem") {
+ohos_js_hap_suite("ActsAnsAddSlotSystemTest") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "ActsAnsAddSlotSystem"
+  hap_name = "ActsAnsAddSlotSystemTest"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

notification/ans_standard/actsansslottest/actsansaddslotsystem/Test.json

@@ -9,7 +9,7 @@
     "kits": [
         {
             "test-file-name": [
-                "ActsAnsAddSlotSystem.hap"
+                "ActsAnsAddSlotSystemTest.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

notification/ans_standard/actsansslottest/actsansgetslotWithoutadd/BUILD.gn

@@ -13,14 +13,14 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ActsAnsGetSlotWithoutAdd") {
+ohos_js_hap_suite("ActsAnsGetSlotWithoutAddTest") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "ActsAnsGetSlotWithoutAdd"
+  hap_name = "ActsAnsGetSlotWithoutAddTest"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

notification/ans_standard/actsansslottest/actsansgetslotWithoutadd/Test.json

@@ -9,7 +9,7 @@
     "kits": [
         {
             "test-file-name": [
-                "ActsAnsGetSlotWithoutAdd.hap"
+                "ActsAnsGetSlotWithoutAddTest.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

notification/ans_standard/actsansslottest/actsansgetslottestcallback/BUILD.gn

@@ -13,14 +13,14 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ActsAnsGetSlotTestCallback") {
+ohos_js_hap_suite("ActsAnsGetSlotTestCallbackTest") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "ActsAnsGetSlotTestCallback"
+  hap_name = "ActsAnsGetSlotTestCallbackTest"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

notification/ans_standard/actsansslottest/actsansgetslottestcallback/Test.json

@@ -9,7 +9,7 @@
     "kits": [
         {
             "test-file-name": [
-                "ActsAnsGetSlotTestCallback.hap"
+                "ActsAnsGetSlotTestCallbackTest.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

notification/ans_standard/actsansslottest/actsansgetslottestpromise/BUILD.gn

@@ -13,14 +13,14 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ActsAnsGetSlotTestPromise") {
+ohos_js_hap_suite("ActsAnsGetSlotTestPromiseTest") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "ActsAnsGetSlotTestPromise"
+  hap_name = "ActsAnsGetSlotTestPromiseTest"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

notification/ans_standard/actsansslottest/actsansgetslottestpromise/Test.json

@@ -9,7 +9,7 @@
     "kits": [
         {
             "test-file-name": [
-                "ActsAnsGetSlotTestPromise.hap"
+                "ActsAnsGetSlotTestPromiseTest.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

notification/ans_standard/actsansslottest/actsansremoveslotwithoutadd/BUILD.gn

@@ -13,14 +13,14 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ActsAnsRemoveSlotWithoutAdd") {
+ohos_js_hap_suite("ActsAnsRemoveSlotWithoutAddTest") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "ActsAnsRemoveSlotWithoutAdd"
+  hap_name = "ActsAnsRemoveSlotWithoutAddTest"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

notification/ans_standard/actsansslottest/actsansremoveslotwithoutadd/Test.json

@@ -9,7 +9,7 @@
     "kits": [
         {
             "test-file-name": [
-                "ActsAnsRemoveSlotWithoutAdd.hap"
+                "ActsAnsRemoveSlotWithoutAddTest.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

notification/ans_standard/actsansslottest/actsansslotbybundle/BUILD.gn

@@ -13,14 +13,14 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ActsAnsSlotByBundle") {
+ohos_js_hap_suite("ActsAnsSlotByBundleTest") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "ActsAnsSlotByBundle"
+  hap_name = "ActsAnsSlotByBundleTest"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

notification/ans_standard/actsansslottest/actsansslotbybundle/Test.json

@@ -9,7 +9,7 @@
     "kits": [
         {
             "test-file-name": [
-                "ActsAnsSlotByBundle.hap"
+                "ActsAnsSlotByBundleTest.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

notification/ans_standard/actsansslottest/actsansslotsystemcallback/BUILD.gn

@@ -13,14 +13,14 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ActsAnsSlotSystemCallback") {
+ohos_js_hap_suite("ActsAnsSlotSystemCallbackTest") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "ActsAnsSlotSystemCallback"
+  hap_name = "ActsAnsSlotSystemCallbackTest"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

notification/ans_standard/actsansslottest/actsansslotsystemcallback/Test.json

@@ -9,7 +9,7 @@
     "kits": [
         {
             "test-file-name": [
-                "ActsAnsSlotSystemCallback.hap"
+                "ActsAnsSlotSystemCallbackTest.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

notification/ans_standard/actsansslottest/actsansslotsystempromise/BUILD.gn

@@ -13,14 +13,14 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ActsAnsSlotSystemPromise") {
+ohos_js_hap_suite("ActsAnsSlotSystemPromiseTest") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "ActsAnsSlotSystemPromise"
+  hap_name = "ActsAnsSlotSystemPromiseTest"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

notification/ans_standard/actsansslottest/actsansslotsystempromise/Test.json

@@ -9,7 +9,7 @@
     "kits": [
         {
             "test-file-name": [
-                "ActsAnsSlotSystemPromise.hap"
+                "ActsAnsSlotSystemPromiseTest.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

notification/ans_standard/actsansslottest/actsansslottaddremoveall/BUILD.gn

@@ -13,14 +13,14 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ActsAnsSlotAddRemoveAll") {
+ohos_js_hap_suite("ActsAnsSlotAddRemoveAllTest") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "ActsAnsSlotAddRemoveAll"
+  hap_name = "ActsAnsSlotAddRemoveAllTest"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

notification/ans_standard/actsansslottest/actsansslottaddremoveall/Test.json

@@ -9,7 +9,7 @@
     "kits": [
         {
             "test-file-name": [
-                "ActsAnsSlotAddRemoveAll.hap"
+                "ActsAnsSlotAddRemoveAllTest.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

notification/ans_standard/publish_test/BUILD.gn

@@ -25,8 +25,8 @@ group("publish_test") {
       #"publishcontentype:publishcontentype",
       #"subscribe:subscribe",
       "activebtn:activebtn",
-      "ansactscancelgroup:ActsAnsCancelGroup",
-      "ansactsremovegroup:ActsAnsRemoveGroup",
+      "ansactscancelgroup:ActsAnsCancelGroupTest",
+      "ansactsremovegroup:ActsAnsRemoveGroupTest",
       "donotdisturbmode:ActsAnsDoNotDisturbTest",
       "publishsound:ActsAnsPublishSoundTest",
       "publishvibra:ActsAnsPublishVibraTest",

notification/ans_standard/publish_test/ansactscancelgroup/BUILD.gn

@@ -13,14 +13,14 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ActsAnsCancelGroup") {
+ohos_js_hap_suite("ActsAnsCancelGroupTest") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "ActsAnsCancelGroup"
+  hap_name = "ActsAnsCancelGroupTest"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

notification/ans_standard/publish_test/ansactscancelgroup/Test.json

@@ -9,7 +9,7 @@
     "kits": [
         {
             "test-file-name": [
-                "ActsAnsCancelGroup.hap"
+                "ActsAnsCancelGroupTest.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

notification/ans_standard/publish_test/ansactsremovegroup/BUILD.gn

@@ -13,14 +13,14 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ActsAnsRemoveGroup") {
+ohos_js_hap_suite("ActsAnsRemoveGroupTest") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "ActsAnsRemoveGroup"
+  hap_name = "ActsAnsRemoveGroupTest"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

notification/ans_standard/publish_test/ansactsremovegroup/Test.json

@@ -9,7 +9,7 @@
     "kits": [
         {
             "test-file-name": [
-                "ActsAnsRemoveGroup.hap"
+                "ActsAnsRemoveGroupTest.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

notification/ces_standard/subscribeandpublish/BUILD.gn

@@ -18,7 +18,7 @@ group("SubscribeAndPublish") {
   if (is_standard_system) {
     deps = [
       "actssubscriberorderedtest:ActsSubscriberOrderTest",
-      "actssubscriberunordersystemtest:ActsSubscriberTestUnorderSystem",
+      "actssubscriberunordersystemtest:ActsSubscriberTestUnorderSystemTest",
       "actssubscriberunordertest:ActsSubscriberUnorderTest",
     ]
   }

notification/ces_standard/subscribeandpublish/actssubscriberunordersystemtest/BUILD.gn

@@ -12,14 +12,14 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ActsSubscriberTestUnorderSystem") {
+ohos_js_hap_suite("ActsSubscriberTestUnorderSystemTest") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "ActsSubscriberTestUnorderSystem"
+  hap_name = "ActsSubscriberTestUnorderSystemTest"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

notification/ces_standard/subscribeandpublish/actssubscriberunordersystemtest/Test.json

@@ -9,7 +9,7 @@
     "kits": [
         {
             "test-file-name": [
-                "ActsSubscriberTestUnorderSystem.hap"
+                "ActsSubscriberTestUnorderSystemTest.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

open_posix_testsuite/conformance/definitions/BUILD.gn

@@ -16,7 +16,8 @@ import("//test/xts/tools/lite/build/suite_lite.gni")
 open_source_suite("ActsOpenPosixBuildOnlyTest") {
   suite_name = "acts"
   exec_command_path = "//third_party/ltp/testcases/open_posix_testsuite/"
-  compiler = rebase_path("${ohos_build_compiler_dir}/bin/${ohos_build_compiler}")
+  compiler =
+      rebase_path("${ohos_build_compiler_dir}/bin/${ohos_build_compiler}")
   sysroot_path = rebase_path(ohos_current_sysroot)
   arch_cflags = string_join(" ", target_arch_cflags)
   prebuild_command = "make clean && make distclean && ./scripts/generate-makefiles.sh $compiler ${ohos_root_path} ${sysroot_path} \"${arch_cflags}\" && make -j -C conformance/definitions"
@@ -31,10 +32,10 @@ open_source_suite("ActsOpenPosixBuildOnlyTest") {
     "aio_h/logfile",
     "sched_h/logfile",
   ]
-  deps = [":install_patch"]
+  deps = [ ":install_patch" ]
 }
 
 build_ext_component("install_patch") {
-    exec_path = rebase_path(".", root_build_dir)
-    command = "./../../ltp-patch/patch.sh"
+  exec_path = rebase_path(".", root_build_dir)
+  command = "./../../ltp-patch/patch.sh"
 }

powermgr/BUILD.gn

@@ -16,5 +16,5 @@ group("powermgr") {
 
   if (is_standard_system) {
     deps = [ "powermgrbattery:powermgr_battery_test" ]
-  } 
+  }
 }

powermgr/powermgrbattery/BUILD.gn

@@ -12,20 +12,15 @@
 # limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
+
 ohos_js_hap_suite("powermgr_battery_test") {
   hap_profile = "./src/main/config.json"
   deps = [
     ":powermgr_battery_js_assets",
     ":powermgr_battery_resources",
   ]
-#  shared_libraries = [
-    #    "//third_party/giflib:libgif",
-#    "//third_party/libpng:libpng",
-#  ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "Powermgrbatterytest"
-#  part_name = "prebuilt_hap"
-#  subsystem_name = "xts"
+  hap_name = "ActsPowerMgrBatteryTest"
 }
 ohos_js_assets("powermgr_battery_js_assets") {
   source_dir = "./src/main/js/default"
@@ -33,4 +28,4 @@ ohos_js_assets("powermgr_battery_js_assets") {
 ohos_resources("powermgr_battery_resources") {
   sources = [ "./src/main/resources" ]
   hap_profile = "./src/main/config.json"
-}
\ No newline at end of file
+}

powermgr/powermgrbattery/Test.json

@@ -9,7 +9,7 @@
     "kits": [
         {
             "test-file-name": [
-                "Powermgrbatterytest.hap"
+                "ActsPowerMgrBatteryTest.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

security/BUILD.gn

@@ -18,9 +18,9 @@ group("security") {
   if (is_standard_system) {
     deps = [
       # "authentication_standard/deviceauth_p2p:DeviceauthP2PFunctionCPPTest",
-      "dataprotect/huks_standard_adapter:huks_std_function_test",
-      "deviceauth/deviceauth_function:DeviceAuthFunctionTest",
-      "permission/permissionkitcpp:PermissionKitCPPTest",
+      "dataprotect/huks_standard_adapter:ActsHuksStdFunctionTest",
+      "deviceauth/deviceauth_function:ActsDeviceAuthFunctionTest",
+      "permission/permissionkitcpp:ActsPermissionKitCPPTest",
     ]
   } else {
     deps =

security/dataprotect/huks_standard_adapter/BUILD.gn

@@ -29,11 +29,7 @@ config("module_private_config") {
 }
 
 ########################################################
-ohos_moduletest_suite("huks_std_function_test") {
-  #subsystem_name = "acts"
-  #part_name = "huks_standard"
-  #module_output_path = subsystem_name + "/" + part_name
-  #module_output_path  = module_output_path
+ohos_moduletest_suite("ActsHuksStdFunctionTest") {
   configs = [ ":module_private_config" ]
   cflags_cc = [ "-DHILOG_ENABLE" ]
   defines = [ "_STANDARD_SYSTEM_" ]
@@ -82,5 +78,5 @@ ohos_moduletest_suite("huks_std_function_test") {
 
 group("Huksstandardtest") {
   testonly = true
-  deps = [ ":huks_std_function_test" ]
+  deps = [ ":ActsHuksStdFunctionTest" ]
 }

security/dataprotect/huks_standard_adapter/Test.json

@@ -2,7 +2,7 @@
     "kits": [
         {
             "push": [
-                "huks_std_function_test->/data/local/tmp/huks_std_function_test"
+                "ActsHuksStdFunctionTest->/data/local/tmp/ActsHuksStdFunctionTest"
             ],
             "type": "PushKit"
         }

security/deviceauth/deviceauth_basic_deps/BUILD.gn

@@ -40,7 +40,7 @@ DEVICEAUTH_BASIC_DEPS_CPP_SOURCE = [
   "${DEVICEAUTH_BASIC_DEPS_CPP_DIR}/hc_file_common.cpp",
 ]
 
-ohos_moduletest_suite("DeviceAuthBasicDepsTest") {
+ohos_moduletest_suite("ActsDeviceAuthBasicDepsTest") {
   configs = [ ":module_private_config" ]
 
   cflags_cc = [

security/deviceauth/deviceauth_basic_deps/Test.json

@@ -2,7 +2,7 @@
     "kits": [
         {
             "push": [
-                "DeviceAuthBasicDepsTest->/data/local/tmp/DeviceAuthBasicDepsTest"
+                "ActsDeviceAuthBasicDepsTest->/data/local/tmp/ActsDeviceAuthBasicDepsTest"
             ],
             "type": "PushKit"
         }

security/deviceauth/deviceauth_function/BUILD.gn

@@ -24,7 +24,7 @@ config("module_private_config") {
 }
 
 ########################################################
-ohos_moduletest_suite("DeviceAuthFunctionTest") {
+ohos_moduletest_suite("ActsDeviceAuthFunctionTest") {
   configs = [ ":module_private_config" ]
   cflags_cc = [ "-DHILOG_ENABLE" ]
   defines = [ "_STANDARD_SYSTEM_" ]

security/deviceauth/deviceauth_function/Test.json

@@ -2,7 +2,7 @@
     "kits": [
         {
             "push": [
-                "DeviceAuthFunctionTest->/data/local/tmp/DeviceAuthFunctionTest"
+                "ActsDeviceAuthFunctionTest->/data/local/tmp/ActsDeviceAuthFunctionTest"
             ],
             "type": "PushKit"
         }

security/permission/permissionkitcpp/BUILD.gn

@@ -23,7 +23,7 @@ config("module_private_config") {
 }
 
 ##################################################################################
-ohos_moduletest_suite("PermissionKitFunctionCPPTest") {
+ohos_moduletest_suite("ActsPermissionKitCPPTest") {
   subsystem_name = "hits"
   part_name = "permission_standard"
   module_out_path = subsystem_name + "/" + part_name

security/permission/permissionkitcpp/Test.json

@@ -2,7 +2,7 @@
     "kits": [
         {
             "push": [
-                "PermissionKitCPPTest->/data/local/tmp/PermissionKitCPPTest"
+                "ActsPermissionKitCPPTest->/data/local/tmp/ActsPermissionKitCPPTest"
             ],
             "type": "PushKit",
             "post-push": [

security_lite/huks_hal/BUILD.gn

@@ -11,8 +11,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import("//test/xts/tools/lite/build/suite_lite.gni")
 import("//base/security/huks/build/config.gni")
+import("//test/xts/tools/lite/build/suite_lite.gni")
 
 hctest_suite("ActsSecurityDataTest") {
   suite_name = "acts"
@@ -24,7 +24,7 @@ hctest_suite("ActsSecurityDataTest") {
     "src/security_data_huks_sign_verify_test.c",
   ]
   if (disable_authenticate == true) {
-      defines = [ "_CUT_AUTHENTICATE_" ]
+    defines = [ "_CUT_AUTHENTICATE_" ]
   }
   include_dirs = [
     "src",

sensors/sensor_standard/BUILD.gn

@@ -10,6 +10,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+
 import("//test/xts/tools/build/suite.gni")
 
 ohos_js_hap_suite("sensor_js_test") {
@@ -19,7 +20,7 @@ ohos_js_hap_suite("sensor_js_test") {
     ":sensor_js_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "SensorJSApiTest"
+  hap_name = "ActsSensorJSApiTest"
 }
 ohos_js_assets("sensor_js_assets") {
   source_dir = "./src/main/js/default"

sensors/sensor_standard/Test.json

@@ -9,7 +9,7 @@
     "kits": [
         {
             "test-file-name": [
-                "SensorJSApiTest.hap"
+                "ActsSensorJSApiTest.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

startup/BUILD.gn

@@ -16,8 +16,6 @@ import("//build/ohos_var.gni")
 group("startup") {
   testonly = true
   if (is_standard_system) {
-     deps = [
-        "startup_standard:startup_js_test",
-     ]
+    deps = [ "startup_standard:startup_js_test" ]
   }
 }

startup/startup_standard/BUILD.gn

@@ -10,6 +10,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+
 import("//test/xts/tools/build/suite.gni")
 
 ohos_js_hap_suite("startup_js_test") {
@@ -18,14 +19,8 @@ ohos_js_hap_suite("startup_js_test") {
     ":startup_js_assets",
     ":startup_js_resources",
   ]
-#  shared_libraries = [
-#    "//third_party/giflib:libgif",
-#    "//third_party/libpng:libpng",
-#  ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "StartupJSApiTest"
-#  part_name = "prebuilt_hap"
-#  subsystem_name = "xts"
+  hap_name = "ActsStartupJSApiTest"
 }
 ohos_js_assets("startup_js_assets") {
   source_dir = "./src/main/js/default"
@@ -33,4 +28,4 @@ ohos_js_assets("startup_js_assets") {
 ohos_resources("startup_js_resources") {
   sources = [ "./src/main/resources" ]
   hap_profile = "./src/main/config.json"
-}
\ No newline at end of file
+}

startup/startup_standard/Test.json

@@ -9,7 +9,7 @@
     "kits": [
         {
             "test-file-name": [
-                "StartupJSApiTest.hap"
+                "ActsStartupJSApiTest.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

startup_lite/bootstrap_hal/BUILD.gn

@@ -15,9 +15,7 @@ import("//test/xts/tools/lite/build/suite_lite.gni")
 
 hctest_suite("ActsBootstrapTest") {
   suite_name = "acts"
-  sources = [
-    "src/samgr_api_test.c"
-  ]
+  sources = [ "src/samgr_api_test.c" ]
 
   include_dirs = [
     "src",

storage/storagedsmjstest/BUILD.gn

@@ -10,6 +10,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+
 import("//test/xts/tools/build/suite.gni")
 
 ohos_js_hap_suite("storagedsm_js_test") {
@@ -18,16 +19,8 @@ ohos_js_hap_suite("storagedsm_js_test") {
     ":storagedsm_js_assets",
     ":storagedsm_js_resources",
   ]
-
-  #  shared_libraries = [
-  #    "//third_party/giflib:libgif",
-  #    "//third_party/libpng:libpng",
-  #  ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "storagedsmjstest"
-
-  #  part_name = "prebuilt_hap"
-  #  subsystem_name = "xts"
+  hap_name = "ActsStorageFmsPublicJsTest"
 }
 ohos_js_assets("storagedsm_js_assets") {
   source_dir = "./src/main/js/default"

storage/storagedsmjstest/Test.json

@@ -9,7 +9,7 @@
     "kits": [
         {
             "test-file-name": [
-                "storagefmspublicjstest.hap"
+                "ActsStorageFmsPublicJsTest.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

storage/storagedsmstabilityjstest/BUILD.gn

@@ -10,6 +10,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+
 import("//test/xts/tools/build/suite.gni")
 
 ohos_js_hap_suite("storagedsmstability_js_test") {
@@ -18,16 +19,8 @@ ohos_js_hap_suite("storagedsmstability_js_test") {
     ":storagedsmstability_js_assets",
     ":storagedsmstability_js_resources",
   ]
-
-  #  shared_libraries = [
-  #    "//third_party/giflib:libgif",
-  #    "//third_party/libpng:libpng",
-  #  ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "storagedsmstabilityjstest"
-
-  #  part_name = "prebuilt_hap"
-  #  subsystem_name = "xts"
+  hap_name = "ActsStorageFmsPublicJsTest"
 }
 ohos_js_assets("storagedsmstability_js_assets") {
   source_dir = "./src/main/js/default"

storage/storagedsmstabilityjstest/Test.json

@@ -9,7 +9,7 @@
     "kits": [
         {
             "test-file-name": [
-                "storagefmspublicjstest.hap"
+                "ActsStorageFmsPublicJsTest.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

storage/storagefileconcurrentjstest/BUILD.gn

@@ -10,6 +10,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+
 import("//test/xts/tools/build/suite.gni")
 
 ohos_js_hap_suite("storagefileconcurrent_js_test") {
@@ -18,16 +19,8 @@ ohos_js_hap_suite("storagefileconcurrent_js_test") {
     ":storagefileconcurrent_js_assets",
     ":storagefileconcurrent_js_resources",
   ]
-
-  #  shared_libraries = [
-  #    "//third_party/giflib:libgif",
-  #    "//third_party/libpng:libpng",
-  #  ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "storagefileconcurrentjstest"
-
-  #  part_name = "prebuilt_hap"
-  #  subsystem_name = "xts"
+  hap_name = "ActsStorageFileConcurrentJsTest"
 }
 ohos_js_assets("storagefileconcurrent_js_assets") {
   source_dir = "./src/main/js/default"

storage/storagefileconcurrentjstest/Test.json

@@ -9,7 +9,7 @@
     "kits": [
         {
             "test-file-name": [
-                "storagefileconcurrentjstest.hap"
+                "ActsStorageFileConcurrentJsTest.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

storage/storagefileioerrorjstest/BUILD.gn

@@ -10,6 +10,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+
 import("//test/xts/tools/build/suite.gni")
 
 ohos_js_hap_suite("storagefileioerror_js_test") {
@@ -18,16 +19,8 @@ ohos_js_hap_suite("storagefileioerror_js_test") {
     ":storagefileioerror_js_assets",
     ":storagefileioerror_js_resources",
   ]
-
-  #  shared_libraries = [
-  #    "//third_party/giflib:libgif",
-  #    "//third_party/libpng:libpng",
-  #  ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "storagefileioerrorjstest"
-
-  #  part_name = "prebuilt_hap"
-  #  subsystem_name = "xts"
+  hap_name = "ActsStorageFileIoErrorJsTest"
 }
 ohos_js_assets("storagefileioerror_js_assets") {
   source_dir = "./src/main/js/default"

storage/storagefileioerrorjstest/Test.json

@@ -9,7 +9,7 @@
     "kits": [
         {
             "test-file-name": [
-                "storagefileioerrorjstest.hap"
+                "ActsStorageFileIoErrorJsTest.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

storage/storagefileiojstest/BUILD.gn

@@ -10,6 +10,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+
 import("//test/xts/tools/build/suite.gni")
 
 ohos_js_hap_suite("storagefileio_js_test") {
@@ -18,16 +19,8 @@ ohos_js_hap_suite("storagefileio_js_test") {
     ":storagefileio_js_assets",
     ":storagefileio_js_resources",
   ]
-
-  #  shared_libraries = [
-  #    "//third_party/giflib:libgif",
-  #    "//third_party/libpng:libpng",
-  #  ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "Storagefileiojstest"
-
-  #  part_name = "prebuilt_hap"
-  #  subsystem_name = "xts"
+  hap_name = "ActsStorageFileIoJSTest"
 }
 ohos_js_assets("storagefileio_js_assets") {
   source_dir = "./src/main/js/default"

storage/storagefileiojstest/Test.json

@@ -9,7 +9,7 @@
     "kits": [
         {
             "test-file-name": [
-                "StoragefileioJSTest.hap"
+                "ActsStorageFileIoJSTest.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

storage/storagefileioperformancejstest/BUILD.gn

@@ -10,6 +10,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+
 import("//test/xts/tools/build/suite.gni")
 
 ohos_js_hap_suite("storagefileioperformance_js_test") {
@@ -18,16 +19,8 @@ ohos_js_hap_suite("storagefileioperformance_js_test") {
     ":storagefileioperformance_js_assets",
     ":storagefileioperformance_js_resources",
   ]
-
-  #  shared_libraries = [
-  #    "//third_party/giflib:libgif",
-  #    "//third_party/libpng:libpng",
-  #  ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "storagefileioperformancejstest"
-
-  #  part_name = "prebuilt_hap"
-  #  subsystem_name = "xts"
+  hap_name = "ActsStorageFileIoPerformanceJsTest"
 }
 ohos_js_assets("storagefileioperformance_js_assets") {
   source_dir = "./src/main/js/default"

storage/storagefileioperformancejstest/Test.json

@@ -9,7 +9,7 @@
     "kits": [
         {
             "test-file-name": [
-                "storagefileioperformancejstest.hap"
+                "ActsStorageFileIoPerformanceJsTest.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

storage/storagefileioreliabilityjstest/BUILD.gn

@@ -10,6 +10,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+
 import("//test/xts/tools/build/suite.gni")
 
 ohos_js_hap_suite("storagefileioreliability_js_test") {
@@ -18,16 +19,8 @@ ohos_js_hap_suite("storagefileioreliability_js_test") {
     ":storagefileioreliability_js_assets",
     ":storagefileioreliability_js_resources",
   ]
-
-  #  shared_libraries = [
-  #    "//third_party/giflib:libgif",
-  #    "//third_party/libpng:libpng",
-  #  ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "storagefileioreliabilityjstest"
-
-  #  part_name = "prebuilt_hap"
-  #  subsystem_name = "xts"
+  hap_name = "ActsStorageFileIoreLiabilityJsTest"
 }
 ohos_js_assets("storagefileioreliability_js_assets") {
   source_dir = "./src/main/js/default"

storage/storagefileioreliabilityjstest/Test.json

@@ -9,7 +9,7 @@
     "kits": [
         {
             "test-file-name": [
-                "storagefileioreliabilityjstest.hap"
+                "ActsStorageFileIoreLiabilityJsTest.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

storage/storagefileiostabilityjstest/BUILD.gn

@@ -10,6 +10,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+
 import("//test/xts/tools/build/suite.gni")
 
 ohos_js_hap_suite("storagefileiostability_js_test") {
@@ -18,16 +19,8 @@ ohos_js_hap_suite("storagefileiostability_js_test") {
     ":storagefileiostability_js_assets",
     ":storagefileiostability_js_resources",
   ]
-
-  #  shared_libraries = [
-  #    "//third_party/giflib:libgif",
-  #    "//third_party/libpng:libpng",
-  #  ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "storagefileiostabilityjstest"
-
-  #  part_name = "prebuilt_hap"
-  #  subsystem_name = "xts"
+  hap_name = "ActsStorageFileIoStabilityJsTest"
 }
 ohos_js_assets("storagefileiostability_js_assets") {
   source_dir = "./src/main/js/default"

storage/storagefileiostabilityjstest/Test.json

@@ -9,7 +9,7 @@
     "kits": [
         {
             "test-file-name": [
-                "storagefileiostabilityjstest.hap"
+                "ActsStorageFileIoStabilityJsTest.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

storage/storagefilestabilityjstest/BUILD.gn

@@ -10,6 +10,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+
 import("//test/xts/tools/build/suite.gni")
 
 ohos_js_hap_suite("storagefilestability_js_test") {
@@ -18,16 +19,8 @@ ohos_js_hap_suite("storagefilestability_js_test") {
     ":storagefilestability_js_assets",
     ":storagefilestability_js_resources",
   ]
-
-  #  shared_libraries = [
-  #    "//third_party/giflib:libgif",
-  #    "//third_party/libpng:libpng",
-  #  ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "storagefilestabilityjstest"
-
-  #  part_name = "prebuilt_hap"
-  #  subsystem_name = "xts"
+  hap_name = "ActsStorageFileStabilityJsTest"
 }
 ohos_js_assets("storagefilestability_js_assets") {
   source_dir = "./src/main/js/default"

storage/storagefilestabilityjstest/Test.json

@@ -9,7 +9,7 @@
     "kits": [
         {
             "test-file-name": [
-                "storagefilestabilityjstest.hap"
+                "ActsStorageFileStabilityJsTest.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

storage/storagefmspublicjstest/BUILD.gn

@@ -10,6 +10,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+
 import("//test/xts/tools/build/suite.gni")
 
 ohos_js_hap_suite("storagefmspublic_js_test") {
@@ -18,16 +19,8 @@ ohos_js_hap_suite("storagefmspublic_js_test") {
     ":storagefmspublic_js_assets",
     ":storagefmspublic_js_resources",
   ]
-
-  #  shared_libraries = [
-  #    "//third_party/giflib:libgif",
-  #    "//third_party/libpng:libpng",
-  #  ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "storagefmspublicjstest"
-
-  #  part_name = "prebuilt_hap"
-  #  subsystem_name = "xts"
+  hap_name = "ActsStorageFmsPublicJsTest"
 }
 ohos_js_assets("storagefmspublic_js_assets") {
   source_dir = "./src/main/js/default"

storage/storagefmspublicjstest/Test.json

@@ -9,7 +9,7 @@
     "kits": [
         {
             "test-file-name": [
-                "storagefmspublicjstest.hap"
+                "ActsStorageFmsPublicJsTest.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

storage/storagefmssharejstest/BUILD.gn

@@ -10,6 +10,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+
 import("//test/xts/tools/build/suite.gni")
 
 ohos_js_hap_suite("storagefmsshare_js_test") {
@@ -18,16 +19,8 @@ ohos_js_hap_suite("storagefmsshare_js_test") {
     ":storagefmsshare_js_assets",
     ":storagefmsshare_js_resources",
   ]
-
-  #  shared_libraries = [
-  #    "//third_party/giflib:libgif",
-  #    "//third_party/libpng:libpng",
-  #  ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "storagefmssharejstest"
-
-  #  part_name = "prebuilt_hap"
-  #  subsystem_name = "xts"
+  hap_name = "ActsStorageFmsShareJsTest"
 }
 ohos_js_assets("storagefmsshare_js_assets") {
   source_dir = "./src/main/js/default"

storage/storagefmssharejstest/Test.json

@@ -9,7 +9,7 @@
     "kits": [
         {
             "test-file-name": [
-                "storagefmssharejstest.hap"
+                "ActsStorageFmsShareJsTest.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

storage/storagestatfsjstest/BUILD.gn

@@ -10,6 +10,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+
 import("//test/xts/tools/build/suite.gni")
 
 ohos_js_hap_suite("storagestatfs_js_test") {
@@ -18,16 +19,8 @@ ohos_js_hap_suite("storagestatfs_js_test") {
     ":storagestatfs_js_assets",
     ":storagestatfs_js_resources",
   ]
-
-  #  shared_libraries = [
-  #    "//third_party/giflib:libgif",
-  #    "//third_party/libpng:libpng",
-  #  ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "Storagestatfsjstest"
-
-  #  part_name = "prebuilt_hap"
-  #  subsystem_name = "xts"
+  hap_name = "ActsStorageStatfsJsTest"
 }
 ohos_js_assets("storagestatfs_js_assets") {
   source_dir = "./src/main/js/default"

storage/storagestatfsjstest/Test.json

@@ -9,7 +9,7 @@
     "kits": [
         {
             "test-file-name": [
-                "Storagestatfsjstest.hap"
+                "ActsStorageStatfsJsTest.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

telephony/telephonyjstest/call_manager/call_manager_mmi/BUILD.gn

@@ -20,7 +20,7 @@ ohos_js_hap_suite("CallManagerMMI") {
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "CallManagerMMI"
+  hap_name = "ActsCallManagerMMITest"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

telephony/telephonyjstest/call_manager/call_manager_mmi/Test.json

@@ -10,7 +10,7 @@
     "kits": [
         {
             "test-file-name": [
-                "$module.hap"
+                "ActsCallManagerMMITest.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

telephony/telephonyjstest/call_manager/call_manager_on_dail/BUILD.gn

@@ -20,7 +20,7 @@ ohos_js_hap_suite("CallManagerOnDail") {
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "CallManagerOnDail"
+  hap_name = "ActsCallManagerOnDailTest"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

telephony/telephonyjstest/call_manager/call_manager_on_dail/Test.json

@@ -10,7 +10,7 @@
     "kits": [
         {
             "test-file-name": [
-                "$module.hap"
+                "ActsCallManagerOnDailTest.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

telephony/telephonyjstest/call_manager/call_manager_test/BUILD.gn

@@ -20,7 +20,7 @@ ohos_js_hap_suite("CallManagerTest") {
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "CallManagerTest"
+  hap_name = "ActsCallManagerTest"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

telephony/telephonyjstest/network_search/network_search_information/BUILD.gn

@@ -10,6 +10,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+
 import("//test/xts/tools/build/suite.gni")
 
 ohos_js_hap_suite("NetworkSearchInformation") {
@@ -19,7 +20,7 @@ ohos_js_hap_suite("NetworkSearchInformation") {
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "NetworkSearchInformation"
+  hap_name = "ActsNetworkSearchInformationTest"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

telephony/telephonyjstest/network_search/network_search_radio/BUILD.gn

@@ -10,6 +10,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+
 import("//test/xts/tools/build/suite.gni")
 
 ohos_js_hap_suite("NetworkSearchRadio") {
@@ -19,7 +20,7 @@ ohos_js_hap_suite("NetworkSearchRadio") {
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "NetworkSearchRadio"
+  hap_name = "ActsNetworkSearchRadioTest"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

telephony/telephonyjstest/network_search/network_search_selection_mode/BUILD.gn

@@ -10,6 +10,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+
 import("//test/xts/tools/build/suite.gni")
 
 ohos_js_hap_suite("NetworkSearchSelectionMoce") {
@@ -19,7 +20,7 @@ ohos_js_hap_suite("NetworkSearchSelectionMoce") {
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "NetworkSearchSelectionMoce"
+  hap_name = "ActsNetworkSearchSelectionMoceTest"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

telephony/telephonyjstest/sim/sim_file_manager_function_test/BUILD.gn

@@ -20,7 +20,7 @@ ohos_js_hap_suite("SimFileManagerFunctionTest") {
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "SimFileManagerFunctionTest"
+  hap_name = "ActsSimFileManagerFunctionTest"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

telephony/telephonyjstest/sim/sim_manager_function_test/BUILD.gn

@@ -20,7 +20,7 @@ ohos_js_hap_suite("SimManagerFunctionTest") {
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "SimManagerFunctionTest"
+  hap_name = "ActsSimManagerFunctionTest"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

telephony/telephonyjstest/sim/sim_no_sim_function_test/BUILD.gn

@@ -20,7 +20,7 @@ ohos_js_hap_suite("SimNoSimFunctionTest") {
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "SimNoSimFunctionTest"
+  hap_name = "ActsSimNoSimFunctionTest"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

telephony/telephonyjstest/sim/sim_state_manager_function_test/BUILD.gn

@@ -20,7 +20,7 @@ ohos_js_hap_suite("SimStateManagerFunctionTest") {
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "SimStateManagerFunctionTest"
+  hap_name = "ActsSimStateManagerFunctionTest"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

telephony/telephonyjstest/sms_mms/sms_mms_add/BUILD.gn

@@ -20,7 +20,7 @@ ohos_js_hap_suite("SmsMmsAdd") {
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "SmsMmsAdd"
+  hap_name = "ActsSmsMmsAddTest"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

telephony/telephonyjstest/sms_mms/sms_mms_config/BUILD.gn

@@ -20,7 +20,7 @@ ohos_js_hap_suite("SmsMmsConfig") {
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "SmsMmsConfig"
+  hap_name = "ActsSmsMmsConfigTest"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

telephony/telephonyjstest/sms_mms/sms_mms_create_message/BUILD.gn

@@ -20,7 +20,7 @@ ohos_js_hap_suite("SmsMmsCreateMessage") {
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "SmsMmsCreateMessage"
+  hap_name = "ActsSmsMmsCreateMessageTest"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

telephony/telephonyjstest/sms_mms/sms_mms_del_sim/BUILD.gn

@@ -20,7 +20,7 @@ ohos_js_hap_suite("SmsMmsDelSim") {
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "SmsMmsDelSim"
+  hap_name = "ActsSmsMmsDelSimTest"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

telephony/telephonyjstest/sms_mms/sms_mms_function/BUILD.gn

@@ -20,7 +20,7 @@ ohos_js_hap_suite("SmsMmsFunction") {
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "SmsMmsFunction"
+  hap_name = "ActsSmsMmsFunctionTest"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

telephony/telephonyjstest/sms_mms/sms_mms_get_all/BUILD.gn

@@ -20,7 +20,7 @@ ohos_js_hap_suite("SmsMmsGetAll") {
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "SmsMmsGetAll"
+  hap_name = "ActsSmsMmsGetAllTest"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

telephony/telephonyjstest/sms_mms/sms_mms_radio/BUILD.gn

@@ -20,7 +20,7 @@ ohos_js_hap_suite("SmsMmsConfig") {
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "SmsMmsConfig"
+  hap_name = "ActsSmsMmsConfigTest"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

telephony/telephonyjstest/sms_mms/sms_mms_smsc/BUILD.gn

@@ -20,7 +20,7 @@ ohos_js_hap_suite("SmsMmsSmsc") {
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "SmsMmsSmsc"
+  hap_name = "ActsSmsMmsSmscTest"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

telephony/telephonyjstest/sms_mms/sms_mms_updata_asy/BUILD.gn

@@ -20,7 +20,7 @@ ohos_js_hap_suite("SmsMmsUpdataAsy") {
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "SmsMmsUpdataAsy"
+  hap_name = "ActsSmsMmsUpdataAsyTest"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

telephony/telephonyjstest/sms_mms/sms_mms_updata_pro/BUILD.gn

@@ -20,7 +20,7 @@ ohos_js_hap_suite("SmsMmsUpdataPro") {
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "SmsMmsUpdataPro"
+  hap_name = "ActsSmsMmsUpdataProTest"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

update_lite/dupdate_posix/BUILD.gn

@@ -22,7 +22,7 @@ hcpptest_suite("ActsUpdateTest") {
     "//base/update/ota_lite/hals",
     "//utils/native/lite/include",
   ]
-  deps = [ 
+  deps = [
     "$ohos_third_party_dir/mbedtls:mbedtls_static",
     "//base/update/ota_lite/frameworks/source:hota",
   ]

updater/BUILD.gn

@@ -16,8 +16,6 @@ import("//build/ohos_var.gni")
 group("update") {
   testonly = true
   if (is_standard_system) {
-     deps = [
-        "update_test:update_js_test",
-     ]
+    deps = [ "update_test:update_js_test" ]
   }
 }

updater/update_test/BUILD.gn

@@ -12,20 +12,15 @@
 # limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
+
 ohos_js_hap_suite("update_js_test") {
   hap_profile = "./src/main/config.json"
   deps = [
     ":update_js_assets",
     ":update_js_resources",
   ]
-#  shared_libraries = [
-#    "//third_party/giflib:libgif",
-#    "//third_party/libpng:libpng",
-#  ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "updatejstest"
-#  part_name = "prebuilt_hap"
-#  subsystem_name = "xts"
+  hap_name = "ActsUpdateJsTest"
 }
 ohos_js_assets("update_js_assets") {
   source_dir = "./src/main/js/default"
@@ -33,4 +28,4 @@ ohos_js_assets("update_js_assets") {
 ohos_resources("update_js_resources") {
   sources = [ "./src/main/resources" ]
   hap_profile = "./src/main/config.json"
-}
\ No newline at end of file
+}

updater/update_test/Test.json

@@ -9,7 +9,7 @@
     "kits": [
         {
             "test-file-name": [
-                "updatejstest.hap"
+                "ActsUpdateJsTest.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true