From db92b4e736e437922d9b4dc617cc86fff0e2bf9e Mon Sep 17 00:00:00 2001 From: jiyong_sd Date: Tue, 1 Mar 2022 12:12:31 +0800 Subject: [PATCH] modified settingdata Signed-off-by: jiyong_sd Change-Id: I3344c419772728e129507b0231701409dabb4721 --- .../stage/stage_extension_service/BUILD.gn | 4 +-- .../stage/stage_extension_service/Test.json | 2 +- {settings => settingsdata}/BUILD.gn | 2 +- .../settings_ets}/BUILD.gn | 4 +-- .../settings_ets/Test.json | 2 +- .../settings_ets/entry/src/main/BUILD.gn | 32 ++++++++++++++++++ .../settings_ets/entry/src/main/config.json | 0 .../entry/src/main/ets/MainAbility/app.ets | 0 .../src/main/ets/MainAbility/pages/index.ets | 0 .../main/ets/MainAbility/test/List.test.ets | 0 .../MainAbility/test/SettingUiJsunit.test.ets | 0 .../main/resources/base/element/string.json | 0 .../src/main/resources/base/media/icon.png | Bin .../settings_ets/signature/openharmony_sx.p7b | Bin test_packages.gni | 1 + 15 files changed, 40 insertions(+), 7 deletions(-) rename {settings => settingsdata}/BUILD.gn (96%) rename {settings/settings_ets/entry/src/main => settingsdata/settings_ets}/BUILD.gn (96%) rename {settings => settingsdata}/settings_ets/Test.json (86%) create mode 100644 settingsdata/settings_ets/entry/src/main/BUILD.gn rename {settings => settingsdata}/settings_ets/entry/src/main/config.json (100%) rename {settings => settingsdata}/settings_ets/entry/src/main/ets/MainAbility/app.ets (100%) rename {settings => settingsdata}/settings_ets/entry/src/main/ets/MainAbility/pages/index.ets (100%) rename {settings => settingsdata}/settings_ets/entry/src/main/ets/MainAbility/test/List.test.ets (100%) rename {settings => settingsdata}/settings_ets/entry/src/main/ets/MainAbility/test/SettingUiJsunit.test.ets (100%) rename {settings => settingsdata}/settings_ets/entry/src/main/resources/base/element/string.json (100%) rename {settings => settingsdata}/settings_ets/entry/src/main/resources/base/media/icon.png (100%) rename {settings => settingsdata}/settings_ets/signature/openharmony_sx.p7b (100%) diff --git a/aafwk/aafwk_standard/stage/stage_extension_service/BUILD.gn b/aafwk/aafwk_standard/stage/stage_extension_service/BUILD.gn index 8317e362b..5eea4e5ff 100755 --- a/aafwk/aafwk_standard/stage/stage_extension_service/BUILD.gn +++ b/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" diff --git a/aafwk/aafwk_standard/stage/stage_extension_service/Test.json b/aafwk/aafwk_standard/stage/stage_extension_service/Test.json index 83f5b926b..deba02d66 100755 --- a/aafwk/aafwk_standard/stage/stage_extension_service/Test.json +++ b/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 diff --git a/settings/BUILD.gn b/settingsdata/BUILD.gn similarity index 96% rename from settings/BUILD.gn rename to settingsdata/BUILD.gn index 48d834c3c..8c1858d8f 100755 --- a/settings/BUILD.gn +++ b/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" ] } diff --git a/settings/settings_ets/entry/src/main/BUILD.gn b/settingsdata/settings_ets/BUILD.gn similarity index 96% rename from settings/settings_ets/entry/src/main/BUILD.gn rename to settingsdata/settings_ets/BUILD.gn index fbc52811e..af0f4c461 100755 --- a/settings/settings_ets/entry/src/main/BUILD.gn +++ b/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" diff --git a/settings/settings_ets/Test.json b/settingsdata/settings_ets/Test.json similarity index 86% rename from settings/settings_ets/Test.json rename to settingsdata/settings_ets/Test.json index 44fa2d9b7..928f4ea35 100755 --- a/settings/settings_ets/Test.json +++ b/settingsdata/settings_ets/Test.json @@ -9,7 +9,7 @@ "kits": [ { "test-file-name": [ - "SettingsEtsTest.hap" + "ActsSettingsEtsTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/settingsdata/settings_ets/entry/src/main/BUILD.gn b/settingsdata/settings_ets/entry/src/main/BUILD.gn new file mode 100644 index 000000000..af0f4c461 --- /dev/null +++ b/settingsdata/settings_ets/entry/src/main/BUILD.gn @@ -0,0 +1,32 @@ +# 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" +} diff --git a/settings/settings_ets/entry/src/main/config.json b/settingsdata/settings_ets/entry/src/main/config.json similarity index 100% rename from settings/settings_ets/entry/src/main/config.json rename to settingsdata/settings_ets/entry/src/main/config.json diff --git a/settings/settings_ets/entry/src/main/ets/MainAbility/app.ets b/settingsdata/settings_ets/entry/src/main/ets/MainAbility/app.ets similarity index 100% rename from settings/settings_ets/entry/src/main/ets/MainAbility/app.ets rename to settingsdata/settings_ets/entry/src/main/ets/MainAbility/app.ets diff --git a/settings/settings_ets/entry/src/main/ets/MainAbility/pages/index.ets b/settingsdata/settings_ets/entry/src/main/ets/MainAbility/pages/index.ets similarity index 100% rename from settings/settings_ets/entry/src/main/ets/MainAbility/pages/index.ets rename to settingsdata/settings_ets/entry/src/main/ets/MainAbility/pages/index.ets diff --git a/settings/settings_ets/entry/src/main/ets/MainAbility/test/List.test.ets b/settingsdata/settings_ets/entry/src/main/ets/MainAbility/test/List.test.ets similarity index 100% rename from settings/settings_ets/entry/src/main/ets/MainAbility/test/List.test.ets rename to settingsdata/settings_ets/entry/src/main/ets/MainAbility/test/List.test.ets diff --git a/settings/settings_ets/entry/src/main/ets/MainAbility/test/SettingUiJsunit.test.ets b/settingsdata/settings_ets/entry/src/main/ets/MainAbility/test/SettingUiJsunit.test.ets similarity index 100% rename from settings/settings_ets/entry/src/main/ets/MainAbility/test/SettingUiJsunit.test.ets rename to settingsdata/settings_ets/entry/src/main/ets/MainAbility/test/SettingUiJsunit.test.ets diff --git a/settings/settings_ets/entry/src/main/resources/base/element/string.json b/settingsdata/settings_ets/entry/src/main/resources/base/element/string.json similarity index 100% rename from settings/settings_ets/entry/src/main/resources/base/element/string.json rename to settingsdata/settings_ets/entry/src/main/resources/base/element/string.json diff --git a/settings/settings_ets/entry/src/main/resources/base/media/icon.png b/settingsdata/settings_ets/entry/src/main/resources/base/media/icon.png similarity index 100% rename from settings/settings_ets/entry/src/main/resources/base/media/icon.png rename to settingsdata/settings_ets/entry/src/main/resources/base/media/icon.png diff --git a/settings/settings_ets/signature/openharmony_sx.p7b b/settingsdata/settings_ets/signature/openharmony_sx.p7b similarity index 100% rename from settings/settings_ets/signature/openharmony_sx.p7b rename to settingsdata/settings_ets/signature/openharmony_sx.p7b diff --git a/test_packages.gni b/test_packages.gni index 9f05960f8..35cba435c 100644 --- a/test_packages.gni +++ b/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 = [ -- GitLab