diff --git a/notification/ans_standard/actsansnotificationcancel/BUILD.gn b/notification/ans_standard/actsansnotificationcancel/BUILD.gn index b7fdbe15f9aff15880aa4144da850bcb775199ac..e3f194b5fd2c052b1a1548acf7cf954c582a9655 100644 --- a/notification/ans_standard/actsansnotificationcancel/BUILD.gn +++ b/notification/ans_standard/actsansnotificationcancel/BUILD.gn @@ -9,7 +9,7 @@ # 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. +# limitations under the License. import("//test/xts/tools/build/suite.gni") @@ -21,6 +21,8 @@ ohos_js_hap_suite("ActsAnsNotificationCancelTest") { ] certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "ActsAnsNotificationCancelTest" + subsystem_name = "notification" + part_name = "distributed_notification_service" } ohos_js_assets("hjs_demo_js_assets") { js2abc = true diff --git a/notification/ans_standard/actsansnotificationremove/BUILD.gn b/notification/ans_standard/actsansnotificationremove/BUILD.gn index 977a4f8255898ab3719a58600d42045224e62529..f70bba05968cf0b5e0394bc4dcfec70a178cf8ed 100644 --- a/notification/ans_standard/actsansnotificationremove/BUILD.gn +++ b/notification/ans_standard/actsansnotificationremove/BUILD.gn @@ -9,7 +9,7 @@ # 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. +# limitations under the License. import("//test/xts/tools/build/suite.gni") @@ -21,6 +21,8 @@ ohos_js_hap_suite("ActsAnsNotificationRemoveTest") { ] certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "ActsAnsNotificationRemoveTest" + subsystem_name = "notification" + part_name = "distributed_notification_service" } ohos_js_assets("hjs_demo_js_assets") { js2abc = true diff --git a/notification/ans_standard/actsansslottest/actsansaddslotsystem/BUILD.gn b/notification/ans_standard/actsansslottest/actsansaddslotsystem/BUILD.gn index b3698f547ee60595e006ba34c69956aca1d73f31..a06dca840a62a3f38fd7e224ae7ca270f57b0bf0 100644 --- a/notification/ans_standard/actsansslottest/actsansaddslotsystem/BUILD.gn +++ b/notification/ans_standard/actsansslottest/actsansaddslotsystem/BUILD.gn @@ -9,7 +9,7 @@ # 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. +# limitations under the License. import("//test/xts/tools/build/suite.gni") @@ -21,6 +21,8 @@ ohos_js_hap_suite("ActsAnsAddSlotSystemTest") { ] certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "ActsAnsAddSlotSystemTest" + subsystem_name = "notification" + part_name = "distributed_notification_service" } ohos_js_assets("hjs_demo_js_assets") { js2abc = true diff --git a/notification/ans_standard/actsansslottest/actsansgetslotWithoutadd/BUILD.gn b/notification/ans_standard/actsansslottest/actsansgetslotWithoutadd/BUILD.gn index 70b64cad34391733928cf24faf740318aeafc4ac..c75be1431bc9169d344e36f74dd6bbc1d75f9e3f 100644 --- a/notification/ans_standard/actsansslottest/actsansgetslotWithoutadd/BUILD.gn +++ b/notification/ans_standard/actsansslottest/actsansgetslotWithoutadd/BUILD.gn @@ -9,7 +9,7 @@ # 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. +# limitations under the License. import("//test/xts/tools/build/suite.gni") @@ -21,6 +21,8 @@ ohos_js_hap_suite("ActsAnsGetSlotWithoutAddTest") { ] certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "ActsAnsGetSlotWithoutAddTest" + subsystem_name = "notification" + part_name = "distributed_notification_service" } ohos_js_assets("hjs_demo_js_assets") { js2abc = true diff --git a/notification/ans_standard/actsansslottest/actsansgetslottestcallback/BUILD.gn b/notification/ans_standard/actsansslottest/actsansgetslottestcallback/BUILD.gn index 07e6811ae706e52bc1c059abd29b74ff4d50057a..da23c5d6b94f0ef8028239ea93ae14008a9deecb 100644 --- a/notification/ans_standard/actsansslottest/actsansgetslottestcallback/BUILD.gn +++ b/notification/ans_standard/actsansslottest/actsansgetslottestcallback/BUILD.gn @@ -9,7 +9,7 @@ # 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. +# limitations under the License. import("//test/xts/tools/build/suite.gni") @@ -21,6 +21,8 @@ ohos_js_hap_suite("ActsAnsGetSlotTestCallbackTest") { ] certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "ActsAnsGetSlotTestCallbackTest" + subsystem_name = "notification" + part_name = "distributed_notification_service" } ohos_js_assets("hjs_demo_js_assets") { js2abc = true diff --git a/notification/ans_standard/actsansslottest/actsansgetslottestpromise/BUILD.gn b/notification/ans_standard/actsansslottest/actsansgetslottestpromise/BUILD.gn index 8903d8b59f8e911351d7f42a70935220db217faf..c5163654f81cd9bb958f309f742c6b1c1bc5be77 100644 --- a/notification/ans_standard/actsansslottest/actsansgetslottestpromise/BUILD.gn +++ b/notification/ans_standard/actsansslottest/actsansgetslottestpromise/BUILD.gn @@ -9,7 +9,7 @@ # 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. +# limitations under the License. import("//test/xts/tools/build/suite.gni") @@ -21,6 +21,8 @@ ohos_js_hap_suite("ActsAnsGetSlotTestPromiseTest") { ] certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "ActsAnsGetSlotTestPromiseTest" + subsystem_name = "notification" + part_name = "distributed_notification_service" } ohos_js_assets("hjs_demo_js_assets") { js2abc = true diff --git a/notification/ans_standard/actsansslottest/actsansremoveslottest/BUILD.gn b/notification/ans_standard/actsansslottest/actsansremoveslottest/BUILD.gn index e8759eb8b5c19f0cf72003b23234623007212286..4a73eeb8c6776b82fc66d5577e8e30c80ba9d1af 100644 --- a/notification/ans_standard/actsansslottest/actsansremoveslottest/BUILD.gn +++ b/notification/ans_standard/actsansslottest/actsansremoveslottest/BUILD.gn @@ -9,7 +9,7 @@ # 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. +# limitations under the License. import("//test/xts/tools/build/suite.gni") @@ -21,6 +21,8 @@ ohos_js_hap_suite("ActsAnsRemoveSlotTest") { ] certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "ActsAnsRemoveSlotTest" + subsystem_name = "notification" + part_name = "distributed_notification_service" } ohos_js_assets("hjs_demo_js_assets") { js2abc = true diff --git a/notification/ans_standard/actsansslottest/actsansremoveslotwithoutadd/BUILD.gn b/notification/ans_standard/actsansslottest/actsansremoveslotwithoutadd/BUILD.gn index d1e372b461caaef48b281bfe17e409114bf84287..06dc5c14868e9025c2e8d963452e9f2f259dfc35 100644 --- a/notification/ans_standard/actsansslottest/actsansremoveslotwithoutadd/BUILD.gn +++ b/notification/ans_standard/actsansslottest/actsansremoveslotwithoutadd/BUILD.gn @@ -9,7 +9,7 @@ # 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. +# limitations under the License. import("//test/xts/tools/build/suite.gni") @@ -21,6 +21,8 @@ ohos_js_hap_suite("ActsAnsRemoveSlotWithoutAddTest") { ] certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "ActsAnsRemoveSlotWithoutAddTest" + subsystem_name = "notification" + part_name = "distributed_notification_service" } ohos_js_assets("hjs_demo_js_assets") { js2abc = true diff --git a/notification/ans_standard/actsansslottest/actsansslotbybundle/BUILD.gn b/notification/ans_standard/actsansslottest/actsansslotbybundle/BUILD.gn index f97d4b2da63e27da98c2583e80fa62551505a002..9a1bf18a9bce480b29d1aa7ac17ba70b9519eca9 100644 --- a/notification/ans_standard/actsansslottest/actsansslotbybundle/BUILD.gn +++ b/notification/ans_standard/actsansslottest/actsansslotbybundle/BUILD.gn @@ -9,7 +9,7 @@ # 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. +# limitations under the License. import("//test/xts/tools/build/suite.gni") @@ -21,6 +21,8 @@ ohos_js_hap_suite("ActsAnsSlotByBundleTest") { ] certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "ActsAnsSlotByBundleTest" + subsystem_name = "notification" + part_name = "distributed_notification_service" } ohos_js_assets("hjs_demo_js_assets") { js2abc = true diff --git a/notification/ans_standard/actsansslottest/actsansslotsystemcallback/BUILD.gn b/notification/ans_standard/actsansslottest/actsansslotsystemcallback/BUILD.gn index 66755388f70cf9be0bdb3fbe2609d9b00d295d58..87226e0c68aacbde0b7107d6fb023c57ebc5cbba 100644 --- a/notification/ans_standard/actsansslottest/actsansslotsystemcallback/BUILD.gn +++ b/notification/ans_standard/actsansslottest/actsansslotsystemcallback/BUILD.gn @@ -9,7 +9,7 @@ # 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. +# limitations under the License. import("//test/xts/tools/build/suite.gni") @@ -21,6 +21,8 @@ ohos_js_hap_suite("ActsAnsSlotSystemCallbackTest") { ] certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "ActsAnsSlotSystemCallbackTest" + subsystem_name = "notification" + part_name = "distributed_notification_service" } ohos_js_assets("hjs_demo_js_assets") { js2abc = true diff --git a/notification/ans_standard/actsansslottest/actsansslotsystempromise/BUILD.gn b/notification/ans_standard/actsansslottest/actsansslotsystempromise/BUILD.gn index cb4fce1c490692f009b3ee22b6cd2f3c0c96f2cb..f7ad59aadb88b15167e13996a91ccfdc01f8345e 100644 --- a/notification/ans_standard/actsansslottest/actsansslotsystempromise/BUILD.gn +++ b/notification/ans_standard/actsansslottest/actsansslotsystempromise/BUILD.gn @@ -9,7 +9,7 @@ # 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. +# limitations under the License. import("//test/xts/tools/build/suite.gni") @@ -21,6 +21,8 @@ ohos_js_hap_suite("ActsAnsSlotSystemPromiseTest") { ] certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "ActsAnsSlotSystemPromiseTest" + subsystem_name = "notification" + part_name = "distributed_notification_service" } ohos_js_assets("hjs_demo_js_assets") { js2abc = true diff --git a/notification/ans_standard/actsansslottest/actsansslottaddremoveall/BUILD.gn b/notification/ans_standard/actsansslottest/actsansslottaddremoveall/BUILD.gn index 2f09d8655e0b35e1be66ef2aa1e6bf0e15e8290a..646f8b018480b8cfd66454d6206e133b2e7fa9f9 100644 --- a/notification/ans_standard/actsansslottest/actsansslottaddremoveall/BUILD.gn +++ b/notification/ans_standard/actsansslottest/actsansslottaddremoveall/BUILD.gn @@ -9,7 +9,7 @@ # 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. +# limitations under the License. import("//test/xts/tools/build/suite.gni") @@ -21,6 +21,8 @@ ohos_js_hap_suite("ActsAnsSlotAddRemoveAllTest") { ] certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "ActsAnsSlotAddRemoveAllTest" + subsystem_name = "notification" + part_name = "distributed_notification_service" } ohos_js_assets("hjs_demo_js_assets") { js2abc = true diff --git a/notification/ans_standard/actsnotificationshow/BUILD.gn b/notification/ans_standard/actsnotificationshow/BUILD.gn index 7a1cc99f4ba4d44808b804efefc043f5a9b090cd..f77116cf60109cc58283331a7ad9bdd4b8c597b9 100644 --- a/notification/ans_standard/actsnotificationshow/BUILD.gn +++ b/notification/ans_standard/actsnotificationshow/BUILD.gn @@ -20,6 +20,8 @@ ohos_js_hap_suite("ActsNotificationShowTest") { ] certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "ActsNotificationShowTest" + subsystem_name = "notification" + part_name = "distributed_notification_service" } ohos_js_assets("hjs_demo_js_assets") { js2abc = true diff --git a/notification/ans_standard/publish_test/activebtn/activebutton/BUILD.gn b/notification/ans_standard/publish_test/activebtn/activebutton/BUILD.gn index 0c6f9dc2a59ff352ea3fa2e351c7bd3c40ebb2f0..0c8a2299399ed74dbdfded23a028f0582c32c11e 100644 --- a/notification/ans_standard/publish_test/activebtn/activebutton/BUILD.gn +++ b/notification/ans_standard/publish_test/activebtn/activebutton/BUILD.gn @@ -9,7 +9,7 @@ # 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. +# limitations under the License. import("//test/xts/tools/build/suite.gni") @@ -21,6 +21,8 @@ ohos_js_hap_suite("ActsAnsActionButtonTest") { ] certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "ActsAnsActionButtonTest" + subsystem_name = "notification" + part_name = "distributed_notification_service" } ohos_js_assets("hjs_demo_js_assets") { js2abc = true diff --git a/notification/ans_standard/publish_test/activebtn/testa/BUILD.gn b/notification/ans_standard/publish_test/activebtn/testa/BUILD.gn index 48ceb269aa289353b570b50182f0a3e75611d07a..207e9b317fd9fe7326bf26bd1e43ec2547093616 100644 --- a/notification/ans_standard/publish_test/activebtn/testa/BUILD.gn +++ b/notification/ans_standard/publish_test/activebtn/testa/BUILD.gn @@ -9,16 +9,15 @@ # 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. +# limitations under the License. import("//test/xts/tools/build/suite.gni") -ohos_hap("testA") { +ohos_hap_assist_suite("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" + subsystem_name = "notification" + part_name = "distributed_notification_service" testonly = true deps = [ ":hjs_demo_js_assets", diff --git a/notification/ans_standard/publish_test/activebtn/testb/BUILD.gn b/notification/ans_standard/publish_test/activebtn/testb/BUILD.gn index 0daace8283ee5cafdc5ded037981eae444a81686..cd6e8eceeac2067dbdeb008d614c6b1b8654e6a3 100644 --- a/notification/ans_standard/publish_test/activebtn/testb/BUILD.gn +++ b/notification/ans_standard/publish_test/activebtn/testb/BUILD.gn @@ -9,16 +9,15 @@ # 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. +# limitations under the License. import("//test/xts/tools/build/suite.gni") -ohos_hap("testB") { +ohos_hap_assist_suite("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" + subsystem_name = "notification" + part_name = "distributed_notification_service" testonly = true deps = [ ":hjs_demo_js_assets", diff --git a/notification/ans_standard/publish_test/activebtn/testc/BUILD.gn b/notification/ans_standard/publish_test/activebtn/testc/BUILD.gn index aa8624364de52be590a4075de538341acf1a5a5f..a84fb16aba7fddfce6890854fe8f58897b11034b 100644 --- a/notification/ans_standard/publish_test/activebtn/testc/BUILD.gn +++ b/notification/ans_standard/publish_test/activebtn/testc/BUILD.gn @@ -9,16 +9,15 @@ # 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. +# limitations under the License. import("//test/xts/tools/build/suite.gni") -ohos_hap("testC") { +ohos_hap_assist_suite("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" + subsystem_name = "notification" + part_name = "distributed_notification_service" testonly = true deps = [ ":hjs_demo_js_assets", diff --git a/notification/ans_standard/publish_test/actsansdistributedtest/BUILD.gn b/notification/ans_standard/publish_test/actsansdistributedtest/BUILD.gn index 318fbfe92c271f4bae3edb0782eb8ca7b040e4a3..df875f936b0a7e840e00c25358020aa511fcc922 100644 --- a/notification/ans_standard/publish_test/actsansdistributedtest/BUILD.gn +++ b/notification/ans_standard/publish_test/actsansdistributedtest/BUILD.gn @@ -9,7 +9,7 @@ # 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. +# limitations under the License. import("//test/xts/tools/build/suite.gni") @@ -21,6 +21,8 @@ ohos_js_hap_suite("ActsAnsDistributeTest") { ] certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "ActsAnsDistributeTest" + subsystem_name = "notification" + part_name = "distributed_notification_service" } ohos_js_assets("hjs_demo_js_assets") { js2abc = true diff --git a/notification/ans_standard/publish_test/actsansgetallactive/BUILD.gn b/notification/ans_standard/publish_test/actsansgetallactive/BUILD.gn index 8f9e0bfca19fac566e5a3adff8ee0889ab7fa3ac..8117c33920823c4f1bda68bc1a5df4118ca8ca6e 100644 --- a/notification/ans_standard/publish_test/actsansgetallactive/BUILD.gn +++ b/notification/ans_standard/publish_test/actsansgetallactive/BUILD.gn @@ -9,7 +9,7 @@ # 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. +# limitations under the License. import("//test/xts/tools/build/suite.gni") @@ -21,6 +21,8 @@ ohos_js_hap_suite("ActsAnsGetAllActiveTestXts") { ] certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "ActsAnsGetAllActiveTest" + subsystem_name = "notification" + part_name = "distributed_notification_service" } ohos_js_assets("hjs_demo_js_assets") { js2abc = true diff --git a/notification/ans_standard/publish_test/actsanspublishcontroltest/BUILD.gn b/notification/ans_standard/publish_test/actsanspublishcontroltest/BUILD.gn index c88a4d0ede7fbbf4f5aff494998c42dabfb67a26..1251e230a6154c746b6a1f1c01b025a42f7a8906 100644 --- a/notification/ans_standard/publish_test/actsanspublishcontroltest/BUILD.gn +++ b/notification/ans_standard/publish_test/actsanspublishcontroltest/BUILD.gn @@ -9,7 +9,7 @@ # 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. +# limitations under the License. import("//test/xts/tools/build/suite.gni") @@ -21,6 +21,8 @@ ohos_js_hap_suite("ActsAnsPublishControlTest") { ] certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "ActsAnsPublishControlTest" + subsystem_name = "notification" + part_name = "distributed_notification_service" } ohos_js_assets("hjs_demo_js_assets") { js2abc = true diff --git a/notification/ans_standard/publish_test/actsanspublishconversation/BUILD.gn b/notification/ans_standard/publish_test/actsanspublishconversation/BUILD.gn index f2ef50f9eb9d39b6ff3aebb1508301e66f69604c..e2e6e55841f9d00bd11cf93344a4e70e277cd425 100644 --- a/notification/ans_standard/publish_test/actsanspublishconversation/BUILD.gn +++ b/notification/ans_standard/publish_test/actsanspublishconversation/BUILD.gn @@ -9,7 +9,7 @@ # 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. +# limitations under the License. import("//test/xts/tools/build/suite.gni") @@ -21,6 +21,8 @@ ohos_js_hap_suite("ActsAnsConversationTest") { ] certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "ActsAnsConversationTest" + subsystem_name = "notification" + part_name = "distributed_notification_service" } ohos_js_assets("hjs_demo_js_assets") { js2abc = true diff --git a/notification/ans_standard/publish_test/ansactscancelgroup/BUILD.gn b/notification/ans_standard/publish_test/ansactscancelgroup/BUILD.gn index 5e54164c0e41598a0c5107b72f2220b88890d9e1..30d8aaaa2d30d14f444b3102637adfe65cfe126c 100644 --- a/notification/ans_standard/publish_test/ansactscancelgroup/BUILD.gn +++ b/notification/ans_standard/publish_test/ansactscancelgroup/BUILD.gn @@ -9,7 +9,7 @@ # 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. +# limitations under the License. import("//test/xts/tools/build/suite.gni") @@ -21,6 +21,8 @@ ohos_js_hap_suite("ActsAnsCancelGroupTest") { ] certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "ActsAnsCancelGroupTest" + subsystem_name = "notification" + part_name = "distributed_notification_service" } ohos_js_assets("hjs_demo_js_assets") { js2abc = true diff --git a/notification/ans_standard/publish_test/ansactsremovegroup/BUILD.gn b/notification/ans_standard/publish_test/ansactsremovegroup/BUILD.gn index 16adc7faf73ec018d974df5c6d3274d923bd90ca..e661a26c6f5bc8636e3a95bcf38bce8e26c9daf2 100644 --- a/notification/ans_standard/publish_test/ansactsremovegroup/BUILD.gn +++ b/notification/ans_standard/publish_test/ansactsremovegroup/BUILD.gn @@ -9,7 +9,7 @@ # 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. +# limitations under the License. import("//test/xts/tools/build/suite.gni") @@ -21,6 +21,8 @@ ohos_js_hap_suite("ActsAnsRemoveGroupTest") { ] certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "ActsAnsRemoveGroupTest" + subsystem_name = "notification" + part_name = "distributed_notification_service" } ohos_js_assets("hjs_demo_js_assets") { js2abc = true diff --git a/notification/ans_standard/publish_test/badgedisplayed/badgedisplay/BUILD.gn b/notification/ans_standard/publish_test/badgedisplayed/badgedisplay/BUILD.gn index 60efe192e335a3e8b93abb3de3b855e596fef154..eb0e2e6e80d7fba6e8bd3fb2c9275bfe1bc36151 100644 --- a/notification/ans_standard/publish_test/badgedisplayed/badgedisplay/BUILD.gn +++ b/notification/ans_standard/publish_test/badgedisplayed/badgedisplay/BUILD.gn @@ -9,7 +9,7 @@ # 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. +# limitations under the License. import("//test/xts/tools/build/suite.gni") @@ -21,6 +21,8 @@ ohos_js_hap_suite("ActsAnsBadgeDisplayTest") { ] certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "ActsAnsBadgeDisplayTest" + subsystem_name = "notification" + part_name = "distributed_notification_service" } ohos_js_assets("hjs_demo_js_assets") { js2abc = true diff --git a/notification/ans_standard/publish_test/badgedisplayed/localcandisplay/BUILD.gn b/notification/ans_standard/publish_test/badgedisplayed/localcandisplay/BUILD.gn index f3307612d9ea798fe4aace5f639ba0d0ff0bc7ce..4112820811c5619f08a75f1be1050b19fb7b539f 100644 --- a/notification/ans_standard/publish_test/badgedisplayed/localcandisplay/BUILD.gn +++ b/notification/ans_standard/publish_test/badgedisplayed/localcandisplay/BUILD.gn @@ -9,16 +9,15 @@ # 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. +# limitations under the License. import("//test/xts/tools/build/suite.gni") -ohos_hap("localcandisplay") { +ohos_hap_assist_suite("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" + subsystem_name = "notification" + part_name = "distributed_notification_service" testonly = true deps = [ ":hjs_demo_js_assets", diff --git a/notification/ans_standard/publish_test/donotdisturbmode/BUILD.gn b/notification/ans_standard/publish_test/donotdisturbmode/BUILD.gn index 8e166f377566be7bc9721937076be58349c44d87..b2bb747b6537d7fb176ecf7b0c094692f94892f1 100644 --- a/notification/ans_standard/publish_test/donotdisturbmode/BUILD.gn +++ b/notification/ans_standard/publish_test/donotdisturbmode/BUILD.gn @@ -9,7 +9,7 @@ # 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. +# limitations under the License. import("//test/xts/tools/build/suite.gni") @@ -21,6 +21,8 @@ ohos_js_hap_suite("ActsAnsDoNotDisturbTest") { ] certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "ActsAnsDoNotDisturbTest" + subsystem_name = "notification" + part_name = "distributed_notification_service" } ohos_js_assets("hjs_demo_js_assets") { js2abc = true diff --git a/notification/ans_standard/publish_test/enablenotification/enablenotification/BUILD.gn b/notification/ans_standard/publish_test/enablenotification/enablenotification/BUILD.gn index fd27f84e8e34320dddad1114c629754b04e57860..ee7bec12c81026c0852df67672365b19044da76f 100644 --- a/notification/ans_standard/publish_test/enablenotification/enablenotification/BUILD.gn +++ b/notification/ans_standard/publish_test/enablenotification/enablenotification/BUILD.gn @@ -9,7 +9,7 @@ # 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. +# limitations under the License. import("//test/xts/tools/build/suite.gni") @@ -21,6 +21,8 @@ ohos_js_hap_suite("ActsAnsEnableNotificationTest") { ] certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "ActsAnsEnableNotificationTest" + subsystem_name = "notification" + part_name = "distributed_notification_service" } ohos_js_assets("hjs_demo_js_assets") { js2abc = true diff --git a/notification/ans_standard/publish_test/enablenotification/localnotificationenable/BUILD.gn b/notification/ans_standard/publish_test/enablenotification/localnotificationenable/BUILD.gn index 59c0782fcde3e9af5f68b0d557111895b3ea95d8..0f7a8752336fb155503df26364ab1511ce33f0d3 100644 --- a/notification/ans_standard/publish_test/enablenotification/localnotificationenable/BUILD.gn +++ b/notification/ans_standard/publish_test/enablenotification/localnotificationenable/BUILD.gn @@ -9,16 +9,15 @@ # 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. +# limitations under the License. import("//test/xts/tools/build/suite.gni") -ohos_hap("ActsAnsLocalNotificationTest") { +ohos_hap_assist_suite("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" + subsystem_name = "notification" + part_name = "distributed_notification_service" testonly = true deps = [ ":hjs_demo_js_assets", diff --git a/notification/ans_standard/publish_test/getactive/actsansgetactive/BUILD.gn b/notification/ans_standard/publish_test/getactive/actsansgetactive/BUILD.gn index 5d03d34e9302d415d5857687b11af03117fa2d89..35a3b2d7d6b68d8a9004ce2323eef0f72e979290 100644 --- a/notification/ans_standard/publish_test/getactive/actsansgetactive/BUILD.gn +++ b/notification/ans_standard/publish_test/getactive/actsansgetactive/BUILD.gn @@ -9,7 +9,7 @@ # 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. +# limitations under the License. import("//test/xts/tools/build/suite.gni") @@ -21,6 +21,8 @@ ohos_js_hap_suite("ActsAnsActiveTest") { ] certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "ActsAnsActiveTest" + subsystem_name = "notification" + part_name = "distributed_notification_service" } ohos_js_assets("hjs_demo_js_assets") { js2abc = true diff --git a/notification/ans_standard/publish_test/getactive/actsansgetallactive/BUILD.gn b/notification/ans_standard/publish_test/getactive/actsansgetallactive/BUILD.gn index 0ef8d4c45a21a56f1b10f8f4d30fa2aee351151d..ba274c48ffa652a42800bc2aedb8892812f0abd8 100644 --- a/notification/ans_standard/publish_test/getactive/actsansgetallactive/BUILD.gn +++ b/notification/ans_standard/publish_test/getactive/actsansgetallactive/BUILD.gn @@ -9,7 +9,7 @@ # 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. +# limitations under the License. import("//test/xts/tools/build/suite.gni") @@ -21,6 +21,8 @@ ohos_js_hap_suite("ActsAnsAllActiveTestOne") { ] certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "ActsAnsAllActiveTestOne" + subsystem_name = "notification" + part_name = "distributed_notification_service" } ohos_js_assets("hjs_demo_js_assets") { js2abc = true diff --git a/notification/ans_standard/publish_test/getactive/getactiveotherapp/BUILD.gn b/notification/ans_standard/publish_test/getactive/getactiveotherapp/BUILD.gn index e2983c58e97f30bcb4c457eeba641b2dbaf4f60b..d502d56eac49ced3ebda4a6bf1510898ff5276c2 100644 --- a/notification/ans_standard/publish_test/getactive/getactiveotherapp/BUILD.gn +++ b/notification/ans_standard/publish_test/getactive/getactiveotherapp/BUILD.gn @@ -9,16 +9,15 @@ # 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. +# limitations under the License. import("//test/xts/tools/build/suite.gni") -ohos_hap("ActsAnsGetActiveOtherApp") { +ohos_hap_assist_suite("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" + subsystem_name = "notification" + part_name = "distributed_notification_service" testonly = true deps = [ ":hjs_demo_js_assets", diff --git a/notification/ans_standard/publish_test/getwantagentinfo/BUILD.gn b/notification/ans_standard/publish_test/getwantagentinfo/BUILD.gn index 8d2adbbae0da970073a1f8db6b44017c35c2f221..715ab1e02b4eda746ce0498436ed9fddc2f2c2a2 100644 --- a/notification/ans_standard/publish_test/getwantagentinfo/BUILD.gn +++ b/notification/ans_standard/publish_test/getwantagentinfo/BUILD.gn @@ -9,7 +9,7 @@ # 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. +# limitations under the License. import("//test/xts/tools/build/suite.gni") @@ -21,6 +21,8 @@ ohos_js_hap_suite("ActsAnsGetWantAgentInfoTest") { ] certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "ActsAnsGetWantAgentInfoTest" + subsystem_name = "notification" + part_name = "distributed_notification_service" } ohos_js_assets("hjs_demo_js_assets") { js2abc = true diff --git a/notification/ans_standard/publish_test/publish/BUILD.gn b/notification/ans_standard/publish_test/publish/BUILD.gn index 4dc88363a5659f8c8771db97c27297b740fa9d67..8efa587562507a09d7949e1ef0a85354dd4dd3bb 100644 --- a/notification/ans_standard/publish_test/publish/BUILD.gn +++ b/notification/ans_standard/publish_test/publish/BUILD.gn @@ -9,7 +9,7 @@ # 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. +# limitations under the License. import("//test/xts/tools/build/suite.gni") @@ -21,6 +21,8 @@ ohos_js_hap_suite("ActsAnsNotificationPublishXts") { ] certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "ActsAnsNotificationPublishTest" + subsystem_name = "notification" + part_name = "distributed_notification_service" } ohos_js_assets("hjs_demo_js_assets") { js2abc = true diff --git a/notification/ans_standard/publish_test/publishcontentype/publishtype/BUILD.gn b/notification/ans_standard/publish_test/publishcontentype/publishtype/BUILD.gn index 0ba3656881bd98287be619ea71661adb3b29619e..7ce46a2a2583c5d516146367e0864c282f27caa2 100644 --- a/notification/ans_standard/publish_test/publishcontentype/publishtype/BUILD.gn +++ b/notification/ans_standard/publish_test/publishcontentype/publishtype/BUILD.gn @@ -20,6 +20,8 @@ ohos_js_hap_suite("ActsAnsNotificationTest") { ] certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "ActsAnsNotificationTest" + subsystem_name = "notification" + part_name = "distributed_notification_service" } ohos_js_assets("hjs_demo_js_assets") { js2abc = true diff --git a/notification/ans_standard/publish_test/publishcontentype/sub/BUILD.gn b/notification/ans_standard/publish_test/publishcontentype/sub/BUILD.gn index 8e08824886cfaf36a5319e9c606b60fd7caca41c..f11800a1d5bcceaf55b65719593d1df5ff4159d2 100644 --- a/notification/ans_standard/publish_test/publishcontentype/sub/BUILD.gn +++ b/notification/ans_standard/publish_test/publishcontentype/sub/BUILD.gn @@ -12,12 +12,11 @@ # limitations under the License. import("//test/xts/tools/build/suite.gni") -ohos_hap("ActsAnsCommonEventTest") { +ohos_hap_assist_suite("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" + subsystem_name = "notification" + part_name = "distributed_notification_service" testonly = true deps = [ ":hjs_demo_js_assets", diff --git a/notification/ans_standard/publish_test/publishremovalwantagent/BUILD.gn b/notification/ans_standard/publish_test/publishremovalwantagent/BUILD.gn index 55d6b85adf59901a6291193647497406ed7973b7..1aa720db1793af0319606ef65bc0fc96f3da69ee 100644 --- a/notification/ans_standard/publish_test/publishremovalwantagent/BUILD.gn +++ b/notification/ans_standard/publish_test/publishremovalwantagent/BUILD.gn @@ -9,7 +9,7 @@ # 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. +# limitations under the License. import("//test/xts/tools/build/suite.gni") @@ -21,6 +21,8 @@ ohos_js_hap_suite("ActsAnsPublishRemovalWantAgentTest") { ] certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "ActsAnsPublishRemovalWantAgentTest" + subsystem_name = "notification" + part_name = "distributed_notification_service" } ohos_js_assets("hjs_demo_js_assets") { js2abc = true diff --git a/notification/ans_standard/publish_test/publishsound/BUILD.gn b/notification/ans_standard/publish_test/publishsound/BUILD.gn index 32ccec4c651c39e5059518417f5e68eaa89fd627..0dce2f6e17e12513a70ef28f72acb99d9e9442ca 100644 --- a/notification/ans_standard/publish_test/publishsound/BUILD.gn +++ b/notification/ans_standard/publish_test/publishsound/BUILD.gn @@ -9,7 +9,7 @@ # 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. +# limitations under the License. import("//test/xts/tools/build/suite.gni") @@ -21,6 +21,8 @@ ohos_js_hap_suite("ActsAnsPublishSoundTest") { ] certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "ActsAnsPublishSoundTest" + subsystem_name = "notification" + part_name = "distributed_notification_service" } ohos_js_assets("hjs_demo_js_assets") { js2abc = true diff --git a/notification/ans_standard/publish_test/publishvibra/BUILD.gn b/notification/ans_standard/publish_test/publishvibra/BUILD.gn index a4c714a8d2e6bb91e32f1dca3167d524de5d0215..1d83f83054a3a00f37bbbb444cf45e2130ceb703 100644 --- a/notification/ans_standard/publish_test/publishvibra/BUILD.gn +++ b/notification/ans_standard/publish_test/publishvibra/BUILD.gn @@ -9,7 +9,7 @@ # 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. +# limitations under the License. import("//test/xts/tools/build/suite.gni") @@ -21,6 +21,8 @@ ohos_js_hap_suite("ActsAnsPublishVibraTest") { ] certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "ActsAnsPublishVibraTest" + subsystem_name = "notification" + part_name = "distributed_notification_service" } ohos_js_assets("hjs_demo_js_assets") { js2abc = true diff --git a/notification/ans_standard/publish_test/sub/BUILD.gn b/notification/ans_standard/publish_test/sub/BUILD.gn index 058463e1bcba39febbd1d14dc9ad137efe13156e..161984da29cd21fb7c0e8615009abfcd164a3da4 100644 --- a/notification/ans_standard/publish_test/sub/BUILD.gn +++ b/notification/ans_standard/publish_test/sub/BUILD.gn @@ -9,7 +9,7 @@ # 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. +# limitations under the License. import("//test/xts/tools/build/suite.gni") @@ -21,6 +21,8 @@ ohos_js_hap_suite("ActsAnsSubTestXts") { ] certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "ActsAnsSubTest" + subsystem_name = "notification" + part_name = "distributed_notification_service" } ohos_js_assets("hjs_demo_js_assets") { js2abc = true diff --git a/notification/ans_standard/publish_test/subscribe/publish/BUILD.gn b/notification/ans_standard/publish_test/subscribe/publish/BUILD.gn index 760165ac854049d60e51f95d4c22f26c43c09363..cf83cf4d0689295d4aefc99ca6beb18c98d8b576 100644 --- a/notification/ans_standard/publish_test/subscribe/publish/BUILD.gn +++ b/notification/ans_standard/publish_test/subscribe/publish/BUILD.gn @@ -12,12 +12,11 @@ # limitations under the License. import("//test/xts/tools/build/suite.gni") -ohos_hap("ActsAnsPublishTest") { +ohos_hap_assist_suite("ActsAnsPublishTest") { hap_profile = "./entry/src/main/config.json" hap_name = "ActsAnsPublishTest" - subsystem_name = XTS_SUITENAME - final_hap_path = - "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + subsystem_name = "notification" + part_name = "distributed_notification_service" testonly = true deps = [ ":hjs_demo_js_assets", diff --git a/notification/ans_standard/publish_test/subscribe/subscribe/BUILD.gn b/notification/ans_standard/publish_test/subscribe/subscribe/BUILD.gn index a5ea315587212385c4c7840f81871b82b3fedf70..f3b880f50e2d9d476162edc501c2b9f01dd6c57d 100644 --- a/notification/ans_standard/publish_test/subscribe/subscribe/BUILD.gn +++ b/notification/ans_standard/publish_test/subscribe/subscribe/BUILD.gn @@ -9,7 +9,7 @@ # 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. +# limitations under the License. import("//test/xts/tools/build/suite.gni") @@ -21,6 +21,8 @@ ohos_js_hap_suite("ActsAnsSubscriberTest") { ] certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "ActsAnsSubscriberTest" + subsystem_name = "notification" + part_name = "distributed_notification_service" } ohos_js_assets("hjs_demo_js_assets") { js2abc = true diff --git a/notification/ans_standard/publish_test/unsubscribe/BUILD.gn b/notification/ans_standard/publish_test/unsubscribe/BUILD.gn index e968bd0626a888b3a32ae825cc9e03db9c2c35fa..020abc3939439c35da0868539618cea193b23d47 100644 --- a/notification/ans_standard/publish_test/unsubscribe/BUILD.gn +++ b/notification/ans_standard/publish_test/unsubscribe/BUILD.gn @@ -9,7 +9,7 @@ # 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. +# limitations under the License. import("//test/xts/tools/build/suite.gni") @@ -21,6 +21,8 @@ ohos_js_hap_suite("ActsAnsUnSubscriberTest") { ] certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "ActsAnsUnSubscriberTest" + subsystem_name = "notification" + part_name = "distributed_notification_service" } ohos_js_assets("hjs_demo_js_assets") { js2abc = true diff --git a/notification/ans_standard/publish_test/wantagent/test1/BUILD.gn b/notification/ans_standard/publish_test/wantagent/test1/BUILD.gn index 66a1613d22418cfb4f244343fd6209362422f1c4..fd47b8dc08b95fcdf97c3de98accc5ab43d290e4 100644 --- a/notification/ans_standard/publish_test/wantagent/test1/BUILD.gn +++ b/notification/ans_standard/publish_test/wantagent/test1/BUILD.gn @@ -12,12 +12,11 @@ # limitations under the License. import("//test/xts/tools/build/suite.gni") -ohos_hap("test1") { +ohos_hap_assist_suite("test1") { hap_profile = "./entry/src/main/config.json" hap_name = "test1" - subsystem_name = XTS_SUITENAME - final_hap_path = - "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + subsystem_name = "notification" + part_name = "distributed_notification_service" testonly = true deps = [ ":hjs_demo_js_assets", diff --git a/notification/ans_standard/publish_test/wantagent/test2/BUILD.gn b/notification/ans_standard/publish_test/wantagent/test2/BUILD.gn index 2070fddace17d4ee86a7167c9f748771373b4f6a..28abbb7dd04dc6dd997a85cec86c622a3fe0e01d 100644 --- a/notification/ans_standard/publish_test/wantagent/test2/BUILD.gn +++ b/notification/ans_standard/publish_test/wantagent/test2/BUILD.gn @@ -12,12 +12,11 @@ # limitations under the License. import("//test/xts/tools/build/suite.gni") -ohos_hap("test2") { +ohos_hap_assist_suite("test2") { hap_profile = "./entry/src/main/config.json" hap_name = "test2" - subsystem_name = XTS_SUITENAME - final_hap_path = - "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + subsystem_name = "notification" + part_name = "distributed_notification_service" testonly = true deps = [ ":hjs_demo_js_assets", diff --git a/notification/ans_standard/publish_test/wantagent/wantagent1/BUILD.gn b/notification/ans_standard/publish_test/wantagent/wantagent1/BUILD.gn index c00f84d0d171ccba941434f4c099f13da1d69930..963342d45481e0199e13b958ad13bf35403ea21e 100644 --- a/notification/ans_standard/publish_test/wantagent/wantagent1/BUILD.gn +++ b/notification/ans_standard/publish_test/wantagent/wantagent1/BUILD.gn @@ -9,7 +9,7 @@ # 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. +# limitations under the License. import("//test/xts/tools/build/suite.gni") @@ -21,6 +21,8 @@ ohos_js_hap_suite("ActsAnsWantAgentOneTest") { ] certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "ActsAnsWantAgentOneTest" + subsystem_name = "notification" + part_name = "distributed_notification_service" } ohos_js_assets("hjs_demo_js_assets") { js2abc = true diff --git a/notification/ans_standard/publish_test/wantagent/wantagent1promise/BUILD.gn b/notification/ans_standard/publish_test/wantagent/wantagent1promise/BUILD.gn index 4a83b4d90de2ae639d823674b172b2c73b45e449..11f94c4e8a383148c062f845e91523130c844842 100644 --- a/notification/ans_standard/publish_test/wantagent/wantagent1promise/BUILD.gn +++ b/notification/ans_standard/publish_test/wantagent/wantagent1promise/BUILD.gn @@ -9,7 +9,7 @@ # 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. +# limitations under the License. import("//test/xts/tools/build/suite.gni") @@ -21,6 +21,8 @@ ohos_js_hap_suite("ActsAnsWantAgentOneProTest") { ] certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "ActsAnsWantAgentOneProTest" + subsystem_name = "notification" + part_name = "distributed_notification_service" } ohos_js_assets("hjs_demo_js_assets") { js2abc = true diff --git a/notification/ans_standard/publish_test/wantagent/wantagent2/BUILD.gn b/notification/ans_standard/publish_test/wantagent/wantagent2/BUILD.gn index 919e55d47f12c375f868e7332d83a7400c0fb540..14f13162f620938d49a7b082a14f4e7db97517a2 100644 --- a/notification/ans_standard/publish_test/wantagent/wantagent2/BUILD.gn +++ b/notification/ans_standard/publish_test/wantagent/wantagent2/BUILD.gn @@ -9,7 +9,7 @@ # 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. +# limitations under the License. import("//test/xts/tools/build/suite.gni") @@ -21,6 +21,8 @@ ohos_js_hap_suite("ActsAnsWantAgentTwoTest") { ] certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "ActsAnsWantAgentTwoTest" + subsystem_name = "notification" + part_name = "distributed_notification_service" } ohos_js_assets("hjs_demo_js_assets") { js2abc = true diff --git a/notification/ans_standard/publish_test/wantagent/wantagent2promise/BUILD.gn b/notification/ans_standard/publish_test/wantagent/wantagent2promise/BUILD.gn index 1bc07895d1dff78a6d2c50739df591f23d72a606..ae27f07b7507822aabdc9f250753006238d53aea 100644 --- a/notification/ans_standard/publish_test/wantagent/wantagent2promise/BUILD.gn +++ b/notification/ans_standard/publish_test/wantagent/wantagent2promise/BUILD.gn @@ -9,7 +9,7 @@ # 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. +# limitations under the License. import("//test/xts/tools/build/suite.gni") @@ -21,6 +21,8 @@ ohos_js_hap_suite("ActsAnsWantAgentTwoProTest") { ] certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "ActsAnsWantAgentTwoProTest" + subsystem_name = "notification" + part_name = "distributed_notification_service" } ohos_js_assets("hjs_demo_js_assets") { js2abc = true diff --git a/notification/ans_standard/publish_test/wantagent/wantagent3/BUILD.gn b/notification/ans_standard/publish_test/wantagent/wantagent3/BUILD.gn index b7f0e1b10ea0063da67f871c9db5594f35e24346..611c86320e90da8b2d62239534547c970f803d0b 100644 --- a/notification/ans_standard/publish_test/wantagent/wantagent3/BUILD.gn +++ b/notification/ans_standard/publish_test/wantagent/wantagent3/BUILD.gn @@ -9,7 +9,7 @@ # 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. +# limitations under the License. import("//test/xts/tools/build/suite.gni") @@ -21,6 +21,8 @@ ohos_js_hap_suite("ActsAnsWantAgentTreeTest") { ] certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "ActsAnsWantAgentTreeTest" + subsystem_name = "notification" + part_name = "distributed_notification_service" } ohos_js_assets("hjs_demo_js_assets") { js2abc = true diff --git a/notification/ans_standard/publish_test/wantagent/wantagent3promise/BUILD.gn b/notification/ans_standard/publish_test/wantagent/wantagent3promise/BUILD.gn index 71dc657f31feeb10a799e805bfcef9497e414c09..a203275fe629529a2d7fa5e82c0ce90ac79bbfcf 100644 --- a/notification/ans_standard/publish_test/wantagent/wantagent3promise/BUILD.gn +++ b/notification/ans_standard/publish_test/wantagent/wantagent3promise/BUILD.gn @@ -9,7 +9,7 @@ # 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. +# limitations under the License. import("//test/xts/tools/build/suite.gni") @@ -21,6 +21,8 @@ ohos_js_hap_suite("ActsAnsWantAgentTreeProTest") { ] certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "ActsAnsWantAgentTreeProTest" + subsystem_name = "notification" + part_name = "distributed_notification_service" } ohos_js_assets("hjs_demo_js_assets") { js2abc = true diff --git a/notification/ans_standard/publish_test/wantagent/wantagent4/BUILD.gn b/notification/ans_standard/publish_test/wantagent/wantagent4/BUILD.gn index 6f1b5f58e6d2c928a6392dfed3f4e5608e9d50fa..0f52b70d8535a4975543ec526fc43512dc66452b 100644 --- a/notification/ans_standard/publish_test/wantagent/wantagent4/BUILD.gn +++ b/notification/ans_standard/publish_test/wantagent/wantagent4/BUILD.gn @@ -9,7 +9,7 @@ # 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. +# limitations under the License. import("//test/xts/tools/build/suite.gni") @@ -21,6 +21,8 @@ ohos_js_hap_suite("ActsAnsWantAgentFourTest") { ] certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "ActsAnsWantAgentFourTest" + subsystem_name = "notification" + part_name = "distributed_notification_service" } ohos_js_assets("hjs_demo_js_assets") { js2abc = true diff --git a/notification/ans_standard/publish_test/wantagent/wantagent4promise/BUILD.gn b/notification/ans_standard/publish_test/wantagent/wantagent4promise/BUILD.gn index f3e3752bd92ea5b869904b0e75bade7f64beb39b..81b468e57c8f19ae2ee26dde4c11e3fbd6f78be8 100644 --- a/notification/ans_standard/publish_test/wantagent/wantagent4promise/BUILD.gn +++ b/notification/ans_standard/publish_test/wantagent/wantagent4promise/BUILD.gn @@ -9,7 +9,7 @@ # 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. +# limitations under the License. import("//test/xts/tools/build/suite.gni") @@ -21,6 +21,8 @@ ohos_js_hap_suite("ActsAnsWantAgentFourProTest") { ] certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "ActsAnsWantAgentFourProTest" + subsystem_name = "notification" + part_name = "distributed_notification_service" } ohos_js_assets("hjs_demo_js_assets") { js2abc = true diff --git a/notification/ans_standard/publish_test/wantagent/wantagent5/BUILD.gn b/notification/ans_standard/publish_test/wantagent/wantagent5/BUILD.gn index f93bb4846bef2651dec59de1913642d5bfadc439..b08386e777cdf5781e1649afef7023b99d88c97b 100644 --- a/notification/ans_standard/publish_test/wantagent/wantagent5/BUILD.gn +++ b/notification/ans_standard/publish_test/wantagent/wantagent5/BUILD.gn @@ -9,7 +9,7 @@ # 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. +# limitations under the License. import("//test/xts/tools/build/suite.gni") @@ -21,6 +21,8 @@ ohos_js_hap_suite("ActsAnsWantAgentFiveTest") { ] certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "ActsAnsWantAgentFiveTest" + subsystem_name = "notification" + part_name = "distributed_notification_service" } ohos_js_assets("hjs_demo_js_assets") { js2abc = true diff --git a/notification/ans_standard/publish_test/wantagent/wantagent5promise/BUILD.gn b/notification/ans_standard/publish_test/wantagent/wantagent5promise/BUILD.gn index 9c36b90dfb77ae16bbae6e1858d5a5790ca4a898..05cf376971cfcdd0a8ecfa2a462658ec52d1eb93 100644 --- a/notification/ans_standard/publish_test/wantagent/wantagent5promise/BUILD.gn +++ b/notification/ans_standard/publish_test/wantagent/wantagent5promise/BUILD.gn @@ -9,7 +9,7 @@ # 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. +# limitations under the License. import("//test/xts/tools/build/suite.gni") @@ -21,6 +21,8 @@ ohos_js_hap_suite("ActsAnsWantAgentFiveProTest") { ] certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "ActsAnsWantAgentFiveProTest" + subsystem_name = "notification" + part_name = "distributed_notification_service" } ohos_js_assets("hjs_demo_js_assets") { js2abc = true diff --git a/notification/ces_standard/subscribeandpublish/actssubscriberorderedtest/BUILD.gn b/notification/ces_standard/subscribeandpublish/actssubscriberorderedtest/BUILD.gn index af1b9b623c439728bad790df1d9e37f41dcbd836..23456fa37e2f3d53541dd4dc1ac463181aa43a67 100644 --- a/notification/ces_standard/subscribeandpublish/actssubscriberorderedtest/BUILD.gn +++ b/notification/ces_standard/subscribeandpublish/actssubscriberorderedtest/BUILD.gn @@ -20,6 +20,8 @@ ohos_js_hap_suite("ActsSubscriberOrderTest") { ] certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "ActsSubscriberOrderTest" + subsystem_name = "notification" + part_name = "common_event_service" } ohos_js_assets("hjs_demo_js_assets") { js2abc = true diff --git a/notification/ces_standard/subscribeandpublish/actssubscriberunordersystemtest/BUILD.gn b/notification/ces_standard/subscribeandpublish/actssubscriberunordersystemtest/BUILD.gn index 0d718a4d21546e4724c6d6ca3b965193bb9e45e1..2e839a6ead9fbd0d22f85857552b7df15a0dce72 100644 --- a/notification/ces_standard/subscribeandpublish/actssubscriberunordersystemtest/BUILD.gn +++ b/notification/ces_standard/subscribeandpublish/actssubscriberunordersystemtest/BUILD.gn @@ -20,6 +20,8 @@ ohos_js_hap_suite("ActsSubscriberTestUnorderSystemTest") { ] certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "ActsSubscriberTestUnorderSystemTest" + subsystem_name = "notification" + part_name = "common_event_service" } ohos_js_assets("hjs_demo_js_assets") { js2abc = true diff --git a/notification/ces_standard/subscribeandpublish/actssubscriberunordertest/BUILD.gn b/notification/ces_standard/subscribeandpublish/actssubscriberunordertest/BUILD.gn index 3986a3c3084c546f6152618878550360aafe4c5a..7c8c20e32b0edcda1655e5942b95af4923c07e89 100644 --- a/notification/ces_standard/subscribeandpublish/actssubscriberunordertest/BUILD.gn +++ b/notification/ces_standard/subscribeandpublish/actssubscriberunordertest/BUILD.gn @@ -20,6 +20,8 @@ ohos_js_hap_suite("ActsSubscriberUnorderTest") { ] certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "ActsSubscriberUnorderTest" + subsystem_name = "notification" + part_name = "common_event_service" } ohos_js_assets("hjs_demo_js_assets") { js2abc = true diff --git a/notification/ces_standard/subscribeandpublish/emittertest/BUILD.gn b/notification/ces_standard/subscribeandpublish/emittertest/BUILD.gn index 1dcf18f8052f2db444eb7acfd3aaf5bbf1ca4686..7a5bd1ea64e97d3b97bc2453f6e544e7e0d16aa7 100644 --- a/notification/ces_standard/subscribeandpublish/emittertest/BUILD.gn +++ b/notification/ces_standard/subscribeandpublish/emittertest/BUILD.gn @@ -20,6 +20,8 @@ ohos_js_hap_suite("EmitterTest") { ] certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "ActsEmitterTest" + subsystem_name = "notification" + part_name = "common_event_service" } ohos_js_assets("hjs_demo_js_assets") { js2abc = true