jiyong@huawei.com

Signed-off-by: Njiyong <jiyong@huawei.com>

aafwk/aafwk_standard/abilitymanager/clearmissionscallback/BUILD.gn

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

aafwk/aafwk_standard/abilitymanager/clearmissionscallback/Test.json

 {
     "description": "Configuration for hjunit demo Tests",
+    "driver": {
+        "type": "JSUnitTest",
+        "test-timeout": "120000",
+        "package": "com.ohos.launcher",
+        "abilityName": "com.ohos.launcherSed11.MainAbility",
+        "shell-timeout": "60000"
+    },
+    "kits": [
+        {
+            "test-file-name": [
+                "ClearMissionsCallBack.hap",
+                "verifyIAbility.hap"
+            ],
+            "type": "AppInstallKit",
+            "cleanup-apps": true
+        }
+    ]
 }

aafwk/aafwk_standard/abilitymanager/clearmissionspromise/BUILD.gn

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

aafwk/aafwk_standard/abilitymanager/clearmissionspromise/Test.json

 {
     "description": "Configuration for hjunit demo Tests",
+    "driver": {
+        "type": "JSUnitTest",
+        "test-timeout": "120000",
+        "package": "com.ohos.launcher",
+        "abilityName": "com.ohos.launcherSed111.MainAbility",
+        "shell-timeout": "60000"
+    },
+    "kits": [
+        {
+            "test-file-name": [
+                "ClearMissionsPromise.hap",
+                "verifyIAbility.hap"
+            ],
+            "type": "AppInstallKit",
+            "cleanup-apps": true
+        }
+    ]
 }

appexecfwk/ams_standard/BUILD.gn

@@ -18,8 +18,8 @@ group("ams_standard") {
   if (is_standard_system) {
     deps = [
       "amsdatauriutils:amsDataUriUtils",
-      #"amszipfileunzipfilest:amsZipfileUnzipfileST",
-      #"fwkdataaccessor:FWKDataAccessor",
+      "amszipfileunzipfilest:amsZipfileUnzipfileST",
+      "fwkdataaccessor:FWKDataAccessor",
       #"serviceability/actsparticleabilitytest:ActsParticleAbilityTest",
       #"serviceability/sceneProject/particlestartability:ParticleStartAbility",
       #"serviceability/sceneProject/particletestserver:ParticleTestServer",

appexecfwk/ams_standard/amszipfileunzipfilest/Test.json

@@ -24,9 +24,9 @@
         {
             "type": "PushKit",
             "push": [
-                "/resource/appexecfwk/ceshi.txt->/data/test/ceshi.txt",
-                "/resource/appexecfwk/ceshitwo.zip->/data/test/ceshitwo.zip",
-                "/resource/appexecfwk/ceshitwo.txt->/data/test/ceshitwo.txt"
+                "./resource/appexecfwk/ceshi.txt->/data/test/ceshi.txt",
+                "./resource/appexecfwk/ceshitwo.zip->/data/test/ceshitwo.zip",
+                "./resource/appexecfwk/ceshitwo.txt->/data/test/ceshitwo.txt"
                 
                
             ]

appexecfwk/ams_standard/fwkdataaccessor/Test.json

@@ -25,7 +25,7 @@
         {
             "type": "PushKit",
             "push": [
-                  "amsStDataAbility.hap->/system/vendor/amsStDataAbility.hap"
+                  "./resource/appexecfwk/amsStDataAbility.hap->/system/vendor/amsStDataAbility.hap"
             ]
             
         },

appexecfwk/bundle_standard/bundlemanager/actsbmsallshortcutinfotest/Test.json

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

appexecfwk/bundle_standard/bundlemanager/actsbmshapmoduletest/Test.json

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

appexecfwk/bundle_standard/bundlemanager/actsbmsmetadatatest/Test.json

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

notification/ces_standard/subscribeandpublish/BUILD.gn

@@ -17,8 +17,9 @@ group("SubscribeAndPublish") {
   testonly = true
   if (is_standard_system) {
     deps = [
-      #"actssubscriberorderedtest:ActsSubscriberOrderTest",
-      "actssubscriberunordersystemtest:ActsSubscriberTestUnorderSystem",
+      "actssubscriberorderedtest:ActsSubscriberOrderTest",
+
+      #"actssubscriberunordersystemtest:ActsSubscriberTestUnorderSystem",
       "actssubscriberunordertest:ActsSubscriberUnorderTest",
     ]
   }