!4822 【账号】测试子系统适配任务

Merge pull request !4822 from 何海涛/0804XTS

account/OsAccountTest_js/BUILD.gn

@@ -21,6 +21,8 @@ ohos_js_hap_suite("ActsOsAccountJSApiTest") {
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsOsAccountJSApiTest"
+  subsystem_name = "account"
+  part_name = "os_account"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   js2abc = true

account/appaccount/actsaccounttest/BUILD.gn

@@ -21,6 +21,8 @@ ohos_js_hap_suite("ActsAccountTest") {
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsAccountTest"
+  subsystem_name = "account"
+  part_name = "os_account"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   js2abc = true

account/appaccount/actsgetallaccounts/BUILD.gn

@@ -21,6 +21,8 @@ ohos_js_hap_suite("ActsGetAllAccountsTest") {
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsGetAllAccountsTest"
+  subsystem_name = "account"
+  part_name = "os_account"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   js2abc = true

account/appaccount/actssetchecksyncenable/BUILD.gn

@@ -21,6 +21,8 @@ ohos_js_hap_suite("ActsSetCheckSyncEnableTest") {
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsSetCheckSyncEnableTest"
+  subsystem_name = "account"
+  part_name = "os_account"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   js2abc = true

account/appaccount/getallaccessibleaccounts/actsgetallaccessibleaccounts/BUILD.gn

@@ -21,6 +21,8 @@ ohos_js_hap_suite("ActsGetAllAccessibleAccountsTest") {
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsGetAllAccessibleAccountsTest"
+  subsystem_name = "account"
+  part_name = "os_account"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   js2abc = true

account/appaccount/getallaccessibleaccounts/actsgetallaccessiblemultiple/BUILD.gn

@@ -21,6 +21,8 @@ ohos_js_hap_suite("ActsGetAllAccessibleMultipleTest") {
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsGetAllAccessibleMultipleTest"
+  subsystem_name = "account"
+  part_name = "os_account"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   js2abc = true

account/appaccount/sceneProject/actsaccountaccessibleFirst/BUILD.gn

@@ -12,12 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("ActsAccountAccessibleFirst") {
+ohos_hap_assist_suite("ActsAccountAccessibleFirst") {
   hap_profile = "./entry/src/main/config.json"
   hap_name = "ActsAccountAccessibleFirst"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  subsystem_name = "account"
+  part_name = "os_account"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",

account/appaccount/sceneProject/actsaccountaccessibleSecond/BUILD.gn

@@ -12,12 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("ActsAccountAccessibleSecond") {
+ohos_hap_assist_suite("ActsAccountAccessibleSecond") {
   hap_profile = "./entry/src/main/config.json"
   hap_name = "ActsAccountAccessibleSecond"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  subsystem_name = "account"
+  part_name = "os_account"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",

account/appaccount/sceneProject/actsaccountauthenticator/BUILD.gn

@@ -12,12 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("ActsAccountAuthenticator") {
+ohos_hap_assist_suite("ActsAccountAuthenticator") {
   hap_profile = "./entry/src/main/config.json"
   hap_name = "ActsAccountAuthenticator"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  subsystem_name = "account"
+  part_name = "os_account"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",

account/appaccount/sceneProject/actsaccountoauthtoken/BUILD.gn

@@ -12,12 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("ActsAccountOauthtoken") {
+ohos_hap_assist_suite("ActsAccountOauthtoken") {
   hap_profile = "./entry/src/main/config.json"
   hap_name = "ActsAccountOauthtoken"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  subsystem_name = "account"
+  part_name = "os_account"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",

account/appaccount/sceneProject/actsaccountsceneaccessible/BUILD.gn

@@ -12,12 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("ActsAccountSceneAccessible") {
+ohos_hap_assist_suite("ActsAccountSceneAccessible") {
   hap_profile = "./entry/src/main/config.json"
   hap_name = "ActsAccountSceneAccessible"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  subsystem_name = "account"
+  part_name = "os_account"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",

account/appaccount/sceneProject/actsaccountsceneappaccess/BUILD.gn

@@ -12,12 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("ActsAccountSceneAppAccess") {
+ohos_hap_assist_suite("ActsAccountSceneAppAccess") {
   hap_profile = "./entry/src/main/config.json"
   hap_name = "ActsAccountSceneAppAccess"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  subsystem_name = "account"
+  part_name = "os_account"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",

account/appaccount/sceneProject/actsaccountsceneonoff/BUILD.gn

@@ -12,12 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("ActsAccountSceneOnOff") {
+ohos_hap_assist_suite("ActsAccountSceneOnOff") {
   hap_profile = "./entry/src/main/config.json"
   hap_name = "ActsAccountSceneOnOff"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  subsystem_name = "account"
+  part_name = "os_account"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",

account/appaccount/sceneProject/actsscenegetallaccounts/BUILD.gn

@@ -12,12 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("ActsSceneGetAllAccounts") {
+ohos_hap_assist_suite("ActsSceneGetAllAccounts") {
   hap_profile = "./entry/src/main/config.json"
   hap_name = "ActsSceneGetAllAccounts"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  subsystem_name = "account"
+  part_name = "os_account"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",

account/osaccount/actsosaccountthirdpartytest/BUILD.gn

@@ -21,6 +21,8 @@ ohos_js_hap_suite("ActsOsAccountThirdPartyTest") {
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsOsAccountThirdPartyTest"
+  subsystem_name = "account"
+  part_name = "os_account"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   js2abc = true