diff --git a/aafwk/aafwk_standard/BUILD.gn b/aafwk/aafwk_standard/BUILD.gn index 11a5c15c95f9447213ddb1c16365d543a77a577b..95687a526709dd8b752f9fa0982257e32d4e0666 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/abilitymanager/BUILD.gn b/aafwk/aafwk_standard/abilitymanager/BUILD.gn index 8dff617234c2bd1bb2b2d1492a933984e134cb5b..08de4c3edafd6e5a587e3845c89c7ca6a78063fd 100644 --- a/aafwk/aafwk_standard/abilitymanager/BUILD.gn +++ b/aafwk/aafwk_standard/abilitymanager/BUILD.gn @@ -27,6 +27,11 @@ group("actsabilitymanagertest") { "actsamstestfourthscene:ActsAmsTestFourthScene", "actsamstestsecondscene:ActsAmsTestSecondScene", "actsamstestthirdscene:ActsAmsTestThirdScene", + "sceneProject/simulateFAbilityFir:simulateFAbilityFir", + "sceneProject/simulateEAbility:simulateEAbility", + "sceneProject/simulateFAbilitySed:simulateFAbilitySed", + "sceneProject/verifyAAbility:verifyAAbility", + "sceneProject/verifyIAbility:verifyIAbility" ] } } diff --git a/aafwk/aafwk_standard/abilitymanager/actsamscallbackfifthscene/BUILD.gn b/aafwk/aafwk_standard/abilitymanager/actsamscallbackfifthscene/BUILD.gn index f87c2e31cec200db82b3767767aa8d9837ae00c5..62f92e6d2c5bc6effd3f2f2961d1601d71e4f980 100644 --- a/aafwk/aafwk_standard/abilitymanager/actsamscallbackfifthscene/BUILD.gn +++ b/aafwk/aafwk_standard/abilitymanager/actsamscallbackfifthscene/BUILD.gn @@ -14,6 +14,18 @@ import("//test/xts/tools/build/suite.gni") ohos_js_hap_suite("ActsAmsCallBackFifthScene") { - test_hap_name = "ActsAmsCallBackFifthScene" - hap_source_path = "hap/ActsAmsCallBackFifthScene.hap" + hap_profile = "./entry/src/main/config.json" + deps = [ + ":hjs_demo_js_assets", + ":hjs_demo_resources", + ] + certificate_profile = "./signature/openharmony_sx.p7b" + hap_name = "ActsAmsCallBackFifthScene" +} +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/abilitymanager/actsamscallbackfifthscene/Test.json b/aafwk/aafwk_standard/abilitymanager/actsamscallbackfifthscene/Test.json index db159c76a1c383aa1ceabe2099ff9c3e16dbbb6c..a60a9e0291fde67bdce1690d5453ec209d418bef 100644 --- a/aafwk/aafwk_standard/abilitymanager/actsamscallbackfifthscene/Test.json +++ b/aafwk/aafwk_standard/abilitymanager/actsamscallbackfifthscene/Test.json @@ -9,7 +9,10 @@ "kits": [ { "test-file-name": [ - "ActsAmsCallBackFifthScene.hap" + "ActsAmsCallBackFifthScene.hap", + "simulateFAbilityFir.hap", + "simulateFAbilitySed.hap", + "verifyIAbility.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/aafwk/aafwk_standard/abilitymanager/actsamscallbackfifthscene/entry/src/main/js/default/app.js b/aafwk/aafwk_standard/abilitymanager/actsamscallbackfifthscene/entry/src/main/js/default/app.js index 2a68c1992145a976957d7dcdd69a7e9c2e8e9877..394207eb5460c4907b53b15a6d4f1a1a535916cc 100644 --- a/aafwk/aafwk_standard/abilitymanager/actsamscallbackfifthscene/entry/src/main/js/default/app.js +++ b/aafwk/aafwk_standard/abilitymanager/actsamscallbackfifthscene/entry/src/main/js/default/app.js @@ -1,17 +1,3 @@ -/* - * 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. - */ export default { onCreate() { console.info('AceApplication onCreate'); diff --git a/aafwk/aafwk_standard/abilitymanager/actsamscallbackfifthscene/entry/src/main/js/default/pages/index/index.css b/aafwk/aafwk_standard/abilitymanager/actsamscallbackfifthscene/entry/src/main/js/default/pages/index/index.css new file mode 100755 index 0000000000000000000000000000000000000000..caf729946975b79e55ab9e56e55bf860337b3f50 --- /dev/null +++ b/aafwk/aafwk_standard/abilitymanager/actsamscallbackfifthscene/entry/src/main/js/default/pages/index/index.css @@ -0,0 +1,38 @@ +/* + * 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. + */ + +.container { + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + left: 0px; + top: 0px; + width: 100%; + height: 100%; +} + +.title { + font-size: 60px; + text-align: center; + width: 100%; + height: 40%; + margin: 10px; +} +.btn { + width: 50%; + height: 100px; + font-size: 40px; +} diff --git a/aafwk/aafwk_standard/abilitymanager/actsamscallbackfifthscene/entry/src/main/js/default/pages/index/index.hml b/aafwk/aafwk_standard/abilitymanager/actsamscallbackfifthscene/entry/src/main/js/default/pages/index/index.hml new file mode 100755 index 0000000000000000000000000000000000000000..61ea59d936e5a2971f1ea3d179c44a7f3f596c54 --- /dev/null +++ b/aafwk/aafwk_standard/abilitymanager/actsamscallbackfifthscene/entry/src/main/js/default/pages/index/index.hml @@ -0,0 +1,21 @@ + + +
+ + {{ $t('strings.hello') }} {{title}} + + +
diff --git a/aafwk/aafwk_standard/abilitymanager/actsamscallbackfifthscene/entry/src/main/js/default/pages/index/index.js b/aafwk/aafwk_standard/abilitymanager/actsamscallbackfifthscene/entry/src/main/js/default/pages/index/index.js index bdaebb959afc1cd583c640b63402155e2620221d..1384ae87755704cff89d0ccb57d6f8bad2df8e3c 100644 --- a/aafwk/aafwk_standard/abilitymanager/actsamscallbackfifthscene/entry/src/main/js/default/pages/index/index.js +++ b/aafwk/aafwk_standard/abilitymanager/actsamscallbackfifthscene/entry/src/main/js/default/pages/index/index.js @@ -1,19 +1,5 @@ -/* - * 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 file from '@system.file' -import {Core, ExpectExtend, ReportExtend} from 'deccjsunit/index' +import {Core, ExpectExtend} from 'deccjsunit/index' export default { data: { @@ -29,9 +15,7 @@ export default { const expectExtend = new ExpectExtend({ 'id': 'extend' }) - const reportExtend = new ReportExtend(file) core.addService('expect', expectExtend) - core.addService('report', reportExtend) core.init() const configService = core.getDefaultService('config') diff --git a/aafwk/aafwk_standard/abilitymanager/actsamscallbackfifthscene/entry/src/main/js/resources/base/element/string.json b/aafwk/aafwk_standard/abilitymanager/actsamscallbackfifthscene/entry/src/main/js/resources/base/element/string.json new file mode 100755 index 0000000000000000000000000000000000000000..f94ce7e64e455e1ebf22a4b2792c5b52c791d037 --- /dev/null +++ b/aafwk/aafwk_standard/abilitymanager/actsamscallbackfifthscene/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/aafwk/aafwk_standard/abilitymanager/actsamscallbackfifthscene/entry/src/main/js/resources/base/media/icon.png b/aafwk/aafwk_standard/abilitymanager/actsamscallbackfifthscene/entry/src/main/js/resources/base/media/icon.png new file mode 100755 index 0000000000000000000000000000000000000000..ce307a8827bd75456441ceb57d530e4c8d45d36c Binary files /dev/null and b/aafwk/aafwk_standard/abilitymanager/actsamscallbackfifthscene/entry/src/main/js/resources/base/media/icon.png differ diff --git a/aafwk/aafwk_standard/abilitymanager/actsamscallbackfifthscene/signature/openharmony_sx.p7b b/aafwk/aafwk_standard/abilitymanager/actsamscallbackfifthscene/signature/openharmony_sx.p7b new file mode 100755 index 0000000000000000000000000000000000000000..9be1e98fa4c0c28ca997ed660112fa16b194f0f5 Binary files /dev/null and b/aafwk/aafwk_standard/abilitymanager/actsamscallbackfifthscene/signature/openharmony_sx.p7b differ diff --git a/aafwk/aafwk_standard/abilitymanager/actsamscallbackfirstscene/BUILD.gn b/aafwk/aafwk_standard/abilitymanager/actsamscallbackfirstscene/BUILD.gn index 6ab0e4cd20a09e1067c9f1463a51e1bf4dcc650d..fd7039ba2927328f6f37b0549d75a424d2d0a41a 100644 --- a/aafwk/aafwk_standard/abilitymanager/actsamscallbackfirstscene/BUILD.gn +++ b/aafwk/aafwk_standard/abilitymanager/actsamscallbackfirstscene/BUILD.gn @@ -14,6 +14,18 @@ import("//test/xts/tools/build/suite.gni") ohos_js_hap_suite("ActsAmsCallBackFirstScene") { - test_hap_name = "ActsAmsCallBackFirstScene" - hap_source_path = "hap/ActsAmsCallBackFirstScene.hap" + hap_profile = "./entry/src/main/config.json" + deps = [ + ":hjs_demo_js_assets", + ":hjs_demo_resources", + ] + certificate_profile = "./signature/openharmony_sx.p7b" + hap_name = "ActsAmsCallBackFirstScene" +} +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/abilitymanager/actsamscallbackfirstscene/Test.json b/aafwk/aafwk_standard/abilitymanager/actsamscallbackfirstscene/Test.json index d71b77e8a1ee1373648fc354490953084bee3e42..72d6fbc61b8cff97d658b295dbeb6771d164f785 100644 --- a/aafwk/aafwk_standard/abilitymanager/actsamscallbackfirstscene/Test.json +++ b/aafwk/aafwk_standard/abilitymanager/actsamscallbackfirstscene/Test.json @@ -9,7 +9,8 @@ "kits": [ { "test-file-name": [ - "ActsAmsCallBackFirstScene.hap" + "ActsAmsCallBackFirstScene.hap", + "simulateFAbilityFir.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/aafwk/aafwk_standard/abilitymanager/actsamscallbackfirstscene/entry/src/main/js/default/pages/index/index.css b/aafwk/aafwk_standard/abilitymanager/actsamscallbackfirstscene/entry/src/main/js/default/pages/index/index.css new file mode 100755 index 0000000000000000000000000000000000000000..caf729946975b79e55ab9e56e55bf860337b3f50 --- /dev/null +++ b/aafwk/aafwk_standard/abilitymanager/actsamscallbackfirstscene/entry/src/main/js/default/pages/index/index.css @@ -0,0 +1,38 @@ +/* + * 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. + */ + +.container { + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + left: 0px; + top: 0px; + width: 100%; + height: 100%; +} + +.title { + font-size: 60px; + text-align: center; + width: 100%; + height: 40%; + margin: 10px; +} +.btn { + width: 50%; + height: 100px; + font-size: 40px; +} diff --git a/aafwk/aafwk_standard/abilitymanager/actsamscallbackfirstscene/entry/src/main/js/default/pages/index/index.hml b/aafwk/aafwk_standard/abilitymanager/actsamscallbackfirstscene/entry/src/main/js/default/pages/index/index.hml new file mode 100755 index 0000000000000000000000000000000000000000..61ea59d936e5a2971f1ea3d179c44a7f3f596c54 --- /dev/null +++ b/aafwk/aafwk_standard/abilitymanager/actsamscallbackfirstscene/entry/src/main/js/default/pages/index/index.hml @@ -0,0 +1,21 @@ + + +
+ + {{ $t('strings.hello') }} {{title}} + + +
diff --git a/aafwk/aafwk_standard/abilitymanager/actsamscallbackfirstscene/entry/src/main/js/resources/base/element/string.json b/aafwk/aafwk_standard/abilitymanager/actsamscallbackfirstscene/entry/src/main/js/resources/base/element/string.json new file mode 100755 index 0000000000000000000000000000000000000000..f94ce7e64e455e1ebf22a4b2792c5b52c791d037 --- /dev/null +++ b/aafwk/aafwk_standard/abilitymanager/actsamscallbackfirstscene/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/aafwk/aafwk_standard/abilitymanager/actsamscallbackfirstscene/entry/src/main/js/resources/base/media/icon.png b/aafwk/aafwk_standard/abilitymanager/actsamscallbackfirstscene/entry/src/main/js/resources/base/media/icon.png new file mode 100755 index 0000000000000000000000000000000000000000..ce307a8827bd75456441ceb57d530e4c8d45d36c Binary files /dev/null and b/aafwk/aafwk_standard/abilitymanager/actsamscallbackfirstscene/entry/src/main/js/resources/base/media/icon.png differ diff --git a/aafwk/aafwk_standard/abilitymanager/actsamscallbackfirstscene/signature/openharmony_sx.p7b b/aafwk/aafwk_standard/abilitymanager/actsamscallbackfirstscene/signature/openharmony_sx.p7b new file mode 100755 index 0000000000000000000000000000000000000000..9be1e98fa4c0c28ca997ed660112fa16b194f0f5 Binary files /dev/null and b/aafwk/aafwk_standard/abilitymanager/actsamscallbackfirstscene/signature/openharmony_sx.p7b differ diff --git a/aafwk/aafwk_standard/abilitymanager/actsamscallbackfourthscene/BUILD.gn b/aafwk/aafwk_standard/abilitymanager/actsamscallbackfourthscene/BUILD.gn index ccae686a825ef208ab073bfa282052a921ae874c..d83879662cae4a96e2a410f3ab276eec360a00bf 100644 --- a/aafwk/aafwk_standard/abilitymanager/actsamscallbackfourthscene/BUILD.gn +++ b/aafwk/aafwk_standard/abilitymanager/actsamscallbackfourthscene/BUILD.gn @@ -14,6 +14,18 @@ import("//test/xts/tools/build/suite.gni") ohos_js_hap_suite("ActsAmsCallBackFourthScene") { - test_hap_name = "ActsAmsCallBackFourthScene" - hap_source_path = "hap/ActsAmsCallBackFourthScene.hap" + hap_profile = "./entry/src/main/config.json" + deps = [ + ":hjs_demo_js_assets", + ":hjs_demo_resources", + ] + certificate_profile = "./signature/openharmony_sx.p7b" + hap_name = "ActsAmsCallBackFourthScene" +} +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/abilitymanager/actsamscallbackfourthscene/Test.json b/aafwk/aafwk_standard/abilitymanager/actsamscallbackfourthscene/Test.json index 860bc53893438bb2aead821677e8ed6d6e8c5d69..90197538855a2bf34eeb933d3b9e89f770049b98 100644 --- a/aafwk/aafwk_standard/abilitymanager/actsamscallbackfourthscene/Test.json +++ b/aafwk/aafwk_standard/abilitymanager/actsamscallbackfourthscene/Test.json @@ -9,7 +9,11 @@ "kits": [ { "test-file-name": [ - "ActsAmsCallBackFourthScene.hap" + "ActsAmsCallBackFourthScene.hap", + "simulateFAbilityFir.hap", + "verifyAAbility.hap", + "verifyIAbility.hap", + "simulateEAbility.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/aafwk/aafwk_standard/abilitymanager/actsamscallbackfourthscene/entry/src/main/js/default/pages/index/index.css b/aafwk/aafwk_standard/abilitymanager/actsamscallbackfourthscene/entry/src/main/js/default/pages/index/index.css new file mode 100755 index 0000000000000000000000000000000000000000..caf729946975b79e55ab9e56e55bf860337b3f50 --- /dev/null +++ b/aafwk/aafwk_standard/abilitymanager/actsamscallbackfourthscene/entry/src/main/js/default/pages/index/index.css @@ -0,0 +1,38 @@ +/* + * 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. + */ + +.container { + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + left: 0px; + top: 0px; + width: 100%; + height: 100%; +} + +.title { + font-size: 60px; + text-align: center; + width: 100%; + height: 40%; + margin: 10px; +} +.btn { + width: 50%; + height: 100px; + font-size: 40px; +} diff --git a/aafwk/aafwk_standard/abilitymanager/actsamscallbackfourthscene/entry/src/main/js/default/pages/index/index.hml b/aafwk/aafwk_standard/abilitymanager/actsamscallbackfourthscene/entry/src/main/js/default/pages/index/index.hml new file mode 100755 index 0000000000000000000000000000000000000000..61ea59d936e5a2971f1ea3d179c44a7f3f596c54 --- /dev/null +++ b/aafwk/aafwk_standard/abilitymanager/actsamscallbackfourthscene/entry/src/main/js/default/pages/index/index.hml @@ -0,0 +1,21 @@ + + +
+ + {{ $t('strings.hello') }} {{title}} + + +
diff --git a/aafwk/aafwk_standard/abilitymanager/actsamscallbackfourthscene/entry/src/main/js/resources/base/element/string.json b/aafwk/aafwk_standard/abilitymanager/actsamscallbackfourthscene/entry/src/main/js/resources/base/element/string.json new file mode 100755 index 0000000000000000000000000000000000000000..f94ce7e64e455e1ebf22a4b2792c5b52c791d037 --- /dev/null +++ b/aafwk/aafwk_standard/abilitymanager/actsamscallbackfourthscene/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/aafwk/aafwk_standard/abilitymanager/actsamscallbackfourthscene/entry/src/main/js/resources/base/media/icon.png b/aafwk/aafwk_standard/abilitymanager/actsamscallbackfourthscene/entry/src/main/js/resources/base/media/icon.png new file mode 100755 index 0000000000000000000000000000000000000000..ce307a8827bd75456441ceb57d530e4c8d45d36c Binary files /dev/null and b/aafwk/aafwk_standard/abilitymanager/actsamscallbackfourthscene/entry/src/main/js/resources/base/media/icon.png differ diff --git a/aafwk/aafwk_standard/abilitymanager/actsamscallbackfourthscene/signature/openharmony_sx.p7b b/aafwk/aafwk_standard/abilitymanager/actsamscallbackfourthscene/signature/openharmony_sx.p7b new file mode 100755 index 0000000000000000000000000000000000000000..9be1e98fa4c0c28ca997ed660112fa16b194f0f5 Binary files /dev/null and b/aafwk/aafwk_standard/abilitymanager/actsamscallbackfourthscene/signature/openharmony_sx.p7b differ diff --git a/aafwk/aafwk_standard/abilitymanager/actsamscallbacksecondscene/BUILD.gn b/aafwk/aafwk_standard/abilitymanager/actsamscallbacksecondscene/BUILD.gn index 8200f11bcb0c24edcb51ffdc7bee75b75962e7fe..71c66644cf69ec6076b67618a7b94d94fd1aab58 100644 --- a/aafwk/aafwk_standard/abilitymanager/actsamscallbacksecondscene/BUILD.gn +++ b/aafwk/aafwk_standard/abilitymanager/actsamscallbacksecondscene/BUILD.gn @@ -14,6 +14,18 @@ import("//test/xts/tools/build/suite.gni") ohos_js_hap_suite("ActsAmsCallBackSecondScene") { - test_hap_name = "ActsAmsCallBackSecondScene" - hap_source_path = "hap/ActsAmsCallBackSecondScene.hap" + hap_profile = "./entry/src/main/config.json" + deps = [ + ":hjs_demo_js_assets", + ":hjs_demo_resources", + ] + certificate_profile = "./signature/openharmony_sx.p7b" + hap_name = "ActsAmsCallBackSecondScene" +} +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/abilitymanager/actsamscallbacksecondscene/Test.json b/aafwk/aafwk_standard/abilitymanager/actsamscallbacksecondscene/Test.json index 55b11d7ead9765d938cd5bdb6d01ef333db0a243..9cdf2dfa0b84dbf1ec67042954c0afb4336875d9 100644 --- a/aafwk/aafwk_standard/abilitymanager/actsamscallbacksecondscene/Test.json +++ b/aafwk/aafwk_standard/abilitymanager/actsamscallbacksecondscene/Test.json @@ -9,7 +9,9 @@ "kits": [ { "test-file-name": [ - "ActsAmsCallBackSecondScene.hap" + "ActsAmsCallBackSecondScene.hap", + "verifyIAbility.hap", + "simulateFAbilityFir.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/aafwk/aafwk_standard/abilitymanager/actsamscallbacksecondscene/entry/src/main/js/default/pages/index/index.css b/aafwk/aafwk_standard/abilitymanager/actsamscallbacksecondscene/entry/src/main/js/default/pages/index/index.css new file mode 100755 index 0000000000000000000000000000000000000000..caf729946975b79e55ab9e56e55bf860337b3f50 --- /dev/null +++ b/aafwk/aafwk_standard/abilitymanager/actsamscallbacksecondscene/entry/src/main/js/default/pages/index/index.css @@ -0,0 +1,38 @@ +/* + * 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. + */ + +.container { + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + left: 0px; + top: 0px; + width: 100%; + height: 100%; +} + +.title { + font-size: 60px; + text-align: center; + width: 100%; + height: 40%; + margin: 10px; +} +.btn { + width: 50%; + height: 100px; + font-size: 40px; +} diff --git a/aafwk/aafwk_standard/abilitymanager/actsamscallbacksecondscene/entry/src/main/js/default/pages/index/index.hml b/aafwk/aafwk_standard/abilitymanager/actsamscallbacksecondscene/entry/src/main/js/default/pages/index/index.hml new file mode 100755 index 0000000000000000000000000000000000000000..61ea59d936e5a2971f1ea3d179c44a7f3f596c54 --- /dev/null +++ b/aafwk/aafwk_standard/abilitymanager/actsamscallbacksecondscene/entry/src/main/js/default/pages/index/index.hml @@ -0,0 +1,21 @@ + + +
+ + {{ $t('strings.hello') }} {{title}} + + +
diff --git a/aafwk/aafwk_standard/abilitymanager/actsamscallbacksecondscene/entry/src/main/js/resources/base/element/string.json b/aafwk/aafwk_standard/abilitymanager/actsamscallbacksecondscene/entry/src/main/js/resources/base/element/string.json new file mode 100755 index 0000000000000000000000000000000000000000..f94ce7e64e455e1ebf22a4b2792c5b52c791d037 --- /dev/null +++ b/aafwk/aafwk_standard/abilitymanager/actsamscallbacksecondscene/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/aafwk/aafwk_standard/abilitymanager/actsamscallbacksecondscene/entry/src/main/js/resources/base/media/icon.png b/aafwk/aafwk_standard/abilitymanager/actsamscallbacksecondscene/entry/src/main/js/resources/base/media/icon.png new file mode 100755 index 0000000000000000000000000000000000000000..ce307a8827bd75456441ceb57d530e4c8d45d36c Binary files /dev/null and b/aafwk/aafwk_standard/abilitymanager/actsamscallbacksecondscene/entry/src/main/js/resources/base/media/icon.png differ diff --git a/aafwk/aafwk_standard/abilitymanager/actsamscallbacksecondscene/signature/openharmony_sx.p7b b/aafwk/aafwk_standard/abilitymanager/actsamscallbacksecondscene/signature/openharmony_sx.p7b new file mode 100755 index 0000000000000000000000000000000000000000..9be1e98fa4c0c28ca997ed660112fa16b194f0f5 Binary files /dev/null and b/aafwk/aafwk_standard/abilitymanager/actsamscallbacksecondscene/signature/openharmony_sx.p7b differ diff --git a/aafwk/aafwk_standard/abilitymanager/actsamscallbackthirdscene/BUILD.gn b/aafwk/aafwk_standard/abilitymanager/actsamscallbackthirdscene/BUILD.gn index 71f046e1251feac4d193039fd4c5ddf4c1233d22..569018ef6a66f5852c47b17e7fa54a5a6bad3ffa 100644 --- a/aafwk/aafwk_standard/abilitymanager/actsamscallbackthirdscene/BUILD.gn +++ b/aafwk/aafwk_standard/abilitymanager/actsamscallbackthirdscene/BUILD.gn @@ -14,6 +14,18 @@ import("//test/xts/tools/build/suite.gni") ohos_js_hap_suite("ActsAmsCallBackThirdScene") { - test_hap_name = "ActsAmsCallBackThirdScene" - hap_source_path = "hap/ActsAmsCallBackThirdScene.hap" + hap_profile = "./entry/src/main/config.json" + deps = [ + ":hjs_demo_js_assets", + ":hjs_demo_resources", + ] + certificate_profile = "./signature/openharmony_sx.p7b" + hap_name = "ActsAmsCallBackThirdScene" +} +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/abilitymanager/actsamscallbackthirdscene/Test.json b/aafwk/aafwk_standard/abilitymanager/actsamscallbackthirdscene/Test.json index f67fb3ae1614a9b069cd77ea1eeeb668721515a6..c46daf9e4fd24d2cf0921efc776a271cfb0e4597 100644 --- a/aafwk/aafwk_standard/abilitymanager/actsamscallbackthirdscene/Test.json +++ b/aafwk/aafwk_standard/abilitymanager/actsamscallbackthirdscene/Test.json @@ -9,7 +9,9 @@ "kits": [ { "test-file-name": [ - "ActsAmsCallBackThirdScene.hap" + "ActsAmsCallBackThirdScene.hap", + "simulateFAbilityFir.hap", + "verifyIAbility.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/aafwk/aafwk_standard/abilitymanager/actsamscallbackthirdscene/entry/src/main/js/default/pages/index/index.css b/aafwk/aafwk_standard/abilitymanager/actsamscallbackthirdscene/entry/src/main/js/default/pages/index/index.css new file mode 100755 index 0000000000000000000000000000000000000000..caf729946975b79e55ab9e56e55bf860337b3f50 --- /dev/null +++ b/aafwk/aafwk_standard/abilitymanager/actsamscallbackthirdscene/entry/src/main/js/default/pages/index/index.css @@ -0,0 +1,38 @@ +/* + * 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. + */ + +.container { + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + left: 0px; + top: 0px; + width: 100%; + height: 100%; +} + +.title { + font-size: 60px; + text-align: center; + width: 100%; + height: 40%; + margin: 10px; +} +.btn { + width: 50%; + height: 100px; + font-size: 40px; +} diff --git a/aafwk/aafwk_standard/abilitymanager/actsamscallbackthirdscene/entry/src/main/js/default/pages/index/index.hml b/aafwk/aafwk_standard/abilitymanager/actsamscallbackthirdscene/entry/src/main/js/default/pages/index/index.hml new file mode 100755 index 0000000000000000000000000000000000000000..61ea59d936e5a2971f1ea3d179c44a7f3f596c54 --- /dev/null +++ b/aafwk/aafwk_standard/abilitymanager/actsamscallbackthirdscene/entry/src/main/js/default/pages/index/index.hml @@ -0,0 +1,21 @@ + + +
+ + {{ $t('strings.hello') }} {{title}} + + +
diff --git a/aafwk/aafwk_standard/abilitymanager/actsamscallbackthirdscene/entry/src/main/js/resources/base/element/string.json b/aafwk/aafwk_standard/abilitymanager/actsamscallbackthirdscene/entry/src/main/js/resources/base/element/string.json new file mode 100755 index 0000000000000000000000000000000000000000..f94ce7e64e455e1ebf22a4b2792c5b52c791d037 --- /dev/null +++ b/aafwk/aafwk_standard/abilitymanager/actsamscallbackthirdscene/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/aafwk/aafwk_standard/abilitymanager/actsamscallbackthirdscene/entry/src/main/js/resources/base/media/icon.png b/aafwk/aafwk_standard/abilitymanager/actsamscallbackthirdscene/entry/src/main/js/resources/base/media/icon.png new file mode 100755 index 0000000000000000000000000000000000000000..ce307a8827bd75456441ceb57d530e4c8d45d36c Binary files /dev/null and b/aafwk/aafwk_standard/abilitymanager/actsamscallbackthirdscene/entry/src/main/js/resources/base/media/icon.png differ diff --git a/aafwk/aafwk_standard/abilitymanager/actsamscallbackthirdscene/signature/openharmony_sx.p7b b/aafwk/aafwk_standard/abilitymanager/actsamscallbackthirdscene/signature/openharmony_sx.p7b new file mode 100755 index 0000000000000000000000000000000000000000..9be1e98fa4c0c28ca997ed660112fa16b194f0f5 Binary files /dev/null and b/aafwk/aafwk_standard/abilitymanager/actsamscallbackthirdscene/signature/openharmony_sx.p7b differ diff --git a/aafwk/aafwk_standard/abilitymanager/actsamstestfifthscene/BUILD.gn b/aafwk/aafwk_standard/abilitymanager/actsamstestfifthscene/BUILD.gn index 26882e6578f8f34a2af9605ca14173135b469b09..e7ba22d6d767e0d8ac4fd441665d951c85665f48 100644 --- a/aafwk/aafwk_standard/abilitymanager/actsamstestfifthscene/BUILD.gn +++ b/aafwk/aafwk_standard/abilitymanager/actsamstestfifthscene/BUILD.gn @@ -13,6 +13,18 @@ import("//test/xts/tools/build/suite.gni") ohos_js_hap_suite("ActsAmsTestFifthScene") { - test_hap_name = "ActsAmsTestFifthScene" - hap_source_path = "hap/ActsAmsTestFifthScene.hap" + hap_profile = "./entry/src/main/config.json" + deps = [ + ":hjs_demo_js_assets", + ":hjs_demo_resources", + ] + certificate_profile = "./signature/openharmony_sx.p7b" + hap_name = "ActsAmsTestFifthScene" +} +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/abilitymanager/actsamstestfifthscene/Test.json b/aafwk/aafwk_standard/abilitymanager/actsamstestfifthscene/Test.json index f433300e95aa3c7f68ec71cd67f6eb7b198282f6..a65ff1aa57eba2d47a0b6703a73c0620af643d6f 100644 --- a/aafwk/aafwk_standard/abilitymanager/actsamstestfifthscene/Test.json +++ b/aafwk/aafwk_standard/abilitymanager/actsamstestfifthscene/Test.json @@ -9,7 +9,9 @@ "kits": [ { "test-file-name": [ - "ActsAmsTestFifthScene.hap" + "ActsAmsTestFifthScene.hap", + "simulateFAbilitySed.hap", + "verifyIAbility.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/aafwk/aafwk_standard/abilitymanager/actsamstestfifthscene/entry/src/main/js/default/pages/index/index.css b/aafwk/aafwk_standard/abilitymanager/actsamstestfifthscene/entry/src/main/js/default/pages/index/index.css new file mode 100755 index 0000000000000000000000000000000000000000..caf729946975b79e55ab9e56e55bf860337b3f50 --- /dev/null +++ b/aafwk/aafwk_standard/abilitymanager/actsamstestfifthscene/entry/src/main/js/default/pages/index/index.css @@ -0,0 +1,38 @@ +/* + * 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. + */ + +.container { + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + left: 0px; + top: 0px; + width: 100%; + height: 100%; +} + +.title { + font-size: 60px; + text-align: center; + width: 100%; + height: 40%; + margin: 10px; +} +.btn { + width: 50%; + height: 100px; + font-size: 40px; +} diff --git a/aafwk/aafwk_standard/abilitymanager/actsamstestfifthscene/entry/src/main/js/default/pages/index/index.hml b/aafwk/aafwk_standard/abilitymanager/actsamstestfifthscene/entry/src/main/js/default/pages/index/index.hml new file mode 100755 index 0000000000000000000000000000000000000000..61ea59d936e5a2971f1ea3d179c44a7f3f596c54 --- /dev/null +++ b/aafwk/aafwk_standard/abilitymanager/actsamstestfifthscene/entry/src/main/js/default/pages/index/index.hml @@ -0,0 +1,21 @@ + + +
+ + {{ $t('strings.hello') }} {{title}} + + +
diff --git a/aafwk/aafwk_standard/abilitymanager/actsamstestfifthscene/entry/src/main/js/resources/base/element/string.json b/aafwk/aafwk_standard/abilitymanager/actsamstestfifthscene/entry/src/main/js/resources/base/element/string.json new file mode 100755 index 0000000000000000000000000000000000000000..f94ce7e64e455e1ebf22a4b2792c5b52c791d037 --- /dev/null +++ b/aafwk/aafwk_standard/abilitymanager/actsamstestfifthscene/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/aafwk/aafwk_standard/abilitymanager/actsamstestfifthscene/entry/src/main/js/resources/base/media/icon.png b/aafwk/aafwk_standard/abilitymanager/actsamstestfifthscene/entry/src/main/js/resources/base/media/icon.png new file mode 100755 index 0000000000000000000000000000000000000000..ce307a8827bd75456441ceb57d530e4c8d45d36c Binary files /dev/null and b/aafwk/aafwk_standard/abilitymanager/actsamstestfifthscene/entry/src/main/js/resources/base/media/icon.png differ diff --git a/aafwk/aafwk_standard/abilitymanager/actsamstestfifthscene/signature/openharmony_sx.p7b b/aafwk/aafwk_standard/abilitymanager/actsamstestfifthscene/signature/openharmony_sx.p7b new file mode 100755 index 0000000000000000000000000000000000000000..9be1e98fa4c0c28ca997ed660112fa16b194f0f5 Binary files /dev/null and b/aafwk/aafwk_standard/abilitymanager/actsamstestfifthscene/signature/openharmony_sx.p7b differ diff --git a/aafwk/aafwk_standard/abilitymanager/actsamstestfirstscene/BUILD.gn b/aafwk/aafwk_standard/abilitymanager/actsamstestfirstscene/BUILD.gn index 57cfec251d70436d09a370538befbbc3757fabdb..5687bc9fbe43741c842ec3573862adf9f2ea3ea9 100644 --- a/aafwk/aafwk_standard/abilitymanager/actsamstestfirstscene/BUILD.gn +++ b/aafwk/aafwk_standard/abilitymanager/actsamstestfirstscene/BUILD.gn @@ -13,6 +13,18 @@ import("//test/xts/tools/build/suite.gni") ohos_js_hap_suite("ActsAmsTestFirstScene") { - test_hap_name = "ActsAmsTestFirstScene" - hap_source_path = "hap/ActsAmsTestFirstScene.hap" + hap_profile = "./entry/src/main/config.json" + deps = [ + ":hjs_demo_js_assets", + ":hjs_demo_resources", + ] + certificate_profile = "./signature/openharmony_sx.p7b" + hap_name = "ActsAmsTestFirstScene" +} +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/abilitymanager/actsamstestfirstscene/Test.json b/aafwk/aafwk_standard/abilitymanager/actsamstestfirstscene/Test.json index f1c55b414d6c6289b35605833ad27ccb65614e81..2a9623048492c52ddbf0af818412604a6070ff25 100644 --- a/aafwk/aafwk_standard/abilitymanager/actsamstestfirstscene/Test.json +++ b/aafwk/aafwk_standard/abilitymanager/actsamstestfirstscene/Test.json @@ -9,7 +9,8 @@ "kits": [ { "test-file-name": [ - "ActsAmsTestFirstScene.hap" + "ActsAmsTestFirstScene.hap", + "simulateFAbilityFir.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/aafwk/aafwk_standard/abilitymanager/actsamstestfirstscene/entry/src/main/js/default/pages/index/index.css b/aafwk/aafwk_standard/abilitymanager/actsamstestfirstscene/entry/src/main/js/default/pages/index/index.css new file mode 100755 index 0000000000000000000000000000000000000000..caf729946975b79e55ab9e56e55bf860337b3f50 --- /dev/null +++ b/aafwk/aafwk_standard/abilitymanager/actsamstestfirstscene/entry/src/main/js/default/pages/index/index.css @@ -0,0 +1,38 @@ +/* + * 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. + */ + +.container { + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + left: 0px; + top: 0px; + width: 100%; + height: 100%; +} + +.title { + font-size: 60px; + text-align: center; + width: 100%; + height: 40%; + margin: 10px; +} +.btn { + width: 50%; + height: 100px; + font-size: 40px; +} diff --git a/aafwk/aafwk_standard/abilitymanager/actsamstestfirstscene/entry/src/main/js/default/pages/index/index.hml b/aafwk/aafwk_standard/abilitymanager/actsamstestfirstscene/entry/src/main/js/default/pages/index/index.hml new file mode 100755 index 0000000000000000000000000000000000000000..61ea59d936e5a2971f1ea3d179c44a7f3f596c54 --- /dev/null +++ b/aafwk/aafwk_standard/abilitymanager/actsamstestfirstscene/entry/src/main/js/default/pages/index/index.hml @@ -0,0 +1,21 @@ + + +
+ + {{ $t('strings.hello') }} {{title}} + + +
diff --git a/aafwk/aafwk_standard/abilitymanager/actsamstestfirstscene/entry/src/main/js/resources/base/element/string.json b/aafwk/aafwk_standard/abilitymanager/actsamstestfirstscene/entry/src/main/js/resources/base/element/string.json new file mode 100755 index 0000000000000000000000000000000000000000..f94ce7e64e455e1ebf22a4b2792c5b52c791d037 --- /dev/null +++ b/aafwk/aafwk_standard/abilitymanager/actsamstestfirstscene/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/aafwk/aafwk_standard/abilitymanager/actsamstestfirstscene/entry/src/main/js/resources/base/media/icon.png b/aafwk/aafwk_standard/abilitymanager/actsamstestfirstscene/entry/src/main/js/resources/base/media/icon.png new file mode 100755 index 0000000000000000000000000000000000000000..ce307a8827bd75456441ceb57d530e4c8d45d36c Binary files /dev/null and b/aafwk/aafwk_standard/abilitymanager/actsamstestfirstscene/entry/src/main/js/resources/base/media/icon.png differ diff --git a/aafwk/aafwk_standard/abilitymanager/actsamstestfirstscene/signature/openharmony_sx.p7b b/aafwk/aafwk_standard/abilitymanager/actsamstestfirstscene/signature/openharmony_sx.p7b new file mode 100755 index 0000000000000000000000000000000000000000..9be1e98fa4c0c28ca997ed660112fa16b194f0f5 Binary files /dev/null and b/aafwk/aafwk_standard/abilitymanager/actsamstestfirstscene/signature/openharmony_sx.p7b differ diff --git a/aafwk/aafwk_standard/abilitymanager/actsamstestfourthscene/BUILD.gn b/aafwk/aafwk_standard/abilitymanager/actsamstestfourthscene/BUILD.gn index e35520f56f973bdbc0d25d01181b5a9995c2f661..602b4643a9c91dc38f7cc2b72c0077272c79eb58 100644 --- a/aafwk/aafwk_standard/abilitymanager/actsamstestfourthscene/BUILD.gn +++ b/aafwk/aafwk_standard/abilitymanager/actsamstestfourthscene/BUILD.gn @@ -13,6 +13,18 @@ import("//test/xts/tools/build/suite.gni") ohos_js_hap_suite("ActsAmsTestFourthScene") { - test_hap_name = "ActsAmsTestFourthScene" - hap_source_path = "hap/ActsAmsTestFourthScene.hap" + hap_profile = "./entry/src/main/config.json" + deps = [ + ":hjs_demo_js_assets", + ":hjs_demo_resources", + ] + certificate_profile = "./signature/openharmony_sx.p7b" + hap_name = "ActsAmsTestFourthScene" +} +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/abilitymanager/actsamstestfourthscene/Test.json b/aafwk/aafwk_standard/abilitymanager/actsamstestfourthscene/Test.json index d534d15f52e969131a6bc3debdfebe5cd543db24..94fba40964e7b393feb7a1ca37892d5defa7a648 100644 --- a/aafwk/aafwk_standard/abilitymanager/actsamstestfourthscene/Test.json +++ b/aafwk/aafwk_standard/abilitymanager/actsamstestfourthscene/Test.json @@ -9,7 +9,11 @@ "kits": [ { "test-file-name": [ - "ActsAmsTestFourthScene.hap" + "ActsAmsTestFourthScene.hap", + "simulateFAbilityFir.hap", + "simulateEAbility.hap", + "verifyAAbility.hap", + "verifyIAbility.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/aafwk/aafwk_standard/abilitymanager/actsamstestfourthscene/entry/src/main/js/default/pages/index/index.css b/aafwk/aafwk_standard/abilitymanager/actsamstestfourthscene/entry/src/main/js/default/pages/index/index.css new file mode 100755 index 0000000000000000000000000000000000000000..caf729946975b79e55ab9e56e55bf860337b3f50 --- /dev/null +++ b/aafwk/aafwk_standard/abilitymanager/actsamstestfourthscene/entry/src/main/js/default/pages/index/index.css @@ -0,0 +1,38 @@ +/* + * 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. + */ + +.container { + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + left: 0px; + top: 0px; + width: 100%; + height: 100%; +} + +.title { + font-size: 60px; + text-align: center; + width: 100%; + height: 40%; + margin: 10px; +} +.btn { + width: 50%; + height: 100px; + font-size: 40px; +} diff --git a/aafwk/aafwk_standard/abilitymanager/actsamstestfourthscene/entry/src/main/js/default/pages/index/index.hml b/aafwk/aafwk_standard/abilitymanager/actsamstestfourthscene/entry/src/main/js/default/pages/index/index.hml new file mode 100755 index 0000000000000000000000000000000000000000..61ea59d936e5a2971f1ea3d179c44a7f3f596c54 --- /dev/null +++ b/aafwk/aafwk_standard/abilitymanager/actsamstestfourthscene/entry/src/main/js/default/pages/index/index.hml @@ -0,0 +1,21 @@ + + +
+ + {{ $t('strings.hello') }} {{title}} + + +
diff --git a/aafwk/aafwk_standard/abilitymanager/actsamstestfourthscene/entry/src/main/js/resources/base/element/string.json b/aafwk/aafwk_standard/abilitymanager/actsamstestfourthscene/entry/src/main/js/resources/base/element/string.json new file mode 100755 index 0000000000000000000000000000000000000000..f94ce7e64e455e1ebf22a4b2792c5b52c791d037 --- /dev/null +++ b/aafwk/aafwk_standard/abilitymanager/actsamstestfourthscene/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/aafwk/aafwk_standard/abilitymanager/actsamstestfourthscene/entry/src/main/js/resources/base/media/icon.png b/aafwk/aafwk_standard/abilitymanager/actsamstestfourthscene/entry/src/main/js/resources/base/media/icon.png new file mode 100755 index 0000000000000000000000000000000000000000..ce307a8827bd75456441ceb57d530e4c8d45d36c Binary files /dev/null and b/aafwk/aafwk_standard/abilitymanager/actsamstestfourthscene/entry/src/main/js/resources/base/media/icon.png differ diff --git a/aafwk/aafwk_standard/abilitymanager/actsamstestfourthscene/signature/openharmony_sx.p7b b/aafwk/aafwk_standard/abilitymanager/actsamstestfourthscene/signature/openharmony_sx.p7b new file mode 100755 index 0000000000000000000000000000000000000000..9be1e98fa4c0c28ca997ed660112fa16b194f0f5 Binary files /dev/null and b/aafwk/aafwk_standard/abilitymanager/actsamstestfourthscene/signature/openharmony_sx.p7b differ diff --git a/aafwk/aafwk_standard/abilitymanager/actsamstestsecondscene/BUILD.gn b/aafwk/aafwk_standard/abilitymanager/actsamstestsecondscene/BUILD.gn index 8d66f7a224db5eb3f358b411d95eceab9a872014..ac2edeaa9ace244c04ce5c48a406fa8c2203b05c 100644 --- a/aafwk/aafwk_standard/abilitymanager/actsamstestsecondscene/BUILD.gn +++ b/aafwk/aafwk_standard/abilitymanager/actsamstestsecondscene/BUILD.gn @@ -13,6 +13,18 @@ import("//test/xts/tools/build/suite.gni") ohos_js_hap_suite("ActsAmsTestSecondScene") { - test_hap_name = "ActsAmsTestSecondScene" - hap_source_path = "hap/ActsAmsTestSecondScene.hap" + hap_profile = "./entry/src/main/config.json" + deps = [ + ":hjs_demo_js_assets", + ":hjs_demo_resources", + ] + certificate_profile = "./signature/openharmony_sx.p7b" + hap_name = "ActsAmsTestSecondScene" +} +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/abilitymanager/actsamstestsecondscene/Test.json b/aafwk/aafwk_standard/abilitymanager/actsamstestsecondscene/Test.json index f2c5b0bf33fc874f4038c635cb4f53c0064fdd29..19d906c947356b1d66bc09ff8735109a0adcae06 100644 --- a/aafwk/aafwk_standard/abilitymanager/actsamstestsecondscene/Test.json +++ b/aafwk/aafwk_standard/abilitymanager/actsamstestsecondscene/Test.json @@ -9,7 +9,9 @@ "kits": [ { "test-file-name": [ - "ActsAmsTestSecondScene.hap" + "ActsAmsTestSecondScene.hap", + "simulateFAbilityFir.hap", + "verifyIAbility.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/aafwk/aafwk_standard/abilitymanager/actsamstestsecondscene/entry/src/main/js/default/pages/index/index.css b/aafwk/aafwk_standard/abilitymanager/actsamstestsecondscene/entry/src/main/js/default/pages/index/index.css new file mode 100755 index 0000000000000000000000000000000000000000..caf729946975b79e55ab9e56e55bf860337b3f50 --- /dev/null +++ b/aafwk/aafwk_standard/abilitymanager/actsamstestsecondscene/entry/src/main/js/default/pages/index/index.css @@ -0,0 +1,38 @@ +/* + * 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. + */ + +.container { + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + left: 0px; + top: 0px; + width: 100%; + height: 100%; +} + +.title { + font-size: 60px; + text-align: center; + width: 100%; + height: 40%; + margin: 10px; +} +.btn { + width: 50%; + height: 100px; + font-size: 40px; +} diff --git a/aafwk/aafwk_standard/abilitymanager/actsamstestsecondscene/entry/src/main/js/default/pages/index/index.hml b/aafwk/aafwk_standard/abilitymanager/actsamstestsecondscene/entry/src/main/js/default/pages/index/index.hml new file mode 100755 index 0000000000000000000000000000000000000000..61ea59d936e5a2971f1ea3d179c44a7f3f596c54 --- /dev/null +++ b/aafwk/aafwk_standard/abilitymanager/actsamstestsecondscene/entry/src/main/js/default/pages/index/index.hml @@ -0,0 +1,21 @@ + + +
+ + {{ $t('strings.hello') }} {{title}} + + +
diff --git a/aafwk/aafwk_standard/abilitymanager/actsamstestsecondscene/entry/src/main/js/resources/base/element/string.json b/aafwk/aafwk_standard/abilitymanager/actsamstestsecondscene/entry/src/main/js/resources/base/element/string.json new file mode 100755 index 0000000000000000000000000000000000000000..f94ce7e64e455e1ebf22a4b2792c5b52c791d037 --- /dev/null +++ b/aafwk/aafwk_standard/abilitymanager/actsamstestsecondscene/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/aafwk/aafwk_standard/abilitymanager/actsamstestsecondscene/entry/src/main/js/resources/base/media/icon.png b/aafwk/aafwk_standard/abilitymanager/actsamstestsecondscene/entry/src/main/js/resources/base/media/icon.png new file mode 100755 index 0000000000000000000000000000000000000000..ce307a8827bd75456441ceb57d530e4c8d45d36c Binary files /dev/null and b/aafwk/aafwk_standard/abilitymanager/actsamstestsecondscene/entry/src/main/js/resources/base/media/icon.png differ diff --git a/aafwk/aafwk_standard/abilitymanager/actsamstestsecondscene/signature/openharmony_sx.p7b b/aafwk/aafwk_standard/abilitymanager/actsamstestsecondscene/signature/openharmony_sx.p7b new file mode 100755 index 0000000000000000000000000000000000000000..9be1e98fa4c0c28ca997ed660112fa16b194f0f5 Binary files /dev/null and b/aafwk/aafwk_standard/abilitymanager/actsamstestsecondscene/signature/openharmony_sx.p7b differ diff --git a/aafwk/aafwk_standard/abilitymanager/actsamstestthirdscene/BUILD.gn b/aafwk/aafwk_standard/abilitymanager/actsamstestthirdscene/BUILD.gn index 474b32d5db2c4ff60a4fb80694c1daf6361c60e0..01b014ecf80f3c74c6d3696d16975dbe383eec56 100644 --- a/aafwk/aafwk_standard/abilitymanager/actsamstestthirdscene/BUILD.gn +++ b/aafwk/aafwk_standard/abilitymanager/actsamstestthirdscene/BUILD.gn @@ -13,6 +13,18 @@ import("//test/xts/tools/build/suite.gni") ohos_js_hap_suite("ActsAmsTestThirdScene") { - test_hap_name = "ActsAmsTestThirdScene" - hap_source_path = "hap/ActsAmsTestThirdScene.hap" + hap_profile = "./entry/src/main/config.json" + deps = [ + ":hjs_demo_js_assets", + ":hjs_demo_resources", + ] + certificate_profile = "./signature/openharmony_sx.p7b" + hap_name = "ActsAmsTestThirdScene" +} +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/abilitymanager/actsamstestthirdscene/Test.json b/aafwk/aafwk_standard/abilitymanager/actsamstestthirdscene/Test.json index 5987379cfcc9046c304826427b257424b15159a1..60c8a27bbb61e9bf1b3af673a9d2d65dc0ad86ea 100644 --- a/aafwk/aafwk_standard/abilitymanager/actsamstestthirdscene/Test.json +++ b/aafwk/aafwk_standard/abilitymanager/actsamstestthirdscene/Test.json @@ -9,7 +9,9 @@ "kits": [ { "test-file-name": [ - "ActsAmsTestThirdScene.hap" + "ActsAmsTestThirdScene.hap", + "simulateFAbilityFir.hap", + "verifyIAbility.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/aafwk/aafwk_standard/abilitymanager/actsamstestthirdscene/entry/src/main/js/default/pages/index/index.css b/aafwk/aafwk_standard/abilitymanager/actsamstestthirdscene/entry/src/main/js/default/pages/index/index.css new file mode 100755 index 0000000000000000000000000000000000000000..caf729946975b79e55ab9e56e55bf860337b3f50 --- /dev/null +++ b/aafwk/aafwk_standard/abilitymanager/actsamstestthirdscene/entry/src/main/js/default/pages/index/index.css @@ -0,0 +1,38 @@ +/* + * 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. + */ + +.container { + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + left: 0px; + top: 0px; + width: 100%; + height: 100%; +} + +.title { + font-size: 60px; + text-align: center; + width: 100%; + height: 40%; + margin: 10px; +} +.btn { + width: 50%; + height: 100px; + font-size: 40px; +} diff --git a/aafwk/aafwk_standard/abilitymanager/actsamstestthirdscene/entry/src/main/js/default/pages/index/index.hml b/aafwk/aafwk_standard/abilitymanager/actsamstestthirdscene/entry/src/main/js/default/pages/index/index.hml new file mode 100755 index 0000000000000000000000000000000000000000..61ea59d936e5a2971f1ea3d179c44a7f3f596c54 --- /dev/null +++ b/aafwk/aafwk_standard/abilitymanager/actsamstestthirdscene/entry/src/main/js/default/pages/index/index.hml @@ -0,0 +1,21 @@ + + +
+ + {{ $t('strings.hello') }} {{title}} + + +
diff --git a/aafwk/aafwk_standard/abilitymanager/actsamstestthirdscene/entry/src/main/js/resources/base/element/string.json b/aafwk/aafwk_standard/abilitymanager/actsamstestthirdscene/entry/src/main/js/resources/base/element/string.json new file mode 100755 index 0000000000000000000000000000000000000000..f94ce7e64e455e1ebf22a4b2792c5b52c791d037 --- /dev/null +++ b/aafwk/aafwk_standard/abilitymanager/actsamstestthirdscene/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/aafwk/aafwk_standard/abilitymanager/actsamstestthirdscene/entry/src/main/js/resources/base/media/icon.png b/aafwk/aafwk_standard/abilitymanager/actsamstestthirdscene/entry/src/main/js/resources/base/media/icon.png new file mode 100755 index 0000000000000000000000000000000000000000..ce307a8827bd75456441ceb57d530e4c8d45d36c Binary files /dev/null and b/aafwk/aafwk_standard/abilitymanager/actsamstestthirdscene/entry/src/main/js/resources/base/media/icon.png differ diff --git a/aafwk/aafwk_standard/abilitymanager/actsamstestthirdscene/signature/openharmony_sx.p7b b/aafwk/aafwk_standard/abilitymanager/actsamstestthirdscene/signature/openharmony_sx.p7b new file mode 100755 index 0000000000000000000000000000000000000000..9be1e98fa4c0c28ca997ed660112fa16b194f0f5 Binary files /dev/null and b/aafwk/aafwk_standard/abilitymanager/actsamstestthirdscene/signature/openharmony_sx.p7b differ diff --git a/aafwk/aafwk_standard/abilitymanager/sceneProject/simulateEAbility/BUILD.gn b/aafwk/aafwk_standard/abilitymanager/sceneProject/simulateEAbility/BUILD.gn new file mode 100644 index 0000000000000000000000000000000000000000..5e0aa9e025a5d0cc429948d83c74db4f8d009835 --- /dev/null +++ b/aafwk/aafwk_standard/abilitymanager/sceneProject/simulateEAbility/BUILD.gn @@ -0,0 +1,31 @@ +# 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("simulateEAbility") { + hap_profile = "./src/main/config.json" + deps = [ + ":hjs_demo_js_assets", + ":hjs_demo_resources", + ] + certificate_profile = "./signature/openharmony_sx.p7b" + hap_name = "simulateEAbility" +} +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/abilitymanager/sceneProject/simulateEAbility/Test.json b/aafwk/aafwk_standard/abilitymanager/sceneProject/simulateEAbility/Test.json new file mode 100644 index 0000000000000000000000000000000000000000..7a88763ed8d2ac31dd30211b9574f47273e84549 --- /dev/null +++ b/aafwk/aafwk_standard/abilitymanager/sceneProject/simulateEAbility/Test.json @@ -0,0 +1,3 @@ +{ + "description": "Configuration for hjunit demo Tests", +} diff --git a/aafwk/aafwk_standard/abilitymanager/sceneProject/simulateEAbility/signature/openharmony_sx.p7b b/aafwk/aafwk_standard/abilitymanager/sceneProject/simulateEAbility/signature/openharmony_sx.p7b new file mode 100755 index 0000000000000000000000000000000000000000..9be1e98fa4c0c28ca997ed660112fa16b194f0f5 Binary files /dev/null and b/aafwk/aafwk_standard/abilitymanager/sceneProject/simulateEAbility/signature/openharmony_sx.p7b differ diff --git a/aafwk/aafwk_standard/abilitymanager/sceneProject/simulateEAbility/src/main/js/default/pages/index/index.css b/aafwk/aafwk_standard/abilitymanager/sceneProject/simulateEAbility/src/main/js/default/pages/index/index.css new file mode 100755 index 0000000000000000000000000000000000000000..caf729946975b79e55ab9e56e55bf860337b3f50 --- /dev/null +++ b/aafwk/aafwk_standard/abilitymanager/sceneProject/simulateEAbility/src/main/js/default/pages/index/index.css @@ -0,0 +1,38 @@ +/* + * 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. + */ + +.container { + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + left: 0px; + top: 0px; + width: 100%; + height: 100%; +} + +.title { + font-size: 60px; + text-align: center; + width: 100%; + height: 40%; + margin: 10px; +} +.btn { + width: 50%; + height: 100px; + font-size: 40px; +} diff --git a/aafwk/aafwk_standard/abilitymanager/sceneProject/simulateEAbility/src/main/js/default/pages/index/index.hml b/aafwk/aafwk_standard/abilitymanager/sceneProject/simulateEAbility/src/main/js/default/pages/index/index.hml new file mode 100755 index 0000000000000000000000000000000000000000..61ea59d936e5a2971f1ea3d179c44a7f3f596c54 --- /dev/null +++ b/aafwk/aafwk_standard/abilitymanager/sceneProject/simulateEAbility/src/main/js/default/pages/index/index.hml @@ -0,0 +1,21 @@ + + +
+ + {{ $t('strings.hello') }} {{title}} + + +
diff --git a/aafwk/aafwk_standard/abilitymanager/sceneProject/simulateEAbility/src/main/js/resources/base/element/string.json b/aafwk/aafwk_standard/abilitymanager/sceneProject/simulateEAbility/src/main/js/resources/base/element/string.json new file mode 100755 index 0000000000000000000000000000000000000000..f94ce7e64e455e1ebf22a4b2792c5b52c791d037 --- /dev/null +++ b/aafwk/aafwk_standard/abilitymanager/sceneProject/simulateEAbility/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/aafwk/aafwk_standard/abilitymanager/sceneProject/simulateEAbility/src/main/js/resources/base/media/icon.png b/aafwk/aafwk_standard/abilitymanager/sceneProject/simulateEAbility/src/main/js/resources/base/media/icon.png new file mode 100755 index 0000000000000000000000000000000000000000..ce307a8827bd75456441ceb57d530e4c8d45d36c Binary files /dev/null and b/aafwk/aafwk_standard/abilitymanager/sceneProject/simulateEAbility/src/main/js/resources/base/media/icon.png differ diff --git a/aafwk/aafwk_standard/abilitymanager/sceneProject/simulateFAbilityFir/BUILD.gn b/aafwk/aafwk_standard/abilitymanager/sceneProject/simulateFAbilityFir/BUILD.gn new file mode 100644 index 0000000000000000000000000000000000000000..62b8b7ab2b40caaca48e97836829b89b8ac47290 --- /dev/null +++ b/aafwk/aafwk_standard/abilitymanager/sceneProject/simulateFAbilityFir/BUILD.gn @@ -0,0 +1,31 @@ +# 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("simulateFAbilityFir") { + hap_profile = "./src/main/config.json" + deps = [ + ":hjs_demo_js_assets", + ":hjs_demo_resources", + ] + certificate_profile = "./signature/openharmony_sx.p7b" + hap_name = "simulateFAbilityFir" +} +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/abilitymanager/sceneProject/simulateFAbilityFir/Test.json b/aafwk/aafwk_standard/abilitymanager/sceneProject/simulateFAbilityFir/Test.json new file mode 100644 index 0000000000000000000000000000000000000000..7a88763ed8d2ac31dd30211b9574f47273e84549 --- /dev/null +++ b/aafwk/aafwk_standard/abilitymanager/sceneProject/simulateFAbilityFir/Test.json @@ -0,0 +1,3 @@ +{ + "description": "Configuration for hjunit demo Tests", +} diff --git a/aafwk/aafwk_standard/abilitymanager/sceneProject/simulateFAbilityFir/signature/openharmony_sx.p7b b/aafwk/aafwk_standard/abilitymanager/sceneProject/simulateFAbilityFir/signature/openharmony_sx.p7b new file mode 100755 index 0000000000000000000000000000000000000000..9be1e98fa4c0c28ca997ed660112fa16b194f0f5 Binary files /dev/null and b/aafwk/aafwk_standard/abilitymanager/sceneProject/simulateFAbilityFir/signature/openharmony_sx.p7b differ diff --git a/aafwk/aafwk_standard/abilitymanager/sceneProject/simulateFAbilityFir/src/main/js/default/pages/index/index.css b/aafwk/aafwk_standard/abilitymanager/sceneProject/simulateFAbilityFir/src/main/js/default/pages/index/index.css new file mode 100755 index 0000000000000000000000000000000000000000..caf729946975b79e55ab9e56e55bf860337b3f50 --- /dev/null +++ b/aafwk/aafwk_standard/abilitymanager/sceneProject/simulateFAbilityFir/src/main/js/default/pages/index/index.css @@ -0,0 +1,38 @@ +/* + * 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. + */ + +.container { + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + left: 0px; + top: 0px; + width: 100%; + height: 100%; +} + +.title { + font-size: 60px; + text-align: center; + width: 100%; + height: 40%; + margin: 10px; +} +.btn { + width: 50%; + height: 100px; + font-size: 40px; +} diff --git a/aafwk/aafwk_standard/abilitymanager/sceneProject/simulateFAbilityFir/src/main/js/default/pages/index/index.hml b/aafwk/aafwk_standard/abilitymanager/sceneProject/simulateFAbilityFir/src/main/js/default/pages/index/index.hml new file mode 100755 index 0000000000000000000000000000000000000000..61ea59d936e5a2971f1ea3d179c44a7f3f596c54 --- /dev/null +++ b/aafwk/aafwk_standard/abilitymanager/sceneProject/simulateFAbilityFir/src/main/js/default/pages/index/index.hml @@ -0,0 +1,21 @@ + + +
+ + {{ $t('strings.hello') }} {{title}} + + +
diff --git a/aafwk/aafwk_standard/abilitymanager/sceneProject/simulateFAbilityFir/src/main/js/resources/base/element/string.json b/aafwk/aafwk_standard/abilitymanager/sceneProject/simulateFAbilityFir/src/main/js/resources/base/element/string.json new file mode 100755 index 0000000000000000000000000000000000000000..f94ce7e64e455e1ebf22a4b2792c5b52c791d037 --- /dev/null +++ b/aafwk/aafwk_standard/abilitymanager/sceneProject/simulateFAbilityFir/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/aafwk/aafwk_standard/abilitymanager/sceneProject/simulateFAbilityFir/src/main/js/resources/base/media/icon.png b/aafwk/aafwk_standard/abilitymanager/sceneProject/simulateFAbilityFir/src/main/js/resources/base/media/icon.png new file mode 100755 index 0000000000000000000000000000000000000000..ce307a8827bd75456441ceb57d530e4c8d45d36c Binary files /dev/null and b/aafwk/aafwk_standard/abilitymanager/sceneProject/simulateFAbilityFir/src/main/js/resources/base/media/icon.png differ diff --git a/aafwk/aafwk_standard/abilitymanager/sceneProject/simulateFAbilitySed/BUILD.gn b/aafwk/aafwk_standard/abilitymanager/sceneProject/simulateFAbilitySed/BUILD.gn new file mode 100644 index 0000000000000000000000000000000000000000..e5ea3e176af5f0bbe5f67548a0f6da07f168e974 --- /dev/null +++ b/aafwk/aafwk_standard/abilitymanager/sceneProject/simulateFAbilitySed/BUILD.gn @@ -0,0 +1,31 @@ +# 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("simulateFAbilitySed") { + hap_profile = "./src/main/config.json" + deps = [ + ":hjs_demo_js_assets", + ":hjs_demo_resources", + ] + certificate_profile = "./signature/openharmony_sx.p7b" + hap_name = "simulateFAbilitySed" +} +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/abilitymanager/sceneProject/simulateFAbilitySed/Test.json b/aafwk/aafwk_standard/abilitymanager/sceneProject/simulateFAbilitySed/Test.json new file mode 100644 index 0000000000000000000000000000000000000000..7a88763ed8d2ac31dd30211b9574f47273e84549 --- /dev/null +++ b/aafwk/aafwk_standard/abilitymanager/sceneProject/simulateFAbilitySed/Test.json @@ -0,0 +1,3 @@ +{ + "description": "Configuration for hjunit demo Tests", +} diff --git a/aafwk/aafwk_standard/abilitymanager/sceneProject/simulateFAbilitySed/signature/openharmony_sx.p7b b/aafwk/aafwk_standard/abilitymanager/sceneProject/simulateFAbilitySed/signature/openharmony_sx.p7b new file mode 100755 index 0000000000000000000000000000000000000000..9be1e98fa4c0c28ca997ed660112fa16b194f0f5 Binary files /dev/null and b/aafwk/aafwk_standard/abilitymanager/sceneProject/simulateFAbilitySed/signature/openharmony_sx.p7b differ diff --git a/aafwk/aafwk_standard/abilitymanager/sceneProject/simulateFAbilitySed/src/main/js/default/pages/index/index.css b/aafwk/aafwk_standard/abilitymanager/sceneProject/simulateFAbilitySed/src/main/js/default/pages/index/index.css new file mode 100755 index 0000000000000000000000000000000000000000..caf729946975b79e55ab9e56e55bf860337b3f50 --- /dev/null +++ b/aafwk/aafwk_standard/abilitymanager/sceneProject/simulateFAbilitySed/src/main/js/default/pages/index/index.css @@ -0,0 +1,38 @@ +/* + * 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. + */ + +.container { + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + left: 0px; + top: 0px; + width: 100%; + height: 100%; +} + +.title { + font-size: 60px; + text-align: center; + width: 100%; + height: 40%; + margin: 10px; +} +.btn { + width: 50%; + height: 100px; + font-size: 40px; +} diff --git a/aafwk/aafwk_standard/abilitymanager/sceneProject/simulateFAbilitySed/src/main/js/default/pages/index/index.hml b/aafwk/aafwk_standard/abilitymanager/sceneProject/simulateFAbilitySed/src/main/js/default/pages/index/index.hml new file mode 100755 index 0000000000000000000000000000000000000000..61ea59d936e5a2971f1ea3d179c44a7f3f596c54 --- /dev/null +++ b/aafwk/aafwk_standard/abilitymanager/sceneProject/simulateFAbilitySed/src/main/js/default/pages/index/index.hml @@ -0,0 +1,21 @@ + + +
+ + {{ $t('strings.hello') }} {{title}} + + +
diff --git a/aafwk/aafwk_standard/abilitymanager/sceneProject/simulateFAbilitySed/src/main/js/resources/base/element/string.json b/aafwk/aafwk_standard/abilitymanager/sceneProject/simulateFAbilitySed/src/main/js/resources/base/element/string.json new file mode 100755 index 0000000000000000000000000000000000000000..f94ce7e64e455e1ebf22a4b2792c5b52c791d037 --- /dev/null +++ b/aafwk/aafwk_standard/abilitymanager/sceneProject/simulateFAbilitySed/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/aafwk/aafwk_standard/abilitymanager/sceneProject/simulateFAbilitySed/src/main/js/resources/base/media/icon.png b/aafwk/aafwk_standard/abilitymanager/sceneProject/simulateFAbilitySed/src/main/js/resources/base/media/icon.png new file mode 100755 index 0000000000000000000000000000000000000000..ce307a8827bd75456441ceb57d530e4c8d45d36c Binary files /dev/null and b/aafwk/aafwk_standard/abilitymanager/sceneProject/simulateFAbilitySed/src/main/js/resources/base/media/icon.png differ diff --git a/aafwk/aafwk_standard/abilitymanager/sceneProject/verifyAAbility/BUILD.gn b/aafwk/aafwk_standard/abilitymanager/sceneProject/verifyAAbility/BUILD.gn new file mode 100644 index 0000000000000000000000000000000000000000..9049b5a54119c81edb5125b78fea7d174d739474 --- /dev/null +++ b/aafwk/aafwk_standard/abilitymanager/sceneProject/verifyAAbility/BUILD.gn @@ -0,0 +1,31 @@ +# 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("verifyAAbility") { + hap_profile = "./src/main/config.json" + deps = [ + ":hjs_demo_js_assets", + ":hjs_demo_resources", + ] + certificate_profile = "./signature/openharmony_sx.p7b" + hap_name = "verifyAAbility" +} +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/abilitymanager/sceneProject/verifyAAbility/Test.json b/aafwk/aafwk_standard/abilitymanager/sceneProject/verifyAAbility/Test.json new file mode 100644 index 0000000000000000000000000000000000000000..7a88763ed8d2ac31dd30211b9574f47273e84549 --- /dev/null +++ b/aafwk/aafwk_standard/abilitymanager/sceneProject/verifyAAbility/Test.json @@ -0,0 +1,3 @@ +{ + "description": "Configuration for hjunit demo Tests", +} diff --git a/aafwk/aafwk_standard/abilitymanager/sceneProject/verifyAAbility/signature/openharmony_sx.p7b b/aafwk/aafwk_standard/abilitymanager/sceneProject/verifyAAbility/signature/openharmony_sx.p7b new file mode 100755 index 0000000000000000000000000000000000000000..9be1e98fa4c0c28ca997ed660112fa16b194f0f5 Binary files /dev/null and b/aafwk/aafwk_standard/abilitymanager/sceneProject/verifyAAbility/signature/openharmony_sx.p7b differ diff --git a/aafwk/aafwk_standard/abilitymanager/sceneProject/verifyAAbility/src/main/js/default/pages/index/index.css b/aafwk/aafwk_standard/abilitymanager/sceneProject/verifyAAbility/src/main/js/default/pages/index/index.css new file mode 100755 index 0000000000000000000000000000000000000000..caf729946975b79e55ab9e56e55bf860337b3f50 --- /dev/null +++ b/aafwk/aafwk_standard/abilitymanager/sceneProject/verifyAAbility/src/main/js/default/pages/index/index.css @@ -0,0 +1,38 @@ +/* + * 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. + */ + +.container { + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + left: 0px; + top: 0px; + width: 100%; + height: 100%; +} + +.title { + font-size: 60px; + text-align: center; + width: 100%; + height: 40%; + margin: 10px; +} +.btn { + width: 50%; + height: 100px; + font-size: 40px; +} diff --git a/aafwk/aafwk_standard/abilitymanager/sceneProject/verifyAAbility/src/main/js/default/pages/index/index.hml b/aafwk/aafwk_standard/abilitymanager/sceneProject/verifyAAbility/src/main/js/default/pages/index/index.hml new file mode 100755 index 0000000000000000000000000000000000000000..61ea59d936e5a2971f1ea3d179c44a7f3f596c54 --- /dev/null +++ b/aafwk/aafwk_standard/abilitymanager/sceneProject/verifyAAbility/src/main/js/default/pages/index/index.hml @@ -0,0 +1,21 @@ + + +
+ + {{ $t('strings.hello') }} {{title}} + + +
diff --git a/aafwk/aafwk_standard/abilitymanager/sceneProject/verifyAAbility/src/main/js/resources/base/element/string.json b/aafwk/aafwk_standard/abilitymanager/sceneProject/verifyAAbility/src/main/js/resources/base/element/string.json new file mode 100755 index 0000000000000000000000000000000000000000..f94ce7e64e455e1ebf22a4b2792c5b52c791d037 --- /dev/null +++ b/aafwk/aafwk_standard/abilitymanager/sceneProject/verifyAAbility/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/aafwk/aafwk_standard/abilitymanager/sceneProject/verifyAAbility/src/main/js/resources/base/media/icon.png b/aafwk/aafwk_standard/abilitymanager/sceneProject/verifyAAbility/src/main/js/resources/base/media/icon.png new file mode 100755 index 0000000000000000000000000000000000000000..ce307a8827bd75456441ceb57d530e4c8d45d36c Binary files /dev/null and b/aafwk/aafwk_standard/abilitymanager/sceneProject/verifyAAbility/src/main/js/resources/base/media/icon.png differ diff --git a/aafwk/aafwk_standard/abilitymanager/sceneProject/verifyIAbility/BUILD.gn b/aafwk/aafwk_standard/abilitymanager/sceneProject/verifyIAbility/BUILD.gn new file mode 100644 index 0000000000000000000000000000000000000000..4b1036faa5278621b806b4716f27b9c8742ebd94 --- /dev/null +++ b/aafwk/aafwk_standard/abilitymanager/sceneProject/verifyIAbility/BUILD.gn @@ -0,0 +1,31 @@ +# 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("verifyIAbility") { + hap_profile = "./src/main/config.json" + deps = [ + ":hjs_demo_js_assets", + ":hjs_demo_resources", + ] + certificate_profile = "./signature/openharmony_sx.p7b" + hap_name = "verifyIAbility" +} +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/abilitymanager/sceneProject/verifyIAbility/Test.json b/aafwk/aafwk_standard/abilitymanager/sceneProject/verifyIAbility/Test.json new file mode 100644 index 0000000000000000000000000000000000000000..7a88763ed8d2ac31dd30211b9574f47273e84549 --- /dev/null +++ b/aafwk/aafwk_standard/abilitymanager/sceneProject/verifyIAbility/Test.json @@ -0,0 +1,3 @@ +{ + "description": "Configuration for hjunit demo Tests", +} diff --git a/aafwk/aafwk_standard/abilitymanager/sceneProject/verifyIAbility/signature/openharmony_sx.p7b b/aafwk/aafwk_standard/abilitymanager/sceneProject/verifyIAbility/signature/openharmony_sx.p7b new file mode 100755 index 0000000000000000000000000000000000000000..9be1e98fa4c0c28ca997ed660112fa16b194f0f5 Binary files /dev/null and b/aafwk/aafwk_standard/abilitymanager/sceneProject/verifyIAbility/signature/openharmony_sx.p7b differ diff --git a/aafwk/aafwk_standard/abilitymanager/sceneProject/verifyIAbility/src/main/js/default/pages/index/index.css b/aafwk/aafwk_standard/abilitymanager/sceneProject/verifyIAbility/src/main/js/default/pages/index/index.css new file mode 100755 index 0000000000000000000000000000000000000000..caf729946975b79e55ab9e56e55bf860337b3f50 --- /dev/null +++ b/aafwk/aafwk_standard/abilitymanager/sceneProject/verifyIAbility/src/main/js/default/pages/index/index.css @@ -0,0 +1,38 @@ +/* + * 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. + */ + +.container { + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + left: 0px; + top: 0px; + width: 100%; + height: 100%; +} + +.title { + font-size: 60px; + text-align: center; + width: 100%; + height: 40%; + margin: 10px; +} +.btn { + width: 50%; + height: 100px; + font-size: 40px; +} diff --git a/aafwk/aafwk_standard/abilitymanager/sceneProject/verifyIAbility/src/main/js/default/pages/index/index.hml b/aafwk/aafwk_standard/abilitymanager/sceneProject/verifyIAbility/src/main/js/default/pages/index/index.hml new file mode 100755 index 0000000000000000000000000000000000000000..61ea59d936e5a2971f1ea3d179c44a7f3f596c54 --- /dev/null +++ b/aafwk/aafwk_standard/abilitymanager/sceneProject/verifyIAbility/src/main/js/default/pages/index/index.hml @@ -0,0 +1,21 @@ + + +
+ + {{ $t('strings.hello') }} {{title}} + + +
diff --git a/aafwk/aafwk_standard/abilitymanager/sceneProject/verifyIAbility/src/main/js/resources/base/element/string.json b/aafwk/aafwk_standard/abilitymanager/sceneProject/verifyIAbility/src/main/js/resources/base/element/string.json new file mode 100755 index 0000000000000000000000000000000000000000..f94ce7e64e455e1ebf22a4b2792c5b52c791d037 --- /dev/null +++ b/aafwk/aafwk_standard/abilitymanager/sceneProject/verifyIAbility/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/aafwk/aafwk_standard/abilitymanager/sceneProject/verifyIAbility/src/main/js/resources/base/media/icon.png b/aafwk/aafwk_standard/abilitymanager/sceneProject/verifyIAbility/src/main/js/resources/base/media/icon.png new file mode 100755 index 0000000000000000000000000000000000000000..ce307a8827bd75456441ceb57d530e4c8d45d36c Binary files /dev/null and b/aafwk/aafwk_standard/abilitymanager/sceneProject/verifyIAbility/src/main/js/resources/base/media/icon.png differ diff --git a/test_packages.gni b/test_packages.gni index 481c8708e36178d770cc9cfcf1178af5dbc7f82d..091eb6a6717e15cb13a938e4321c4614c2573a3d 100755 --- a/test_packages.gni +++ b/test_packages.gni @@ -24,7 +24,7 @@ _all_test_packages = [ "${ACTS_ROOT}/account:account", # "${ACTS_ROOT}/communication:communication", #"${ACTS_ROOT}/notification:notification", - # "${ACTS_ROOT}/aafwk:aafwk", + "${ACTS_ROOT}/aafwk:aafwk", "${ACTS_ROOT}/location:location", "${ACTS_ROOT}/miscservices:miscservices", "${ACTS_ROOT}/powermgr:powermgr",