diff --git a/test/sceneProject/systemtest/BundleClient/bundleClient1/AppScope/app.json5 b/test/sceneProject/systemtest/BundleClient/bundleClient1/AppScope/app.json 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 100644 --- 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/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 100644 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/testHapNoSo/hapNotIncludeso3/AppScope/app.json5 b/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso3/AppScope/app.json similarity index 34% rename from test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso3/AppScope/app.json5 rename to test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso3/AppScope/app.json index b2cf0f9d411d29a1e5714a91485930cadc45cf78..59298ccebc2c1a0c6b1f6a4f313e72ab866d191f 100644 --- a/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso3/AppScope/app.json5 +++ b/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso3/AppScope/app.json @@ -1,24 +1,12 @@ -/* - * 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": { + "apiReleaseType": "Release", "bundleName": "com.example.hapNotIncludeso3", "debug": true, "icon": "$media:app_icon", + "iconId": 16777217, "label": "$string:app_name", + "labelId": 16777216, "minAPIVersion": 9, "targetAPIVersion": 16, "vendor": "example", diff --git a/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso3/BUILD.gn b/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso3/BUILD.gn index 6e4829e387665f0cf8badc28cae6af6003b1be5b..8e3c5d6a8320492be440eb589cb6b9958e4d84d2 100644 --- a/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso3/BUILD.gn +++ b/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso3/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2023-2025 Huawei Device Co., Ltd. +# Copyright (c) 2023 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("hapNotIncludeso3") { +ohos_hap("hapNotIncludeso3") { + hap_profile = "entry/src/main/module.json" hap_name = "hapNotIncludeso3" subsystem_name = "bundlemanager" - part_name = "bundle_framework" - hap_out_dir = "$root_out_dir/tests/systemtest/bundle_framework/bundle_framework/resource/testHapNoSo" + final_hap_path = "$root_out_dir/tests/systemtest/bundle_framework/bundle_framework/resource/testHapNoSo/${hap_name}.hap" testonly = true + deps = [ + ":hjs_demo_js_assets", + ":hjs_demo_resources", + ] certificate_profile = "${bundle_framework_path}/test/sceneProject/signature/com.example.hapNotIncludeso3.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 = "assembleHar" - build_level = "module" - build_modules = [ "entry_A" ] +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/testHapNoSo/hapNotIncludeso3/build-profile.json5 b/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso3/build-profile.json5 deleted file mode 100644 index 79ac9f99aa0a571b5dea11950d2a68253eb0be2e..0000000000000000000000000000000000000000 --- a/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso3/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_A", - "srcPath": "./entry", - "targets": [ - { - "name": "default", - "applyToProducts": [ - "default" - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso3/entry/build-profile.json5 b/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso3/entry/build-profile.json5 deleted file mode 100644 index b4d65d490ef6cbe22d933b9231555210f1555786..0000000000000000000000000000000000000000 --- a/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso3/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/testHapNoSo/hapNotIncludeso3/entry/hvigorfile.ts b/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso3/entry/hvigorfile.ts deleted file mode 100644 index cfa8a00f74f409d9647f55cdf270ab6aec69fe41..0000000000000000000000000000000000000000 --- a/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso3/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/testHapNoSo/hapNotIncludeso3/entry/obfuscation-rules.txt b/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso3/entry/obfuscation-rules.txt deleted file mode 100644 index c1d419bdc6fa72c5914cc864ede925c53a2b01c5..0000000000000000000000000000000000000000 --- a/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso3/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/testHapNoSo/hapNotIncludeso3/entry/oh-package.json5 b/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso3/entry/oh-package.json5 deleted file mode 100644 index 4bf3e2a9b1ae7381cf9363dff1cbcc1861a41e7b..0000000000000000000000000000000000000000 --- a/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso3/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/pages/FormCard.ets b/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso3/entry/src/main/ets/MainAbility/GlobalContext.ts similarity index 51% rename from test/sceneProject/systemtest/BundleClient/bundleClient1/entry/src/main/ets/pages/FormCard.ets rename to test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso3/entry/src/main/ets/MainAbility/GlobalContext.ts index d6d92615beaacc53814b19b7caddc45c242b966c..ce579a3b37d7379cbc7ad48fc8b3a88ad7d1576f 100644 --- a/test/sceneProject/systemtest/BundleClient/bundleClient1/entry/src/main/ets/pages/FormCard.ets +++ b/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso3/entry/src/main/ets/MainAbility/GlobalContext.ts @@ -1,34 +1,28 @@ -/* - * 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%') - } +/* + * Copyright (c) 2023 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 {Core} from "deccjsunit/index.ets" +import testsuite from "../../test/List.test.ets" + +export default class GlobalContext { + constructor(){ + } + globalContext(core:Core) { + const configService = core.getDefaultService('config') + console.info('parameters---->' + JSON.stringify(globalThis.abilityWant.parameters)) + globalThis.abilityWant.parameters.timeout = 70000; + configService.setConfig(globalThis.abilityWant.parameters) + testsuite(globalThis.abilityContext) + } } \ No newline at end of file diff --git a/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso3/entry/src/main/ets/pages/index/index.ets b/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso3/entry/src/main/ets/pages/index/index.ets index 683fbd407e08e7e353fcbc29d5c739822fc352a8..5fd7e4ec1f5121493728ebee1d7d7ddfece4a382 100644 --- a/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso3/entry/src/main/ets/pages/index/index.ets +++ b/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso3/entry/src/main/ets/pages/index/index.ets @@ -12,10 +12,33 @@ * 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 GlobalContext from "../MainAbility/GlobalContext.ts" + @Entry @Component struct Index { + aboutToAppear(){ + console.info("start run testcase!!!!") + const core:Core = Core.getInstance() + const expectExtend:ExpectExtend = new ExpectExtend({ + id: 'extend' + }) + core.addService('expect', expectExtend) + const reportExtend:ReportExtend = new ReportExtend(file) + + core.addService('report', reportExtend) + core.init() + core.subscribeEvent('task', reportExtend) + + const globalContext:GlobalContext = new GlobalContext() + globalContext.globalContext(core) + core.execute() + } + build() { Flex({ direction:FlexDirection.Column, alignItems:ItemAlign.Center, justifyContent: FlexAlign.Center }) { Text('Hello World') diff --git a/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso3/entry/src/main/module.json5 b/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso3/entry/src/main/module.json similarity index 55% rename from test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso3/entry/src/main/module.json5 rename to test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso3/entry/src/main/module.json index f13c031007c79035721b04a44cdb23e5d932a08c..ca797786ef35e4e1f2ff1ff3e8cc41cf89d625a1 100644 --- a/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso3/entry/src/main/module.json5 +++ b/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso3/entry/src/main/module.json @@ -1,25 +1,13 @@ -/* - * 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": { "abilities": [ { "description": "$string:MainAbility_desc", + "descriptionId": 16777218, "icon": "$media:icon", + "iconId": 16777221, "label": "$string:MainAbility_label", + "labelId": 16777219, "name": "MainAbility", "skills": [ { @@ -32,25 +20,22 @@ } ], "srcEntry": "./ets/MainAbility/MainAbility.ts", - "exported": true, - "startWindowIcon": "$media:startIcon", - "startWindowBackground": "$color:start_window_background" + "exported": true } ], "deliveryWithInstall": true, "description": "$string:entry_desc", + "descriptionId": 16777220, "deviceTypes": [ "2in1", - "default", "tablet", - "tv", - "wearable" + "default" ], "installationFree": false, "mainElement": "MainAbility", "name": "entry_A", "pages": "$profile:main_pages", - "srcEntry": "./ets/MainAbility/MainAbility.ts", + "srcEntry": "./ets/Application/AbilityStage.ts", "type": "feature", "virtualMachine": "ark", "compressNativeLibs": false, diff --git a/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso3/entry/src/main/resources/base/element/color.json b/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso3/entry/src/main/resources/base/element/color.json index ca5a2e6cb5384fa1cc26622d3e3d94394363d50d..da3f48e2475c66fad5b23feb535379244be849cf 100644 --- a/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso3/entry/src/main/resources/base/element/color.json +++ b/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso3/entry/src/main/resources/base/element/color.json @@ -3,10 +3,6 @@ { "name": "icon", "value": "#99999999" - }, - { - "name": "start_window_background", - "value": "#FFFFFF" } ] } diff --git a/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso3/AppScope/resources/base/media/app_icon.png b/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso3/entry/src/main/resources/base/media/app_icon.png similarity index 100% rename from test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso3/AppScope/resources/base/media/app_icon.png rename to test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso3/entry/src/main/resources/base/media/app_icon.png diff --git a/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso3/entry/src/main/resources/base/media/startIcon.png b/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso3/entry/src/main/resources/base/media/startIcon.png deleted file mode 100644 index 205ad8b5a8a42e8762fbe4899b8e5e31ce822b8b..0000000000000000000000000000000000000000 Binary files a/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso3/entry/src/main/resources/base/media/startIcon.png and /dev/null differ diff --git a/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso3/entry/src/main/resources/base/profile/form_config.json b/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso3/entry/src/main/resources/base/profile/form_config.json index ad1ce4bd4bdbb833ab72872e120161f01245a65e..1f4e42f3f7e6aeb01fca5726ba74ed560e0494d3 100644 --- a/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso3/entry/src/main/resources/base/profile/form_config.json +++ b/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso3/entry/src/main/resources/base/profile/form_config.json @@ -9,8 +9,7 @@ "isDefault": true, "name": "Form_Js", "scheduledUpdateTime": "10:30", - "src": "./ets/pages/index/index.ets", - "uiSyntax": "arkts", + "src": "pages/card/index", "supportDimensions": [ "2*2" ], diff --git a/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso3/hvigor/hvigor-config.json5 b/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso3/hvigor/hvigor-config.json5 deleted file mode 100644 index c61d3eed60978a00d9a67b754ec36c0c9dcde929..0000000000000000000000000000000000000000 --- a/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso3/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/testHapNoSo/hapNotIncludeso3/hvigorfile.ts b/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso3/hvigorfile.ts deleted file mode 100644 index e3340f07e45ddc5dcadbb87012668555def2e6e0..0000000000000000000000000000000000000000 --- a/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso3/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/testHapNoSo/hapNotIncludeso3/oh-package.json5 b/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso3/oh-package.json5 deleted file mode 100644 index 15ec86a73e760904339e9269d493e3015429d8a2..0000000000000000000000000000000000000000 --- a/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso3/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/sceneProject/systemtest/testHapNoSo/hapNotIncludeso4/AppScope/app.json5 b/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso4/AppScope/app.json similarity index 34% rename from test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso4/AppScope/app.json5 rename to test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso4/AppScope/app.json index f756e01a93316a884d023699ccabc108f598adf3..85ce8db4b6096d7ffc51fef303eb615edf6e9e1b 100644 --- a/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso4/AppScope/app.json5 +++ b/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso4/AppScope/app.json @@ -1,24 +1,12 @@ -/* - * 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": { + "apiReleaseType": "Release", "bundleName": "com.example.hapNotIncludeso4", "debug": true, "icon": "$media:app_icon", + "iconId": 16777217, "label": "$string:app_name", + "labelId": 16777216, "minAPIVersion": 9, "targetAPIVersion": 16, "vendor": "example", diff --git a/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso4/BUILD.gn b/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso4/BUILD.gn index 8b3965f82e1739e701386a51944da55d73e01019..4954c3c0025e2a3100b04db9d9b9635b85307ed5 100644 --- a/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso4/BUILD.gn +++ b/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso4/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2023-2025 Huawei Device Co., Ltd. +# Copyright (c) 2023 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("hapNotIncludeso4") { +ohos_hap("hapNotIncludeso4") { + hap_profile = "entry/src/main/module.json" hap_name = "hapNotIncludeso4" subsystem_name = "bundlemanager" - part_name = "bundle_framework" - hap_out_dir = "$root_out_dir/tests/systemtest/bundle_framework/bundle_framework/resource/testHapNoSo" + final_hap_path = "$root_out_dir/tests/systemtest/bundle_framework/bundle_framework/resource/testHapNoSo/${hap_name}.hap" testonly = true + deps = [ + ":hjs_demo_js_assets", + ":hjs_demo_resources", + ] certificate_profile = "${bundle_framework_path}/test/sceneProject/signature/com.example.hapNotIncludeso4.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 = "assembleHar" - build_level = "module" - build_modules = [ "entry_A" ] +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/testHapNoSo/hapNotIncludeso4/build-profile.json5 b/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso4/build-profile.json5 deleted file mode 100644 index 79ac9f99aa0a571b5dea11950d2a68253eb0be2e..0000000000000000000000000000000000000000 --- a/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso4/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_A", - "srcPath": "./entry", - "targets": [ - { - "name": "default", - "applyToProducts": [ - "default" - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso4/entry/build-profile.json5 b/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso4/entry/build-profile.json5 deleted file mode 100644 index b4d65d490ef6cbe22d933b9231555210f1555786..0000000000000000000000000000000000000000 --- a/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso4/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/testHapNoSo/hapNotIncludeso4/entry/hvigorfile.ts b/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso4/entry/hvigorfile.ts deleted file mode 100644 index cfa8a00f74f409d9647f55cdf270ab6aec69fe41..0000000000000000000000000000000000000000 --- a/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso4/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/testHapNoSo/hapNotIncludeso4/entry/obfuscation-rules.txt b/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso4/entry/obfuscation-rules.txt deleted file mode 100644 index c1d419bdc6fa72c5914cc864ede925c53a2b01c5..0000000000000000000000000000000000000000 --- a/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso4/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/testHapNoSo/hapNotIncludeso4/entry/oh-package.json5 b/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso4/entry/oh-package.json5 deleted file mode 100644 index 4bf3e2a9b1ae7381cf9363dff1cbcc1861a41e7b..0000000000000000000000000000000000000000 --- a/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso4/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/testHapNoSo/hapNotIncludeso4/entry/src/main/ets/MainAbility/GlobalContext.ts b/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso4/entry/src/main/ets/MainAbility/GlobalContext.ts new file mode 100644 index 0000000000000000000000000000000000000000..0a0a885f3e2610c79645c247880b0675dc905ad8 --- /dev/null +++ b/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso4/entry/src/main/ets/MainAbility/GlobalContext.ts @@ -0,0 +1,28 @@ +/* + * Copyright (c) 2023 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 {Core} from "deccjsunit/index.ets" +import testsuite from "../../test/List.test.ets" + +export default class GlobalContext { + constructor(){ + } + globalContext(core:Core) { + const configService = core.getDefaultService('config') + console.info('parameters---->' + JSON.stringify(globalThis.abilityWant.parameters)) + globalThis.abilityWant.parameters.timeout = 70000; + configService.setConfig(globalThis.abilityWant.parameters) + testsuite(globalThis.abilityContext) + } +} \ No newline at end of file diff --git a/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso4/entry/src/main/ets/pages/index/index.ets b/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso4/entry/src/main/ets/pages/index/index.ets index ccbeb5d23516dc24db5557627ac351a6375fe0b0..5fd7e4ec1f5121493728ebee1d7d7ddfece4a382 100644 --- a/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso4/entry/src/main/ets/pages/index/index.ets +++ b/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso4/entry/src/main/ets/pages/index/index.ets @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023-2025 Huawei Device Co., Ltd. + * Copyright (c) 2023 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,10 +12,33 @@ * 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 GlobalContext from "../MainAbility/GlobalContext.ts" + @Entry @Component struct Index { + aboutToAppear(){ + console.info("start run testcase!!!!") + const core:Core = Core.getInstance() + const expectExtend:ExpectExtend = new ExpectExtend({ + id: 'extend' + }) + core.addService('expect', expectExtend) + const reportExtend:ReportExtend = new ReportExtend(file) + + core.addService('report', reportExtend) + core.init() + core.subscribeEvent('task', reportExtend) + + const globalContext:GlobalContext = new GlobalContext() + globalContext.globalContext(core) + core.execute() + } + build() { Flex({ direction:FlexDirection.Column, alignItems:ItemAlign.Center, justifyContent: FlexAlign.Center }) { Text('Hello World') diff --git a/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso4/entry/src/main/module.json5 b/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso4/entry/src/main/module.json similarity index 57% rename from test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso4/entry/src/main/module.json5 rename to test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso4/entry/src/main/module.json index 35c03ff5aed53964fbff53b3b76cb80c81b75ed4..39e04a742993977dc27d0b8c125819d3633de829 100644 --- a/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso4/entry/src/main/module.json5 +++ b/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso4/entry/src/main/module.json @@ -1,25 +1,13 @@ -/* - * 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": { "abilities": [ { "description": "$string:MainAbility_desc", + "descriptionId": 16777218, "icon": "$media:icon", + "iconId": 16777221, "label": "$string:MainAbility_label", + "labelId": 16777219, "name": "MainAbility", "skills": [ { @@ -32,13 +20,12 @@ } ], "srcEntry": "./ets/MainAbility/MainAbility.ts", - "exported": true, - "startWindowIcon": "$media:startIcon", - "startWindowBackground": "$color:start_window_background" + "exported": true } ], "deliveryWithInstall": true, "description": "$string:entry_desc", + "descriptionId": 16777220, "deviceTypes": [ "2in1", "tablet", @@ -48,7 +35,7 @@ "mainElement": "MainAbility", "name": "entry_A", "pages": "$profile:main_pages", - "srcEntry": "./ets/MainAbility/MainAbility.ts", + "srcEntry": "./ets/Application/AbilityStage.ts", "type": "feature", "virtualMachine": "ark", "compressNativeLibs": true, diff --git a/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso4/entry/src/main/resources/base/element/color.json b/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso4/entry/src/main/resources/base/element/color.json index ca5a2e6cb5384fa1cc26622d3e3d94394363d50d..da3f48e2475c66fad5b23feb535379244be849cf 100644 --- a/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso4/entry/src/main/resources/base/element/color.json +++ b/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso4/entry/src/main/resources/base/element/color.json @@ -3,10 +3,6 @@ { "name": "icon", "value": "#99999999" - }, - { - "name": "start_window_background", - "value": "#FFFFFF" } ] } diff --git a/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso4/AppScope/resources/base/media/app_icon.png b/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso4/entry/src/main/resources/base/media/app_icon.png similarity index 100% rename from test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso4/AppScope/resources/base/media/app_icon.png rename to test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso4/entry/src/main/resources/base/media/app_icon.png diff --git a/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso4/entry/src/main/resources/base/media/startIcon.png b/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso4/entry/src/main/resources/base/media/startIcon.png deleted file mode 100644 index 205ad8b5a8a42e8762fbe4899b8e5e31ce822b8b..0000000000000000000000000000000000000000 Binary files a/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso4/entry/src/main/resources/base/media/startIcon.png and /dev/null differ diff --git a/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso4/entry/src/main/resources/base/profile/form_config.json b/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso4/entry/src/main/resources/base/profile/form_config.json index ad1ce4bd4bdbb833ab72872e120161f01245a65e..1f4e42f3f7e6aeb01fca5726ba74ed560e0494d3 100644 --- a/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso4/entry/src/main/resources/base/profile/form_config.json +++ b/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso4/entry/src/main/resources/base/profile/form_config.json @@ -9,8 +9,7 @@ "isDefault": true, "name": "Form_Js", "scheduledUpdateTime": "10:30", - "src": "./ets/pages/index/index.ets", - "uiSyntax": "arkts", + "src": "pages/card/index", "supportDimensions": [ "2*2" ], diff --git a/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso4/hvigor/hvigor-config.json5 b/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso4/hvigor/hvigor-config.json5 deleted file mode 100644 index c61d3eed60978a00d9a67b754ec36c0c9dcde929..0000000000000000000000000000000000000000 --- a/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso4/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/testHapNoSo/hapNotIncludeso4/hvigorfile.ts b/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso4/hvigorfile.ts deleted file mode 100644 index e3340f07e45ddc5dcadbb87012668555def2e6e0..0000000000000000000000000000000000000000 --- a/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso4/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/testHapNoSo/hapSectionContainso2/AppScope/app.json b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/AppScope/app.json new file mode 100644 index 0000000000000000000000000000000000000000..c45744cd797bf1418891d4f85e1eb3d8cf34f55e --- /dev/null +++ b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/AppScope/app.json @@ -0,0 +1,16 @@ +{ + "app": { + "apiReleaseType": "Release", + "bundleName": "com.example.hapSectionContainso2", + "debug": true, + "icon": "$media:app_icon", + "iconId": 16777217, + "label": "$string:app_name", + "labelId": 16777216, + "minAPIVersion": 9, + "targetAPIVersion": 16, + "vendor": "example", + "versionCode": 1000000, + "versionName": "1.0.0" + } +} diff --git a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/AppScope/app.json5 b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/AppScope/app.json5 deleted file mode 100644 index bb1e00c7df9353dc582ac392fcc40b0d45dea0e1..0000000000000000000000000000000000000000 --- a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/AppScope/app.json5 +++ /dev/null @@ -1,28 +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": { - "bundleName": "com.example.hapSectionContainso2", - "debug": true, - "icon": "$media:app_icon", - "label": "$string:app_name", - "minAPIVersion": 9, - "targetAPIVersion": 16, - "vendor": "example", - "versionCode": 1000000, - "versionName": "1.0.0" - } -} diff --git a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/BUILD.gn b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/BUILD.gn index 4bd2a2741d61b5a415ad26c445153edd7b73a0bc..3d8bc57e06dcd0556a3efad33e61ececcc60a9c9 100644 --- a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/BUILD.gn +++ b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2023-2025 Huawei Device Co., Ltd. +# Copyright (c) 2023 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("hapSectionContainso2") { - certificate_profile = "${bundle_framework_path}/test/sceneProject/signature/com.example.hapSectionContainso2.p7b" +ohos_hap("hapSectionContainso2") { + hap_profile = "entry/src/main/module.json" hap_name = "hapSectionContainso2" - hap_out_dir = "$root_out_dir/tests/systemtest/bundle_framework/bundle_framework/resource/testHapNoSo" - subsystem_name = "bundlemanager" - part_name = "bundle_framework" + final_hap_path = "$root_out_dir/tests/systemtest/bundle_framework/bundle_framework/resource/testHapNoSo/${hap_name}.hap" + testonly = true + deps = [ + ":hjs_demo_js_assets", + ":hjs_demo_resources", + ] + certificate_profile = "${bundle_framework_path}/test/sceneProject/signature/com.example.hapSectionContainso2.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_A" ] +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/testHapNoSo/hapSectionContainso2/build-profile.json5 b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/build-profile.json5 deleted file mode 100644 index 79ac9f99aa0a571b5dea11950d2a68253eb0be2e..0000000000000000000000000000000000000000 --- a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/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_A", - "srcPath": "./entry", - "targets": [ - { - "name": "default", - "applyToProducts": [ - "default" - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/entry/build-profile.json5 b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/entry/build-profile.json5 deleted file mode 100644 index b4d65d490ef6cbe22d933b9231555210f1555786..0000000000000000000000000000000000000000 --- a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/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/testHapNoSo/hapSectionContainso2/entry/hvigorfile.ts b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/entry/hvigorfile.ts deleted file mode 100644 index cfa8a00f74f409d9647f55cdf270ab6aec69fe41..0000000000000000000000000000000000000000 --- a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/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/testHapNoSo/hapSectionContainso2/entry/obfuscation-rules.txt b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/entry/obfuscation-rules.txt deleted file mode 100644 index c1d419bdc6fa72c5914cc864ede925c53a2b01c5..0000000000000000000000000000000000000000 --- a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/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/testHapNoSo/hapSectionContainso2/entry/oh-package.json5 b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/entry/oh-package.json5 deleted file mode 100644 index 4bf3e2a9b1ae7381cf9363dff1cbcc1861a41e7b..0000000000000000000000000000000000000000 --- a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/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/testHapNoSo/hapSectionContainso2/entry/src/main/ets/pages/index/index.ets b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/entry/src/main/ets/pages/index/index.ets index ccbeb5d23516dc24db5557627ac351a6375fe0b0..5fd7e4ec1f5121493728ebee1d7d7ddfece4a382 100644 --- a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/entry/src/main/ets/pages/index/index.ets +++ b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/entry/src/main/ets/pages/index/index.ets @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023-2025 Huawei Device Co., Ltd. + * Copyright (c) 2023 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,10 +12,33 @@ * 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 GlobalContext from "../MainAbility/GlobalContext.ts" + @Entry @Component struct Index { + aboutToAppear(){ + console.info("start run testcase!!!!") + const core:Core = Core.getInstance() + const expectExtend:ExpectExtend = new ExpectExtend({ + id: 'extend' + }) + core.addService('expect', expectExtend) + const reportExtend:ReportExtend = new ReportExtend(file) + + core.addService('report', reportExtend) + core.init() + core.subscribeEvent('task', reportExtend) + + const globalContext:GlobalContext = new GlobalContext() + globalContext.globalContext(core) + core.execute() + } + build() { Flex({ direction:FlexDirection.Column, alignItems:ItemAlign.Center, justifyContent: FlexAlign.Center }) { Text('Hello World') diff --git a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/entry/src/main/module.json b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/entry/src/main/module.json new file mode 100644 index 0000000000000000000000000000000000000000..6d8692fa6057911f0f7581ed6c0b8af6628e26dd --- /dev/null +++ b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/entry/src/main/module.json @@ -0,0 +1,45 @@ +{ + "module": { + "abilities": [ + { + "description": "$string:MainAbility_desc", + "descriptionId": 16777218, + "icon": "$media:icon", + "iconId": 16777221, + "label": "$string:MainAbility_label", + "labelId": 16777219, + "name": "MainAbility", + "skills": [ + { + "actions": [ + "action.system.home" + ], + "entities": [ + "entity.system.home" + ] + } + ], + "srcEntry": "./ets/MainAbility/MainAbility.ts", + "exported": true + } + ], + "deliveryWithInstall": true, + "description": "$string:entry_desc", + "descriptionId": 16777220, + "deviceTypes": [ + "2in1", + "tablet", + "default" + ], + "installationFree": false, + "mainElement": "MainAbility", + "name": "entry_A", + "pages": "$profile:main_pages", + "srcEntry": "./ets/Application/AbilityStage.ts", + "type": "feature", + "virtualMachine": "ark", + "compressNativeLibs": false, + "extractNativeLibs": false, + "libIsolation": false + } +} \ No newline at end of file diff --git a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/entry/src/main/module.json5 b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/entry/src/main/module.json5 deleted file mode 100644 index 33c44467f613cfe5deab1203fbb55bef9c59b6ed..0000000000000000000000000000000000000000 --- a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/entry/src/main/module.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. - */ - -{ - "module": { - "abilities": [ - { - "description": "$string:MainAbility_desc", - "icon": "$media:icon", - "label": "$string:MainAbility_label", - "name": "MainAbility", - "skills": [ - { - "actions": [ - "action.system.home" - ], - "entities": [ - "entity.system.home" - ] - } - ], - "srcEntry": "./ets/MainAbility/MainAbility.ts", - "exported": true, - "startWindowIcon": "$media:icon", - "startWindowBackground": "$color:icon" - } - ], - "deliveryWithInstall": true, - "description": "$string:entry_desc", - "deviceTypes": [ - "2in1", - "tablet", - "default" - ], - "installationFree": false, - "mainElement": "MainAbility", - "name": "entry_A", - "pages": "$profile:main_pages", - "srcEntry": "./ets/MainAbility/MainAbility.ts", - "type": "feature", - "virtualMachine": "ark", - "compressNativeLibs": false, - "extractNativeLibs": false, - "libIsolation": false - } -} \ No newline at end of file diff --git a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/entry/src/main/resources/base/profile/main_pages.json b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/entry/src/main/resources/base/profile/main_pages.json index 821ecf2358ec52ffa8b0812267be3793be71896a..6898b31d2085f478ee1ed9d933a5910cbf901d92 100644 --- a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/entry/src/main/resources/base/profile/main_pages.json +++ b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/entry/src/main/resources/base/profile/main_pages.json @@ -1,5 +1,6 @@ { "src": [ - "pages/index/index" + "pages/index/index", + "pages/second/second" ] } \ No newline at end of file diff --git a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature4/AppScope/app.json5 b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature4/AppScope/app.json5 deleted file mode 100644 index bb1e00c7df9353dc582ac392fcc40b0d45dea0e1..0000000000000000000000000000000000000000 --- a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature4/AppScope/app.json5 +++ /dev/null @@ -1,28 +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": { - "bundleName": "com.example.hapSectionContainso2", - "debug": true, - "icon": "$media:app_icon", - "label": "$string:app_name", - "minAPIVersion": 9, - "targetAPIVersion": 16, - "vendor": "example", - "versionCode": 1000000, - "versionName": "1.0.0" - } -} diff --git a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature4/AppScope/resources/base/element/string.json b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature4/AppScope/resources/base/element/string.json deleted file mode 100644 index ee69f9a861d9dc269ed6638735d52674583498e1..0000000000000000000000000000000000000000 --- a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature4/AppScope/resources/base/element/string.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "string":[ - { - "name":"app_name", - "value":"ohosProject" - } - ] -} \ No newline at end of file diff --git a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature4/BUILD.gn b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature4/BUILD.gn index c1d6d0da4d240d467f4a62a04a737530613bfe85..954e53499191a2dc2eee80cfd15eefc732c24b3b 100644 --- a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature4/BUILD.gn +++ b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature4/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2023-2025 Huawei Device Co., Ltd. +# Copyright (c) 2023 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,36 +14,47 @@ import("//build/ohos.gni") import("../../../../../../appexecfwk.gni") -ohos_app("hapSectionContainsoFeature4") { - certificate_profile = "${bundle_framework_path}/test/sceneProject/signature/com.example.hapSectionContainso2.p7b" +ohos_hap("hapSectionContainsoFeature4") { + hap_profile = "src/main/module.json" hap_name = "hapSectionContainsoFeature4" - hap_out_dir = "$root_out_dir/tests/systemtest/bundle_framework/bundle_framework/resource/testHapNoSo" - subsystem_name = "bundlemanager" - part_name = "bundle_framework" - - js_build_mode = "release" - sdk_home = "//prebuilts/ohos-sdk/linux" - sdk_type_name = [ "sdk.dir" ] - assemble_type = "assembleHap" - build_level = "module" - system_lib_deps = [ + final_hap_path = "$root_out_dir/tests/systemtest/bundle_framework/bundle_framework/resource/testHapNoSo/${hap_name}.hap" + testonly = true + deps = [ + ":hjs_demo_js_assets", + ":hjs_demo_resources", + ] + shared_libraries = [ ":hapSectionContainso5", ":hapSectionContainso6", ] - module_libs_dir = "feature4" - build_modules = [ "feature4" ] + certificate_profile = "${bundle_framework_path}/test/sceneProject/signature/com.example.hapSectionContainso2.p7b" +} + +ohos_app_scope("bmsstagedemoone_app_profile") { + app_profile = "../AppScope/app.json" + sources = [ "../AppScope/resources" ] +} + +ohos_resources("hjs_demo_resources") { + sources = [ "src/main/resources" ] + deps = [ ":bmsstagedemoone_app_profile" ] + hap_profile = "src/main/module.json" +} + +ohos_js_assets("hjs_demo_js_assets") { + source_dir = "src/main/ets" } ohos_shared_library("hapSectionContainso5") { - sources = [ "feature4/src/main/cpp/hapSectionContainso5.cpp" ] + sources = [ "src/main/cpp/hapSectionContainso5.cpp" ] visibility = [ ":*" ] subsystem_name = "bundlemanager" part_name = "bundle_framework" } ohos_shared_library("hapSectionContainso6") { - sources = [ "feature4/src/main/cpp/hapSectionContainso6.cpp" ] + sources = [ "src/main/cpp/hapSectionContainso6.cpp" ] visibility = [ ":*" ] subsystem_name = "bundlemanager" part_name = "bundle_framework" diff --git a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature4/build-profile.json5 b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature4/build-profile.json5 deleted file mode 100644 index 8f61afcca0b66bd239a2996be236ce9f10852c13..0000000000000000000000000000000000000000 --- a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature4/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": "feature4", - "srcPath": "./feature4", - "targets": [ - { - "name": "default", - "applyToProducts": [ - "default" - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature4/feature4/build-profile.json5 b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature4/feature4/build-profile.json5 deleted file mode 100644 index b4d65d490ef6cbe22d933b9231555210f1555786..0000000000000000000000000000000000000000 --- a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature4/feature4/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/testHapNoSo/hapSectionContainso2/feature4/feature4/hvigorfile.ts b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature4/feature4/hvigorfile.ts deleted file mode 100644 index cfa8a00f74f409d9647f55cdf270ab6aec69fe41..0000000000000000000000000000000000000000 --- a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature4/feature4/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/testHapNoSo/hapSectionContainso2/feature4/feature4/obfuscation-rules.txt b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature4/feature4/obfuscation-rules.txt deleted file mode 100644 index c1d419bdc6fa72c5914cc864ede925c53a2b01c5..0000000000000000000000000000000000000000 --- a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature4/feature4/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/testHapNoSo/hapSectionContainso2/feature4/feature4/oh-package.json5 b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature4/feature4/oh-package.json5 deleted file mode 100644 index 4bf3e2a9b1ae7381cf9363dff1cbcc1861a41e7b..0000000000000000000000000000000000000000 --- a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature4/feature4/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/testHapNoSo/hapSectionContainso2/feature4/feature4/src/main/module.json5 b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature4/feature4/src/main/module.json5 deleted file mode 100644 index bb010ea0b6b12ffbcb711d90b02d7674365937b3..0000000000000000000000000000000000000000 --- a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature4/feature4/src/main/module.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. - */ - -{ - "module": { - "abilities": [ - { - "description": "$string:MainAbility_desc", - "icon": "$media:icon", - "label": "$string:MainAbility_label", - "name": "MainAbility", - "skills": [ - { - "actions": [ - "action.system.home" - ], - "entities": [ - "entity.system.home" - ] - } - ], - "srcEntry": "./ets/MainAbility/MainAbility.ts", - "exported": true, - "startWindowIcon": "$media:icon", - "startWindowBackground": "$color:icon" - } - ], - "deliveryWithInstall": true, - "description": "$string:entry_desc", - "deviceTypes": [ - "2in1", - "default", - "tablet" - ], - "installationFree": false, - "mainElement": "MainAbility", - "name": "feature4", - "pages": "$profile:main_pages", - "srcEntry": "./ets/Application/AbilityStage.ts", - "type": "feature", - "virtualMachine": "ark", - "compressNativeLibs": false, - "extractNativeLibs": false, - "libIsolation": false - } -} \ No newline at end of file diff --git a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature4/feature4/src/main/resources/base/element/color.json b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature4/feature4/src/main/resources/base/element/color.json deleted file mode 100644 index c6a43ee62ce2e1f2d3f8e6e22c8469638f096841..0000000000000000000000000000000000000000 --- a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature4/feature4/src/main/resources/base/element/color.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "color": [ - { - "name": "icon", - "value": "#99999999" - } - ] -} \ No newline at end of file diff --git a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature4/hvigor/hvigor-config.json5 b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature4/hvigor/hvigor-config.json5 deleted file mode 100644 index c61d3eed60978a00d9a67b754ec36c0c9dcde929..0000000000000000000000000000000000000000 --- a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature4/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/testHapNoSo/hapSectionContainso2/feature4/hvigorfile.ts b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature4/hvigorfile.ts deleted file mode 100644 index e3340f07e45ddc5dcadbb87012668555def2e6e0..0000000000000000000000000000000000000000 --- a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature4/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/testHapNoSo/hapSectionContainso2/feature4/oh-package.json5 b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature4/oh-package.json5 deleted file mode 100644 index 15ec86a73e760904339e9269d493e3015429d8a2..0000000000000000000000000000000000000000 --- a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature4/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/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature4/feature4/src/main/cpp/hapSectionContainso5.cpp b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature4/src/main/cpp/hapSectionContainso5.cpp similarity index 93% rename from test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature4/feature4/src/main/cpp/hapSectionContainso5.cpp rename to test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature4/src/main/cpp/hapSectionContainso5.cpp index d1f9d284d0aeb172179b700eb01761ed99786280..f9cbd1a2c036c9b70e2204757bc348a84d736805 100644 --- a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature4/feature4/src/main/cpp/hapSectionContainso5.cpp +++ b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature4/src/main/cpp/hapSectionContainso5.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2025 Huawei Device Co., Ltd. + * Copyright (c) 2023 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 diff --git a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature4/feature4/src/main/cpp/hapSectionContainso6.cpp b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature4/src/main/cpp/hapSectionContainso6.cpp similarity index 93% rename from test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature4/feature4/src/main/cpp/hapSectionContainso6.cpp rename to test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature4/src/main/cpp/hapSectionContainso6.cpp index 347c0f2bb88bdb36c3568bbdacb9f8209d495691..401f82f019e90901d5c2e20ce8096636a717a09c 100644 --- a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature4/feature4/src/main/cpp/hapSectionContainso6.cpp +++ b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature4/src/main/cpp/hapSectionContainso6.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2025 Huawei Device Co., Ltd. + * Copyright (c) 2023 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 diff --git a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature4/feature4/src/main/ets/Application/AbilityStage.ts b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature4/src/main/ets/Application/AbilityStage.ts similarity index 94% rename from test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature4/feature4/src/main/ets/Application/AbilityStage.ts rename to test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature4/src/main/ets/Application/AbilityStage.ts index 1e523cb3c36e2c6b2d9fa913f2abc83764f0ab2c..95090c6854b1bbbcce83d3bf0674d07096bacd9e 100644 --- a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature4/feature4/src/main/ets/Application/AbilityStage.ts +++ b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature4/src/main/ets/Application/AbilityStage.ts @@ -1,5 +1,5 @@ /* - * Copyright (c) 2025 Huawei Device Co., Ltd. + * Copyright (c) 2023 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 diff --git a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature5/feature5/src/main/ets/MainAbility/MainAbility.ts b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature4/src/main/ets/MainAbility/MainAbility.ts similarity index 97% rename from test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature5/feature5/src/main/ets/MainAbility/MainAbility.ts rename to test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature4/src/main/ets/MainAbility/MainAbility.ts index 7e1517570598d19b64079e2671e51715d0ccc7c5..fffec61ab03fe9ca78edadf220de42ad94935e89 100644 --- a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature5/feature5/src/main/ets/MainAbility/MainAbility.ts +++ b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature4/src/main/ets/MainAbility/MainAbility.ts @@ -1,5 +1,5 @@ /* - * Copyright (c) 2025 Huawei Device Co., Ltd. + * Copyright (c) 2023 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 diff --git a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature4/feature4/src/main/ets/pages/index.ets b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature4/src/main/ets/pages/index.ets similarity index 79% rename from test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature4/feature4/src/main/ets/pages/index.ets rename to test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature4/src/main/ets/pages/index.ets index 51fb34a200697b986644da446ecddd9253ba5548..f26a7f435e0512667ac6c1969c720c58dc237d07 100644 --- a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature4/feature4/src/main/ets/pages/index.ets +++ b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature4/src/main/ets/pages/index.ets @@ -1,5 +1,5 @@ /* - * Copyright (c) 2025 Huawei Device Co., Ltd. + * Copyright (c) 2023 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/testHapNoSo/hapSectionContainso2/feature4/src/main/module.json b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature4/src/main/module.json new file mode 100644 index 0000000000000000000000000000000000000000..d9b0033da227711d359c26ab6140d011b6287535 --- /dev/null +++ b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature4/src/main/module.json @@ -0,0 +1,46 @@ +{ + "module": { + "abilities": [ + { + "description": "$string:MainAbility_desc", + "descriptionId": 16777218, + "icon": "$media:icon", + "iconId": 16777221, + "label": "$string:MainAbility_label", + "labelId": 16777219, + "name": "MainAbility", + "skills": [ + { + "actions": [ + "action.system.home" + ], + "entities": [ + "entity.system.home" + ] + } + ], + "srcEntry": "./ets/MainAbility/MainAbility.ts", + "exported": true + } + ], + "deliveryWithInstall": true, + "description": "$string:entry_desc", + "descriptionId": 16777220, + "deviceTypes": [ + "2in1", + "default", + "phone", + "tablet" + ], + "installationFree": false, + "mainElement": "MainAbility", + "name": "feature4", + "pages": "$profile:main_pages", + "srcEntry": "./ets/Application/AbilityStage.ts", + "type": "feature", + "virtualMachine": "ark", + "compressNativeLibs": false, + "extractNativeLibs": false, + "libIsolation": false + } +} \ No newline at end of file diff --git a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature4/feature4/src/main/resources/base/element/string.json b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature4/src/main/resources/base/element/string.json similarity index 100% rename from test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature4/feature4/src/main/resources/base/element/string.json rename to test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature4/src/main/resources/base/element/string.json diff --git a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/AppScope/resources/base/media/app_icon.png b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature4/src/main/resources/base/media/app_icon.png similarity index 100% rename from test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/AppScope/resources/base/media/app_icon.png rename to test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature4/src/main/resources/base/media/app_icon.png diff --git a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature4/feature4/src/main/resources/base/media/icon.png b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature4/src/main/resources/base/media/icon.png similarity index 100% rename from test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature4/feature4/src/main/resources/base/media/icon.png rename to test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature4/src/main/resources/base/media/icon.png diff --git a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature4/feature4/src/main/resources/base/profile/main_pages.json b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature4/src/main/resources/base/profile/main_pages.json similarity index 100% rename from test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature4/feature4/src/main/resources/base/profile/main_pages.json rename to test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature4/src/main/resources/base/profile/main_pages.json diff --git a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature5/AppScope/app.json5 b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature5/AppScope/app.json5 deleted file mode 100644 index bb1e00c7df9353dc582ac392fcc40b0d45dea0e1..0000000000000000000000000000000000000000 --- a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature5/AppScope/app.json5 +++ /dev/null @@ -1,28 +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": { - "bundleName": "com.example.hapSectionContainso2", - "debug": true, - "icon": "$media:app_icon", - "label": "$string:app_name", - "minAPIVersion": 9, - "targetAPIVersion": 16, - "vendor": "example", - "versionCode": 1000000, - "versionName": "1.0.0" - } -} diff --git a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature5/AppScope/resources/base/element/string.json b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature5/AppScope/resources/base/element/string.json deleted file mode 100644 index ee69f9a861d9dc269ed6638735d52674583498e1..0000000000000000000000000000000000000000 --- a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature5/AppScope/resources/base/element/string.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "string":[ - { - "name":"app_name", - "value":"ohosProject" - } - ] -} \ No newline at end of file diff --git a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature5/AppScope/resources/base/media/app_icon.png b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature5/AppScope/resources/base/media/app_icon.png deleted file mode 100644 index ce307a8827bd75456441ceb57d530e4c8d45d36c..0000000000000000000000000000000000000000 Binary files a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature5/AppScope/resources/base/media/app_icon.png and /dev/null differ diff --git a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature5/BUILD.gn b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature5/BUILD.gn index 2e8a5b0320d6684837d2bb6bdd1b683646d7d4a0..8ccb7b98dd1245be57752603ef5c4cd63e028750 100644 --- a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature5/BUILD.gn +++ b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature5/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2023-2025 Huawei Device Co., Ltd. +# Copyright (c) 2023 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("hapSectionContainsoFeature5") { - certificate_profile = "${bundle_framework_path}/test/sceneProject/signature/com.example.hapSectionContainso2.p7b" +ohos_hap("hapSectionContainsoFeature5") { + hap_profile = "src/main/module.json" hap_name = "hapSectionContainsoFeature5" - hap_out_dir = "$root_out_dir/tests/systemtest/bundle_framework/bundle_framework/resource/testHapNoSo" - subsystem_name = "bundlemanager" - part_name = "bundle_framework" + final_hap_path = "$root_out_dir/tests/systemtest/bundle_framework/bundle_framework/resource/testHapNoSo/${hap_name}.hap" + testonly = true + deps = [ + ":hjs_demo_js_assets", + ":hjs_demo_resources", + ] + certificate_profile = "${bundle_framework_path}/test/sceneProject/signature/com.example.hapSectionContainso2.p7b" +} + +ohos_app_scope("bmsstagedemoone_app_profile") { + app_profile = "../AppScope/app.json" + sources = [ "../AppScope/resources" ] +} + +ohos_resources("hjs_demo_resources") { + sources = [ "src/main/resources" ] + deps = [ ":bmsstagedemoone_app_profile" ] + hap_profile = "src/main/module.json" +} - js_build_mode = "release" - sdk_home = "//prebuilts/ohos-sdk/linux" - sdk_type_name = [ "sdk.dir" ] - assemble_type = "assembleHap" - build_level = "module" - build_modules = [ "feature5" ] +ohos_js_assets("hjs_demo_js_assets") { + source_dir = "src/main/ets" } diff --git a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature5/build-profile.json5 b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature5/build-profile.json5 deleted file mode 100644 index e907105dced4209f3d5a82194416c064f89d7dec..0000000000000000000000000000000000000000 --- a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature5/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": "feature5", - "srcPath": "./feature5", - "targets": [ - { - "name": "default", - "applyToProducts": [ - "default" - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature5/feature5/build-profile.json5 b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature5/feature5/build-profile.json5 deleted file mode 100644 index b4d65d490ef6cbe22d933b9231555210f1555786..0000000000000000000000000000000000000000 --- a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature5/feature5/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/testHapNoSo/hapSectionContainso2/feature5/feature5/hvigorfile.ts b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature5/feature5/hvigorfile.ts deleted file mode 100644 index cfa8a00f74f409d9647f55cdf270ab6aec69fe41..0000000000000000000000000000000000000000 --- a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature5/feature5/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/testHapNoSo/hapSectionContainso2/feature5/feature5/obfuscation-rules.txt b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature5/feature5/obfuscation-rules.txt deleted file mode 100644 index c1d419bdc6fa72c5914cc864ede925c53a2b01c5..0000000000000000000000000000000000000000 --- a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature5/feature5/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/testHapNoSo/hapSectionContainso2/feature5/feature5/oh-package.json5 b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature5/feature5/oh-package.json5 deleted file mode 100644 index 4bf3e2a9b1ae7381cf9363dff1cbcc1861a41e7b..0000000000000000000000000000000000000000 --- a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature5/feature5/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/testHapNoSo/hapSectionContainso2/feature5/feature5/src/main/module.json5 b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature5/feature5/src/main/module.json5 deleted file mode 100644 index 41dafed1e341d8891f45cb8b16d539b0819a2385..0000000000000000000000000000000000000000 --- a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature5/feature5/src/main/module.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. - */ - -{ - "module": { - "abilities": [ - { - "description": "$string:MainAbility_desc", - "icon": "$media:icon", - "label": "$string:MainAbility_label", - "name": "MainAbility", - "skills": [ - { - "actions": [ - "action.system.home" - ], - "entities": [ - "entity.system.home" - ] - } - ], - "srcEntry": "./ets/MainAbility/MainAbility.ts", - "exported": true, - "startWindowIcon": "$media:icon", - "startWindowBackground": "$color:icon" - } - ], - "deliveryWithInstall": true, - "description": "$string:entry_desc", - "deviceTypes": [ - "2in1", - "default", - "tablet" - ], - "installationFree": false, - "mainElement": "MainAbility", - "name": "feature5", - "pages": "$profile:main_pages", - "srcEntry": "./ets/Application/AbilityStage.ts", - "type": "feature", - "virtualMachine": "ark", - "compressNativeLibs": false, - "extractNativeLibs": false, - "libIsolation": true - } -} \ No newline at end of file diff --git a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature5/feature5/src/main/resources/base/element/color.json b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature5/feature5/src/main/resources/base/element/color.json deleted file mode 100644 index c6a43ee62ce2e1f2d3f8e6e22c8469638f096841..0000000000000000000000000000000000000000 --- a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature5/feature5/src/main/resources/base/element/color.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "color": [ - { - "name": "icon", - "value": "#99999999" - } - ] -} \ No newline at end of file diff --git a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature5/feature5/src/main/resources/base/media/app_icon.png b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature5/feature5/src/main/resources/base/media/app_icon.png deleted file mode 100644 index ce307a8827bd75456441ceb57d530e4c8d45d36c..0000000000000000000000000000000000000000 Binary files a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature5/feature5/src/main/resources/base/media/app_icon.png and /dev/null differ diff --git a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature5/hvigor/hvigor-config.json5 b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature5/hvigor/hvigor-config.json5 deleted file mode 100644 index c61d3eed60978a00d9a67b754ec36c0c9dcde929..0000000000000000000000000000000000000000 --- a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature5/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/testHapNoSo/hapSectionContainso2/feature5/hvigorfile.ts b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature5/hvigorfile.ts deleted file mode 100644 index e3340f07e45ddc5dcadbb87012668555def2e6e0..0000000000000000000000000000000000000000 --- a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature5/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/testHapNoSo/hapSectionContainso2/feature5/oh-package.json5 b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature5/oh-package.json5 deleted file mode 100644 index 15ec86a73e760904339e9269d493e3015429d8a2..0000000000000000000000000000000000000000 --- a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature5/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/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature6/feature6/src/main/ets/Application/AbilityStage.ts b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature5/src/main/ets/Application/AbilityStage.ts similarity index 94% rename from test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature6/feature6/src/main/ets/Application/AbilityStage.ts rename to test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature5/src/main/ets/Application/AbilityStage.ts index 1e523cb3c36e2c6b2d9fa913f2abc83764f0ab2c..95090c6854b1bbbcce83d3bf0674d07096bacd9e 100644 --- a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature6/feature6/src/main/ets/Application/AbilityStage.ts +++ b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature5/src/main/ets/Application/AbilityStage.ts @@ -1,5 +1,5 @@ /* - * Copyright (c) 2025 Huawei Device Co., Ltd. + * Copyright (c) 2023 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 diff --git a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature4/feature4/src/main/ets/MainAbility/MainAbility.ts b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature5/src/main/ets/MainAbility/MainAbility.ts similarity index 97% rename from test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature4/feature4/src/main/ets/MainAbility/MainAbility.ts rename to test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature5/src/main/ets/MainAbility/MainAbility.ts index 7e1517570598d19b64079e2671e51715d0ccc7c5..fffec61ab03fe9ca78edadf220de42ad94935e89 100644 --- a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature4/feature4/src/main/ets/MainAbility/MainAbility.ts +++ b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature5/src/main/ets/MainAbility/MainAbility.ts @@ -1,5 +1,5 @@ /* - * Copyright (c) 2025 Huawei Device Co., Ltd. + * Copyright (c) 2023 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 diff --git a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature5/feature5/src/main/ets/pages/index.ets b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature5/src/main/ets/pages/index.ets similarity index 79% rename from test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature5/feature5/src/main/ets/pages/index.ets rename to test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature5/src/main/ets/pages/index.ets index 51fb34a200697b986644da446ecddd9253ba5548..f26a7f435e0512667ac6c1969c720c58dc237d07 100644 --- a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature5/feature5/src/main/ets/pages/index.ets +++ b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature5/src/main/ets/pages/index.ets @@ -1,5 +1,5 @@ /* - * Copyright (c) 2025 Huawei Device Co., Ltd. + * Copyright (c) 2023 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/testHapNoSo/hapSectionContainso2/feature5/src/main/module.json b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature5/src/main/module.json new file mode 100644 index 0000000000000000000000000000000000000000..4d65b381a10926c0f926952636f424d8f941c445 --- /dev/null +++ b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature5/src/main/module.json @@ -0,0 +1,46 @@ +{ + "module": { + "abilities": [ + { + "description": "$string:MainAbility_desc", + "descriptionId": 16777218, + "icon": "$media:icon", + "iconId": 16777221, + "label": "$string:MainAbility_label", + "labelId": 16777219, + "name": "MainAbility", + "skills": [ + { + "actions": [ + "action.system.home" + ], + "entities": [ + "entity.system.home" + ] + } + ], + "srcEntry": "./ets/MainAbility/MainAbility.ts", + "exported": true + } + ], + "deliveryWithInstall": true, + "description": "$string:entry_desc", + "descriptionId": 16777220, + "deviceTypes": [ + "2in1", + "default", + "phone", + "tablet" + ], + "installationFree": false, + "mainElement": "MainAbility", + "name": "feature5", + "pages": "$profile:main_pages", + "srcEntry": "./ets/Application/AbilityStage.ts", + "type": "feature", + "virtualMachine": "ark", + "compressNativeLibs": false, + "extractNativeLibs": false, + "libIsolation": true + } +} \ No newline at end of file diff --git a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature5/feature5/src/main/resources/base/element/string.json b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature5/src/main/resources/base/element/string.json similarity index 100% rename from test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature5/feature5/src/main/resources/base/element/string.json rename to test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature5/src/main/resources/base/element/string.json diff --git a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature4/AppScope/resources/base/media/app_icon.png b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature5/src/main/resources/base/media/app_icon.png similarity index 100% rename from test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature4/AppScope/resources/base/media/app_icon.png rename to test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature5/src/main/resources/base/media/app_icon.png diff --git a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature5/feature5/src/main/resources/base/media/icon.png b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature5/src/main/resources/base/media/icon.png similarity index 100% rename from test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature5/feature5/src/main/resources/base/media/icon.png rename to test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature5/src/main/resources/base/media/icon.png diff --git a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature5/feature5/src/main/resources/base/profile/main_pages.json b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature5/src/main/resources/base/profile/main_pages.json similarity index 100% rename from test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature5/feature5/src/main/resources/base/profile/main_pages.json rename to test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature5/src/main/resources/base/profile/main_pages.json diff --git a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature6/AppScope/app.json5 b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature6/AppScope/app.json5 deleted file mode 100644 index bb1e00c7df9353dc582ac392fcc40b0d45dea0e1..0000000000000000000000000000000000000000 --- a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature6/AppScope/app.json5 +++ /dev/null @@ -1,28 +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": { - "bundleName": "com.example.hapSectionContainso2", - "debug": true, - "icon": "$media:app_icon", - "label": "$string:app_name", - "minAPIVersion": 9, - "targetAPIVersion": 16, - "vendor": "example", - "versionCode": 1000000, - "versionName": "1.0.0" - } -} diff --git a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature6/AppScope/resources/base/element/string.json b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature6/AppScope/resources/base/element/string.json deleted file mode 100644 index ee69f9a861d9dc269ed6638735d52674583498e1..0000000000000000000000000000000000000000 --- a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature6/AppScope/resources/base/element/string.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "string":[ - { - "name":"app_name", - "value":"ohosProject" - } - ] -} \ No newline at end of file diff --git a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature6/AppScope/resources/base/media/app_icon.png b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature6/AppScope/resources/base/media/app_icon.png deleted file mode 100644 index ce307a8827bd75456441ceb57d530e4c8d45d36c..0000000000000000000000000000000000000000 Binary files a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature6/AppScope/resources/base/media/app_icon.png and /dev/null differ diff --git a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature6/BUILD.gn b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature6/BUILD.gn index 55ca7b5d2e081f5d9a85021414ff28299f7cd6c5..d9adee1061e4829057f951ce2f53ec5d0e11360a 100644 --- a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature6/BUILD.gn +++ b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature6/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2023-2025 Huawei Device Co., Ltd. +# Copyright (c) 2023 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,36 +14,47 @@ import("//build/ohos.gni") import("../../../../../../appexecfwk.gni") -ohos_app("hapSectionContainsoFeature6") { - certificate_profile = "${bundle_framework_path}/test/sceneProject/signature/com.example.hapSectionContainso2.p7b" +ohos_hap("hapSectionContainsoFeature6") { + hap_profile = "src/main/module.json" hap_name = "hapSectionContainsoFeature6" - hap_out_dir = "$root_out_dir/tests/systemtest/bundle_framework/bundle_framework/resource/testHapNoSo" - subsystem_name = "bundlemanager" - part_name = "bundle_framework" - - js_build_mode = "release" - sdk_home = "//prebuilts/ohos-sdk/linux" - sdk_type_name = [ "sdk.dir" ] - assemble_type = "assembleHap" - build_level = "module" - system_lib_deps = [ + final_hap_path = "$root_out_dir/tests/systemtest/bundle_framework/bundle_framework/resource/testHapNoSo/${hap_name}.hap" + testonly = true + deps = [ + ":hjs_demo_js_assets", + ":hjs_demo_resources", + ] + shared_libraries = [ ":hapSectionContainso7", ":hapSectionContainso8", ] - module_libs_dir = "feature6" - build_modules = [ "feature6" ] + certificate_profile = "${bundle_framework_path}/test/sceneProject/signature/com.example.hapSectionContainso2.p7b" +} + +ohos_app_scope("bmsstagedemoone_app_profile") { + app_profile = "../AppScope/app.json" + sources = [ "../AppScope/resources" ] +} + +ohos_resources("hjs_demo_resources") { + sources = [ "src/main/resources" ] + deps = [ ":bmsstagedemoone_app_profile" ] + hap_profile = "src/main/module.json" +} + +ohos_js_assets("hjs_demo_js_assets") { + source_dir = "src/main/ets" } ohos_shared_library("hapSectionContainso7") { - sources = [ "feature6/src/main/cpp/hapSectionContainso7.cpp" ] + sources = [ "src/main/cpp/hapSectionContainso7.cpp" ] visibility = [ ":*" ] subsystem_name = "bundlemanager" part_name = "bundle_framework" } ohos_shared_library("hapSectionContainso8") { - sources = [ "feature6/src/main/cpp/hapSectionContainso8.cpp" ] + sources = [ "src/main/cpp/hapSectionContainso8.cpp" ] visibility = [ ":*" ] subsystem_name = "bundlemanager" part_name = "bundle_framework" diff --git a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature6/build-profile.json5 b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature6/build-profile.json5 deleted file mode 100644 index 0924f444bf157431bc1d0be9fedd3bb7fe2d2280..0000000000000000000000000000000000000000 --- a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature6/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": "feature6", - "srcPath": "./feature6", - "targets": [ - { - "name": "default", - "applyToProducts": [ - "default" - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature6/feature6/build-profile.json5 b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature6/feature6/build-profile.json5 deleted file mode 100644 index b4d65d490ef6cbe22d933b9231555210f1555786..0000000000000000000000000000000000000000 --- a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature6/feature6/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/testHapNoSo/hapSectionContainso2/feature6/feature6/hvigorfile.ts b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature6/feature6/hvigorfile.ts deleted file mode 100644 index cfa8a00f74f409d9647f55cdf270ab6aec69fe41..0000000000000000000000000000000000000000 --- a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature6/feature6/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/testHapNoSo/hapSectionContainso2/feature6/feature6/obfuscation-rules.txt b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature6/feature6/obfuscation-rules.txt deleted file mode 100644 index c1d419bdc6fa72c5914cc864ede925c53a2b01c5..0000000000000000000000000000000000000000 --- a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature6/feature6/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/testHapNoSo/hapSectionContainso2/feature6/feature6/oh-package.json5 b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature6/feature6/oh-package.json5 deleted file mode 100644 index 4bf3e2a9b1ae7381cf9363dff1cbcc1861a41e7b..0000000000000000000000000000000000000000 --- a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature6/feature6/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/testHapNoSo/hapSectionContainso2/feature6/feature6/src/main/module.json5 b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature6/feature6/src/main/module.json5 deleted file mode 100644 index ded9fb62b97c7f3f782e9bc6f6c398f52964c43f..0000000000000000000000000000000000000000 --- a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature6/feature6/src/main/module.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. - */ - -{ - "module": { - "abilities": [ - { - "description": "$string:MainAbility_desc", - "icon": "$media:icon", - "label": "$string:MainAbility_label", - "name": "MainAbility", - "skills": [ - { - "actions": [ - "action.system.home" - ], - "entities": [ - "entity.system.home" - ] - } - ], - "srcEntry": "./ets/MainAbility/MainAbility.ts", - "exported": true, - "startWindowIcon": "$media:icon", - "startWindowBackground": "$color:icon" - } - ], - "deliveryWithInstall": true, - "description": "$string:entry_desc", - "deviceTypes": [ - "2in1", - "default", - "tablet" - ], - "installationFree": false, - "mainElement": "MainAbility", - "name": "feature6", - "pages": "$profile:main_pages", - "srcEntry": "./ets/Application/AbilityStage.ts", - "type": "feature", - "virtualMachine": "ark", - "compressNativeLibs": false, - "extractNativeLibs": false, - "libIsolation": true - } -} \ No newline at end of file diff --git a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature6/feature6/src/main/resources/base/element/color.json b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature6/feature6/src/main/resources/base/element/color.json deleted file mode 100644 index c6a43ee62ce2e1f2d3f8e6e22c8469638f096841..0000000000000000000000000000000000000000 --- a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature6/feature6/src/main/resources/base/element/color.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "color": [ - { - "name": "icon", - "value": "#99999999" - } - ] -} \ No newline at end of file diff --git a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature6/feature6/src/main/resources/base/media/app_icon.png b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature6/feature6/src/main/resources/base/media/app_icon.png deleted file mode 100644 index ce307a8827bd75456441ceb57d530e4c8d45d36c..0000000000000000000000000000000000000000 Binary files a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature6/feature6/src/main/resources/base/media/app_icon.png and /dev/null differ diff --git a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature6/hvigor/hvigor-config.json5 b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature6/hvigor/hvigor-config.json5 deleted file mode 100644 index c61d3eed60978a00d9a67b754ec36c0c9dcde929..0000000000000000000000000000000000000000 --- a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature6/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/testHapNoSo/hapSectionContainso2/feature6/hvigorfile.ts b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature6/hvigorfile.ts deleted file mode 100644 index e3340f07e45ddc5dcadbb87012668555def2e6e0..0000000000000000000000000000000000000000 --- a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature6/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/testHapNoSo/hapSectionContainso2/feature6/oh-package.json5 b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature6/oh-package.json5 deleted file mode 100644 index 15ec86a73e760904339e9269d493e3015429d8a2..0000000000000000000000000000000000000000 --- a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature6/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/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature6/feature6/src/main/cpp/hapSectionContainso7.cpp b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature6/src/main/cpp/hapSectionContainso7.cpp similarity index 93% rename from test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature6/feature6/src/main/cpp/hapSectionContainso7.cpp rename to test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature6/src/main/cpp/hapSectionContainso7.cpp index 8549727ada757431892aca8319e4400e25129fd1..a95da5ecdc77f5021b50484ef3006eceb0d82cd0 100644 --- a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature6/feature6/src/main/cpp/hapSectionContainso7.cpp +++ b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature6/src/main/cpp/hapSectionContainso7.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2025 Huawei Device Co., Ltd. + * Copyright (c) 2023 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 diff --git a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature6/feature6/src/main/cpp/hapSectionContainso8.cpp b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature6/src/main/cpp/hapSectionContainso8.cpp similarity index 93% rename from test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature6/feature6/src/main/cpp/hapSectionContainso8.cpp rename to test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature6/src/main/cpp/hapSectionContainso8.cpp index c17c0e5b41ef0d1531662dd8343c785400ce5869..b764017b1c1810e723cc7618e9bf377e4f753889 100644 --- a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature6/feature6/src/main/cpp/hapSectionContainso8.cpp +++ b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature6/src/main/cpp/hapSectionContainso8.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2025 Huawei Device Co., Ltd. + * Copyright (c) 2023 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 diff --git a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature5/feature5/src/main/ets/Application/AbilityStage.ts b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature6/src/main/ets/Application/AbilityStage.ts similarity index 94% rename from test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature5/feature5/src/main/ets/Application/AbilityStage.ts rename to test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature6/src/main/ets/Application/AbilityStage.ts index 1e523cb3c36e2c6b2d9fa913f2abc83764f0ab2c..95090c6854b1bbbcce83d3bf0674d07096bacd9e 100644 --- a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature5/feature5/src/main/ets/Application/AbilityStage.ts +++ b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature6/src/main/ets/Application/AbilityStage.ts @@ -1,5 +1,5 @@ /* - * Copyright (c) 2025 Huawei Device Co., Ltd. + * Copyright (c) 2023 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 diff --git a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature6/feature6/src/main/ets/MainAbility/MainAbility.ts b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature6/src/main/ets/MainAbility/MainAbility.ts similarity index 97% rename from test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature6/feature6/src/main/ets/MainAbility/MainAbility.ts rename to test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature6/src/main/ets/MainAbility/MainAbility.ts index 7e1517570598d19b64079e2671e51715d0ccc7c5..fffec61ab03fe9ca78edadf220de42ad94935e89 100644 --- a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature6/feature6/src/main/ets/MainAbility/MainAbility.ts +++ b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature6/src/main/ets/MainAbility/MainAbility.ts @@ -1,5 +1,5 @@ /* - * Copyright (c) 2025 Huawei Device Co., Ltd. + * Copyright (c) 2023 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 diff --git a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature6/feature6/src/main/ets/pages/index.ets b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature6/src/main/ets/pages/index.ets similarity index 79% rename from test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature6/feature6/src/main/ets/pages/index.ets rename to test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature6/src/main/ets/pages/index.ets index 51fb34a200697b986644da446ecddd9253ba5548..f26a7f435e0512667ac6c1969c720c58dc237d07 100644 --- a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature6/feature6/src/main/ets/pages/index.ets +++ b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature6/src/main/ets/pages/index.ets @@ -1,5 +1,5 @@ /* - * Copyright (c) 2025 Huawei Device Co., Ltd. + * Copyright (c) 2023 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/testHapNoSo/hapSectionContainso2/feature6/src/main/module.json b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature6/src/main/module.json new file mode 100644 index 0000000000000000000000000000000000000000..cd3536c7dc2a4ab22f5f0feef1782ff8d4786e29 --- /dev/null +++ b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature6/src/main/module.json @@ -0,0 +1,46 @@ +{ + "module": { + "abilities": [ + { + "description": "$string:MainAbility_desc", + "descriptionId": 16777218, + "icon": "$media:icon", + "iconId": 16777221, + "label": "$string:MainAbility_label", + "labelId": 16777219, + "name": "MainAbility", + "skills": [ + { + "actions": [ + "action.system.home" + ], + "entities": [ + "entity.system.home" + ] + } + ], + "srcEntry": "./ets/MainAbility/MainAbility.ts", + "exported": true + } + ], + "deliveryWithInstall": true, + "description": "$string:entry_desc", + "descriptionId": 16777220, + "deviceTypes": [ + "2in1", + "default", + "phone", + "tablet" + ], + "installationFree": false, + "mainElement": "MainAbility", + "name": "feature6", + "pages": "$profile:main_pages", + "srcEntry": "./ets/Application/AbilityStage.ts", + "type": "feature", + "virtualMachine": "ark", + "compressNativeLibs": false, + "extractNativeLibs": false, + "libIsolation": true + } +} \ No newline at end of file diff --git a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature6/feature6/src/main/resources/base/element/string.json b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature6/src/main/resources/base/element/string.json similarity index 100% rename from test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature6/feature6/src/main/resources/base/element/string.json rename to test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature6/src/main/resources/base/element/string.json diff --git a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature4/feature4/src/main/resources/base/media/app_icon.png b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature6/src/main/resources/base/media/app_icon.png similarity index 100% rename from test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature4/feature4/src/main/resources/base/media/app_icon.png rename to test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature6/src/main/resources/base/media/app_icon.png diff --git a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature6/feature6/src/main/resources/base/media/icon.png b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature6/src/main/resources/base/media/icon.png similarity index 100% rename from test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature6/feature6/src/main/resources/base/media/icon.png rename to test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature6/src/main/resources/base/media/icon.png diff --git a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature6/feature6/src/main/resources/base/profile/main_pages.json b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature6/src/main/resources/base/profile/main_pages.json similarity index 100% rename from test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature6/feature6/src/main/resources/base/profile/main_pages.json rename to test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/feature6/src/main/resources/base/profile/main_pages.json diff --git a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/hvigor/hvigor-config.json5 b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/hvigor/hvigor-config.json5 deleted file mode 100644 index c61d3eed60978a00d9a67b754ec36c0c9dcde929..0000000000000000000000000000000000000000 --- a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/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/testHapNoSo/hapSectionContainso2/hvigorfile.ts b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/hvigorfile.ts deleted file mode 100644 index e3340f07e45ddc5dcadbb87012668555def2e6e0..0000000000000000000000000000000000000000 --- a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/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/testHapNoSo/hapSectionContainso2/oh-package.json5 b/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/oh-package.json5 deleted file mode 100644 index 15ec86a73e760904339e9269d493e3015429d8a2..0000000000000000000000000000000000000000 --- a/test/sceneProject/systemtest/testHapNoSo/hapSectionContainso2/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/sceneProject/systemtest/testOverlay/target_module_feature1/AppScope/app.json5 b/test/sceneProject/systemtest/testOverlay/target_module_feature1/AppScope/app.json similarity index 36% rename from test/sceneProject/systemtest/testOverlay/target_module_feature1/AppScope/app.json5 rename to test/sceneProject/systemtest/testOverlay/target_module_feature1/AppScope/app.json index 097801574242c9d49b601ec492c22dd237f03411..f0c3cd2a5193f34e25a2376657032556268b9a65 100644 --- a/test/sceneProject/systemtest/testOverlay/target_module_feature1/AppScope/app.json5 +++ b/test/sceneProject/systemtest/testOverlay/target_module_feature1/AppScope/app.json @@ -1,24 +1,12 @@ -/* - * 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": { + "apiReleaseType": "Release", "bundleName": "com.example.internalOverlayTest1", "debug": true, "icon": "$media:app_icon", + "iconId": 16777217, "label": "$string:app_name", + "labelId": 16777216, "minAPIVersion": 9, "targetAPIVersion": 9, "vendor": "example", diff --git a/test/sceneProject/systemtest/testOverlay/target_module_feature1/AppScope/resources/base/media/app_icon.png b/test/sceneProject/systemtest/testOverlay/target_module_feature1/AppScope/resources/base/media/app_icon.png deleted file mode 100644 index ce307a8827bd75456441ceb57d530e4c8d45d36c..0000000000000000000000000000000000000000 Binary files a/test/sceneProject/systemtest/testOverlay/target_module_feature1/AppScope/resources/base/media/app_icon.png and /dev/null differ diff --git a/test/sceneProject/systemtest/testOverlay/target_module_feature1/BUILD.gn b/test/sceneProject/systemtest/testOverlay/target_module_feature1/BUILD.gn index d8740d6241ef68d21c843ff74a455dcdf8952c2e..22055fae8ba72fac466b7b3211629cf8977d0dfa 100644 --- a/test/sceneProject/systemtest/testOverlay/target_module_feature1/BUILD.gn +++ b/test/sceneProject/systemtest/testOverlay/target_module_feature1/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2023-2025 Huawei Device Co., Ltd. +# Copyright (c) 2023 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("feature1_hap") { - certificate_profile = "${bundle_framework_path}/test/sceneProject/signature/com.example.internalOverlayTest1.p7b" +ohos_hap("feature1_hap") { + hap_profile = "entry/src/main/module.json" hap_name = "feature1_hap" - hap_out_dir = "$root_out_dir/tests/systemtest/bundle_framework/bundle_framework/resource/testOverlay/internal" - subsystem_name = "bundlemanager" - part_name = "bundle_framework" + final_hap_path = "$root_out_dir/tests/systemtest/bundle_framework/bundle_framework/resource/testOverlay/internal/${hap_name}.hap" + testonly = true + deps = [ + ":hjs_demo_js_assets", + ":hjs_demo_resources", + ] + certificate_profile = "${bundle_framework_path}/test/sceneProject/signature/com.example.internalOverlayTest1.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 = "assembleHar" - build_level = "module" - build_modules = [ "feature" ] +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/testOverlay/target_module_feature1/build-profile.json5 b/test/sceneProject/systemtest/testOverlay/target_module_feature1/build-profile.json5 deleted file mode 100644 index 7d37be427c510929416c3035c0a08d8e8d287db5..0000000000000000000000000000000000000000 --- a/test/sceneProject/systemtest/testOverlay/target_module_feature1/build-profile.json5 +++ /dev/null @@ -1,44 +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", - "compatibleSdkVersion": 20, - "compileSdkVersion": 20, - "targetSdkVersion": 20, - "runtimeOS": "OpenHarmony" - } - ] - }, - "modules": [ - { - "name": "feature", - "srcPath": "./entry", - "targets": [ - { - "name": "default", - "applyToProducts": [ - "default" - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/test/sceneProject/systemtest/testOverlay/target_module_feature1/entry/build-profile.json5 b/test/sceneProject/systemtest/testOverlay/target_module_feature1/entry/build-profile.json5 deleted file mode 100644 index b4d65d490ef6cbe22d933b9231555210f1555786..0000000000000000000000000000000000000000 --- a/test/sceneProject/systemtest/testOverlay/target_module_feature1/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/testOverlay/target_module_feature1/entry/hvigorfile.ts b/test/sceneProject/systemtest/testOverlay/target_module_feature1/entry/hvigorfile.ts deleted file mode 100644 index e4f43d54667f8327c367c8096bd08bb8c75aff54..0000000000000000000000000000000000000000 --- a/test/sceneProject/systemtest/testOverlay/target_module_feature1/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. */ -} diff --git a/test/sceneProject/systemtest/testOverlay/target_module_feature1/entry/obfuscation-rules.txt b/test/sceneProject/systemtest/testOverlay/target_module_feature1/entry/obfuscation-rules.txt deleted file mode 100644 index c1d419bdc6fa72c5914cc864ede925c53a2b01c5..0000000000000000000000000000000000000000 --- a/test/sceneProject/systemtest/testOverlay/target_module_feature1/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/testOverlay/target_module_feature1/entry/oh-package.json5 b/test/sceneProject/systemtest/testOverlay/target_module_feature1/entry/oh-package.json5 deleted file mode 100644 index dcf2e958e54605b86ace9cea5bde8dc634b4f645..0000000000000000000000000000000000000000 --- a/test/sceneProject/systemtest/testOverlay/target_module_feature1/entry/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. - */ - -{ - "name": "feature", - "version": "1.0.0", - "description": "Please describe the basic information.", - "main": "", - "author": "", - "license": "", - "dependencies": {} -} \ No newline at end of file diff --git a/test/sceneProject/systemtest/BundleClient/bundleClient1/oh-package.json5 b/test/sceneProject/systemtest/testOverlay/target_module_feature1/entry/src/main/cpp/hapso1.cpp similarity index 70% rename from test/sceneProject/systemtest/BundleClient/bundleClient1/oh-package.json5 rename to test/sceneProject/systemtest/testOverlay/target_module_feature1/entry/src/main/cpp/hapso1.cpp index 15ec86a73e760904339e9269d493e3015429d8a2..7b6396f42870f9d96622a829408a429327b1b553 100644 --- a/test/sceneProject/systemtest/BundleClient/bundleClient1/oh-package.json5 +++ b/test/sceneProject/systemtest/testOverlay/target_module_feature1/entry/src/main/cpp/hapso1.cpp @@ -1,24 +1,20 @@ -/* - * 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" - } -} +/* + * Copyright (c) 2023 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. + */ + +namespace OHOS { +namespace AppExecFwk { +void HapSo1() {} +} // namespace AppExecFwk +} // namespace OHOS diff --git a/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso4/oh-package.json5 b/test/sceneProject/systemtest/testOverlay/target_module_feature1/entry/src/main/cpp/hapso2.cpp similarity index 70% rename from test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso4/oh-package.json5 rename to test/sceneProject/systemtest/testOverlay/target_module_feature1/entry/src/main/cpp/hapso2.cpp index 15ec86a73e760904339e9269d493e3015429d8a2..0467c3be2c0831ce24afda5e8c2d3ce6ee17dba0 100644 --- a/test/sceneProject/systemtest/testHapNoSo/hapNotIncludeso4/oh-package.json5 +++ b/test/sceneProject/systemtest/testOverlay/target_module_feature1/entry/src/main/cpp/hapso2.cpp @@ -1,24 +1,20 @@ -/* - * 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" - } -} +/* + * Copyright (c) 2023 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. + */ + +namespace OHOS { +namespace AppExecFwk { +void HapSo2() {} +} // namespace AppExecFwk +} // namespace OHOS diff --git a/test/sceneProject/systemtest/testOverlay/target_module_feature1/entry/src/main/ets/pages/index.ets b/test/sceneProject/systemtest/testOverlay/target_module_feature1/entry/src/main/ets/pages/index.ets index ee23703d08fb0a93e747dbb955e860271fdbcc90..f26a7f435e0512667ac6c1969c720c58dc237d07 100644 --- a/test/sceneProject/systemtest/testOverlay/target_module_feature1/entry/src/main/ets/pages/index.ets +++ b/test/sceneProject/systemtest/testOverlay/target_module_feature1/entry/src/main/ets/pages/index.ets @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023-2025 Huawei Device Co., Ltd. + * Copyright (c) 2023 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/testOverlay/target_module_feature1/entry/src/main/module.json5 b/test/sceneProject/systemtest/testOverlay/target_module_feature1/entry/src/main/module.json similarity index 40% rename from test/sceneProject/systemtest/testOverlay/target_module_feature1/entry/src/main/module.json5 rename to test/sceneProject/systemtest/testOverlay/target_module_feature1/entry/src/main/module.json index c7a10ba4eb1aab06681e94fca84ddd16950e1068..efda9aa197fb9234796125fbc16e2827af36ffb1 100644 --- a/test/sceneProject/systemtest/testOverlay/target_module_feature1/entry/src/main/module.json5 +++ b/test/sceneProject/systemtest/testOverlay/target_module_feature1/entry/src/main/module.json @@ -1,21 +1,6 @@ -/* - * 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": { - "installationFree": false, + "installaitonFree": false, "mainElement": "MainAbility", "name": "feature", "pages": "$profile:main_pages", @@ -26,12 +11,12 @@ "libIsolation": true, "deliveryWithInstall": true, "description": "$string:entry_desc", + "descriptionId": 16777220, "deviceTypes": [ "2in1", "default", - "tablet", - "tv", - "wearable" + "phone", + "tablet" ] } } \ No newline at end of file diff --git a/test/sceneProject/systemtest/testOverlay/target_module_feature1/hvigor/hvigor-config.json5 b/test/sceneProject/systemtest/testOverlay/target_module_feature1/hvigor/hvigor-config.json5 deleted file mode 100644 index c61d3eed60978a00d9a67b754ec36c0c9dcde929..0000000000000000000000000000000000000000 --- a/test/sceneProject/systemtest/testOverlay/target_module_feature1/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/testOverlay/target_module_feature1/hvigorfile.ts b/test/sceneProject/systemtest/testOverlay/target_module_feature1/hvigorfile.ts deleted file mode 100644 index 2a5e543f190732c159beb574dfc9fa37bc94e156..0000000000000000000000000000000000000000 --- a/test/sceneProject/systemtest/testOverlay/target_module_feature1/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. */ -} diff --git a/test/sceneProject/systemtest/testOverlay/target_module_feature1/oh-package.json5 b/test/sceneProject/systemtest/testOverlay/target_module_feature1/oh-package.json5 deleted file mode 100644 index 15ec86a73e760904339e9269d493e3015429d8a2..0000000000000000000000000000000000000000 --- a/test/sceneProject/systemtest/testOverlay/target_module_feature1/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);