LTS_3.0 HAP's name modified

Signed-off-by: Nquxianfei <quxianfei@huawei.com>

aafwk/aafwk_standard/amszipfileunzipfilest/BUILD.gn

@@ -20,7 +20,7 @@ ohos_js_hap_suite("amsZipfileUnzipfileST") {
     ":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

@@ -20,7 +20,7 @@ ohos_js_hap_suite("FWKDataAccessor") {
     ":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",

account/BUILD.gn

@@ -15,7 +15,7 @@ import("//build/ohos_var.gni")
 group("account") {
   testonly = true
   if (is_standard_system) {
-    deps = [ "OsAccountTest_js:osaccount_js_test" ]
+    deps = [ "OsAccountTest_js:ActsOsAccountJSApiTest" ]
   } else {
     deps = [
       "appaccount:appaccount_hap",

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

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"

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,7 +27,7 @@ group("bundlemanager") {
       #"actsbmsmetadatatest:ActsBmsMetaDataTest",
       "actsbmsmoduleusagerecordtest:ActsBmsModuleUsageRecordTest",
       "actsbundlemanagertest:ActsBundleManagerTest",
-      "actsbundlemanageruninstall:ActsBundleManagerUninstall",
+      "actsbundlemanageruninstall:ActsBundleManagerUninstallTest",
       "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

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/",
@@ -44,9 +44,7 @@ ohos_moduletest_suite("hipluginmoduleapitest") {
     "-Wno-inconsistent-missing-override",
     "-Dprivate=public",  #allow test code access private members
   ]
-  external_deps = [
-    "hiviewdfx_hilog_native:libhilog",
-  ]
+  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"

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"

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"

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"

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,10 +13,10 @@
 
 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

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"

graphic/windowstandard/Test.json

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

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"
         }
@@ -10,9 +10,9 @@
     "driver": {
         "native-test-timeout": "120000",
         "type": "CppTest",
-        "module-name": "faultloggertest",
+        "module-name": "ActsFaultLoggerTest",
         "runtime-hint": "1s",
         "native-test-device-path": "/data/local/tmp"
     },
-    "description": "Configuration for faultloggertest Tests"
+    "description": "Configuration for ActsFaultLoggerTest Tests"
 }
\ No newline at end of file

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"

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": [
@@ -13,9 +13,9 @@
     "driver": {
         "native-test-timeout": "120000",
         "type": "CppTest",
-        "module-name": "HiCollieCppTest",
+        "module-name": "ActsHiCollieCppTest",
         "runtime-hint": "1s",
         "native-test-device-path": "/data/local/tmp"
     },
-    "description": "Configuration for HiCollieCppTest Tests"
+    "description": "Configuration for ActsHiCollieCppTest Tests"
 }
\ No newline at end of file

hiviewdfx/hilogtest/libhilogtest/BUILD.gn

@@ -14,8 +14,8 @@
 group("libhilogtestacts") {
   testonly = true
   deps = [
-    "libhilogCPPtest:LibhilogCPPtest",
-    "libhilogCtest:libhilogCtest",
-    "hilogtest:hilogtest",
+    "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"
         }
@@ -10,9 +10,9 @@
     "driver": {
         "native-test-timeout": "120000",
         "type": "CppTest",
-        "module-name": "hilogtest",
+        "module-name": "ActsHilogTest",
         "runtime-hint": "1s",
         "native-test-device-path": "/data/local/tmp"
     },
-    "description": "Configuration for hilogtest Tests"
+    "description": "Configuration for ActsHilogTest Tests"
 }
\ No newline at end of file

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"
         }
@@ -10,9 +10,9 @@
     "driver": {
         "native-test-timeout": "120000",
         "type": "CppTest",
-        "module-name": "LibhilogCPPtest",
+        "module-name": "ActsLibhilogCPPTest",
         "runtime-hint": "1s",
         "native-test-device-path": "/data/local/tmp"
     },
-    "description": "Configuration for LibhilogCPPtest Tests"
+    "description": "Configuration for ActsLibhilogCPPTest Tests"
 }
\ No newline at end of file

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"
         }
@@ -10,9 +10,9 @@
     "driver": {
         "native-test-timeout": "120000",
         "type": "CppTest",
-        "module-name": "libhilogCtest",
+        "module-name": "ActsLibhilogCTest",
         "runtime-hint": "1s",
         "native-test-device-path": "/data/local/tmp"
     },
-    "description": "Configuration for libhilogCtest Tests"
+    "description": "Configuration for ActsLibhilogCTest Tests"
 }
\ No newline at end of file

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"
         }
@@ -10,9 +10,9 @@
     "driver": {
         "native-test-timeout": "120000",
         "type": "CppTest",
-        "module-name": "HiSysEventCPPTest",
+        "module-name": "ActsHiSysEventCPPTest",
         "runtime-hint": "1s",
         "native-test-device-path": "/data/local/tmp"
     },
-    "description": "Configuration for HiSysEventCPPTest Tests"
+    "description": "Configuration for ActsHiSysEventCPPTest Tests"
 }
\ No newline at end of file

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": [
@@ -13,9 +13,9 @@
     "driver": {
         "native-test-timeout": "120000",
         "type": "CppTest",
-        "module-name": "HitraceCPPtest",
+        "module-name": "ActsHitraceCPPTest",
         "runtime-hint": "1s",
         "native-test-device-path": "/data/local/tmp"
     },
-    "description": "Configuration for HitraceCPPtest Tests"
+    "description": "Configuration for ActsHitraceCPPTest Tests"
 }
\ No newline at end of file

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": [
@@ -13,9 +13,9 @@
     "driver": {
         "native-test-timeout": "120000",
         "type": "CppTest",
-        "module-name": "HitraceCtest",
+        "module-name": "ActsHitraceCTest",
         "runtime-hint": "1s",
         "native-test-device-path": "/data/local/tmp"
     },
-    "description": "Configuration for HitraceCtest Tests"
+    "description": "Configuration for ActsHitraceCTest Tests"
 }
\ No newline at end of file

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",
-    ]
+  sources = [ "src/hievent_lite_test.c" ]
 
   include_dirs = [
     "src",

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",
-    ]
+  sources = [ "src/dfx_hilog.c" ]
 
   include_dirs = [
     "src",
@@ -25,7 +23,7 @@ hctest_suite("ActsDfxFuncTest") {
     "//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"
+    "//vendor/hisi/hi3861/hi3861/components/lwip_sack/include",
   ]
 
   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",
   ]
 }

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"

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"

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"

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"

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"