!1493 事件通知依赖包编译方式修改

Merge pull request !1493 from 刘旭/cherry-pick-1641366676

notification/ans_standard/publish_test/activebtn/activebutton/entry/src/main/js/test/ActsAnsPublishInput.js

@@ -37,8 +37,8 @@ describe('ActsAnsPublishInput', function () {
         console.info("=========Ans_PublishInput_0100 onConsume editType================>"+editType);
         expect(inputKey).assertEqual("inputKey_0100");
         expect(tag).assertEqual("tag_0100");
-        expect(options).assertEqual("options_0100");
-        expect(permitMimeTypes).assertEqual("permitMimeTypes_0100");
+        expect(JSON.stringify(options)).assertEqual(JSON.stringify(["options_0100"]));
+        expect(JSON.stringify(permitMimeTypes)).assertEqual(JSON.stringify(["permitMimeTypes_0100"]));
         expect(editType).assertEqual(1);
         expect(additionalData.key0100).assertEqual("0100");
         console.info("=========Ans_PublishInput_0100 onConsume end================>");

notification/ans_standard/publish_test/activebtn/testa/BUILD.gn

@@ -13,14 +13,18 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("testA") {
+ohos_hap("testA") {
   hap_profile = "./entry/src/main/config.json"
+  hap_name = "testA"
+  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/openharmony_sx.p7b"
-  hap_name = "testA"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

notification/ans_standard/publish_test/activebtn/testa/Test.json

-{
-    "description": "Configuration for hjunit demo Tests",
-}

notification/ans_standard/publish_test/activebtn/testb/BUILD.gn

@@ -13,14 +13,18 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("testB") {
+ohos_hap("testB") {
   hap_profile = "./entry/src/main/config.json"
+  hap_name = "testB"
+  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/openharmony_sx.p7b"
-  hap_name = "testB"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

notification/ans_standard/publish_test/activebtn/testb/Test.json

-{
-    "description": "Configuration for hjunit demo Tests",
-}

notification/ans_standard/publish_test/activebtn/testc/BUILD.gn

@@ -13,14 +13,18 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("testC") {
+ohos_hap("testC") {
   hap_profile = "./entry/src/main/config.json"
+  hap_name = "testC"
+  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/openharmony_sx.p7b"
-  hap_name = "testC"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

notification/ans_standard/publish_test/activebtn/testc/Test.json

-{
-    "description": "Configuration for hjunit demo Tests",
-}

notification/ans_standard/publish_test/badgedisplayed/localcandisplay/BUILD.gn

@@ -13,14 +13,18 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("localcandisplay") {
+ohos_hap("localcandisplay") {
   hap_profile = "./entry/src/main/config.json"
+  hap_name = "localcandisplay"
+  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/openharmony_sx.p7b"
-  hap_name = "localcandisplay"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

notification/ans_standard/publish_test/badgedisplayed/localcandisplay/Test.json

-{
-    "description": "Configuration for hjunit demo Tests",
-}

notification/ans_standard/publish_test/enablenotification/localnotificationenable/BUILD.gn

@@ -13,14 +13,18 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ActsAnsLocalNotificationTest") {
+ohos_hap("ActsAnsLocalNotificationTest") {
   hap_profile = "./entry/src/main/config.json"
+  hap_name = "ActsAnsLocalNotificationTest"
+  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/openharmony_sx.p7b"
-  hap_name = "ActsAnsLocalNotificationTest"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

notification/ans_standard/publish_test/enablenotification/localnotificationenable/Test.json

-{
-  "description": "Configuration for hjunit demo Tests",
-}

notification/ans_standard/publish_test/getactive/getactiveotherapp/BUILD.gn

@@ -13,14 +13,18 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ActsAnsGetActiveOtherApp") {
+ohos_hap("ActsAnsGetActiveOtherApp") {
   hap_profile = "./entry/src/main/config.json"
+  hap_name = "ActsAnsGetActiveOtherApp"
+  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/openharmony_sx.p7b"
-  hap_name = "ActsAnsGetActiveOtherApp"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

notification/ans_standard/publish_test/getactive/getactiveotherapp/Test.json

-{
-    "description": "Configuration for hjunit demo Tests",
-    "driver": {
-        "type": "JSUnitTest",
-        "test-timeout": "180000",
-        "package": "com.example.actsansgetactiveotherapp",
-        "shell-timeout": "60000"
-    },
-    "kits": [
-        {
-            "test-file-name": [
-                "ActsAnsGetActiveOtherApp.hap"
-            ],
-            "type": "AppInstallKit",
-            "cleanup-apps": true
-        }
-    ]
-}

notification/ans_standard/publish_test/publishcontentype/sub/BUILD.gn

@@ -12,14 +12,18 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ActsAnsCommonEventTest") {
+ohos_hap("ActsAnsCommonEventTest") {
   hap_profile = "./entry/src/main/config.json"
+  hap_name = "ActsAnsCommonEventTest"
+  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/openharmony_sx.p7b"
-  hap_name = "ActsAnsCommonEventTest"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

notification/ans_standard/publish_test/publishcontentype/sub/Test.json

-{
-    "description": "Configuration for hjunit demo Tests",
-    "driver": {
-        "type": "JSUnitTest",
-        "test-timeout": "60000",
-        "package": "com.example.actsanscommoneventtest",
-        "shell-timeout": "60000"
-    },
-    "kits": [
-        {
-            "test-file-name": [
-                "ActsAnsCommonEventTest"
-            ],
-            "type": "AppInstallKit",
-            "cleanup-apps": true
-        }
-    ]
-}

notification/ans_standard/publish_test/subscribe/publish/Test.json

-{
-    "description": "Configuration for hjunit demo Tests",
-    "driver": {
-        "type": "JSUnitTest",
-        "test-timeout": "60000",
-        "package": "com.example.actsanspublishtest",
-        "shell-timeout": "60000"
-    },
-    "kits": [
-        {
-            "test-file-name": [
-                "ActsAnsPublishTest.hap"
-            ],
-            "type": "AppInstallKit",
-            "cleanup-apps": true
-        }
-    ]
-}

notification/ans_standard/publish_test/wantagent/sub/BUILD.gn

@@ -13,14 +13,18 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ActsAnsCommonSubscriberTest") {
+ohos_hap("ActsAnsCommonSubscriberTest") {
   hap_profile = "./entry/src/main/config.json"
+  hap_name = "ActsAnsCommonSubscriberTest"
+  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/openharmony_sx.p7b"
-  hap_name = "ActsAnsCommonSubscriberTest"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

notification/ans_standard/publish_test/wantagent/sub/Test.json

-{
-    "description": "Configuration for hjunit demo Tests",
-    "driver": {
-        "type": "JSUnitTest",
-        "test-timeout": "60000",
-        "package": "com.example.actsanscommonsubscribertest",
-        "shell-timeout": "60000"
-    },
-    "kits": [
-        {
-            "test-file-name": [
-                "ActsAnsCommonSubscriberTest.hap"
-            ],
-            "type": "AppInstallKit",
-            "cleanup-apps": true
-        }
-    ]
-}

notification/ans_standard/publish_test/wantagent/test1/Test.json

-{
-    "description": "Configuration for hjunit demo Tests",
-}

notification/ans_standard/publish_test/wantagent/test2/Test.json

-{
-    "description": "Configuration for hjunit demo Tests",
-}