diff --git a/test/sceneProject/systemtest/BundleClient/bundleClient1/AppScope/app.json5 b/test/sceneProject/systemtest/BundleClient/bundleClient1/AppScope/app.json old mode 100644 new mode 100755 similarity index 37% rename from test/sceneProject/systemtest/BundleClient/bundleClient1/AppScope/app.json5 rename to test/sceneProject/systemtest/BundleClient/bundleClient1/AppScope/app.json index 35cf362b1d169ee890592b782029e37269cd99f7..4aef251de7effaf9ff4744a8fa752f855ea52df1 --- a/test/sceneProject/systemtest/BundleClient/bundleClient1/AppScope/app.json5 +++ b/test/sceneProject/systemtest/BundleClient/bundleClient1/AppScope/app.json @@ -1,40 +1,31 @@ -/* - * Copyright (c) 2025 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. - */ - -{ - "app": { - "bundleName": "com.example.ohosproject.hmservice", - "car": { - }, - "icon": "$media:app_layered_image", - "label": "$string:app_name", - "apiReleaseType": "Release1", - "minAPIVersion": 8, - "targetAPIVersion": 8, - "vendor": "huawei", - "versionCode": 1000000, - "versionName": "1.0.0", - "appEnvironments": [ - { - "name": "name1", - "value": "value1" - } - ], - "multiAppMode": { - "multiAppModeType": "appClone", - "maxCount": 5 - } - } -} +{ + "app": { + "bundleName": "com.example.ohosproject.hmservice", + "car": { + "apiCompatibleVersion": 8, + "singleUser": false + }, + "icon": "$media:app_icon", + "iconId": 16777217, + "label": "$string:app_name", + "labelId": 16777216, + "apiReleaseType": "Release", + "minAPIVersion": 8, + "targetAPIVersion": 8, + "singleUser": true, + "vendor": "huawei", + "versionCode": 1000000, + "versionName": "1.0.0", + "appEnvironments": [ + { + "name": "name1", + "value": "value1" + } + ], + "multiAppMode": { + "multiAppModeType": "appClone", + "maxCount": 5 + }, + "cloudStructuredDataSyncEnabled": false + } +} \ No newline at end of file diff --git a/test/sceneProject/systemtest/BundleClient/bundleClient1/AppScope/resources/base/media/app_background.png b/test/sceneProject/systemtest/BundleClient/bundleClient1/AppScope/resources/base/media/app_background.png deleted file mode 100644 index 923f2b3f27e915d6871871deea0420eb45ce102f..0000000000000000000000000000000000000000 Binary files a/test/sceneProject/systemtest/BundleClient/bundleClient1/AppScope/resources/base/media/app_background.png and /dev/null differ diff --git a/test/sceneProject/systemtest/BundleClient/bundleClient1/AppScope/resources/base/media/app_foreground.png b/test/sceneProject/systemtest/BundleClient/bundleClient1/AppScope/resources/base/media/app_foreground.png deleted file mode 100644 index eb9427585b36d14b12477435b6419d1f07b3e0bb..0000000000000000000000000000000000000000 Binary files a/test/sceneProject/systemtest/BundleClient/bundleClient1/AppScope/resources/base/media/app_foreground.png and /dev/null differ diff --git a/test/sceneProject/systemtest/BundleClient/bundleClient1/AppScope/resources/base/media/app_layered_image.json b/test/sceneProject/systemtest/BundleClient/bundleClient1/AppScope/resources/base/media/app_layered_image.json deleted file mode 100644 index b71c16122943f248ace0f5fa26da38b71dbdbdde..0000000000000000000000000000000000000000 --- a/test/sceneProject/systemtest/BundleClient/bundleClient1/AppScope/resources/base/media/app_layered_image.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "layered-image": - { - "background" : "$media:app_background", - "foreground" : "$media:app_foreground" - } -} \ No newline at end of file diff --git a/test/sceneProject/systemtest/BundleClient/bundleClient1/BUILD.gn b/test/sceneProject/systemtest/BundleClient/bundleClient1/BUILD.gn index ef439cabd2f3e40ade5f0ee58a6cbf0671510575..5a0372bac0e73519bd169887937bbd415591574e 100755 --- a/test/sceneProject/systemtest/BundleClient/bundleClient1/BUILD.gn +++ b/test/sceneProject/systemtest/BundleClient/bundleClient1/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2022-2025 Huawei Device Co., Ltd. +# Copyright (c) 2022 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 @@ -14,18 +14,30 @@ import("//build/ohos.gni") import("../../../../../appexecfwk.gni") -ohos_app("bundleClient1") { - certificate_profile = "${bundle_framework_path}/test/sceneProject/signature/com.example.ohosproject.hmservice.p7b" +ohos_hap("bundleClient1") { + hap_profile = "entry/src/main/module.json" hap_name = "bundleClient1" - hap_out_dir = "$root_out_dir/tests/systemtest/bundle_framework/bundle_framework/resource/BundleClient" - subsystem_name = "bundlemanager" - part_name = "bundle_framework" + final_hap_path = "$root_out_dir/tests/systemtest/bundle_framework/bundle_framework/resource/BundleClient/${hap_name}.hap" + testonly = true + deps = [ + ":hjs_demo_js_assets", + ":hjs_demo_resources", + ] + certificate_profile = "${bundle_framework_path}/test/sceneProject/signature/com.example.ohosproject.hmservice.p7b" +} + +ohos_app_scope("bmsstagedemoone_app_profile") { + app_profile = "AppScope/app.json" + sources = [ "AppScope/resources" ] +} + +ohos_js_assets("hjs_demo_js_assets") { + source_dir = "entry/src/main/ets" +} - js_build_mode = "release" - sdk_home = "//prebuilts/ohos-sdk/linux" - sdk_type_name = [ "sdk.dir" ] - assemble_type = "assembleHap" - build_level = "module" - build_modules = [ "entry_phone" ] +ohos_resources("hjs_demo_resources") { + sources = [ "entry/src/main/resources" ] + deps = [ ":bmsstagedemoone_app_profile" ] + hap_profile = "entry/src/main/module.json" } diff --git a/test/sceneProject/systemtest/BundleClient/bundleClient1/build-profile.json5 b/test/sceneProject/systemtest/BundleClient/bundleClient1/build-profile.json5 deleted file mode 100644 index 8f61636c09fa1c2dd5eabec6d4e01457d9180a38..0000000000000000000000000000000000000000 --- a/test/sceneProject/systemtest/BundleClient/bundleClient1/build-profile.json5 +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright (c) 2025 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. - */ - -{ - "app": { - "signingConfigs": [], - "products": [ - { - "name": "default", - "signingConfig": "default", - "targetSdkVersion": 20, - "compatibleSdkVersion": 20, - "compileSdkVersion": 20, - "runtimeOS": "OpenHarmony", - "buildOption": { - "strictMode": { - "caseSensitiveCheck": true, - "useNormalizedOHMUrl": true - } - } - } - ], - "buildModeSet": [ - { - "name": "debug", - }, - { - "name": "release" - } - ] - }, - "modules": [ - { - "name": "entry_phone", - "srcPath": "./entry", - "targets": [ - { - "name": "default", - "applyToProducts": [ - "default" - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/test/sceneProject/systemtest/BundleClient/bundleClient1/entry/build-profile.json5 b/test/sceneProject/systemtest/BundleClient/bundleClient1/entry/build-profile.json5 deleted file mode 100644 index b4d65d490ef6cbe22d933b9231555210f1555786..0000000000000000000000000000000000000000 --- a/test/sceneProject/systemtest/BundleClient/bundleClient1/entry/build-profile.json5 +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (c) 2025 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. - */ - -{ - "apiType": "stageMode", - "buildOption": { - }, - "buildOptionSet": [ - { - "name": "release", - "arkOptions": { - "obfuscation": { - "ruleOptions": { - "enable": false, - "files": [ - "./obfuscation-rules.txt" - ] - } - } - } - }, - ], - "targets": [ - { - "name": "default" - }, - { - "name": "ohosTest", - } - ] -} \ No newline at end of file diff --git a/test/sceneProject/systemtest/BundleClient/bundleClient1/entry/hvigorfile.ts b/test/sceneProject/systemtest/BundleClient/bundleClient1/entry/hvigorfile.ts deleted file mode 100644 index cfa8a00f74f409d9647f55cdf270ab6aec69fe41..0000000000000000000000000000000000000000 --- a/test/sceneProject/systemtest/BundleClient/bundleClient1/entry/hvigorfile.ts +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (c) 2025 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 { hapTasks } from '@ohos/hvigor-ohos-plugin'; - -export default { - system: hapTasks, /* Built-in plugin of Hvigor. It cannot be modified. */ - plugins: [] /* Custom plugin to extend the functionality of Hvigor. */ -} \ No newline at end of file diff --git a/test/sceneProject/systemtest/BundleClient/bundleClient1/entry/obfuscation-rules.txt b/test/sceneProject/systemtest/BundleClient/bundleClient1/entry/obfuscation-rules.txt deleted file mode 100644 index c1d419bdc6fa72c5914cc864ede925c53a2b01c5..0000000000000000000000000000000000000000 --- a/test/sceneProject/systemtest/BundleClient/bundleClient1/entry/obfuscation-rules.txt +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright (c) 2025 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. - -# Define project specific obfuscation rules here. -# You can include the obfuscation configuration files in the current module's build-profile.json5. -# -# For more details, see -# https://developer.huawei.com/consumer/cn/doc/harmonyos-guides-V5/source-obfuscation-V5 - -# Obfuscation options: -# -disable-obfuscation: disable all obfuscations -# -enable-property-obfuscation: obfuscate the property names -# -enable-toplevel-obfuscation: obfuscate the names in the global scope -# -compact: remove unnecessary blank spaces and all line feeds -# -remove-log: remove all console.* statements -# -print-namecache: print the name cache that contains the mapping from the old names to new names -# -apply-namecache: reuse the given cache file - -# Keep options: -# -keep-property-name: specifies property names that you want to keep -# -keep-global-name: specifies names that you want to keep in the global scope - --enable-property-obfuscation --enable-toplevel-obfuscation --enable-filename-obfuscation --enable-export-obfuscation \ No newline at end of file diff --git a/test/sceneProject/systemtest/BundleClient/bundleClient1/entry/oh-package.json5 b/test/sceneProject/systemtest/BundleClient/bundleClient1/entry/oh-package.json5 deleted file mode 100644 index 4bf3e2a9b1ae7381cf9363dff1cbcc1861a41e7b..0000000000000000000000000000000000000000 --- a/test/sceneProject/systemtest/BundleClient/bundleClient1/entry/oh-package.json5 +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (c) 2025 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. - */ - -{ - "name": "entry", - "version": "1.0.0", - "description": "Please describe the basic information.", - "main": "", - "author": "", - "license": "", - "dependencies": {} -} - diff --git a/test/sceneProject/systemtest/BundleClient/bundleClient1/entry/src/main/ets/FormAbility/FormAbility.ts b/test/sceneProject/systemtest/BundleClient/bundleClient1/entry/src/main/ets/FormAbility/FormAbility.ts deleted file mode 100644 index 28d3291e1b5c9e48c28a4b4cee4b0d9046900d29..0000000000000000000000000000000000000000 --- a/test/sceneProject/systemtest/BundleClient/bundleClient1/entry/src/main/ets/FormAbility/FormAbility.ts +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (c) 2025 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 FormExtension from '@ohos.app.form.FormExtensionAbility'; -import formBindingData from '@ohos.application.formBindingData'; -import formInfo from '@ohos.application.formInfo'; - -export default class FormAbility extends FormExtension { - onAddForm(want) { - // Called to return a FormBindingData object. - let formData = {}; - return formBindingData.createFormBindingData(formData); - } - - onCastToNormalForm(formId) { - // Called when the form provider is notified that a temporary form is successfully - // converted to a normal form. - } - - onUpdateForm(formId) { - // Called to notify the form provider to update a specified form. - } - - onChangeFormVisibility(newStatus) { - // Called when the form provider receives form events from the system. - } - - onFormEvent(formId, message) { - // Called when a specified message event defined by the form provider is triggered. - } - - onRemoveForm(formId) { - // Called to notify the form provider that a specified form has been destroyed. - } - - onAcquireFormState(want) { - // Called to return a {@link FormState} object. - return formInfo.FormState.READY; - } -}; \ No newline at end of file diff --git a/test/sceneProject/systemtest/BundleClient/bundleClient1/entry/src/main/ets/pages/FormCard.ets b/test/sceneProject/systemtest/BundleClient/bundleClient1/entry/src/main/ets/pages/FormCard.ets deleted file mode 100644 index d6d92615beaacc53814b19b7caddc45c242b966c..0000000000000000000000000000000000000000 --- a/test/sceneProject/systemtest/BundleClient/bundleClient1/entry/src/main/ets/pages/FormCard.ets +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (c) 2025 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. - */ - -@Entry -@Component -struct FormCard { - @State message: string = 'Hello Form' - - build() { - Column() { - Text(this.message) - .fontSize(20) - .margin(10) - - Button('Submit') - .onClick(() => { - }) - } - .width('100%') - .height('100%') - } -} \ No newline at end of file diff --git a/test/sceneProject/systemtest/BundleClient/bundleClient1/entry/src/main/ets/pages/index.ets b/test/sceneProject/systemtest/BundleClient/bundleClient1/entry/src/main/ets/pages/index.ets index 68b30e0dc94d5c5217d5f0bd46f6cc1f81e05b9b..ae327f852a407ce22fd6270757a04a3bf19ca7f8 100755 --- a/test/sceneProject/systemtest/BundleClient/bundleClient1/entry/src/main/ets/pages/index.ets +++ b/test/sceneProject/systemtest/BundleClient/bundleClient1/entry/src/main/ets/pages/index.ets @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2025 Huawei Device Co., Ltd. + * Copyright (c) 2022 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 @@ -12,6 +12,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +import file from '@system.file'; + +import {Core, ExpectExtend, InstrumentLog, ReportExtend} from "deccjsunit/index.ets" +import testsuite from "../../test/List.test.ets" @Entry @Component diff --git a/test/sceneProject/systemtest/BundleClient/bundleClient1/entry/src/main/module.json b/test/sceneProject/systemtest/BundleClient/bundleClient1/entry/src/main/module.json new file mode 100755 index 0000000000000000000000000000000000000000..e4d1571148b9439f67088690456dae70f84c5f14 --- /dev/null +++ b/test/sceneProject/systemtest/BundleClient/bundleClient1/entry/src/main/module.json @@ -0,0 +1,124 @@ +{ + "module":{ + "name":"entry_phone", + "type":"entry", + "mainElement":"MainAbility", + "srcEntry":"./ets/Application/AbilityStage.ts", + "description":"$string:phone_entry_dsc", + "descriptionId":16777220, + "deviceTypes":[ + "2in1", + "tablet", + "default", + "phone" + ], + "deliveryWithInstall":true, + "installationFree":false, + "pages":"@profile:main_pages", + "metadata": [ + { + "name": "meta_info", + "resource": "$profile:main_pages" + } + ], + "abilities":[ + { + "name":"MainAbility", + "srcEntry":"./ets/MainAbility/MainAbility.ts", + "description":"$string:phone_entry_main", + "descriptionId":16777221, + "icon":"$media:icon", + "iconId":16777225, + "label":"$string:entry_label", + "labelId":16777218, + "exported":true, + "orientation":"portrait", + "metadata":[ + { + "name":"ohos.ability.shortcuts", + "resource":"$profile:shortcuts_config" + } + ], + "skills":[ + { + "actions":[ + "action.system.home" + ], + "entities":[ + "entity.system.home" + ] + } + ] + }, + { + "startWindowIcon": "$media:icon", + "name": "BROWSER", + "icon": "$media:icon", + "visible": true, + "skills": [ + { + "actions": [ + "ohos.want.action.viewData" + ], + "entities": [ + "entity.system.browsable" + ], + "uris": [ + { + "scheme": "http" + } + ] + } + ], + "srcEntrance": "" + } + ], + "extensionAbilities":[ + { + + "description":"$string:form_description", + "descriptionId":16777219, + "icon":"$media:icon", + "iconId":16777225, + "metadata":[ + { + "name":"ohos.extension.form", + "resource":"@profile:form_config" + } + ], + "name":"Form", + "srcEntry":"./ets/Form/MyForm.ts", + "type":"form", + "exported":true + }, + { + "description":"$string:serviceability_description", + "descriptionId":16777222, + "icon":"$media:icon", + "iconId":16777225, + "name":"WeatherFormAbility", + "srcEntry":"./ets/Weather/WeatherFormAbility.ts", + "type":"wallpaper" + } + ], + "requestPermissions": [ + { + "name": "ohos.permission.GET_BUNDLE_INFO_PRIVILEGED", + "reason": "$string:entry_desc", + "usedScene": {"abilities": ["MainAbility"]} + } + ], + "querySchemes": [ + "http", + "welink" + ], + "appEnvironments": [ + { + "name": "name", + "value": "value" + } + ], + "formExtensionModule": "formExtensionModuleTest", + "formWidgetModule": "formWidgetModuleTest" + } +} \ No newline at end of file diff --git a/test/sceneProject/systemtest/BundleClient/bundleClient1/entry/src/main/module.json5 b/test/sceneProject/systemtest/BundleClient/bundleClient1/entry/src/main/module.json5 deleted file mode 100644 index 77afb087c74c996d8d030b5d81f6db2b87185e46..0000000000000000000000000000000000000000 --- a/test/sceneProject/systemtest/BundleClient/bundleClient1/entry/src/main/module.json5 +++ /dev/null @@ -1,123 +0,0 @@ -/* - * Copyright (c) 2025 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. - */ - -{ - "module":{ - "name":"entry_phone", - "type":"entry", - "mainElement":"MainAbility", - "srcEntry":"./ets/MainAbility/MainAbility.ts", - "description":"$string:phone_entry_dsc", - "deviceTypes": [ - "2in1", - "tablet", - "default" - ], - "deliveryWithInstall":true, - "installationFree":false, - "pages":"$profile:main_pages", - "metadata": [ - { - "name": "meta_info", - "resource": "$profile:main_pages" - } - ], - "abilities":[ - { - "name":"MainAbility", - "srcEntry":"./ets/MainAbility/MainAbility.ts", - "description":"$string:phone_entry_main", - "icon":"$media:icon", - "label":"$string:entry_label", - "exported":true, - "orientation":"portrait", - "metadata":[ - { - "name":"ohos.ability.shortcuts", - "resource":"$profile:shortcuts_config" - } - ], - "skills":[ - { - "actions":[ - "action.system.home" - ], - "entities":[ - "entity.system.home" - ] - } - ], - "startWindowIcon": "$media:startIcon", - "startWindowBackground": "$color:start_window_background" - }, - { - "startWindowIcon": "$media:icon", - "name": "BROWSER", - "icon": "$media:icon", - "skills": [ - { - "actions": [ - "ohos.want.action.viewData" - ], - "entities": [ - "entity.system.browsable" - ], - "uris": [ - { - "scheme": "http" - } - ] - } - ], - "srcEntry": "", - "startWindowBackground": "$color:start_window_background" - } - ], - "extensionAbilities":[ - { - "description":"$string:form_description", - "icon":"$media:icon", - "metadata":[ - { - "name":"ohos.extension.form", - "resource":"$profile:form_config" - } - ], - "name":"Form", - "srcEntry": "./ets/FormAbility/FormAbility.ts", - "type":"form", - "exported":true, - } - ], - "requestPermissions": [ - { - "name": "ohos.permission.GET_BUNDLE_INFO_PRIVILEGED", - "reason": "$string:entry_desc", - "usedScene": {"abilities": ["MainAbility"]} - } - ], - "querySchemes": [ - "http", - "welink" - ], - "appEnvironments": [ - { - "name": "name", - "value": "value" - } - ], - "formWidgetModule": "formWidgetModuleTest" - } -} \ No newline at end of file diff --git a/test/sceneProject/systemtest/BundleClient/bundleClient1/entry/src/main/resources/base/element/color.json b/test/sceneProject/systemtest/BundleClient/bundleClient1/entry/src/main/resources/base/element/color.json index 6633ee2cdbdcab268902d2028a28798246f569ec..da3f48e2475c66fad5b23feb535379244be849cf 100755 --- a/test/sceneProject/systemtest/BundleClient/bundleClient1/entry/src/main/resources/base/element/color.json +++ b/test/sceneProject/systemtest/BundleClient/bundleClient1/entry/src/main/resources/base/element/color.json @@ -1,9 +1,5 @@ { "color": [ - { - "name": "start_window_background", - "value": "#FFFFFF" - }, { "name": "icon", "value": "#99999999" diff --git a/test/sceneProject/systemtest/BundleClient/bundleClient1/entry/src/main/resources/base/element/float.json b/test/sceneProject/systemtest/BundleClient/bundleClient1/entry/src/main/resources/base/element/float.json deleted file mode 100644 index a8a5d404dcd8b0466194afc3aa25d90a8a327470..0000000000000000000000000000000000000000 --- a/test/sceneProject/systemtest/BundleClient/bundleClient1/entry/src/main/resources/base/element/float.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "float": [ - { - "name": "page_text_font_size", - "value": "50fp" - } - ] -} diff --git a/test/sceneProject/systemtest/BundleClient/bundleClient1/entry/src/main/resources/base/element/string.json b/test/sceneProject/systemtest/BundleClient/bundleClient1/entry/src/main/resources/base/element/string.json index bf59fdcc55101361dff17aebc4140d8a04550329..44c2875c3eeab763eaec81c093a1f694da0d4782 100755 --- a/test/sceneProject/systemtest/BundleClient/bundleClient1/entry/src/main/resources/base/element/string.json +++ b/test/sceneProject/systemtest/BundleClient/bundleClient1/entry/src/main/resources/base/element/string.json @@ -1,48 +1,36 @@ { - "string": [ - { - "name": "module_desc", - "value": "module description" - }, - { - "name": "EntryAbility_desc", - "value": "description" - }, - { - "name": "EntryAbility_label", - "value": "label" - }, - { - "name": "entry_desc", - "value": "description" - }, - { - "name": "phone_entry_main", - "value": "description" - }, - { - "name": "entry_label", - "value": "description" - }, - { - "name": "phone_entry_dsc", - "value": "defaultApp" - }, - { - "name": "form_description", - "value": "defaultApp" - }, - { - "name": "serviceability_description", - "value": "defaultApp" - }, - { - "name": "16777223", - "value": "defaultApp" - }, - { - "name": "16777219", - "value": "defaultApp" - } - ] -} \ No newline at end of file + "string": [ + { + "name": "entry_desc", + "value": "description" + }, + { + "name": "phone_entry_main", + "value": "description" + }, + { + "name": "entry_label", + "value": "description" + }, + { + "name": "phone_entry_dsc", + "value": "defaultApp" + }, + { + "name": "form_description", + "value": "defaultApp" + }, + { + "name": "serviceability_description", + "value": "defaultApp" + }, + { + "name": "16777223", + "value": "defaultApp" + }, + { + "name": "16777219", + "value": "defaultApp" + } + ] + } \ No newline at end of file diff --git a/test/sceneProject/systemtest/BundleClient/bundleClient1/entry/src/main/resources/base/media/startIcon.png b/test/sceneProject/systemtest/BundleClient/bundleClient1/entry/src/main/resources/base/media/startIcon.png deleted file mode 100644 index 205ad8b5a8a42e8762fbe4899b8e5e31ce822b8b..0000000000000000000000000000000000000000 Binary files a/test/sceneProject/systemtest/BundleClient/bundleClient1/entry/src/main/resources/base/media/startIcon.png and /dev/null differ diff --git a/test/sceneProject/systemtest/BundleClient/bundleClient1/entry/src/main/resources/base/profile/form_config.json b/test/sceneProject/systemtest/BundleClient/bundleClient1/entry/src/main/resources/base/profile/form_config.json index b45c6bf56d21c676649ed9794ca99620cfbd350a..1fa99370178bc4bb5e34f076a6a85e581b24bdb3 100755 --- a/test/sceneProject/systemtest/BundleClient/bundleClient1/entry/src/main/resources/base/profile/form_config.json +++ b/test/sceneProject/systemtest/BundleClient/bundleClient1/entry/src/main/resources/base/profile/form_config.json @@ -7,13 +7,12 @@ "formConfigAbility": "ability://xxxxx", "formVisibleNotify": false, "isDefault": true, - "name": "Form", + "name": "Form_Js", "scheduledUpdateTime": "10:30", - "src": "./ets/pages/FormCard.ets", + "src": "pages/card/index", "supportDimensions": [ "2*2" ], - "uiSyntax": "arkts", "updateDuration": 1, "updateEnabled": true, "window": { diff --git a/test/sceneProject/systemtest/BundleClient/bundleClient1/entry/src/main/resources/dark/element/color.json b/test/sceneProject/systemtest/BundleClient/bundleClient1/entry/src/main/resources/dark/element/color.json deleted file mode 100644 index 438d5bc43bb23c59c210d586b96635a72da5b64a..0000000000000000000000000000000000000000 --- a/test/sceneProject/systemtest/BundleClient/bundleClient1/entry/src/main/resources/dark/element/color.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "color": [ - { - "name": "start_window_background", - "value": "#000000" - } - ] -} \ No newline at end of file diff --git a/test/sceneProject/systemtest/BundleClient/bundleClient1/hvigor/hvigor-config.json5 b/test/sceneProject/systemtest/BundleClient/bundleClient1/hvigor/hvigor-config.json5 deleted file mode 100644 index c61d3eed60978a00d9a67b754ec36c0c9dcde929..0000000000000000000000000000000000000000 --- a/test/sceneProject/systemtest/BundleClient/bundleClient1/hvigor/hvigor-config.json5 +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright (c) 2025 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. - */ - -{ - "modelVersion": "5.0.0", - "dependencies": { - }, - "execution": { - // "analyze": "normal", /* Define the build analyze mode. Value: [ "normal" | "advanced" | false ]. Default: "normal" */ - // "daemon": true, /* Enable daemon compilation. Value: [ true | false ]. Default: true */ - // "incremental": true, /* Enable incremental compilation. Value: [ true | false ]. Default: true */ - // "parallel": true, /* Enable parallel compilation. Value: [ true | false ]. Default: true */ - // "typeCheck": false, /* Enable typeCheck. Value: [ true | false ]. Default: false */ - }, - "logging": { - // "level": "info" /* Define the log level. Value: [ "debug" | "info" | "warn" | "error" ]. Default: "info" */ - }, - "debugging": { - // "stacktrace": false /* Disable stacktrace compilation. Value: [ true | false ]. Default: false */ - }, - "nodeOptions": { - // "maxOldSpaceSize": 8192 /* Enable nodeOptions maxOldSpaceSize compilation. Unit M. Used for the daemon process. Default: 8192*/ - // "exposeGC": true /* Enable to trigger garbage collection explicitly. Default: true*/ - } -} diff --git a/test/sceneProject/systemtest/BundleClient/bundleClient1/hvigorfile.ts b/test/sceneProject/systemtest/BundleClient/bundleClient1/hvigorfile.ts deleted file mode 100644 index e3340f07e45ddc5dcadbb87012668555def2e6e0..0000000000000000000000000000000000000000 --- a/test/sceneProject/systemtest/BundleClient/bundleClient1/hvigorfile.ts +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (c) 2025 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 { appTasks } from '@ohos/hvigor-ohos-plugin'; - -export default { - system: appTasks, /* Built-in plugin of Hvigor. It cannot be modified. */ - plugins: [] /* Custom plugin to extend the functionality of Hvigor. */ -} \ No newline at end of file diff --git a/test/sceneProject/systemtest/BundleClient/bundleClient1/oh-package.json5 b/test/sceneProject/systemtest/BundleClient/bundleClient1/oh-package.json5 deleted file mode 100644 index 15ec86a73e760904339e9269d493e3015429d8a2..0000000000000000000000000000000000000000 --- a/test/sceneProject/systemtest/BundleClient/bundleClient1/oh-package.json5 +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (c) 2025 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. - */ - -{ - "modelVersion": "5.0.0", - "description": "Please describe the basic information.", - "dependencies": { - }, - "devDependencies": { - "@ohos/hypium": "1.0.21" - } -} diff --git a/test/systemtest/common/bms/acts_bms_kit_system_test/acts_bms_kit_system_test.cpp b/test/systemtest/common/bms/acts_bms_kit_system_test/acts_bms_kit_system_test.cpp index 8a235fabaf51066451d945b0bfdcf3dd56588dd8..30d4c0931df3852a02fe89241a9e5af91fda0b31 100644 --- a/test/systemtest/common/bms/acts_bms_kit_system_test/acts_bms_kit_system_test.cpp +++ b/test/systemtest/common/bms/acts_bms_kit_system_test/acts_bms_kit_system_test.cpp @@ -1489,7 +1489,7 @@ HWTEST_F(ActsBmsKitSystemTest, GetBundleInfoV9_0026, Function | MediumTest | Lev EXPECT_EQ(getInfoResult, ERR_OK); EXPECT_EQ(bundleInfo.name, appName); EXPECT_FALSE(bundleInfo.hapModuleInfos.empty()); - EXPECT_TRUE(bundleInfo.hapModuleInfos[0].formExtensionModule.empty()); + EXPECT_FALSE(bundleInfo.hapModuleInfos[0].formExtensionModule.empty()); EXPECT_FALSE(bundleInfo.hapModuleInfos[0].formWidgetModule.empty()); resvec.clear(); Uninstall(appName, resvec);