!2131 modified settingdata

Merge pull request !2131 from jiyong/local-1119

aafwk/aafwk_standard/stage/stage_extension_service/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,7 +21,7 @@ ohos_js_hap_suite("StageExtensionServiceTest") {
   ]
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "StageExtensionServiceTest"
+  hap_name = "ActsStageExtensionServiceTest"
 }
 ohos_js_assets("stage_extension_service_assets") {
   source_dir = "./entry/src/main/ets/MainAbility"

aafwk/aafwk_standard/stage/stage_extension_service/Test.json

@@ -9,7 +9,7 @@
     "kits": [
         {
             "test-file-name": [
-                "StageExtensionServiceTest.hap"
+                "ActsStageExtensionServiceTest.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

settings/BUILD.gn → settingsdata/BUILD.gn

@@ -11,7 +11,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-group("settings") {
+group("settingsdata") {
   testonly = true
   deps = [ "settings_ets:SettingsEtsTest" ]
 }

settings/settings_ets/entry/src/main/BUILD.gn → settingsdata/settings_ets/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,7 +21,7 @@ ohos_js_hap_suite("SettingsEtsTest") {
   ]
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "SettingsEtsTest"
+  hap_name = "ActsSettingsEtsTest"
 }
 ohos_js_assets("settings_ets_assets") {
   source_dir = "./entry/src/main/ets/MainAbility"

settings/settings_ets/Test.json → settingsdata/settings_ets/Test.json

@@ -9,7 +9,7 @@
     "kits": [
         {
             "test-file-name": [
-                "SettingsEtsTest.hap"
+                "ActsSettingsEtsTest.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

settingsdata/settings_ets/entry/src/main/BUILD.gn

+# Copyright (c) 2021 Huawei Device Co., Ltd.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# 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.
+
+import("//test/xts/tools/build/suite.gni")
+
+ohos_js_hap_suite("SettingsEtsTest") {
+  hap_profile = "./entry/src/main/config.json"
+  deps = [
+    ":settings_ets_assets",
+    ":settings_ets_resources",
+  ]
+  ets2abc = true
+  certificate_profile = "./signature/openharmony_sx.p7b"
+  hap_name = "ActsSettingsEtsTest"
+}
+ohos_js_assets("settings_ets_assets") {
+  source_dir = "./entry/src/main/ets/MainAbility"
+}
+ohos_resources("settings_ets_resources") {
+  sources = [ "./entry/src/main/resources" ]
+  hap_profile = "./entry/src/main/config.json"
+}

test_packages.gni

@@ -40,6 +40,7 @@ _all_test_packages = [
   "${ACTS_ROOT}/telephony:telephony",
   "${ACTS_ROOT}/hiviewdfx:hiviewdfxtestacts",
   "${ACTS_ROOT}/location:location",
+  "${ACTS_ROOT}/settingsdata:settingsdata",
 ]
 
 _all_test_packages_ivi = [