diff --git a/aafwk/aafwk_standard/BUILD.gn b/aafwk/aafwk_standard/BUILD.gn index 95687a526709dd8b752f9fa0982257e32d4e0666..11a5c15c95f9447213ddb1c16365d543a77a577b 100644 --- a/aafwk/aafwk_standard/BUILD.gn +++ b/aafwk/aafwk_standard/BUILD.gn @@ -18,9 +18,9 @@ group("aafwk_standard") { if (is_standard_system) { deps = [ "abilitymanager:actsabilitymanagertest", - #"context:context", - #"featureability:featureability", - #"want:want", + "context:context", + "featureability:featureability", + "want:want", ] } } diff --git a/aafwk/aafwk_standard/context/BUILD.gn b/aafwk/aafwk_standard/context/BUILD.gn index 849fcf61d5bb3ad1a7ea7019617a45a333d30ede..2c459d56b59eb8a3d47d9d39a977d97eb2c86070 100755 --- a/aafwk/aafwk_standard/context/BUILD.gn +++ b/aafwk/aafwk_standard/context/BUILD.gn @@ -16,6 +16,9 @@ import("//test/xts/tools/build/suite.gni") group("context") { testonly = true if (is_standard_system) { - deps = [ "actscontexttest:ActsContextTest" ] + deps = [ + "actscontexttest:ActsContextTest", + "scene/defpermission:Defpermission", + ] } } diff --git a/aafwk/aafwk_standard/context/actscontexttest/BUILD.gn b/aafwk/aafwk_standard/context/actscontexttest/BUILD.gn index 40057d0a05156afe3cf3cc69ead01809d6943693..99ce3e12bbc37d9cdaeed4909382eac59002d172 100755 --- a/aafwk/aafwk_standard/context/actscontexttest/BUILD.gn +++ b/aafwk/aafwk_standard/context/actscontexttest/BUILD.gn @@ -14,6 +14,18 @@ import("//test/xts/tools/build/suite.gni") ohos_js_hap_suite("ActsContextTest") { - test_hap_name = "ActsContextTest" - hap_source_path = "hap/ActsContextTest.hap" + hap_profile = "./entry/src/main/config.json" + deps = [ + ":hjs_demo_js_assets", + ":hjs_demo_resources", + ] + certificate_profile = "./signature/openharmony_sx.p7b" + hap_name = "ActsContextTest" +} +ohos_js_assets("hjs_demo_js_assets") { + source_dir = "./entry/src/main/js/default" +} +ohos_resources("hjs_demo_resources") { + sources = [ "./entry/src/main/js/resources" ] + hap_profile = "./entry/src/main/config.json" } diff --git a/aafwk/aafwk_standard/context/actscontexttest/Test.json b/aafwk/aafwk_standard/context/actscontexttest/Test.json index 84ea6ee068794d2317744421e8774993f6d8da21..c74f0a155c2fb614e261d8933bcfa99e235e7482 100755 --- a/aafwk/aafwk_standard/context/actscontexttest/Test.json +++ b/aafwk/aafwk_standard/context/actscontexttest/Test.json @@ -9,7 +9,8 @@ "kits": [ { "test-file-name": [ - "ActsContextTest.hap" + "ActsContextTest.hap", + "DefPermission.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/aafwk/aafwk_standard/context/actscontexttest/entry/src/main/resources/base/element/string.json b/aafwk/aafwk_standard/context/actscontexttest/entry/src/main/js/resources/base/element/string.json similarity index 100% rename from aafwk/aafwk_standard/context/actscontexttest/entry/src/main/resources/base/element/string.json rename to aafwk/aafwk_standard/context/actscontexttest/entry/src/main/js/resources/base/element/string.json diff --git a/aafwk/aafwk_standard/context/actscontexttest/entry/src/main/resources/base/media/icon.png b/aafwk/aafwk_standard/context/actscontexttest/entry/src/main/js/resources/base/media/icon.png similarity index 100% rename from aafwk/aafwk_standard/context/actscontexttest/entry/src/main/resources/base/media/icon.png rename to aafwk/aafwk_standard/context/actscontexttest/entry/src/main/js/resources/base/media/icon.png diff --git a/aafwk/aafwk_standard/context/actscontexttest/signature/openharmony_sx.p7b b/aafwk/aafwk_standard/context/actscontexttest/signature/openharmony_sx.p7b new file mode 100755 index 0000000000000000000000000000000000000000..9be1e98fa4c0c28ca997ed660112fa16b194f0f5 Binary files /dev/null and b/aafwk/aafwk_standard/context/actscontexttest/signature/openharmony_sx.p7b differ diff --git a/aafwk/aafwk_standard/context/scene/defpermission/BUILD.gn b/aafwk/aafwk_standard/context/scene/defpermission/BUILD.gn new file mode 100644 index 0000000000000000000000000000000000000000..c3de3d8e27e7f71355b6c3f6c4696f6cff2d9740 --- /dev/null +++ b/aafwk/aafwk_standard/context/scene/defpermission/BUILD.gn @@ -0,0 +1,30 @@ +# 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("Defpermission") { + hap_profile = "./src/main/config.json" + deps = [ + ":hjs_demo_js_assets", + ":hjs_demo_resources", + ] + certificate_profile = "./signature/openharmony_sx.p7b" + hap_name = "Defpermission" +} +ohos_js_assets("hjs_demo_js_assets") { + source_dir = "./src/main/js/default" +} +ohos_resources("hjs_demo_resources") { + sources = [ "./src/main/js/resources" ] + hap_profile = "./src/main/config.json" +} diff --git a/aafwk/aafwk_standard/context/scene/defpermission/Test.json b/aafwk/aafwk_standard/context/scene/defpermission/Test.json new file mode 100644 index 0000000000000000000000000000000000000000..7a88763ed8d2ac31dd30211b9574f47273e84549 --- /dev/null +++ b/aafwk/aafwk_standard/context/scene/defpermission/Test.json @@ -0,0 +1,3 @@ +{ + "description": "Configuration for hjunit demo Tests", +} diff --git a/aafwk/aafwk_standard/context/scene/defpermission/signature/openharmony_sx.p7b b/aafwk/aafwk_standard/context/scene/defpermission/signature/openharmony_sx.p7b new file mode 100755 index 0000000000000000000000000000000000000000..9be1e98fa4c0c28ca997ed660112fa16b194f0f5 Binary files /dev/null and b/aafwk/aafwk_standard/context/scene/defpermission/signature/openharmony_sx.p7b differ diff --git a/aafwk/aafwk_standard/context/scene/defpermission/src/main/resources/base/element/string.json b/aafwk/aafwk_standard/context/scene/defpermission/src/main/js/resources/base/element/string.json similarity index 100% rename from aafwk/aafwk_standard/context/scene/defpermission/src/main/resources/base/element/string.json rename to aafwk/aafwk_standard/context/scene/defpermission/src/main/js/resources/base/element/string.json diff --git a/aafwk/aafwk_standard/context/scene/defpermission/src/main/resources/base/media/icon.png b/aafwk/aafwk_standard/context/scene/defpermission/src/main/js/resources/base/media/icon.png similarity index 100% rename from aafwk/aafwk_standard/context/scene/defpermission/src/main/resources/base/media/icon.png rename to aafwk/aafwk_standard/context/scene/defpermission/src/main/js/resources/base/media/icon.png diff --git a/aafwk/aafwk_standard/featureability/BUILD.gn b/aafwk/aafwk_standard/featureability/BUILD.gn index d509bc943e508ece93eae4aa6e629a44b1eb873f..f4154943de716dbfd0647d099b4e82a449d352c3 100755 --- a/aafwk/aafwk_standard/featureability/BUILD.gn +++ b/aafwk/aafwk_standard/featureability/BUILD.gn @@ -16,6 +16,15 @@ import("//test/xts/tools/build/suite.gni") group("featureability") { testonly = true if (is_standard_system) { - deps = [ "actsfeatureabilitytest:ActsFeatureAbilityTest" ] + deps = [ + "actsfeatureabilitytest:ActsFeatureAbilityTest", + "sceneproject/finishwithresultemptytest:FinishWithResultEmptyTest", + "sceneproject/finishwithresultpromiseparameterstest:FinishWithResultPromiseParametersTest", + "sceneproject/finishwithresulttest:FinishWithResultTest", + "sceneproject/getcallingbundletest:GetCallingBundlePromiseTest", + "sceneproject/startability:StartAbility", + "sceneproject/startabilityforresult:StartAbilityForResult", + "sceneproject/terminateabilitytest:TerminateAbilityTest", + ] } } diff --git a/aafwk/aafwk_standard/featureability/actsfeatureabilitytest/BUILD.gn b/aafwk/aafwk_standard/featureability/actsfeatureabilitytest/BUILD.gn index cca6e9abdf62e49e6cf85d37c7b77c67ff1b4333..0cc7c016d1e209609382c48bf0260444d5b54784 100755 --- a/aafwk/aafwk_standard/featureability/actsfeatureabilitytest/BUILD.gn +++ b/aafwk/aafwk_standard/featureability/actsfeatureabilitytest/BUILD.gn @@ -14,6 +14,18 @@ import("//test/xts/tools/build/suite.gni") ohos_js_hap_suite("ActsFeatureAbilityTest") { - test_hap_name = "ActsFeatureAbilityTest" - hap_source_path = "hap/ActsFeatureAbilityTest.hap" + hap_profile = "./entry/src/main/config.json" + deps = [ + ":hjs_demo_js_assets", + ":hjs_demo_resources", + ] + certificate_profile = "./signature/openharmony_sx.p7b" + hap_name = "ActsFeatureAbilityTest" +} +ohos_js_assets("hjs_demo_js_assets") { + source_dir = "./entry/src/main/js/default" +} +ohos_resources("hjs_demo_resources") { + sources = [ "./entry/src/main/js/resources" ] + hap_profile = "./entry/src/main/config.json" } diff --git a/aafwk/aafwk_standard/featureability/actsfeatureabilitytest/Test.json b/aafwk/aafwk_standard/featureability/actsfeatureabilitytest/Test.json index fa4eee279f39a381bc3f6e1ee2115d042498471a..ccb26668349461663d9757b9889e00235810a5be 100755 --- a/aafwk/aafwk_standard/featureability/actsfeatureabilitytest/Test.json +++ b/aafwk/aafwk_standard/featureability/actsfeatureabilitytest/Test.json @@ -3,7 +3,7 @@ "driver": { "type": "JSUnitTest", "test-timeout": "21600000", - "package": "com.example.actsfeatureabilitytest", + "package": "com.example.actsamscallbackfifthscene", "shell-timeout": "21600000" }, "kits": [ @@ -13,6 +13,19 @@ ], "type": "AppInstallKit", "cleanup-apps": true - } + }, + { + "type": "PushKit", + "push": [ + "FinishWithResultEmptyTest.hap->/data/FinishWithResultEmptyTest.hap", + "FinishWithResultPromiseParametersTest.hap->/data/FinishWithResultPromiseParametersTest.hap", + "FinishWithResultTest.hap->/data/FinishWithResultTest.hap", + "GetCallingBundlePromiseTest.hap->/data/GetCallingBundlePromiseTest.hap", + "StartAbility.hap->/data/StartAbility.hap", + "StartAbilityForResult.hap->/data/StartAbilityForResult.hap", + "TerminateAbilityTest.hap->/data/TerminateAbilityTest.hap" + ] + + } ] } diff --git a/aafwk/aafwk_standard/featureability/actsfeatureabilitytest/entry/src/main/resources/base/element/string.json b/aafwk/aafwk_standard/featureability/actsfeatureabilitytest/entry/src/main/js/resources/base/element/string.json similarity index 100% rename from aafwk/aafwk_standard/featureability/actsfeatureabilitytest/entry/src/main/resources/base/element/string.json rename to aafwk/aafwk_standard/featureability/actsfeatureabilitytest/entry/src/main/js/resources/base/element/string.json diff --git a/aafwk/aafwk_standard/featureability/actsfeatureabilitytest/entry/src/main/resources/base/media/icon.png b/aafwk/aafwk_standard/featureability/actsfeatureabilitytest/entry/src/main/js/resources/base/media/icon.png similarity index 100% rename from aafwk/aafwk_standard/featureability/actsfeatureabilitytest/entry/src/main/resources/base/media/icon.png rename to aafwk/aafwk_standard/featureability/actsfeatureabilitytest/entry/src/main/js/resources/base/media/icon.png diff --git a/aafwk/aafwk_standard/featureability/actsfeatureabilitytest/signature/openharmony_sx.p7b b/aafwk/aafwk_standard/featureability/actsfeatureabilitytest/signature/openharmony_sx.p7b new file mode 100755 index 0000000000000000000000000000000000000000..9be1e98fa4c0c28ca997ed660112fa16b194f0f5 Binary files /dev/null and b/aafwk/aafwk_standard/featureability/actsfeatureabilitytest/signature/openharmony_sx.p7b differ diff --git a/aafwk/aafwk_standard/featureability/sceneproject/finishwithresultemptytest/BUILD.gn b/aafwk/aafwk_standard/featureability/sceneproject/finishwithresultemptytest/BUILD.gn new file mode 100644 index 0000000000000000000000000000000000000000..e44fc8e1ca44ff29e2b30acb0306eb1760248d78 --- /dev/null +++ b/aafwk/aafwk_standard/featureability/sceneproject/finishwithresultemptytest/BUILD.gn @@ -0,0 +1,30 @@ +# 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("FinishWithResultEmptyTest") { + hap_profile = "./src/main/config.json" + deps = [ + ":hjs_demo_js_assets", + ":hjs_demo_resources", + ] + certificate_profile = "./signature/openharmony_sx.p7b" + hap_name = "FinishWithResultEmptyTest" +} +ohos_js_assets("hjs_demo_js_assets") { + source_dir = "./src/main/js/default" +} +ohos_resources("hjs_demo_resources") { + sources = [ "./src/main/js/resources" ] + hap_profile = "./src/main/config.json" +} diff --git a/aafwk/aafwk_standard/featureability/sceneproject/finishwithresultemptytest/Test.json b/aafwk/aafwk_standard/featureability/sceneproject/finishwithresultemptytest/Test.json new file mode 100644 index 0000000000000000000000000000000000000000..7a88763ed8d2ac31dd30211b9574f47273e84549 --- /dev/null +++ b/aafwk/aafwk_standard/featureability/sceneproject/finishwithresultemptytest/Test.json @@ -0,0 +1,3 @@ +{ + "description": "Configuration for hjunit demo Tests", +} diff --git a/aafwk/aafwk_standard/featureability/sceneproject/finishwithresultemptytest/entry/package.json b/aafwk/aafwk_standard/featureability/sceneproject/finishwithresultemptytest/package.json similarity index 100% rename from aafwk/aafwk_standard/featureability/sceneproject/finishwithresultemptytest/entry/package.json rename to aafwk/aafwk_standard/featureability/sceneproject/finishwithresultemptytest/package.json diff --git a/aafwk/aafwk_standard/featureability/sceneproject/finishwithresultemptytest/signature/openharmony_sx.p7b b/aafwk/aafwk_standard/featureability/sceneproject/finishwithresultemptytest/signature/openharmony_sx.p7b new file mode 100755 index 0000000000000000000000000000000000000000..9be1e98fa4c0c28ca997ed660112fa16b194f0f5 Binary files /dev/null and b/aafwk/aafwk_standard/featureability/sceneproject/finishwithresultemptytest/signature/openharmony_sx.p7b differ diff --git a/aafwk/aafwk_standard/featureability/sceneproject/finishwithresultemptytest/entry/src/main/config.json b/aafwk/aafwk_standard/featureability/sceneproject/finishwithresultemptytest/src/main/config.json similarity index 100% rename from aafwk/aafwk_standard/featureability/sceneproject/finishwithresultemptytest/entry/src/main/config.json rename to aafwk/aafwk_standard/featureability/sceneproject/finishwithresultemptytest/src/main/config.json diff --git a/aafwk/aafwk_standard/featureability/sceneproject/finishwithresultemptytest/entry/src/main/js/default/app.js b/aafwk/aafwk_standard/featureability/sceneproject/finishwithresultemptytest/src/main/js/default/app.js similarity index 100% rename from aafwk/aafwk_standard/featureability/sceneproject/finishwithresultemptytest/entry/src/main/js/default/app.js rename to aafwk/aafwk_standard/featureability/sceneproject/finishwithresultemptytest/src/main/js/default/app.js diff --git a/aafwk/aafwk_standard/featureability/sceneproject/finishwithresultemptytest/entry/src/main/js/default/i18n/en-US.json b/aafwk/aafwk_standard/featureability/sceneproject/finishwithresultemptytest/src/main/js/default/i18n/en-US.json similarity index 100% rename from aafwk/aafwk_standard/featureability/sceneproject/finishwithresultemptytest/entry/src/main/js/default/i18n/en-US.json rename to aafwk/aafwk_standard/featureability/sceneproject/finishwithresultemptytest/src/main/js/default/i18n/en-US.json diff --git a/aafwk/aafwk_standard/featureability/sceneproject/finishwithresultemptytest/entry/src/main/js/default/i18n/zh-CN.json b/aafwk/aafwk_standard/featureability/sceneproject/finishwithresultemptytest/src/main/js/default/i18n/zh-CN.json similarity index 100% rename from aafwk/aafwk_standard/featureability/sceneproject/finishwithresultemptytest/entry/src/main/js/default/i18n/zh-CN.json rename to aafwk/aafwk_standard/featureability/sceneproject/finishwithresultemptytest/src/main/js/default/i18n/zh-CN.json diff --git a/aafwk/aafwk_standard/featureability/sceneproject/finishwithresultemptytest/entry/src/main/js/default/pages/index/index.css b/aafwk/aafwk_standard/featureability/sceneproject/finishwithresultemptytest/src/main/js/default/pages/index/index.css similarity index 100% rename from aafwk/aafwk_standard/featureability/sceneproject/finishwithresultemptytest/entry/src/main/js/default/pages/index/index.css rename to aafwk/aafwk_standard/featureability/sceneproject/finishwithresultemptytest/src/main/js/default/pages/index/index.css diff --git a/aafwk/aafwk_standard/featureability/sceneproject/finishwithresultemptytest/entry/src/main/js/default/pages/index/index.hml b/aafwk/aafwk_standard/featureability/sceneproject/finishwithresultemptytest/src/main/js/default/pages/index/index.hml similarity index 100% rename from aafwk/aafwk_standard/featureability/sceneproject/finishwithresultemptytest/entry/src/main/js/default/pages/index/index.hml rename to aafwk/aafwk_standard/featureability/sceneproject/finishwithresultemptytest/src/main/js/default/pages/index/index.hml diff --git a/aafwk/aafwk_standard/featureability/sceneproject/finishwithresultemptytest/entry/src/main/js/default/pages/index/index.js b/aafwk/aafwk_standard/featureability/sceneproject/finishwithresultemptytest/src/main/js/default/pages/index/index.js similarity index 100% rename from aafwk/aafwk_standard/featureability/sceneproject/finishwithresultemptytest/entry/src/main/js/default/pages/index/index.js rename to aafwk/aafwk_standard/featureability/sceneproject/finishwithresultemptytest/src/main/js/default/pages/index/index.js diff --git a/aafwk/aafwk_standard/featureability/sceneproject/finishwithresultemptytest/entry/src/main/resources/base/element/string.json b/aafwk/aafwk_standard/featureability/sceneproject/finishwithresultemptytest/src/main/js/resources/base/element/string.json similarity index 100% rename from aafwk/aafwk_standard/featureability/sceneproject/finishwithresultemptytest/entry/src/main/resources/base/element/string.json rename to aafwk/aafwk_standard/featureability/sceneproject/finishwithresultemptytest/src/main/js/resources/base/element/string.json diff --git a/aafwk/aafwk_standard/featureability/sceneproject/finishwithresultemptytest/entry/src/main/resources/base/media/icon.png b/aafwk/aafwk_standard/featureability/sceneproject/finishwithresultemptytest/src/main/js/resources/base/media/icon.png similarity index 100% rename from aafwk/aafwk_standard/featureability/sceneproject/finishwithresultemptytest/entry/src/main/resources/base/media/icon.png rename to aafwk/aafwk_standard/featureability/sceneproject/finishwithresultemptytest/src/main/js/resources/base/media/icon.png diff --git a/aafwk/aafwk_standard/featureability/sceneproject/finishwithresultpromiseparameterstest/BUILD.gn b/aafwk/aafwk_standard/featureability/sceneproject/finishwithresultpromiseparameterstest/BUILD.gn new file mode 100644 index 0000000000000000000000000000000000000000..035c9989cdb92127f2d2c596aa871f8decc70bc0 --- /dev/null +++ b/aafwk/aafwk_standard/featureability/sceneproject/finishwithresultpromiseparameterstest/BUILD.gn @@ -0,0 +1,30 @@ +# 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("FinishWithResultPromiseParametersTest") { + hap_profile = "./src/main/config.json" + deps = [ + ":hjs_demo_js_assets", + ":hjs_demo_resources", + ] + certificate_profile = "./signature/openharmony_sx.p7b" + hap_name = "FinishWithResultPromiseParametersTest" +} +ohos_js_assets("hjs_demo_js_assets") { + source_dir = "./src/main/js/default" +} +ohos_resources("hjs_demo_resources") { + sources = [ "./src/main/js/resources" ] + hap_profile = "./src/main/config.json" +} diff --git a/aafwk/aafwk_standard/featureability/sceneproject/finishwithresultpromiseparameterstest/Test.json b/aafwk/aafwk_standard/featureability/sceneproject/finishwithresultpromiseparameterstest/Test.json new file mode 100644 index 0000000000000000000000000000000000000000..7a88763ed8d2ac31dd30211b9574f47273e84549 --- /dev/null +++ b/aafwk/aafwk_standard/featureability/sceneproject/finishwithresultpromiseparameterstest/Test.json @@ -0,0 +1,3 @@ +{ + "description": "Configuration for hjunit demo Tests", +} diff --git a/aafwk/aafwk_standard/featureability/sceneproject/finishwithresultpromiseparameterstest/entry/package.json b/aafwk/aafwk_standard/featureability/sceneproject/finishwithresultpromiseparameterstest/package.json similarity index 100% rename from aafwk/aafwk_standard/featureability/sceneproject/finishwithresultpromiseparameterstest/entry/package.json rename to aafwk/aafwk_standard/featureability/sceneproject/finishwithresultpromiseparameterstest/package.json diff --git a/aafwk/aafwk_standard/featureability/sceneproject/finishwithresultpromiseparameterstest/signature/openharmony_sx.p7b b/aafwk/aafwk_standard/featureability/sceneproject/finishwithresultpromiseparameterstest/signature/openharmony_sx.p7b new file mode 100755 index 0000000000000000000000000000000000000000..9be1e98fa4c0c28ca997ed660112fa16b194f0f5 Binary files /dev/null and b/aafwk/aafwk_standard/featureability/sceneproject/finishwithresultpromiseparameterstest/signature/openharmony_sx.p7b differ diff --git a/aafwk/aafwk_standard/featureability/sceneproject/finishwithresultpromiseparameterstest/entry/src/main/config.json b/aafwk/aafwk_standard/featureability/sceneproject/finishwithresultpromiseparameterstest/src/main/config.json similarity index 100% rename from aafwk/aafwk_standard/featureability/sceneproject/finishwithresultpromiseparameterstest/entry/src/main/config.json rename to aafwk/aafwk_standard/featureability/sceneproject/finishwithresultpromiseparameterstest/src/main/config.json diff --git a/aafwk/aafwk_standard/featureability/sceneproject/finishwithresultpromiseparameterstest/entry/src/main/js/default/app.js b/aafwk/aafwk_standard/featureability/sceneproject/finishwithresultpromiseparameterstest/src/main/js/default/app.js similarity index 100% rename from aafwk/aafwk_standard/featureability/sceneproject/finishwithresultpromiseparameterstest/entry/src/main/js/default/app.js rename to aafwk/aafwk_standard/featureability/sceneproject/finishwithresultpromiseparameterstest/src/main/js/default/app.js diff --git a/aafwk/aafwk_standard/featureability/sceneproject/finishwithresultpromiseparameterstest/entry/src/main/js/default/i18n/en-US.json b/aafwk/aafwk_standard/featureability/sceneproject/finishwithresultpromiseparameterstest/src/main/js/default/i18n/en-US.json similarity index 100% rename from aafwk/aafwk_standard/featureability/sceneproject/finishwithresultpromiseparameterstest/entry/src/main/js/default/i18n/en-US.json rename to aafwk/aafwk_standard/featureability/sceneproject/finishwithresultpromiseparameterstest/src/main/js/default/i18n/en-US.json diff --git a/aafwk/aafwk_standard/featureability/sceneproject/finishwithresultpromiseparameterstest/entry/src/main/js/default/i18n/zh-CN.json b/aafwk/aafwk_standard/featureability/sceneproject/finishwithresultpromiseparameterstest/src/main/js/default/i18n/zh-CN.json similarity index 100% rename from aafwk/aafwk_standard/featureability/sceneproject/finishwithresultpromiseparameterstest/entry/src/main/js/default/i18n/zh-CN.json rename to aafwk/aafwk_standard/featureability/sceneproject/finishwithresultpromiseparameterstest/src/main/js/default/i18n/zh-CN.json diff --git a/aafwk/aafwk_standard/featureability/sceneproject/finishwithresultpromiseparameterstest/entry/src/main/js/default/pages/index/index.css b/aafwk/aafwk_standard/featureability/sceneproject/finishwithresultpromiseparameterstest/src/main/js/default/pages/index/index.css similarity index 100% rename from aafwk/aafwk_standard/featureability/sceneproject/finishwithresultpromiseparameterstest/entry/src/main/js/default/pages/index/index.css rename to aafwk/aafwk_standard/featureability/sceneproject/finishwithresultpromiseparameterstest/src/main/js/default/pages/index/index.css diff --git a/aafwk/aafwk_standard/featureability/sceneproject/finishwithresultpromiseparameterstest/entry/src/main/js/default/pages/index/index.hml b/aafwk/aafwk_standard/featureability/sceneproject/finishwithresultpromiseparameterstest/src/main/js/default/pages/index/index.hml similarity index 100% rename from aafwk/aafwk_standard/featureability/sceneproject/finishwithresultpromiseparameterstest/entry/src/main/js/default/pages/index/index.hml rename to aafwk/aafwk_standard/featureability/sceneproject/finishwithresultpromiseparameterstest/src/main/js/default/pages/index/index.hml diff --git a/aafwk/aafwk_standard/featureability/sceneproject/finishwithresultpromiseparameterstest/entry/src/main/js/default/pages/index/index.js b/aafwk/aafwk_standard/featureability/sceneproject/finishwithresultpromiseparameterstest/src/main/js/default/pages/index/index.js similarity index 100% rename from aafwk/aafwk_standard/featureability/sceneproject/finishwithresultpromiseparameterstest/entry/src/main/js/default/pages/index/index.js rename to aafwk/aafwk_standard/featureability/sceneproject/finishwithresultpromiseparameterstest/src/main/js/default/pages/index/index.js diff --git a/aafwk/aafwk_standard/featureability/sceneproject/finishwithresultpromiseparameterstest/entry/src/main/resources/base/element/string.json b/aafwk/aafwk_standard/featureability/sceneproject/finishwithresultpromiseparameterstest/src/main/js/resources/base/element/string.json similarity index 100% rename from aafwk/aafwk_standard/featureability/sceneproject/finishwithresultpromiseparameterstest/entry/src/main/resources/base/element/string.json rename to aafwk/aafwk_standard/featureability/sceneproject/finishwithresultpromiseparameterstest/src/main/js/resources/base/element/string.json diff --git a/aafwk/aafwk_standard/featureability/sceneproject/finishwithresultpromiseparameterstest/entry/src/main/resources/base/media/icon.png b/aafwk/aafwk_standard/featureability/sceneproject/finishwithresultpromiseparameterstest/src/main/js/resources/base/media/icon.png similarity index 100% rename from aafwk/aafwk_standard/featureability/sceneproject/finishwithresultpromiseparameterstest/entry/src/main/resources/base/media/icon.png rename to aafwk/aafwk_standard/featureability/sceneproject/finishwithresultpromiseparameterstest/src/main/js/resources/base/media/icon.png diff --git a/aafwk/aafwk_standard/featureability/sceneproject/finishwithresulttest/BUILD.gn b/aafwk/aafwk_standard/featureability/sceneproject/finishwithresulttest/BUILD.gn new file mode 100644 index 0000000000000000000000000000000000000000..cd0238f156391c49473f73b8edb33160e57722a3 --- /dev/null +++ b/aafwk/aafwk_standard/featureability/sceneproject/finishwithresulttest/BUILD.gn @@ -0,0 +1,30 @@ +# 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("FinishWithResultTest") { + hap_profile = "./src/main/config.json" + deps = [ + ":hjs_demo_js_assets", + ":hjs_demo_resources", + ] + certificate_profile = "./signature/openharmony_sx.p7b" + hap_name = "FinishWithResultTest" +} +ohos_js_assets("hjs_demo_js_assets") { + source_dir = "./src/main/js/default" +} +ohos_resources("hjs_demo_resources") { + sources = [ "./src/main/js/resources" ] + hap_profile = "./src/main/config.json" +} diff --git a/aafwk/aafwk_standard/featureability/sceneproject/finishwithresulttest/Test.json b/aafwk/aafwk_standard/featureability/sceneproject/finishwithresulttest/Test.json new file mode 100644 index 0000000000000000000000000000000000000000..7a88763ed8d2ac31dd30211b9574f47273e84549 --- /dev/null +++ b/aafwk/aafwk_standard/featureability/sceneproject/finishwithresulttest/Test.json @@ -0,0 +1,3 @@ +{ + "description": "Configuration for hjunit demo Tests", +} diff --git a/aafwk/aafwk_standard/featureability/sceneproject/finishwithresulttest/entry/package.json b/aafwk/aafwk_standard/featureability/sceneproject/finishwithresulttest/package.json similarity index 100% rename from aafwk/aafwk_standard/featureability/sceneproject/finishwithresulttest/entry/package.json rename to aafwk/aafwk_standard/featureability/sceneproject/finishwithresulttest/package.json diff --git a/aafwk/aafwk_standard/featureability/sceneproject/finishwithresulttest/signature/openharmony_sx.p7b b/aafwk/aafwk_standard/featureability/sceneproject/finishwithresulttest/signature/openharmony_sx.p7b new file mode 100755 index 0000000000000000000000000000000000000000..9be1e98fa4c0c28ca997ed660112fa16b194f0f5 Binary files /dev/null and b/aafwk/aafwk_standard/featureability/sceneproject/finishwithresulttest/signature/openharmony_sx.p7b differ diff --git a/aafwk/aafwk_standard/featureability/sceneproject/finishwithresulttest/entry/src/main/config.json b/aafwk/aafwk_standard/featureability/sceneproject/finishwithresulttest/src/main/config.json similarity index 100% rename from aafwk/aafwk_standard/featureability/sceneproject/finishwithresulttest/entry/src/main/config.json rename to aafwk/aafwk_standard/featureability/sceneproject/finishwithresulttest/src/main/config.json diff --git a/aafwk/aafwk_standard/featureability/sceneproject/finishwithresulttest/entry/src/main/js/default/app.js b/aafwk/aafwk_standard/featureability/sceneproject/finishwithresulttest/src/main/js/default/app.js similarity index 100% rename from aafwk/aafwk_standard/featureability/sceneproject/finishwithresulttest/entry/src/main/js/default/app.js rename to aafwk/aafwk_standard/featureability/sceneproject/finishwithresulttest/src/main/js/default/app.js diff --git a/aafwk/aafwk_standard/featureability/sceneproject/finishwithresulttest/entry/src/main/js/default/i18n/en-US.json b/aafwk/aafwk_standard/featureability/sceneproject/finishwithresulttest/src/main/js/default/i18n/en-US.json similarity index 100% rename from aafwk/aafwk_standard/featureability/sceneproject/finishwithresulttest/entry/src/main/js/default/i18n/en-US.json rename to aafwk/aafwk_standard/featureability/sceneproject/finishwithresulttest/src/main/js/default/i18n/en-US.json diff --git a/aafwk/aafwk_standard/featureability/sceneproject/finishwithresulttest/entry/src/main/js/default/i18n/zh-CN.json b/aafwk/aafwk_standard/featureability/sceneproject/finishwithresulttest/src/main/js/default/i18n/zh-CN.json similarity index 100% rename from aafwk/aafwk_standard/featureability/sceneproject/finishwithresulttest/entry/src/main/js/default/i18n/zh-CN.json rename to aafwk/aafwk_standard/featureability/sceneproject/finishwithresulttest/src/main/js/default/i18n/zh-CN.json diff --git a/aafwk/aafwk_standard/featureability/sceneproject/finishwithresulttest/entry/src/main/js/default/pages/index/index.css b/aafwk/aafwk_standard/featureability/sceneproject/finishwithresulttest/src/main/js/default/pages/index/index.css similarity index 100% rename from aafwk/aafwk_standard/featureability/sceneproject/finishwithresulttest/entry/src/main/js/default/pages/index/index.css rename to aafwk/aafwk_standard/featureability/sceneproject/finishwithresulttest/src/main/js/default/pages/index/index.css diff --git a/aafwk/aafwk_standard/featureability/sceneproject/finishwithresulttest/entry/src/main/js/default/pages/index/index.hml b/aafwk/aafwk_standard/featureability/sceneproject/finishwithresulttest/src/main/js/default/pages/index/index.hml similarity index 100% rename from aafwk/aafwk_standard/featureability/sceneproject/finishwithresulttest/entry/src/main/js/default/pages/index/index.hml rename to aafwk/aafwk_standard/featureability/sceneproject/finishwithresulttest/src/main/js/default/pages/index/index.hml diff --git a/aafwk/aafwk_standard/featureability/sceneproject/finishwithresulttest/entry/src/main/js/default/pages/index/index.js b/aafwk/aafwk_standard/featureability/sceneproject/finishwithresulttest/src/main/js/default/pages/index/index.js similarity index 100% rename from aafwk/aafwk_standard/featureability/sceneproject/finishwithresulttest/entry/src/main/js/default/pages/index/index.js rename to aafwk/aafwk_standard/featureability/sceneproject/finishwithresulttest/src/main/js/default/pages/index/index.js diff --git a/aafwk/aafwk_standard/featureability/sceneproject/finishwithresulttest/entry/src/main/resources/base/element/string.json b/aafwk/aafwk_standard/featureability/sceneproject/finishwithresulttest/src/main/js/resources/base/element/string.json similarity index 100% rename from aafwk/aafwk_standard/featureability/sceneproject/finishwithresulttest/entry/src/main/resources/base/element/string.json rename to aafwk/aafwk_standard/featureability/sceneproject/finishwithresulttest/src/main/js/resources/base/element/string.json diff --git a/aafwk/aafwk_standard/featureability/sceneproject/finishwithresulttest/entry/src/main/resources/base/media/icon.png b/aafwk/aafwk_standard/featureability/sceneproject/finishwithresulttest/src/main/js/resources/base/media/icon.png similarity index 100% rename from aafwk/aafwk_standard/featureability/sceneproject/finishwithresulttest/entry/src/main/resources/base/media/icon.png rename to aafwk/aafwk_standard/featureability/sceneproject/finishwithresulttest/src/main/js/resources/base/media/icon.png diff --git a/aafwk/aafwk_standard/featureability/sceneproject/getcallingbundletest/BUILD.gn b/aafwk/aafwk_standard/featureability/sceneproject/getcallingbundletest/BUILD.gn new file mode 100644 index 0000000000000000000000000000000000000000..b7af51ba89e3175a79b401dd0d2130b2892cc82f --- /dev/null +++ b/aafwk/aafwk_standard/featureability/sceneproject/getcallingbundletest/BUILD.gn @@ -0,0 +1,30 @@ +# 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("GetCallingBundlePromiseTest") { + hap_profile = "./src/main/config.json" + deps = [ + ":hjs_demo_js_assets", + ":hjs_demo_resources", + ] + certificate_profile = "./signature/openharmony_sx.p7b" + hap_name = "GetCallingBundlePromiseTest" +} +ohos_js_assets("hjs_demo_js_assets") { + source_dir = "./src/main/js/default" +} +ohos_resources("hjs_demo_resources") { + sources = [ "./src/main/js/resources" ] + hap_profile = "./src/main/config.json" +} diff --git a/aafwk/aafwk_standard/featureability/sceneproject/getcallingbundletest/Test.json b/aafwk/aafwk_standard/featureability/sceneproject/getcallingbundletest/Test.json new file mode 100644 index 0000000000000000000000000000000000000000..7a88763ed8d2ac31dd30211b9574f47273e84549 --- /dev/null +++ b/aafwk/aafwk_standard/featureability/sceneproject/getcallingbundletest/Test.json @@ -0,0 +1,3 @@ +{ + "description": "Configuration for hjunit demo Tests", +} diff --git a/aafwk/aafwk_standard/featureability/sceneproject/getcallingbundletest/entry/package.json b/aafwk/aafwk_standard/featureability/sceneproject/getcallingbundletest/package.json similarity index 100% rename from aafwk/aafwk_standard/featureability/sceneproject/getcallingbundletest/entry/package.json rename to aafwk/aafwk_standard/featureability/sceneproject/getcallingbundletest/package.json diff --git a/aafwk/aafwk_standard/featureability/sceneproject/getcallingbundletest/signature/openharmony_sx.p7b b/aafwk/aafwk_standard/featureability/sceneproject/getcallingbundletest/signature/openharmony_sx.p7b new file mode 100755 index 0000000000000000000000000000000000000000..9be1e98fa4c0c28ca997ed660112fa16b194f0f5 Binary files /dev/null and b/aafwk/aafwk_standard/featureability/sceneproject/getcallingbundletest/signature/openharmony_sx.p7b differ diff --git a/aafwk/aafwk_standard/featureability/sceneproject/getcallingbundletest/entry/src/main/config.json b/aafwk/aafwk_standard/featureability/sceneproject/getcallingbundletest/src/main/config.json similarity index 100% rename from aafwk/aafwk_standard/featureability/sceneproject/getcallingbundletest/entry/src/main/config.json rename to aafwk/aafwk_standard/featureability/sceneproject/getcallingbundletest/src/main/config.json diff --git a/aafwk/aafwk_standard/featureability/sceneproject/getcallingbundletest/entry/src/main/js/default/app.js b/aafwk/aafwk_standard/featureability/sceneproject/getcallingbundletest/src/main/js/default/app.js similarity index 100% rename from aafwk/aafwk_standard/featureability/sceneproject/getcallingbundletest/entry/src/main/js/default/app.js rename to aafwk/aafwk_standard/featureability/sceneproject/getcallingbundletest/src/main/js/default/app.js diff --git a/aafwk/aafwk_standard/featureability/sceneproject/getcallingbundletest/entry/src/main/js/default/i18n/en-US.json b/aafwk/aafwk_standard/featureability/sceneproject/getcallingbundletest/src/main/js/default/i18n/en-US.json similarity index 100% rename from aafwk/aafwk_standard/featureability/sceneproject/getcallingbundletest/entry/src/main/js/default/i18n/en-US.json rename to aafwk/aafwk_standard/featureability/sceneproject/getcallingbundletest/src/main/js/default/i18n/en-US.json diff --git a/aafwk/aafwk_standard/featureability/sceneproject/getcallingbundletest/entry/src/main/js/default/i18n/zh-CN.json b/aafwk/aafwk_standard/featureability/sceneproject/getcallingbundletest/src/main/js/default/i18n/zh-CN.json similarity index 100% rename from aafwk/aafwk_standard/featureability/sceneproject/getcallingbundletest/entry/src/main/js/default/i18n/zh-CN.json rename to aafwk/aafwk_standard/featureability/sceneproject/getcallingbundletest/src/main/js/default/i18n/zh-CN.json diff --git a/aafwk/aafwk_standard/featureability/sceneproject/getcallingbundletest/entry/src/main/js/default/pages/index/index.css b/aafwk/aafwk_standard/featureability/sceneproject/getcallingbundletest/src/main/js/default/pages/index/index.css similarity index 100% rename from aafwk/aafwk_standard/featureability/sceneproject/getcallingbundletest/entry/src/main/js/default/pages/index/index.css rename to aafwk/aafwk_standard/featureability/sceneproject/getcallingbundletest/src/main/js/default/pages/index/index.css diff --git a/aafwk/aafwk_standard/featureability/sceneproject/getcallingbundletest/entry/src/main/js/default/pages/index/index.hml b/aafwk/aafwk_standard/featureability/sceneproject/getcallingbundletest/src/main/js/default/pages/index/index.hml similarity index 100% rename from aafwk/aafwk_standard/featureability/sceneproject/getcallingbundletest/entry/src/main/js/default/pages/index/index.hml rename to aafwk/aafwk_standard/featureability/sceneproject/getcallingbundletest/src/main/js/default/pages/index/index.hml diff --git a/aafwk/aafwk_standard/featureability/sceneproject/getcallingbundletest/entry/src/main/js/default/pages/index/index.js b/aafwk/aafwk_standard/featureability/sceneproject/getcallingbundletest/src/main/js/default/pages/index/index.js similarity index 100% rename from aafwk/aafwk_standard/featureability/sceneproject/getcallingbundletest/entry/src/main/js/default/pages/index/index.js rename to aafwk/aafwk_standard/featureability/sceneproject/getcallingbundletest/src/main/js/default/pages/index/index.js diff --git a/aafwk/aafwk_standard/featureability/sceneproject/getcallingbundletest/entry/src/main/resources/base/element/string.json b/aafwk/aafwk_standard/featureability/sceneproject/getcallingbundletest/src/main/js/resources/base/element/string.json similarity index 100% rename from aafwk/aafwk_standard/featureability/sceneproject/getcallingbundletest/entry/src/main/resources/base/element/string.json rename to aafwk/aafwk_standard/featureability/sceneproject/getcallingbundletest/src/main/js/resources/base/element/string.json diff --git a/aafwk/aafwk_standard/featureability/sceneproject/getcallingbundletest/entry/src/main/resources/base/media/icon.png b/aafwk/aafwk_standard/featureability/sceneproject/getcallingbundletest/src/main/js/resources/base/media/icon.png similarity index 100% rename from aafwk/aafwk_standard/featureability/sceneproject/getcallingbundletest/entry/src/main/resources/base/media/icon.png rename to aafwk/aafwk_standard/featureability/sceneproject/getcallingbundletest/src/main/js/resources/base/media/icon.png diff --git a/aafwk/aafwk_standard/featureability/sceneproject/startability/BUILD.gn b/aafwk/aafwk_standard/featureability/sceneproject/startability/BUILD.gn new file mode 100644 index 0000000000000000000000000000000000000000..4f85a3b942108f79829a44182e1d2a081ce13c9e --- /dev/null +++ b/aafwk/aafwk_standard/featureability/sceneproject/startability/BUILD.gn @@ -0,0 +1,30 @@ +# 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("StartAbility") { + hap_profile = "./src/main/config.json" + deps = [ + ":hjs_demo_js_assets", + ":hjs_demo_resources", + ] + certificate_profile = "./signature/openharmony_sx.p7b" + hap_name = "StartAbility" +} +ohos_js_assets("hjs_demo_js_assets") { + source_dir = "./src/main/js/default" +} +ohos_resources("hjs_demo_resources") { + sources = [ "./src/main/js/resources" ] + hap_profile = "./src/main/config.json" +} diff --git a/aafwk/aafwk_standard/featureability/sceneproject/startability/Test.json b/aafwk/aafwk_standard/featureability/sceneproject/startability/Test.json new file mode 100644 index 0000000000000000000000000000000000000000..7a88763ed8d2ac31dd30211b9574f47273e84549 --- /dev/null +++ b/aafwk/aafwk_standard/featureability/sceneproject/startability/Test.json @@ -0,0 +1,3 @@ +{ + "description": "Configuration for hjunit demo Tests", +} diff --git a/aafwk/aafwk_standard/featureability/sceneproject/startability/entry/package.json b/aafwk/aafwk_standard/featureability/sceneproject/startability/package.json similarity index 100% rename from aafwk/aafwk_standard/featureability/sceneproject/startability/entry/package.json rename to aafwk/aafwk_standard/featureability/sceneproject/startability/package.json diff --git a/aafwk/aafwk_standard/featureability/sceneproject/startability/signature/openharmony_sx.p7b b/aafwk/aafwk_standard/featureability/sceneproject/startability/signature/openharmony_sx.p7b new file mode 100755 index 0000000000000000000000000000000000000000..9be1e98fa4c0c28ca997ed660112fa16b194f0f5 Binary files /dev/null and b/aafwk/aafwk_standard/featureability/sceneproject/startability/signature/openharmony_sx.p7b differ diff --git a/aafwk/aafwk_standard/featureability/sceneproject/startability/entry/src/main/config.json b/aafwk/aafwk_standard/featureability/sceneproject/startability/src/main/config.json similarity index 100% rename from aafwk/aafwk_standard/featureability/sceneproject/startability/entry/src/main/config.json rename to aafwk/aafwk_standard/featureability/sceneproject/startability/src/main/config.json diff --git a/aafwk/aafwk_standard/featureability/sceneproject/startability/entry/src/main/js/default/app.js b/aafwk/aafwk_standard/featureability/sceneproject/startability/src/main/js/default/app.js similarity index 100% rename from aafwk/aafwk_standard/featureability/sceneproject/startability/entry/src/main/js/default/app.js rename to aafwk/aafwk_standard/featureability/sceneproject/startability/src/main/js/default/app.js diff --git a/aafwk/aafwk_standard/featureability/sceneproject/startability/entry/src/main/js/default/i18n/en-US.json b/aafwk/aafwk_standard/featureability/sceneproject/startability/src/main/js/default/i18n/en-US.json similarity index 100% rename from aafwk/aafwk_standard/featureability/sceneproject/startability/entry/src/main/js/default/i18n/en-US.json rename to aafwk/aafwk_standard/featureability/sceneproject/startability/src/main/js/default/i18n/en-US.json diff --git a/aafwk/aafwk_standard/featureability/sceneproject/startability/entry/src/main/js/default/i18n/zh-CN.json b/aafwk/aafwk_standard/featureability/sceneproject/startability/src/main/js/default/i18n/zh-CN.json similarity index 100% rename from aafwk/aafwk_standard/featureability/sceneproject/startability/entry/src/main/js/default/i18n/zh-CN.json rename to aafwk/aafwk_standard/featureability/sceneproject/startability/src/main/js/default/i18n/zh-CN.json diff --git a/aafwk/aafwk_standard/featureability/sceneproject/startability/entry/src/main/js/default/pages/index/index.css b/aafwk/aafwk_standard/featureability/sceneproject/startability/src/main/js/default/pages/index/index.css similarity index 100% rename from aafwk/aafwk_standard/featureability/sceneproject/startability/entry/src/main/js/default/pages/index/index.css rename to aafwk/aafwk_standard/featureability/sceneproject/startability/src/main/js/default/pages/index/index.css diff --git a/aafwk/aafwk_standard/featureability/sceneproject/startability/entry/src/main/js/default/pages/index/index.hml b/aafwk/aafwk_standard/featureability/sceneproject/startability/src/main/js/default/pages/index/index.hml similarity index 100% rename from aafwk/aafwk_standard/featureability/sceneproject/startability/entry/src/main/js/default/pages/index/index.hml rename to aafwk/aafwk_standard/featureability/sceneproject/startability/src/main/js/default/pages/index/index.hml diff --git a/aafwk/aafwk_standard/featureability/sceneproject/startability/entry/src/main/js/default/pages/index/index.js b/aafwk/aafwk_standard/featureability/sceneproject/startability/src/main/js/default/pages/index/index.js similarity index 100% rename from aafwk/aafwk_standard/featureability/sceneproject/startability/entry/src/main/js/default/pages/index/index.js rename to aafwk/aafwk_standard/featureability/sceneproject/startability/src/main/js/default/pages/index/index.js diff --git a/aafwk/aafwk_standard/featureability/sceneproject/startability/entry/src/main/resources/base/element/string.json b/aafwk/aafwk_standard/featureability/sceneproject/startability/src/main/js/resources/base/element/string.json similarity index 100% rename from aafwk/aafwk_standard/featureability/sceneproject/startability/entry/src/main/resources/base/element/string.json rename to aafwk/aafwk_standard/featureability/sceneproject/startability/src/main/js/resources/base/element/string.json diff --git a/aafwk/aafwk_standard/featureability/sceneproject/startability/entry/src/main/resources/base/media/icon.png b/aafwk/aafwk_standard/featureability/sceneproject/startability/src/main/js/resources/base/media/icon.png similarity index 100% rename from aafwk/aafwk_standard/featureability/sceneproject/startability/entry/src/main/resources/base/media/icon.png rename to aafwk/aafwk_standard/featureability/sceneproject/startability/src/main/js/resources/base/media/icon.png diff --git a/aafwk/aafwk_standard/featureability/sceneproject/startabilityforresult/BUILD.gn b/aafwk/aafwk_standard/featureability/sceneproject/startabilityforresult/BUILD.gn new file mode 100644 index 0000000000000000000000000000000000000000..a1a86ed13aed375ad2b694b3954e5662bc644505 --- /dev/null +++ b/aafwk/aafwk_standard/featureability/sceneproject/startabilityforresult/BUILD.gn @@ -0,0 +1,30 @@ +# 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("StartAbilityForResult") { + hap_profile = "./src/main/config.json" + deps = [ + ":hjs_demo_js_assets", + ":hjs_demo_resources", + ] + certificate_profile = "./signature/openharmony_sx.p7b" + hap_name = "StartAbilityForResult" +} +ohos_js_assets("hjs_demo_js_assets") { + source_dir = "./src/main/js/default" +} +ohos_resources("hjs_demo_resources") { + sources = [ "./src/main/js/resources" ] + hap_profile = "./src/main/config.json" +} diff --git a/aafwk/aafwk_standard/featureability/sceneproject/startabilityforresult/Test.json b/aafwk/aafwk_standard/featureability/sceneproject/startabilityforresult/Test.json new file mode 100644 index 0000000000000000000000000000000000000000..7a88763ed8d2ac31dd30211b9574f47273e84549 --- /dev/null +++ b/aafwk/aafwk_standard/featureability/sceneproject/startabilityforresult/Test.json @@ -0,0 +1,3 @@ +{ + "description": "Configuration for hjunit demo Tests", +} diff --git a/aafwk/aafwk_standard/featureability/sceneproject/startabilityforresult/entry/package.json b/aafwk/aafwk_standard/featureability/sceneproject/startabilityforresult/package.json similarity index 100% rename from aafwk/aafwk_standard/featureability/sceneproject/startabilityforresult/entry/package.json rename to aafwk/aafwk_standard/featureability/sceneproject/startabilityforresult/package.json diff --git a/aafwk/aafwk_standard/featureability/sceneproject/startabilityforresult/signature/openharmony_sx.p7b b/aafwk/aafwk_standard/featureability/sceneproject/startabilityforresult/signature/openharmony_sx.p7b new file mode 100755 index 0000000000000000000000000000000000000000..9be1e98fa4c0c28ca997ed660112fa16b194f0f5 Binary files /dev/null and b/aafwk/aafwk_standard/featureability/sceneproject/startabilityforresult/signature/openharmony_sx.p7b differ diff --git a/aafwk/aafwk_standard/featureability/sceneproject/startabilityforresult/entry/src/main/config.json b/aafwk/aafwk_standard/featureability/sceneproject/startabilityforresult/src/main/config.json similarity index 100% rename from aafwk/aafwk_standard/featureability/sceneproject/startabilityforresult/entry/src/main/config.json rename to aafwk/aafwk_standard/featureability/sceneproject/startabilityforresult/src/main/config.json diff --git a/aafwk/aafwk_standard/featureability/sceneproject/startabilityforresult/entry/src/main/js/default/app.js b/aafwk/aafwk_standard/featureability/sceneproject/startabilityforresult/src/main/js/default/app.js similarity index 100% rename from aafwk/aafwk_standard/featureability/sceneproject/startabilityforresult/entry/src/main/js/default/app.js rename to aafwk/aafwk_standard/featureability/sceneproject/startabilityforresult/src/main/js/default/app.js diff --git a/aafwk/aafwk_standard/featureability/sceneproject/startabilityforresult/entry/src/main/js/default/i18n/en-US.json b/aafwk/aafwk_standard/featureability/sceneproject/startabilityforresult/src/main/js/default/i18n/en-US.json similarity index 100% rename from aafwk/aafwk_standard/featureability/sceneproject/startabilityforresult/entry/src/main/js/default/i18n/en-US.json rename to aafwk/aafwk_standard/featureability/sceneproject/startabilityforresult/src/main/js/default/i18n/en-US.json diff --git a/aafwk/aafwk_standard/featureability/sceneproject/startabilityforresult/entry/src/main/js/default/i18n/zh-CN.json b/aafwk/aafwk_standard/featureability/sceneproject/startabilityforresult/src/main/js/default/i18n/zh-CN.json similarity index 100% rename from aafwk/aafwk_standard/featureability/sceneproject/startabilityforresult/entry/src/main/js/default/i18n/zh-CN.json rename to aafwk/aafwk_standard/featureability/sceneproject/startabilityforresult/src/main/js/default/i18n/zh-CN.json diff --git a/aafwk/aafwk_standard/featureability/sceneproject/startabilityforresult/entry/src/main/js/default/pages/index/index.css b/aafwk/aafwk_standard/featureability/sceneproject/startabilityforresult/src/main/js/default/pages/index/index.css similarity index 100% rename from aafwk/aafwk_standard/featureability/sceneproject/startabilityforresult/entry/src/main/js/default/pages/index/index.css rename to aafwk/aafwk_standard/featureability/sceneproject/startabilityforresult/src/main/js/default/pages/index/index.css diff --git a/aafwk/aafwk_standard/featureability/sceneproject/startabilityforresult/entry/src/main/js/default/pages/index/index.hml b/aafwk/aafwk_standard/featureability/sceneproject/startabilityforresult/src/main/js/default/pages/index/index.hml similarity index 100% rename from aafwk/aafwk_standard/featureability/sceneproject/startabilityforresult/entry/src/main/js/default/pages/index/index.hml rename to aafwk/aafwk_standard/featureability/sceneproject/startabilityforresult/src/main/js/default/pages/index/index.hml diff --git a/aafwk/aafwk_standard/featureability/sceneproject/startabilityforresult/entry/src/main/js/default/pages/index/index.js b/aafwk/aafwk_standard/featureability/sceneproject/startabilityforresult/src/main/js/default/pages/index/index.js similarity index 100% rename from aafwk/aafwk_standard/featureability/sceneproject/startabilityforresult/entry/src/main/js/default/pages/index/index.js rename to aafwk/aafwk_standard/featureability/sceneproject/startabilityforresult/src/main/js/default/pages/index/index.js diff --git a/aafwk/aafwk_standard/featureability/sceneproject/startabilityforresult/entry/src/main/resources/base/element/string.json b/aafwk/aafwk_standard/featureability/sceneproject/startabilityforresult/src/main/js/resources/base/element/string.json similarity index 100% rename from aafwk/aafwk_standard/featureability/sceneproject/startabilityforresult/entry/src/main/resources/base/element/string.json rename to aafwk/aafwk_standard/featureability/sceneproject/startabilityforresult/src/main/js/resources/base/element/string.json diff --git a/aafwk/aafwk_standard/featureability/sceneproject/startabilityforresult/entry/src/main/resources/base/media/icon.png b/aafwk/aafwk_standard/featureability/sceneproject/startabilityforresult/src/main/js/resources/base/media/icon.png similarity index 100% rename from aafwk/aafwk_standard/featureability/sceneproject/startabilityforresult/entry/src/main/resources/base/media/icon.png rename to aafwk/aafwk_standard/featureability/sceneproject/startabilityforresult/src/main/js/resources/base/media/icon.png diff --git a/aafwk/aafwk_standard/featureability/sceneproject/terminateabilitytest/BUILD.gn b/aafwk/aafwk_standard/featureability/sceneproject/terminateabilitytest/BUILD.gn new file mode 100644 index 0000000000000000000000000000000000000000..0af33d1bdf4d9e4502a42d1712367158d3f058a5 --- /dev/null +++ b/aafwk/aafwk_standard/featureability/sceneproject/terminateabilitytest/BUILD.gn @@ -0,0 +1,30 @@ +# 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("TerminateAbilityTest") { + hap_profile = "./src/main/config.json" + deps = [ + ":hjs_demo_js_assets", + ":hjs_demo_resources", + ] + certificate_profile = "./signature/openharmony_sx.p7b" + hap_name = "TerminateAbilityTest" +} +ohos_js_assets("hjs_demo_js_assets") { + source_dir = "./src/main/js/default" +} +ohos_resources("hjs_demo_resources") { + sources = [ "./src/main/js/resources" ] + hap_profile = "./src/main/config.json" +} diff --git a/aafwk/aafwk_standard/featureability/sceneproject/terminateabilitytest/Test.json b/aafwk/aafwk_standard/featureability/sceneproject/terminateabilitytest/Test.json new file mode 100644 index 0000000000000000000000000000000000000000..7a88763ed8d2ac31dd30211b9574f47273e84549 --- /dev/null +++ b/aafwk/aafwk_standard/featureability/sceneproject/terminateabilitytest/Test.json @@ -0,0 +1,3 @@ +{ + "description": "Configuration for hjunit demo Tests", +} diff --git a/aafwk/aafwk_standard/featureability/sceneproject/terminateabilitytest/entry/package.json b/aafwk/aafwk_standard/featureability/sceneproject/terminateabilitytest/package.json similarity index 100% rename from aafwk/aafwk_standard/featureability/sceneproject/terminateabilitytest/entry/package.json rename to aafwk/aafwk_standard/featureability/sceneproject/terminateabilitytest/package.json diff --git a/aafwk/aafwk_standard/featureability/sceneproject/terminateabilitytest/signature/openharmony_sx.p7b b/aafwk/aafwk_standard/featureability/sceneproject/terminateabilitytest/signature/openharmony_sx.p7b new file mode 100755 index 0000000000000000000000000000000000000000..9be1e98fa4c0c28ca997ed660112fa16b194f0f5 Binary files /dev/null and b/aafwk/aafwk_standard/featureability/sceneproject/terminateabilitytest/signature/openharmony_sx.p7b differ diff --git a/aafwk/aafwk_standard/featureability/sceneproject/terminateabilitytest/entry/src/main/config.json b/aafwk/aafwk_standard/featureability/sceneproject/terminateabilitytest/src/main/config.json similarity index 100% rename from aafwk/aafwk_standard/featureability/sceneproject/terminateabilitytest/entry/src/main/config.json rename to aafwk/aafwk_standard/featureability/sceneproject/terminateabilitytest/src/main/config.json diff --git a/aafwk/aafwk_standard/featureability/sceneproject/terminateabilitytest/entry/src/main/js/default/app.js b/aafwk/aafwk_standard/featureability/sceneproject/terminateabilitytest/src/main/js/default/app.js similarity index 100% rename from aafwk/aafwk_standard/featureability/sceneproject/terminateabilitytest/entry/src/main/js/default/app.js rename to aafwk/aafwk_standard/featureability/sceneproject/terminateabilitytest/src/main/js/default/app.js diff --git a/aafwk/aafwk_standard/featureability/sceneproject/terminateabilitytest/entry/src/main/js/default/i18n/en-US.json b/aafwk/aafwk_standard/featureability/sceneproject/terminateabilitytest/src/main/js/default/i18n/en-US.json similarity index 100% rename from aafwk/aafwk_standard/featureability/sceneproject/terminateabilitytest/entry/src/main/js/default/i18n/en-US.json rename to aafwk/aafwk_standard/featureability/sceneproject/terminateabilitytest/src/main/js/default/i18n/en-US.json diff --git a/aafwk/aafwk_standard/featureability/sceneproject/terminateabilitytest/entry/src/main/js/default/i18n/zh-CN.json b/aafwk/aafwk_standard/featureability/sceneproject/terminateabilitytest/src/main/js/default/i18n/zh-CN.json similarity index 100% rename from aafwk/aafwk_standard/featureability/sceneproject/terminateabilitytest/entry/src/main/js/default/i18n/zh-CN.json rename to aafwk/aafwk_standard/featureability/sceneproject/terminateabilitytest/src/main/js/default/i18n/zh-CN.json diff --git a/aafwk/aafwk_standard/featureability/sceneproject/terminateabilitytest/entry/src/main/js/default/pages/index/index.css b/aafwk/aafwk_standard/featureability/sceneproject/terminateabilitytest/src/main/js/default/pages/index/index.css similarity index 100% rename from aafwk/aafwk_standard/featureability/sceneproject/terminateabilitytest/entry/src/main/js/default/pages/index/index.css rename to aafwk/aafwk_standard/featureability/sceneproject/terminateabilitytest/src/main/js/default/pages/index/index.css diff --git a/aafwk/aafwk_standard/featureability/sceneproject/terminateabilitytest/entry/src/main/js/default/pages/index/index.hml b/aafwk/aafwk_standard/featureability/sceneproject/terminateabilitytest/src/main/js/default/pages/index/index.hml similarity index 100% rename from aafwk/aafwk_standard/featureability/sceneproject/terminateabilitytest/entry/src/main/js/default/pages/index/index.hml rename to aafwk/aafwk_standard/featureability/sceneproject/terminateabilitytest/src/main/js/default/pages/index/index.hml diff --git a/aafwk/aafwk_standard/featureability/sceneproject/terminateabilitytest/entry/src/main/js/default/pages/index/index.js b/aafwk/aafwk_standard/featureability/sceneproject/terminateabilitytest/src/main/js/default/pages/index/index.js similarity index 100% rename from aafwk/aafwk_standard/featureability/sceneproject/terminateabilitytest/entry/src/main/js/default/pages/index/index.js rename to aafwk/aafwk_standard/featureability/sceneproject/terminateabilitytest/src/main/js/default/pages/index/index.js diff --git a/aafwk/aafwk_standard/featureability/sceneproject/terminateabilitytest/entry/src/main/resources/base/element/string.json b/aafwk/aafwk_standard/featureability/sceneproject/terminateabilitytest/src/main/js/resources/base/element/string.json similarity index 100% rename from aafwk/aafwk_standard/featureability/sceneproject/terminateabilitytest/entry/src/main/resources/base/element/string.json rename to aafwk/aafwk_standard/featureability/sceneproject/terminateabilitytest/src/main/js/resources/base/element/string.json diff --git a/aafwk/aafwk_standard/featureability/sceneproject/terminateabilitytest/entry/src/main/resources/base/media/icon.png b/aafwk/aafwk_standard/featureability/sceneproject/terminateabilitytest/src/main/js/resources/base/media/icon.png similarity index 100% rename from aafwk/aafwk_standard/featureability/sceneproject/terminateabilitytest/entry/src/main/resources/base/media/icon.png rename to aafwk/aafwk_standard/featureability/sceneproject/terminateabilitytest/src/main/js/resources/base/media/icon.png diff --git a/aafwk/aafwk_standard/want/BUILD.gn b/aafwk/aafwk_standard/want/BUILD.gn index d99664a6bb017599daea5cbe24aab1d2a4499921..8fdd55ca02d0b6a0406196c1b261e5a92c1bd284 100755 --- a/aafwk/aafwk_standard/want/BUILD.gn +++ b/aafwk/aafwk_standard/want/BUILD.gn @@ -19,6 +19,7 @@ group("want") { deps = [ "actsgetwantalltest:ActsGetWantAllTest", "actssetwanttest:ActsSetWantTest", + "sceneProject/actsgetwantalltesthap:ActsGetWantAllTestHap", ] } } diff --git a/aafwk/aafwk_standard/want/actsgetwantalltest/BUILD.gn b/aafwk/aafwk_standard/want/actsgetwantalltest/BUILD.gn index 56c1c21cf77f8cd2c3da52e5ca42ba48316fd5e4..9d108f99cfeafa49eb5273950171d1f64e02f5f0 100644 --- a/aafwk/aafwk_standard/want/actsgetwantalltest/BUILD.gn +++ b/aafwk/aafwk_standard/want/actsgetwantalltest/BUILD.gn @@ -14,6 +14,18 @@ import("//test/xts/tools/build/suite.gni") ohos_js_hap_suite("ActsGetWantAllTest") { - test_hap_name = "ActsGetWantAllTest" - hap_source_path = "hap/ActsGetWantAllTest.hap" + hap_profile = "./entry/src/main/config.json" + deps = [ + ":hjs_demo_js_assets", + ":hjs_demo_resources", + ] + certificate_profile = "./signature/openharmony_sx.p7b" + hap_name = "ActsGetWantAllTest" +} +ohos_js_assets("hjs_demo_js_assets") { + source_dir = "./entry/src/main/js/default" +} +ohos_resources("hjs_demo_resources") { + sources = [ "./entry/src/main/js/resources" ] + hap_profile = "./entry/src/main/config.json" } diff --git a/aafwk/aafwk_standard/want/actsgetwantalltest/Test.json b/aafwk/aafwk_standard/want/actsgetwantalltest/Test.json index d4d29dc0cce06c0ccac57b480866371f7fee7a19..3dfc03214aab6634dc195f373920f22969094987 100644 --- a/aafwk/aafwk_standard/want/actsgetwantalltest/Test.json +++ b/aafwk/aafwk_standard/want/actsgetwantalltest/Test.json @@ -3,7 +3,7 @@ "driver": { "type": "JSUnitTest", "test-timeout": "21600000", - "package": "com.example.actsgetwantalltest", + "package": "com.example.actsamscallbackfifthscene", "shell-timeout": "21600000" }, "kits": [ @@ -13,6 +13,13 @@ ], "type": "AppInstallKit", "cleanup-apps": true - } + }, + { + "type": "PushKit", + "push": [ + "ActsGetWantAllTestHap.hap->/data/ActsGetWantAllTestHap.hap" + ] + + } ] } diff --git a/aafwk/aafwk_standard/want/actsgetwantalltest/entry/src/main/resources/base/element/string.json b/aafwk/aafwk_standard/want/actsgetwantalltest/entry/src/main/js/resources/base/element/string.json similarity index 100% rename from aafwk/aafwk_standard/want/actsgetwantalltest/entry/src/main/resources/base/element/string.json rename to aafwk/aafwk_standard/want/actsgetwantalltest/entry/src/main/js/resources/base/element/string.json diff --git a/aafwk/aafwk_standard/want/actsgetwantalltest/entry/src/main/resources/base/media/icon.png b/aafwk/aafwk_standard/want/actsgetwantalltest/entry/src/main/js/resources/base/media/icon.png similarity index 100% rename from aafwk/aafwk_standard/want/actsgetwantalltest/entry/src/main/resources/base/media/icon.png rename to aafwk/aafwk_standard/want/actsgetwantalltest/entry/src/main/js/resources/base/media/icon.png diff --git a/aafwk/aafwk_standard/want/actsgetwantalltest/signature/openharmony_sx.p7b b/aafwk/aafwk_standard/want/actsgetwantalltest/signature/openharmony_sx.p7b new file mode 100755 index 0000000000000000000000000000000000000000..9be1e98fa4c0c28ca997ed660112fa16b194f0f5 Binary files /dev/null and b/aafwk/aafwk_standard/want/actsgetwantalltest/signature/openharmony_sx.p7b differ diff --git a/aafwk/aafwk_standard/want/actssetwanttest/BUILD.gn b/aafwk/aafwk_standard/want/actssetwanttest/BUILD.gn index 677db5f2dc75d375c9116bcc95d86496a02bec61..d51acda59c7340b996c3b9875f385e009aef0e47 100755 --- a/aafwk/aafwk_standard/want/actssetwanttest/BUILD.gn +++ b/aafwk/aafwk_standard/want/actssetwanttest/BUILD.gn @@ -14,6 +14,18 @@ import("//test/xts/tools/build/suite.gni") ohos_js_hap_suite("ActsSetWantTest") { - test_hap_name = "ActsSetWantTest" - hap_source_path = "hap/ActsSetWantTest.hap" + hap_profile = "./entry/src/main/config.json" + deps = [ + ":hjs_demo_js_assets", + ":hjs_demo_resources", + ] + certificate_profile = "./signature/openharmony_sx.p7b" + hap_name = "ActsSetWantTest" +} +ohos_js_assets("hjs_demo_js_assets") { + source_dir = "./entry/src/main/js/default" +} +ohos_resources("hjs_demo_resources") { + sources = [ "./entry/src/main/js/resources" ] + hap_profile = "./entry/src/main/config.json" } diff --git a/aafwk/aafwk_standard/want/actssetwanttest/Test.json b/aafwk/aafwk_standard/want/actssetwanttest/Test.json index b7eec6b0da4433a20425f9b940bfb6567728969a..553e8c54d362fc69083ebbc22137916d468190f3 100755 --- a/aafwk/aafwk_standard/want/actssetwanttest/Test.json +++ b/aafwk/aafwk_standard/want/actssetwanttest/Test.json @@ -3,7 +3,7 @@ "driver": { "type": "JSUnitTest", "test-timeout": "21600000", - "package": "com.example.actssetwanttest", + "package": "com.example.actsamscallbackfifthscene", "shell-timeout": "21600000" }, "kits": [ diff --git a/aafwk/aafwk_standard/want/actssetwanttest/entry/src/main/resources/base/element/string.json b/aafwk/aafwk_standard/want/actssetwanttest/entry/src/main/js/resources/base/element/string.json similarity index 100% rename from aafwk/aafwk_standard/want/actssetwanttest/entry/src/main/resources/base/element/string.json rename to aafwk/aafwk_standard/want/actssetwanttest/entry/src/main/js/resources/base/element/string.json diff --git a/aafwk/aafwk_standard/want/actssetwanttest/entry/src/main/resources/base/media/icon.png b/aafwk/aafwk_standard/want/actssetwanttest/entry/src/main/js/resources/base/media/icon.png similarity index 100% rename from aafwk/aafwk_standard/want/actssetwanttest/entry/src/main/resources/base/media/icon.png rename to aafwk/aafwk_standard/want/actssetwanttest/entry/src/main/js/resources/base/media/icon.png diff --git a/aafwk/aafwk_standard/want/actssetwanttest/signature/openharmony_sx.p7b b/aafwk/aafwk_standard/want/actssetwanttest/signature/openharmony_sx.p7b new file mode 100755 index 0000000000000000000000000000000000000000..9be1e98fa4c0c28ca997ed660112fa16b194f0f5 Binary files /dev/null and b/aafwk/aafwk_standard/want/actssetwanttest/signature/openharmony_sx.p7b differ diff --git a/aafwk/aafwk_standard/want/sceneProject/actsgetwantalltesthap/BUILD.gn b/aafwk/aafwk_standard/want/sceneProject/actsgetwantalltesthap/BUILD.gn new file mode 100644 index 0000000000000000000000000000000000000000..c51df67d35b1bb90c4ce924cbd586659adc3069c --- /dev/null +++ b/aafwk/aafwk_standard/want/sceneProject/actsgetwantalltesthap/BUILD.gn @@ -0,0 +1,30 @@ +# 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("ActsGetWantAllTestHap") { + hap_profile = "./src/main/config.json" + deps = [ + ":hjs_demo_js_assets", + ":hjs_demo_resources", + ] + certificate_profile = "./signature/openharmony_sx.p7b" + hap_name = "ActsGetWantAllTestHap" +} +ohos_js_assets("hjs_demo_js_assets") { + source_dir = "./src/main/js/default" +} +ohos_resources("hjs_demo_resources") { + sources = [ "./src/main/js/resources" ] + hap_profile = "./src/main/config.json" +} diff --git a/aafwk/aafwk_standard/want/sceneProject/actsgetwantalltesthap/Test.json b/aafwk/aafwk_standard/want/sceneProject/actsgetwantalltesthap/Test.json new file mode 100644 index 0000000000000000000000000000000000000000..7a88763ed8d2ac31dd30211b9574f47273e84549 --- /dev/null +++ b/aafwk/aafwk_standard/want/sceneProject/actsgetwantalltesthap/Test.json @@ -0,0 +1,3 @@ +{ + "description": "Configuration for hjunit demo Tests", +} diff --git a/aafwk/aafwk_standard/want/sceneProject/actsgetwantalltesthap/entry/package.json b/aafwk/aafwk_standard/want/sceneProject/actsgetwantalltesthap/package.json similarity index 100% rename from aafwk/aafwk_standard/want/sceneProject/actsgetwantalltesthap/entry/package.json rename to aafwk/aafwk_standard/want/sceneProject/actsgetwantalltesthap/package.json diff --git a/aafwk/aafwk_standard/want/sceneProject/actsgetwantalltesthap/signature/openharmony_sx.p7b b/aafwk/aafwk_standard/want/sceneProject/actsgetwantalltesthap/signature/openharmony_sx.p7b new file mode 100755 index 0000000000000000000000000000000000000000..9be1e98fa4c0c28ca997ed660112fa16b194f0f5 Binary files /dev/null and b/aafwk/aafwk_standard/want/sceneProject/actsgetwantalltesthap/signature/openharmony_sx.p7b differ diff --git a/aafwk/aafwk_standard/want/sceneProject/actsgetwantalltesthap/entry/src/main/config.json b/aafwk/aafwk_standard/want/sceneProject/actsgetwantalltesthap/src/main/config.json similarity index 100% rename from aafwk/aafwk_standard/want/sceneProject/actsgetwantalltesthap/entry/src/main/config.json rename to aafwk/aafwk_standard/want/sceneProject/actsgetwantalltesthap/src/main/config.json diff --git a/aafwk/aafwk_standard/want/sceneProject/actsgetwantalltesthap/entry/src/main/js/default/app.js b/aafwk/aafwk_standard/want/sceneProject/actsgetwantalltesthap/src/main/js/default/app.js similarity index 100% rename from aafwk/aafwk_standard/want/sceneProject/actsgetwantalltesthap/entry/src/main/js/default/app.js rename to aafwk/aafwk_standard/want/sceneProject/actsgetwantalltesthap/src/main/js/default/app.js diff --git a/aafwk/aafwk_standard/want/sceneProject/actsgetwantalltesthap/entry/src/main/js/default/i18n/en-US.json b/aafwk/aafwk_standard/want/sceneProject/actsgetwantalltesthap/src/main/js/default/i18n/en-US.json similarity index 100% rename from aafwk/aafwk_standard/want/sceneProject/actsgetwantalltesthap/entry/src/main/js/default/i18n/en-US.json rename to aafwk/aafwk_standard/want/sceneProject/actsgetwantalltesthap/src/main/js/default/i18n/en-US.json diff --git a/aafwk/aafwk_standard/want/sceneProject/actsgetwantalltesthap/entry/src/main/js/default/i18n/zh-CN.json b/aafwk/aafwk_standard/want/sceneProject/actsgetwantalltesthap/src/main/js/default/i18n/zh-CN.json similarity index 100% rename from aafwk/aafwk_standard/want/sceneProject/actsgetwantalltesthap/entry/src/main/js/default/i18n/zh-CN.json rename to aafwk/aafwk_standard/want/sceneProject/actsgetwantalltesthap/src/main/js/default/i18n/zh-CN.json diff --git a/aafwk/aafwk_standard/want/sceneProject/actsgetwantalltesthap/entry/src/main/js/default/pages/index/index.css b/aafwk/aafwk_standard/want/sceneProject/actsgetwantalltesthap/src/main/js/default/pages/index/index.css similarity index 100% rename from aafwk/aafwk_standard/want/sceneProject/actsgetwantalltesthap/entry/src/main/js/default/pages/index/index.css rename to aafwk/aafwk_standard/want/sceneProject/actsgetwantalltesthap/src/main/js/default/pages/index/index.css diff --git a/aafwk/aafwk_standard/want/sceneProject/actsgetwantalltesthap/entry/src/main/js/default/pages/index/index.hml b/aafwk/aafwk_standard/want/sceneProject/actsgetwantalltesthap/src/main/js/default/pages/index/index.hml similarity index 100% rename from aafwk/aafwk_standard/want/sceneProject/actsgetwantalltesthap/entry/src/main/js/default/pages/index/index.hml rename to aafwk/aafwk_standard/want/sceneProject/actsgetwantalltesthap/src/main/js/default/pages/index/index.hml diff --git a/aafwk/aafwk_standard/want/sceneProject/actsgetwantalltesthap/entry/src/main/js/default/pages/index/index.js b/aafwk/aafwk_standard/want/sceneProject/actsgetwantalltesthap/src/main/js/default/pages/index/index.js similarity index 100% rename from aafwk/aafwk_standard/want/sceneProject/actsgetwantalltesthap/entry/src/main/js/default/pages/index/index.js rename to aafwk/aafwk_standard/want/sceneProject/actsgetwantalltesthap/src/main/js/default/pages/index/index.js diff --git a/aafwk/aafwk_standard/want/sceneProject/actsgetwantalltesthap/entry/src/main/resources/base/element/string.json b/aafwk/aafwk_standard/want/sceneProject/actsgetwantalltesthap/src/main/js/resources/base/element/string.json similarity index 100% rename from aafwk/aafwk_standard/want/sceneProject/actsgetwantalltesthap/entry/src/main/resources/base/element/string.json rename to aafwk/aafwk_standard/want/sceneProject/actsgetwantalltesthap/src/main/js/resources/base/element/string.json diff --git a/aafwk/aafwk_standard/want/sceneProject/actsgetwantalltesthap/entry/src/main/resources/base/media/icon.png b/aafwk/aafwk_standard/want/sceneProject/actsgetwantalltesthap/src/main/js/resources/base/media/icon.png similarity index 100% rename from aafwk/aafwk_standard/want/sceneProject/actsgetwantalltesthap/entry/src/main/resources/base/media/icon.png rename to aafwk/aafwk_standard/want/sceneProject/actsgetwantalltesthap/src/main/js/resources/base/media/icon.png diff --git a/appexecfwk/bundle_standard/bundlemanager/BUILD.gn b/appexecfwk/bundle_standard/bundlemanager/BUILD.gn index e1e43a08955993269c07160f9e4f30f2b8c7a53e..6ed119e142d96957a8461f6180d7da8c5990a892 100755 --- a/appexecfwk/bundle_standard/bundlemanager/BUILD.gn +++ b/appexecfwk/bundle_standard/bundlemanager/BUILD.gn @@ -16,6 +16,17 @@ import("//test/xts/tools/build/suite.gni") group("bundlemanager") { testonly = true if (is_standard_system) { - deps = [ "actsbundlemanagertest:ActsBundleManagerTest" ] + deps = [ + "actsbundlemanagertest:ActsBundleManagerTest", + "sceneProject/bmssceneeight:bmsJstest8", + "sceneProject/bmsscenefive:bmsJstest5", + "sceneProject/bmsscenefour:bmsJstest4", + "sceneProject/bmsscenenine:bmsJstest9", + "sceneProject/bmssceneone:bmsJstest1", + "sceneProject/bmssceneseven:bmsJstest7", + "sceneProject/bmsscenesix:bmsJstest6", + "sceneProject/bmsscenethree:bmsJstest3", + "sceneProject/bmsscenetwo:bmsJstest2", + ] } } diff --git a/appexecfwk/bundle_standard/bundlemanager/actsbundlemanagertest/BUILD.gn b/appexecfwk/bundle_standard/bundlemanager/actsbundlemanagertest/BUILD.gn index eba6e9fb0f061361323c8ad47bad79ed838fe520..61aa0a41e5cdfba2d2d1fe2a32f135432ddf665d 100644 --- a/appexecfwk/bundle_standard/bundlemanager/actsbundlemanagertest/BUILD.gn +++ b/appexecfwk/bundle_standard/bundlemanager/actsbundlemanagertest/BUILD.gn @@ -14,6 +14,18 @@ import("//test/xts/tools/build/suite.gni") ohos_js_hap_suite("ActsBundleManagerTest") { - test_hap_name = "ActsBundleManagerTest" - hap_source_path = "hap/ActsBundleManagerTest.hap" + hap_profile = "./entry/src/main/config.json" + deps = [ + ":hjs_demo_js_assets", + ":hjs_demo_resources", + ] + certificate_profile = "./signature/openharmony_sx.p7b" + hap_name = "ActsBundleManagerTest" +} +ohos_js_assets("hjs_demo_js_assets") { + source_dir = "./entry/src/main/js/default" +} +ohos_resources("hjs_demo_resources") { + sources = [ "./entry/src/main/js/resources" ] + hap_profile = "./entry/src/main/config.json" } diff --git a/appexecfwk/bundle_standard/bundlemanager/actsbundlemanagertest/Test.json b/appexecfwk/bundle_standard/bundlemanager/actsbundlemanagertest/Test.json index 9ad53dfc1bc5e20071470fe232605435d8a08076..f2760ab22a64c6fe05c7c7c4893220b01d1f24aa 100644 --- a/appexecfwk/bundle_standard/bundlemanager/actsbundlemanagertest/Test.json +++ b/appexecfwk/bundle_standard/bundlemanager/actsbundlemanagertest/Test.json @@ -3,16 +3,32 @@ "driver": { "type": "JSUnitTest", "test-timeout": "21600000", - "package": "com.example.actsbundlemanagertest", + "package": "com.example.actsamscallbackfifthscene", "shell-timeout": "21600000" }, "kits": [ { "test-file-name": [ - "ActsBundleManagerTest.hap" + "ActsFeatureAbilityTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true - } + }, + { + "type": "PushKit", + "push": [ + "bmsJstest1.hap->/data/bmsJstest1.hap", + "bmsJstest2.hap->/data/bmsJstest2.hap", + "bmsJstest3.hap->/data/bmsJstest3.hap", + "bmsJstest4.hap->/data/bmsJstest4.hap", + "bmsJstest5.hap->/data/bmsJstest5.hap", + "bmsJstest6.hap->/data/bmsJstest6.hap", + "bmsJstest7.hap->/data/bmsJstest7.hap", + "bmsJstest8.hap->/data/bmsJstest8.hap", + "bmsJstest9.hap->/data/bmsJstest9.hap", + "error.hap->/data/bmsJstest1.hap" + ] + + } ] } diff --git a/appexecfwk/bundle_standard/bundlemanager/actsbundlemanagertest/entry/src/main/resources/base/element/string.json b/appexecfwk/bundle_standard/bundlemanager/actsbundlemanagertest/entry/src/main/js/resources/base/element/string.json similarity index 100% rename from appexecfwk/bundle_standard/bundlemanager/actsbundlemanagertest/entry/src/main/resources/base/element/string.json rename to appexecfwk/bundle_standard/bundlemanager/actsbundlemanagertest/entry/src/main/js/resources/base/element/string.json diff --git a/appexecfwk/bundle_standard/bundlemanager/actsbundlemanagertest/entry/src/main/resources/base/media/icon.png b/appexecfwk/bundle_standard/bundlemanager/actsbundlemanagertest/entry/src/main/js/resources/base/media/icon.png similarity index 100% rename from appexecfwk/bundle_standard/bundlemanager/actsbundlemanagertest/entry/src/main/resources/base/media/icon.png rename to appexecfwk/bundle_standard/bundlemanager/actsbundlemanagertest/entry/src/main/js/resources/base/media/icon.png diff --git a/appexecfwk/bundle_standard/bundlemanager/actsbundlemanagertest/signature/openharmony_sx.p7b b/appexecfwk/bundle_standard/bundlemanager/actsbundlemanagertest/signature/openharmony_sx.p7b new file mode 100755 index 0000000000000000000000000000000000000000..9be1e98fa4c0c28ca997ed660112fa16b194f0f5 Binary files /dev/null and b/appexecfwk/bundle_standard/bundlemanager/actsbundlemanagertest/signature/openharmony_sx.p7b differ diff --git a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneeight/BUILD.gn b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneeight/BUILD.gn new file mode 100644 index 0000000000000000000000000000000000000000..4585808ecf45cfec0cd3b7c4ed56eb5779bcb505 --- /dev/null +++ b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneeight/BUILD.gn @@ -0,0 +1,30 @@ +# 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("bmsJstest8") { + hap_profile = "./src/main/config.json" + deps = [ + ":hjs_demo_js_assets", + ":hjs_demo_resources", + ] + certificate_profile = "./signature/openharmony_sx.p7b" + hap_name = "bmsJstest8" +} +ohos_js_assets("hjs_demo_js_assets") { + source_dir = "./src/main/js/default" +} +ohos_resources("hjs_demo_resources") { + sources = [ "./src/main/js/resources" ] + hap_profile = "./src/main/config.json" +} diff --git a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneeight/Test.json b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneeight/Test.json new file mode 100644 index 0000000000000000000000000000000000000000..7a88763ed8d2ac31dd30211b9574f47273e84549 --- /dev/null +++ b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneeight/Test.json @@ -0,0 +1,3 @@ +{ + "description": "Configuration for hjunit demo Tests", +} diff --git a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneeight/signature/openharmony_sx.p7b b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneeight/signature/openharmony_sx.p7b new file mode 100755 index 0000000000000000000000000000000000000000..9be1e98fa4c0c28ca997ed660112fa16b194f0f5 Binary files /dev/null and b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneeight/signature/openharmony_sx.p7b differ diff --git a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneeight/src/main/resources/base/element/string.json b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneeight/src/main/js/resources/base/element/string.json similarity index 100% rename from appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneeight/src/main/resources/base/element/string.json rename to appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneeight/src/main/js/resources/base/element/string.json diff --git a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneeight/src/main/resources/base/media/icon.png b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneeight/src/main/js/resources/base/media/icon.png similarity index 100% rename from appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneeight/src/main/resources/base/media/icon.png rename to appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneeight/src/main/js/resources/base/media/icon.png diff --git a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenefive/BUILD.gn b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenefive/BUILD.gn new file mode 100644 index 0000000000000000000000000000000000000000..85897982efd018b8d88f733886af34c3bf7c9935 --- /dev/null +++ b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenefive/BUILD.gn @@ -0,0 +1,30 @@ +# 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("bmsJstest5") { + hap_profile = "./src/main/config.json" + deps = [ + ":hjs_demo_js_assets", + ":hjs_demo_resources", + ] + certificate_profile = "./signature/openharmony_sx.p7b" + hap_name = "bmsJstest5" +} +ohos_js_assets("hjs_demo_js_assets") { + source_dir = "./src/main/js/default" +} +ohos_resources("hjs_demo_resources") { + sources = [ "./src/main/js/resources" ] + hap_profile = "./src/main/config.json" +} diff --git a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenefive/Test.json b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenefive/Test.json new file mode 100644 index 0000000000000000000000000000000000000000..7a88763ed8d2ac31dd30211b9574f47273e84549 --- /dev/null +++ b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenefive/Test.json @@ -0,0 +1,3 @@ +{ + "description": "Configuration for hjunit demo Tests", +} diff --git a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenefive/signature/openharmony_sx.p7b b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenefive/signature/openharmony_sx.p7b new file mode 100755 index 0000000000000000000000000000000000000000..9be1e98fa4c0c28ca997ed660112fa16b194f0f5 Binary files /dev/null and b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenefive/signature/openharmony_sx.p7b differ diff --git a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenefive/src/main/resources/base/element/string.json b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenefive/src/main/js/resources/base/element/string.json similarity index 100% rename from appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenefive/src/main/resources/base/element/string.json rename to appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenefive/src/main/js/resources/base/element/string.json diff --git a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenefive/src/main/resources/base/media/icon.png b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenefive/src/main/js/resources/base/media/icon.png similarity index 100% rename from appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenefive/src/main/resources/base/media/icon.png rename to appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenefive/src/main/js/resources/base/media/icon.png diff --git a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenefour/BUILD.gn b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenefour/BUILD.gn new file mode 100644 index 0000000000000000000000000000000000000000..e6887d9492a251a2219020a62b02742892fb001e --- /dev/null +++ b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenefour/BUILD.gn @@ -0,0 +1,30 @@ +# 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("bmsJstest4") { + hap_profile = "./src/main/config.json" + deps = [ + ":hjs_demo_js_assets", + ":hjs_demo_resources", + ] + certificate_profile = "./signature/openharmony_sx.p7b" + hap_name = "bmsJstest4" +} +ohos_js_assets("hjs_demo_js_assets") { + source_dir = "./src/main/js/default" +} +ohos_resources("hjs_demo_resources") { + sources = [ "./src/main/js/resources" ] + hap_profile = "./src/main/config.json" +} diff --git a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenefour/Test.json b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenefour/Test.json new file mode 100644 index 0000000000000000000000000000000000000000..7a88763ed8d2ac31dd30211b9574f47273e84549 --- /dev/null +++ b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenefour/Test.json @@ -0,0 +1,3 @@ +{ + "description": "Configuration for hjunit demo Tests", +} diff --git a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenefour/signature/openharmony_sx.p7b b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenefour/signature/openharmony_sx.p7b new file mode 100755 index 0000000000000000000000000000000000000000..9be1e98fa4c0c28ca997ed660112fa16b194f0f5 Binary files /dev/null and b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenefour/signature/openharmony_sx.p7b differ diff --git a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenefour/src/main/resources/base/element/string.json b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenefour/src/main/js/resources/base/element/string.json similarity index 100% rename from appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenefour/src/main/resources/base/element/string.json rename to appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenefour/src/main/js/resources/base/element/string.json diff --git a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenefour/src/main/resources/base/media/icon.png b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenefour/src/main/js/resources/base/media/icon.png similarity index 100% rename from appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenefour/src/main/resources/base/media/icon.png rename to appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenefour/src/main/js/resources/base/media/icon.png diff --git a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenenine/BUILD.gn b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenenine/BUILD.gn new file mode 100644 index 0000000000000000000000000000000000000000..55a16f5836e14162913d46786eb414b0b003637c --- /dev/null +++ b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenenine/BUILD.gn @@ -0,0 +1,30 @@ +# 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("bmsJstest9") { + hap_profile = "./src/main/config.json" + deps = [ + ":hjs_demo_js_assets", + ":hjs_demo_resources", + ] + certificate_profile = "./signature/openharmony_sx.p7b" + hap_name = "bmsJstest9" +} +ohos_js_assets("hjs_demo_js_assets") { + source_dir = "./src/main/js/default" +} +ohos_resources("hjs_demo_resources") { + sources = [ "./src/main/js/resources" ] + hap_profile = "./src/main/config.json" +} diff --git a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenenine/Test.json b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenenine/Test.json new file mode 100644 index 0000000000000000000000000000000000000000..7a88763ed8d2ac31dd30211b9574f47273e84549 --- /dev/null +++ b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenenine/Test.json @@ -0,0 +1,3 @@ +{ + "description": "Configuration for hjunit demo Tests", +} diff --git a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenenine/signature/openharmony_sx.p7b b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenenine/signature/openharmony_sx.p7b new file mode 100755 index 0000000000000000000000000000000000000000..9be1e98fa4c0c28ca997ed660112fa16b194f0f5 Binary files /dev/null and b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenenine/signature/openharmony_sx.p7b differ diff --git a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenenine/src/main/resources/base/element/string.json b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenenine/src/main/js/resources/base/element/string.json similarity index 100% rename from appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenenine/src/main/resources/base/element/string.json rename to appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenenine/src/main/js/resources/base/element/string.json diff --git a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenenine/src/main/resources/base/media/icon.png b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenenine/src/main/js/resources/base/media/icon.png similarity index 100% rename from appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenenine/src/main/resources/base/media/icon.png rename to appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenenine/src/main/js/resources/base/media/icon.png diff --git a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneone/BUILD.gn b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneone/BUILD.gn new file mode 100644 index 0000000000000000000000000000000000000000..819fef56c57fa95e9d180752eaebf735ae77d72b --- /dev/null +++ b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneone/BUILD.gn @@ -0,0 +1,30 @@ +# 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("bmsJstest1") { + hap_profile = "./src/main/config.json" + deps = [ + ":hjs_demo_js_assets", + ":hjs_demo_resources", + ] + certificate_profile = "./signature/openharmony_sx.p7b" + hap_name = "bmsJstest1" +} +ohos_js_assets("hjs_demo_js_assets") { + source_dir = "./src/main/js/default" +} +ohos_resources("hjs_demo_resources") { + sources = [ "./src/main/js/resources" ] + hap_profile = "./src/main/config.json" +} diff --git a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneone/Test.json b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneone/Test.json new file mode 100644 index 0000000000000000000000000000000000000000..7a88763ed8d2ac31dd30211b9574f47273e84549 --- /dev/null +++ b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneone/Test.json @@ -0,0 +1,3 @@ +{ + "description": "Configuration for hjunit demo Tests", +} diff --git a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneone/signature/openharmony_sx.p7b b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneone/signature/openharmony_sx.p7b new file mode 100755 index 0000000000000000000000000000000000000000..9be1e98fa4c0c28ca997ed660112fa16b194f0f5 Binary files /dev/null and b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneone/signature/openharmony_sx.p7b differ diff --git a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneone/src/main/resources/base/element/string.json b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneone/src/main/js/resources/base/element/string.json similarity index 100% rename from appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneone/src/main/resources/base/element/string.json rename to appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneone/src/main/js/resources/base/element/string.json diff --git a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneone/src/main/resources/base/media/icon.png b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneone/src/main/js/resources/base/media/icon.png similarity index 100% rename from appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneone/src/main/resources/base/media/icon.png rename to appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneone/src/main/js/resources/base/media/icon.png diff --git a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneseven/BUILD.gn b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneseven/BUILD.gn new file mode 100644 index 0000000000000000000000000000000000000000..96a8b68dd98c7adbdf765de8323f4f478e6d1008 --- /dev/null +++ b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneseven/BUILD.gn @@ -0,0 +1,30 @@ +# 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("bmsJstest7") { + hap_profile = "./src/main/config.json" + deps = [ + ":hjs_demo_js_assets", + ":hjs_demo_resources", + ] + certificate_profile = "./signature/openharmony_sx.p7b" + hap_name = "bmsJstest7" +} +ohos_js_assets("hjs_demo_js_assets") { + source_dir = "./src/main/js/default" +} +ohos_resources("hjs_demo_resources") { + sources = [ "./src/main/js/resources" ] + hap_profile = "./src/main/config.json" +} diff --git a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneseven/Test.json b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneseven/Test.json new file mode 100644 index 0000000000000000000000000000000000000000..7a88763ed8d2ac31dd30211b9574f47273e84549 --- /dev/null +++ b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneseven/Test.json @@ -0,0 +1,3 @@ +{ + "description": "Configuration for hjunit demo Tests", +} diff --git a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneseven/signature/openharmony_sx.p7b b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneseven/signature/openharmony_sx.p7b new file mode 100755 index 0000000000000000000000000000000000000000..9be1e98fa4c0c28ca997ed660112fa16b194f0f5 Binary files /dev/null and b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneseven/signature/openharmony_sx.p7b differ diff --git a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneseven/src/main/resources/base/element/string.json b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneseven/src/main/js/resources/base/element/string.json similarity index 100% rename from appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneseven/src/main/resources/base/element/string.json rename to appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneseven/src/main/js/resources/base/element/string.json diff --git a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneseven/src/main/resources/base/media/icon.png b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneseven/src/main/js/resources/base/media/icon.png similarity index 100% rename from appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneseven/src/main/resources/base/media/icon.png rename to appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneseven/src/main/js/resources/base/media/icon.png diff --git a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenesix/BUILD.gn b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenesix/BUILD.gn new file mode 100644 index 0000000000000000000000000000000000000000..28cd23361f43d0b487035c307dc1d3e66892a5be --- /dev/null +++ b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenesix/BUILD.gn @@ -0,0 +1,30 @@ +# 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("bmsJstest6") { + hap_profile = "./src/main/config.json" + deps = [ + ":hjs_demo_js_assets", + ":hjs_demo_resources", + ] + certificate_profile = "./signature/openharmony_sx.p7b" + hap_name = "bmsJstest6" +} +ohos_js_assets("hjs_demo_js_assets") { + source_dir = "./src/main/js/default" +} +ohos_resources("hjs_demo_resources") { + sources = [ "./src/main/js/resources" ] + hap_profile = "./src/main/config.json" +} diff --git a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenesix/Test.json b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenesix/Test.json new file mode 100644 index 0000000000000000000000000000000000000000..7a88763ed8d2ac31dd30211b9574f47273e84549 --- /dev/null +++ b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenesix/Test.json @@ -0,0 +1,3 @@ +{ + "description": "Configuration for hjunit demo Tests", +} diff --git a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenesix/signature/openharmony_sx.p7b b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenesix/signature/openharmony_sx.p7b new file mode 100755 index 0000000000000000000000000000000000000000..9be1e98fa4c0c28ca997ed660112fa16b194f0f5 Binary files /dev/null and b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenesix/signature/openharmony_sx.p7b differ diff --git a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenesix/src/main/resources/base/element/string.json b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenesix/src/main/js/resources/base/element/string.json similarity index 100% rename from appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenesix/src/main/resources/base/element/string.json rename to appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenesix/src/main/js/resources/base/element/string.json diff --git a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenesix/src/main/resources/base/media/icon.png b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenesix/src/main/js/resources/base/media/icon.png similarity index 100% rename from appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenesix/src/main/resources/base/media/icon.png rename to appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenesix/src/main/js/resources/base/media/icon.png diff --git a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenethree/BUILD.gn b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenethree/BUILD.gn new file mode 100644 index 0000000000000000000000000000000000000000..294dfb4b7f3897cf4af6f56db3723c9040e8459a --- /dev/null +++ b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenethree/BUILD.gn @@ -0,0 +1,30 @@ +# 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("bmsJstest3") { + hap_profile = "./src/main/config.json" + deps = [ + ":hjs_demo_js_assets", + ":hjs_demo_resources", + ] + certificate_profile = "./signature/openharmony_sx.p7b" + hap_name = "bmsJstest3" +} +ohos_js_assets("hjs_demo_js_assets") { + source_dir = "./src/main/js/default" +} +ohos_resources("hjs_demo_resources") { + sources = [ "./src/main/js/resources" ] + hap_profile = "./src/main/config.json" +} diff --git a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenethree/Test.json b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenethree/Test.json new file mode 100644 index 0000000000000000000000000000000000000000..7a88763ed8d2ac31dd30211b9574f47273e84549 --- /dev/null +++ b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenethree/Test.json @@ -0,0 +1,3 @@ +{ + "description": "Configuration for hjunit demo Tests", +} diff --git a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenethree/signature/openharmony_sx.p7b b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenethree/signature/openharmony_sx.p7b new file mode 100755 index 0000000000000000000000000000000000000000..9be1e98fa4c0c28ca997ed660112fa16b194f0f5 Binary files /dev/null and b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenethree/signature/openharmony_sx.p7b differ diff --git a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenethree/src/main/resources/base/element/string.json b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenethree/src/main/js/resources/base/element/string.json similarity index 100% rename from appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenethree/src/main/resources/base/element/string.json rename to appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenethree/src/main/js/resources/base/element/string.json diff --git a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenethree/src/main/resources/base/media/icon.png b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenethree/src/main/js/resources/base/media/icon.png similarity index 100% rename from appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenethree/src/main/resources/base/media/icon.png rename to appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenethree/src/main/js/resources/base/media/icon.png diff --git a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenetwo/BUILD.gn b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenetwo/BUILD.gn new file mode 100644 index 0000000000000000000000000000000000000000..bb475d2258793e4fcd7cce9adce2aaeeb4457bf3 --- /dev/null +++ b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenetwo/BUILD.gn @@ -0,0 +1,30 @@ +# 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("bmsJstest2") { + hap_profile = "./src/main/config.json" + deps = [ + ":hjs_demo_js_assets", + ":hjs_demo_resources", + ] + certificate_profile = "./signature/openharmony_sx.p7b" + hap_name = "bmsJstest2" +} +ohos_js_assets("hjs_demo_js_assets") { + source_dir = "./src/main/js/default" +} +ohos_resources("hjs_demo_resources") { + sources = [ "./src/main/js/resources" ] + hap_profile = "./src/main/config.json" +} diff --git a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenetwo/Test.json b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenetwo/Test.json new file mode 100644 index 0000000000000000000000000000000000000000..7a88763ed8d2ac31dd30211b9574f47273e84549 --- /dev/null +++ b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenetwo/Test.json @@ -0,0 +1,3 @@ +{ + "description": "Configuration for hjunit demo Tests", +} diff --git a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenetwo/signature/openharmony_sx.p7b b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenetwo/signature/openharmony_sx.p7b new file mode 100755 index 0000000000000000000000000000000000000000..9be1e98fa4c0c28ca997ed660112fa16b194f0f5 Binary files /dev/null and b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenetwo/signature/openharmony_sx.p7b differ diff --git a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenetwo/src/main/resources/base/element/string.json b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenetwo/src/main/js/resources/base/element/string.json similarity index 100% rename from appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenetwo/src/main/resources/base/element/string.json rename to appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenetwo/src/main/js/resources/base/element/string.json diff --git a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenetwo/src/main/resources/base/media/icon.png b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenetwo/src/main/js/resources/base/media/icon.png similarity index 100% rename from appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenetwo/src/main/resources/base/media/icon.png rename to appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenetwo/src/main/js/resources/base/media/icon.png diff --git a/notification/ces_standard/subscribeandpublish/actssubscriberorderedtest/BUILD.gn b/notification/ces_standard/subscribeandpublish/actssubscriberorderedtest/BUILD.gn index 9e89da7230e37923359ea2f9224ef12b52d9d991..a3645a042cd246cee6d43d83be25b61f49a49599 100644 --- a/notification/ces_standard/subscribeandpublish/actssubscriberorderedtest/BUILD.gn +++ b/notification/ces_standard/subscribeandpublish/actssubscriberorderedtest/BUILD.gn @@ -13,6 +13,18 @@ import("//test/xts/tools/build/suite.gni") ohos_js_hap_suite("ActsSubscriberOrderedTest") { - test_hap_name = "ActsSubscriberTestOrder" - hap_source_path = "hap/ActsSubscriberTestOrder.hap" + hap_profile = "./entry/src/main/config.json" + deps = [ + ":hjs_demo_js_assets", + ":hjs_demo_resources", + ] + certificate_profile = "./signature/openharmony_sx.p7b" + hap_name = "ActsSubscriberTestOrder" +} +ohos_js_assets("hjs_demo_js_assets") { + source_dir = "./entry/src/main/js/default" +} +ohos_resources("hjs_demo_resources") { + sources = [ "./entry/src/main/js/resources" ] + hap_profile = "./entry/src/main/config.json" } diff --git a/notification/ces_standard/subscribeandpublish/actssubscriberorderedtest/entry/src/main/js/resources/base/element/string.json b/notification/ces_standard/subscribeandpublish/actssubscriberorderedtest/entry/src/main/js/resources/base/element/string.json new file mode 100755 index 0000000000000000000000000000000000000000..f94ce7e64e455e1ebf22a4b2792c5b52c791d037 --- /dev/null +++ b/notification/ces_standard/subscribeandpublish/actssubscriberorderedtest/entry/src/main/js/resources/base/element/string.json @@ -0,0 +1,12 @@ +{ + "string": [ + { + "name": "app_name", + "value": "JsHelloWorld" + }, + { + "name": "mainability_description", + "value": "hap sample empty page" + } + ] +} \ No newline at end of file diff --git a/notification/ces_standard/subscribeandpublish/actssubscriberorderedtest/entry/src/main/js/resources/base/media/icon.png b/notification/ces_standard/subscribeandpublish/actssubscriberorderedtest/entry/src/main/js/resources/base/media/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..ce307a8827bd75456441ceb57d530e4c8d45d36c Binary files /dev/null and b/notification/ces_standard/subscribeandpublish/actssubscriberorderedtest/entry/src/main/js/resources/base/media/icon.png differ diff --git a/notification/ces_standard/subscribeandpublish/actssubscriberorderedtest/signature/openharmony_sx.p7b b/notification/ces_standard/subscribeandpublish/actssubscriberorderedtest/signature/openharmony_sx.p7b new file mode 100755 index 0000000000000000000000000000000000000000..9be1e98fa4c0c28ca997ed660112fa16b194f0f5 Binary files /dev/null and b/notification/ces_standard/subscribeandpublish/actssubscriberorderedtest/signature/openharmony_sx.p7b differ diff --git a/notification/ces_standard/subscribeandpublish/actssubscriberunordertest/BUILD.gn b/notification/ces_standard/subscribeandpublish/actssubscriberunordertest/BUILD.gn index e6da9a3e9ce3ff1ae59c6f03b7442810e04cb7e0..e87869680c6dcd54de3c5cc4d9e194b1777807b7 100644 --- a/notification/ces_standard/subscribeandpublish/actssubscriberunordertest/BUILD.gn +++ b/notification/ces_standard/subscribeandpublish/actssubscriberunordertest/BUILD.gn @@ -13,6 +13,18 @@ import("//test/xts/tools/build/suite.gni") ohos_js_hap_suite("ActsSubscriberUnorderTest") { - test_hap_name = "ActsSubscriberTestUnorder" - hap_source_path = "hap/ActsSubscriberTestUnorder.hap" + hap_profile = "./entry/src/main/config.json" + deps = [ + ":hjs_demo_js_assets", + ":hjs_demo_resources", + ] + certificate_profile = "./signature/openharmony_sx.p7b" + hap_name = "ActsSubscriberUnorderTest" +} +ohos_js_assets("hjs_demo_js_assets") { + source_dir = "./entry/src/main/js/default" +} +ohos_resources("hjs_demo_resources") { + sources = [ "./entry/src/main/js/resources" ] + hap_profile = "./entry/src/main/config.json" } diff --git a/notification/ces_standard/subscribeandpublish/actssubscriberunordertest/entry/src/main/js/resources/base/element/string.json b/notification/ces_standard/subscribeandpublish/actssubscriberunordertest/entry/src/main/js/resources/base/element/string.json new file mode 100755 index 0000000000000000000000000000000000000000..f94ce7e64e455e1ebf22a4b2792c5b52c791d037 --- /dev/null +++ b/notification/ces_standard/subscribeandpublish/actssubscriberunordertest/entry/src/main/js/resources/base/element/string.json @@ -0,0 +1,12 @@ +{ + "string": [ + { + "name": "app_name", + "value": "JsHelloWorld" + }, + { + "name": "mainability_description", + "value": "hap sample empty page" + } + ] +} \ No newline at end of file diff --git a/notification/ces_standard/subscribeandpublish/actssubscriberunordertest/entry/src/main/js/resources/base/media/icon.png b/notification/ces_standard/subscribeandpublish/actssubscriberunordertest/entry/src/main/js/resources/base/media/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..ce307a8827bd75456441ceb57d530e4c8d45d36c Binary files /dev/null and b/notification/ces_standard/subscribeandpublish/actssubscriberunordertest/entry/src/main/js/resources/base/media/icon.png differ diff --git a/notification/ces_standard/subscribeandpublish/actssubscriberunordertest/signature/openharmony_sx.p7b b/notification/ces_standard/subscribeandpublish/actssubscriberunordertest/signature/openharmony_sx.p7b new file mode 100755 index 0000000000000000000000000000000000000000..9be1e98fa4c0c28ca997ed660112fa16b194f0f5 Binary files /dev/null and b/notification/ces_standard/subscribeandpublish/actssubscriberunordertest/signature/openharmony_sx.p7b differ diff --git a/test_packages.gni b/test_packages.gni index 091eb6a6717e15cb13a938e4321c4614c2573a3d..8fec789ab2867d5973df699d20375c08732e95ab 100755 --- a/test_packages.gni +++ b/test_packages.gni @@ -20,10 +20,10 @@ _all_test_packages = [ "${ACTS_ROOT}/hiviewdfx:hiviewdfxtestacts", "${ACTS_ROOT}/barrierfree:barrierfree", # "${ACTS_ROOT}/telephony:telephony", -# "${ACTS_ROOT}/appexecfwk:appexecfwk", + "${ACTS_ROOT}/appexecfwk:appexecfwk", "${ACTS_ROOT}/account:account", # "${ACTS_ROOT}/communication:communication", - #"${ACTS_ROOT}/notification:notification", + "${ACTS_ROOT}/notification:notification", "${ACTS_ROOT}/aafwk:aafwk", "${ACTS_ROOT}/location:location", "${ACTS_ROOT}/miscservices:miscservices",