!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"
         }