diff --git a/notification/ans_standard/publish_test/activebtn/activebutton/entry/src/main/js/test/ActsAnsPublishInput.js b/notification/ans_standard/publish_test/activebtn/activebutton/entry/src/main/js/test/ActsAnsPublishInput.js index 008d44ce77c6a198721862e7c7b4baa79d92fb96..d9db869138d35688e6fec8853f181607ae1a5fcd 100644 --- a/notification/ans_standard/publish_test/activebtn/activebutton/entry/src/main/js/test/ActsAnsPublishInput.js +++ b/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================>"); diff --git a/notification/ans_standard/publish_test/activebtn/testa/BUILD.gn b/notification/ans_standard/publish_test/activebtn/testa/BUILD.gn index c42394c1682bc5376933d2912d956d2ea97296c1..15d640044512f981940310593ccb5ca74a1400b4 100644 --- a/notification/ans_standard/publish_test/activebtn/testa/BUILD.gn +++ b/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" diff --git a/notification/ans_standard/publish_test/activebtn/testa/Test.json b/notification/ans_standard/publish_test/activebtn/testa/Test.json deleted file mode 100644 index fd2b84059ded89eccdaa96c479873e0c1bc5d090..0000000000000000000000000000000000000000 --- a/notification/ans_standard/publish_test/activebtn/testa/Test.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "description": "Configuration for hjunit demo Tests", -} diff --git a/notification/ans_standard/publish_test/activebtn/testb/BUILD.gn b/notification/ans_standard/publish_test/activebtn/testb/BUILD.gn index cc2bd6dd43d5e691a243612e4dd493e90443b715..f7517f848e0bb7499fa879b8eb5e10ddfc515976 100644 --- a/notification/ans_standard/publish_test/activebtn/testb/BUILD.gn +++ b/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" diff --git a/notification/ans_standard/publish_test/activebtn/testb/Test.json b/notification/ans_standard/publish_test/activebtn/testb/Test.json deleted file mode 100644 index fd2b84059ded89eccdaa96c479873e0c1bc5d090..0000000000000000000000000000000000000000 --- a/notification/ans_standard/publish_test/activebtn/testb/Test.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "description": "Configuration for hjunit demo Tests", -} diff --git a/notification/ans_standard/publish_test/activebtn/testc/BUILD.gn b/notification/ans_standard/publish_test/activebtn/testc/BUILD.gn index 1d4243ec909866168221b70f4f987e6d4ccdf84b..fa94663571207ef84e5981fed929d2215e639935 100644 --- a/notification/ans_standard/publish_test/activebtn/testc/BUILD.gn +++ b/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" diff --git a/notification/ans_standard/publish_test/activebtn/testc/Test.json b/notification/ans_standard/publish_test/activebtn/testc/Test.json deleted file mode 100644 index fd2b84059ded89eccdaa96c479873e0c1bc5d090..0000000000000000000000000000000000000000 --- a/notification/ans_standard/publish_test/activebtn/testc/Test.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "description": "Configuration for hjunit demo Tests", -} diff --git a/notification/ans_standard/publish_test/badgedisplayed/localcandisplay/BUILD.gn b/notification/ans_standard/publish_test/badgedisplayed/localcandisplay/BUILD.gn index 3a6f8047d1d126ecedb068db9f227a87bc85bb77..5f0111f09d1e99cc4e3c235d8a31a042c23c8c8e 100644 --- a/notification/ans_standard/publish_test/badgedisplayed/localcandisplay/BUILD.gn +++ b/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" diff --git a/notification/ans_standard/publish_test/badgedisplayed/localcandisplay/Test.json b/notification/ans_standard/publish_test/badgedisplayed/localcandisplay/Test.json deleted file mode 100644 index fd2b84059ded89eccdaa96c479873e0c1bc5d090..0000000000000000000000000000000000000000 --- a/notification/ans_standard/publish_test/badgedisplayed/localcandisplay/Test.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "description": "Configuration for hjunit demo Tests", -} diff --git a/notification/ans_standard/publish_test/enablenotification/localnotificationenable/BUILD.gn b/notification/ans_standard/publish_test/enablenotification/localnotificationenable/BUILD.gn index a3b8a00d84b8b563a13a0e79393159cf3cf289a2..80b7bab50da52e5f3c00c6f77f711af63a270a75 100644 --- a/notification/ans_standard/publish_test/enablenotification/localnotificationenable/BUILD.gn +++ b/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" diff --git a/notification/ans_standard/publish_test/enablenotification/localnotificationenable/Test.json b/notification/ans_standard/publish_test/enablenotification/localnotificationenable/Test.json deleted file mode 100644 index 93663d2d6daff396ef073ef618d623d75414cb68..0000000000000000000000000000000000000000 --- a/notification/ans_standard/publish_test/enablenotification/localnotificationenable/Test.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "description": "Configuration for hjunit demo Tests", -} diff --git a/notification/ans_standard/publish_test/getactive/getactiveotherapp/BUILD.gn b/notification/ans_standard/publish_test/getactive/getactiveotherapp/BUILD.gn index e60138c473f1d79cef812e7eb90cf0e5b1defa43..26258c461f62604b0eeb05f9125187c12f8eab75 100644 --- a/notification/ans_standard/publish_test/getactive/getactiveotherapp/BUILD.gn +++ b/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" diff --git a/notification/ans_standard/publish_test/getactive/getactiveotherapp/Test.json b/notification/ans_standard/publish_test/getactive/getactiveotherapp/Test.json deleted file mode 100644 index 26b6403fe06f2dafb6fa2f622bec8a8aefe6f945..0000000000000000000000000000000000000000 --- a/notification/ans_standard/publish_test/getactive/getactiveotherapp/Test.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "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 - } - ] -} diff --git a/notification/ans_standard/publish_test/publishcontentype/sub/BUILD.gn b/notification/ans_standard/publish_test/publishcontentype/sub/BUILD.gn index 40c0b759c934562736f64da69c094c392754f182..8e08824886cfaf36a5319e9c606b60fd7caca41c 100644 --- a/notification/ans_standard/publish_test/publishcontentype/sub/BUILD.gn +++ b/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" diff --git a/notification/ans_standard/publish_test/publishcontentype/sub/Test.json b/notification/ans_standard/publish_test/publishcontentype/sub/Test.json deleted file mode 100644 index 8fd5a7192169bdf2942a03d04b9e1ff1e96912a2..0000000000000000000000000000000000000000 --- a/notification/ans_standard/publish_test/publishcontentype/sub/Test.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "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 - } - ] -} diff --git a/notification/ans_standard/publish_test/subscribe/publish/Test.json b/notification/ans_standard/publish_test/subscribe/publish/Test.json deleted file mode 100644 index f7a2623f05c045447fd01c3aa9227bc487bdd122..0000000000000000000000000000000000000000 --- a/notification/ans_standard/publish_test/subscribe/publish/Test.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "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 - } - ] -} diff --git a/notification/ans_standard/publish_test/wantagent/sub/BUILD.gn b/notification/ans_standard/publish_test/wantagent/sub/BUILD.gn index 83bea6382e8fe9eb100e6762b7a65074f3585762..ac8d2eb90a2df0c1f8e05db6a76fc6cf12e818cb 100644 --- a/notification/ans_standard/publish_test/wantagent/sub/BUILD.gn +++ b/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" diff --git a/notification/ans_standard/publish_test/wantagent/sub/Test.json b/notification/ans_standard/publish_test/wantagent/sub/Test.json deleted file mode 100644 index c10a3732c1cf63089923d6d241019f31dede3e56..0000000000000000000000000000000000000000 --- a/notification/ans_standard/publish_test/wantagent/sub/Test.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "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 - } - ] -} diff --git a/notification/ans_standard/publish_test/wantagent/test1/Test.json b/notification/ans_standard/publish_test/wantagent/test1/Test.json deleted file mode 100644 index fd2b84059ded89eccdaa96c479873e0c1bc5d090..0000000000000000000000000000000000000000 --- a/notification/ans_standard/publish_test/wantagent/test1/Test.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "description": "Configuration for hjunit demo Tests", -} diff --git a/notification/ans_standard/publish_test/wantagent/test2/Test.json b/notification/ans_standard/publish_test/wantagent/test2/Test.json deleted file mode 100644 index fd2b84059ded89eccdaa96c479873e0c1bc5d090..0000000000000000000000000000000000000000 --- a/notification/ans_standard/publish_test/wantagent/test2/Test.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "description": "Configuration for hjunit demo Tests", -}