bujianhua

Signed-off-by: Nfjr <fujiarui6@huawei.com>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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",

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",

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",

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

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

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

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

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

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

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

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",

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

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

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",

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

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

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",

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

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

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

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",

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

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

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

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

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",

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

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

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",

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",

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

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

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

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

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

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

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

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

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

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

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

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

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

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