From 5a6923199c2ea019e579039f95b0d1a524f6cefd Mon Sep 17 00:00:00 2001 From: zhaoyuan17 Date: Sat, 25 Dec 2021 16:01:04 +0800 Subject: [PATCH] fixed 2271d21 from https://gitee.com/liu-xu01/xts_acts/pulls/1429 Change gn file of dependent package Signed-off-by: zhaoyuan17 --- .../src/main/js/test/ActsAnsPublishInput.js | 4 ++-- .../publish_test/activebtn/testa/BUILD.gn | 8 ++++++-- .../publish_test/activebtn/testa/Test.json | 3 --- .../publish_test/activebtn/testb/BUILD.gn | 8 ++++++-- .../publish_test/activebtn/testb/Test.json | 3 --- .../publish_test/activebtn/testc/BUILD.gn | 8 ++++++-- .../publish_test/activebtn/testc/Test.json | 3 --- .../badgedisplayed/localcandisplay/BUILD.gn | 8 ++++++-- .../badgedisplayed/localcandisplay/Test.json | 3 --- .../localnotificationenable/BUILD.gn | 8 ++++++-- .../localnotificationenable/Test.json | 3 --- .../getactive/getactiveotherapp/BUILD.gn | 8 ++++++-- .../getactive/getactiveotherapp/Test.json | 18 ------------------ .../publishcontentype/sub/BUILD.gn | 8 ++++++-- .../publishcontentype/sub/Test.json | 18 ------------------ .../publish_test/subscribe/publish/Test.json | 18 ------------------ .../publish_test/wantagent/sub/BUILD.gn | 8 ++++++-- .../publish_test/wantagent/sub/Test.json | 18 ------------------ .../publish_test/wantagent/test1/Test.json | 3 --- .../publish_test/wantagent/test2/Test.json | 3 --- 20 files changed, 50 insertions(+), 111 deletions(-) delete mode 100644 notification/ans_standard/publish_test/activebtn/testa/Test.json delete mode 100644 notification/ans_standard/publish_test/activebtn/testb/Test.json delete mode 100644 notification/ans_standard/publish_test/activebtn/testc/Test.json delete mode 100644 notification/ans_standard/publish_test/badgedisplayed/localcandisplay/Test.json delete mode 100644 notification/ans_standard/publish_test/enablenotification/localnotificationenable/Test.json delete mode 100644 notification/ans_standard/publish_test/getactive/getactiveotherapp/Test.json delete mode 100644 notification/ans_standard/publish_test/publishcontentype/sub/Test.json delete mode 100644 notification/ans_standard/publish_test/subscribe/publish/Test.json delete mode 100644 notification/ans_standard/publish_test/wantagent/sub/Test.json delete mode 100644 notification/ans_standard/publish_test/wantagent/test1/Test.json delete mode 100644 notification/ans_standard/publish_test/wantagent/test2/Test.json 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 008d44ce7..d9db86913 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 c42394c16..15d640044 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 fd2b84059..000000000 --- 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 cc2bd6dd4..f7517f848 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 fd2b84059..000000000 --- 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 1d4243ec9..fa9466357 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 fd2b84059..000000000 --- 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 3a6f8047d..5f0111f09 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 fd2b84059..000000000 --- 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 a3b8a00d8..80b7bab50 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 93663d2d6..000000000 --- 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 e60138c47..26258c461 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 26b6403fe..000000000 --- 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 40c0b759c..8e0882488 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 8fd5a7192..000000000 --- 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 f7a2623f0..000000000 --- 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 83bea6382..ac8d2eb90 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 c10a3732c..000000000 --- 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 fd2b84059..000000000 --- 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 fd2b84059..000000000 --- a/notification/ans_standard/publish_test/wantagent/test2/Test.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "description": "Configuration for hjunit demo Tests", -} -- GitLab