diff --git a/aafwk/aafwk_standard/BUILD.gn b/aafwk/aafwk_standard/BUILD.gn index ea4c604ad325ef1ba0abc8a27372fd56d0a7a06d..a2c500a7555033a4bd65e9132f67b390f42d7bc3 100755 --- a/aafwk/aafwk_standard/BUILD.gn +++ b/aafwk/aafwk_standard/BUILD.gn @@ -25,7 +25,6 @@ group("aafwk_standard") { "actsabilitydistributetest:ActsAbilityDistributeTest", "actsabilitydistributetest:ActsAbilityDistributeTest", "actsabilitymanageretstest:ActsAbilityManagerEtsTest", - "amsZipfileUnzipfileST:ActsZlibTest", "amsabilitymanager/amsMissionSnapshotTest:ActsAmsMissionSnapshotTest", "amsabilitymanager/amsMissionSnapshotTestSingleton:ActsAmsMissionSnapshotTestSingleton", "amsabilitymanager/amsMissionSnapshotTestSingletonS:ActsAmsMissionSnapshotTestSingletonS", diff --git a/aafwk/aafwk_standard/amsZipfileUnzipfileST/.gitignore b/aafwk/aafwk_standard/amsZipfileUnzipfileST/.gitignore deleted file mode 100644 index 52c0fa2ebccc570f0beb3e329e1fea389f7676e0..0000000000000000000000000000000000000000 --- a/aafwk/aafwk_standard/amsZipfileUnzipfileST/.gitignore +++ /dev/null @@ -1,16 +0,0 @@ -*.iml -.gradle -/local.properties -/.idea/caches -/.idea/libraries -/.idea/modules.xml -/.idea/workspace.xml -/.idea/navEditor.xml -/.idea/assetWizardSettings.xml -.DS_Store -/build -/captures -.externalNativeBuild -/entry/.preview -.cxx -/node_modules diff --git a/aafwk/aafwk_standard/amsZipfileUnzipfileST/.idea/.gitignore b/aafwk/aafwk_standard/amsZipfileUnzipfileST/.idea/.gitignore deleted file mode 100644 index eaf91e2ac647df635a09f01b8a2a254252aae8d7..0000000000000000000000000000000000000000 --- a/aafwk/aafwk_standard/amsZipfileUnzipfileST/.idea/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml diff --git a/aafwk/aafwk_standard/amsZipfileUnzipfileST/.idea/compiler.xml b/aafwk/aafwk_standard/amsZipfileUnzipfileST/.idea/compiler.xml deleted file mode 100644 index 7d7ec2eaff970ea468433aae59edca2f9f6ae6a5..0000000000000000000000000000000000000000 --- a/aafwk/aafwk_standard/amsZipfileUnzipfileST/.idea/compiler.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/aafwk/aafwk_standard/amsZipfileUnzipfileST/.idea/gradle.xml b/aafwk/aafwk_standard/amsZipfileUnzipfileST/.idea/gradle.xml deleted file mode 100644 index bd281968de3d79b380603a0382778d7a702526ca..0000000000000000000000000000000000000000 --- a/aafwk/aafwk_standard/amsZipfileUnzipfileST/.idea/gradle.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/aafwk/aafwk_standard/amsZipfileUnzipfileST/.idea/jarRepositories.xml b/aafwk/aafwk_standard/amsZipfileUnzipfileST/.idea/jarRepositories.xml deleted file mode 100644 index d76bbd8a2d2027c2dface071abe1f6b139d806d2..0000000000000000000000000000000000000000 --- a/aafwk/aafwk_standard/amsZipfileUnzipfileST/.idea/jarRepositories.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/aafwk/aafwk_standard/amsZipfileUnzipfileST/.idea/misc.xml b/aafwk/aafwk_standard/amsZipfileUnzipfileST/.idea/misc.xml deleted file mode 100644 index 9883d055f8725da2d0f5c1cecc525b815e5dfcec..0000000000000000000000000000000000000000 --- a/aafwk/aafwk_standard/amsZipfileUnzipfileST/.idea/misc.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/aafwk/aafwk_standard/amsZipfileUnzipfileST/entry/.gitignore b/aafwk/aafwk_standard/amsZipfileUnzipfileST/entry/.gitignore deleted file mode 100644 index f77260b1509284d42a7f8a2449ad1e8f4b489a3a..0000000000000000000000000000000000000000 --- a/aafwk/aafwk_standard/amsZipfileUnzipfileST/entry/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/build -/node_modules diff --git a/aafwk/aafwk_standard/amsZipfileUnzipfileST/entry/src/main/config.json b/aafwk/aafwk_standard/amsZipfileUnzipfileST/entry/src/main/config.json deleted file mode 100644 index c296a6f20efd97a2ade730897fe966143d74642c..0000000000000000000000000000000000000000 --- a/aafwk/aafwk_standard/amsZipfileUnzipfileST/entry/src/main/config.json +++ /dev/null @@ -1,92 +0,0 @@ -{ - "app": { - "bundleName": "com.example.amsZipfileUnzipfileST", - "vendor": "example", - "version": { - "code": 1000000, - "name": "1.0.0" - } - }, - "deviceConfig": {}, - "module": { - "package": "com.example.amsZipfileUnzipfileST", - "name": ".MyApplication", - "mainAbility": "com.example.amsZipfileUnzipfileST.MainAbility", - "deviceType": [ - "phone", - "tablet", - "tv", - "wearable" - ], - "distro": { - "deliveryWithInstall": true, - "moduleName": "entry", - "moduleType": "entry", - "installationFree": false - }, - "abilities": [ - { - "skills": [ - { - "entities": [ - "entity.system.home" - ], - "actions": [ - "action.system.home" - ] - } - ], - "visible": true, - "name": "com.example.amsZipfileUnzipfileST.MainAbility", - "icon": "$media:icon", - "description": "$string:mainability_description", - "label": "$string:entry_MainAbility", - "type": "page", - "launchType": "standard" - } - ], - "js": [ - { - "pages": [ - "pages/index/index" - ], - "name": "default", - "window": { - "designWidth": 720, - "autoDesignWidth": true - } - } - ], - "reqPermissions": [ - - { - "name":"ohos.permission.GET_BUNDLE_INFO_PRIVILEGED", - "reason":"need use ohos.permission.GET_BUNDLE_INFO_PRIVILEGED" - }, - { - "name":"ohos.permission.INSTALL_BUNDLE", - "reason":"need use ohos.permission.INSTALL_BUNDLE" - }, - { - "name":"ohos.permission.GET_BUNDLE_INFO", - "reason":"need use ohos.permission.GET_BUNDLE_INFO" - }, - { - "name":" ohos.permission.MANAGE_MISSIONS", - "reason":"need use ohos.permission.MANAGE_MISSIONS" - }, - { - "name":"ohos.permission.CHANGE_ABILITY_ENABLED_STATE", - "reason":"need use ohos.permission.CHANGE_ABILITY_ENABLED_STATE" - }, - { - "name":"ohos.permission.REMOVE_CACHE_FILES", - "reason":"need use ohos.permission.REMOVE_CACHE_FILES" - }, - { - "name":"ohos.permission.LISTEN_BUNDLE_CHANGE", - "reason":"need use ohos.permission.LISTEN_BUNDLE_CHANGE" - } - ] - } -} \ No newline at end of file diff --git a/aafwk/aafwk_standard/amsZipfileUnzipfileST/entry/src/main/js/default/app.js b/aafwk/aafwk_standard/amsZipfileUnzipfileST/entry/src/main/js/default/app.js deleted file mode 100644 index c158442201abb1888ae8fb1d57f150c5ec26c36b..0000000000000000000000000000000000000000 --- a/aafwk/aafwk_standard/amsZipfileUnzipfileST/entry/src/main/js/default/app.js +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright (c) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -export default { - onCreate() { - console.info('AceApplication onCreate'); - }, - onDestroy() { - console.info('AceApplication onDestroy'); - } -}; diff --git a/aafwk/aafwk_standard/amsZipfileUnzipfileST/entry/src/main/js/default/pages/index/index.css b/aafwk/aafwk_standard/amsZipfileUnzipfileST/entry/src/main/js/default/pages/index/index.css deleted file mode 100644 index 5bd7567028568bd522193b2519d545ca6dcf397d..0000000000000000000000000000000000000000 --- a/aafwk/aafwk_standard/amsZipfileUnzipfileST/entry/src/main/js/default/pages/index/index.css +++ /dev/null @@ -1,46 +0,0 @@ -.container { - flex-direction: column; - justify-content: center; - align-items: center; - width: 100%; - height: 100%; -} - -.title { - font-size: 40px; - color: #000000; - opacity: 0.9; -} - -@media screen and (device-type: tablet) and (orientation: landscape) { - .title { - font-size: 100px; - } -} - -@media screen and (device-type: wearable) { - .title { - font-size: 28px; - color: #FFFFFF; - } -} - -@media screen and (device-type: tv) { - .container { - background-image: url("/common/images/Wallpaper.png"); - background-size: cover; - background-repeat: no-repeat; - background-position: center; - } - - .title { - font-size: 100px; - color: #FFFFFF; - } -} - -@media screen and (device-type: phone) and (orientation: landscape) { - .title { - font-size: 60px; - } -} diff --git a/aafwk/aafwk_standard/amsZipfileUnzipfileST/entry/src/main/js/resources/base/element/string.json b/aafwk/aafwk_standard/amsZipfileUnzipfileST/entry/src/main/js/resources/base/element/string.json deleted file mode 100644 index c0dd3a09e5dcefc69f22b5e00e92296f1c3f55a5..0000000000000000000000000000000000000000 --- a/aafwk/aafwk_standard/amsZipfileUnzipfileST/entry/src/main/js/resources/base/element/string.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "string": [ - { - "name": "entry_MainAbility", - "value": "entry_MainAbility" - }, - { - "name": "mainability_description", - "value": "JS_Empty Ability" - } - ] -} \ No newline at end of file diff --git a/aafwk/aafwk_standard/amszipfileunzipfilest/entry/src/main/js/default/i18n/en-US.json b/aafwk/aafwk_standard/amszipfileunzipfilest/entry/src/main/js/default/i18n/en-US.json deleted file mode 100644 index e63c70d978a3a53be988388c87182f81785e170c..0000000000000000000000000000000000000000 --- a/aafwk/aafwk_standard/amszipfileunzipfilest/entry/src/main/js/default/i18n/en-US.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "strings": { - "hello": "Hello", - "world": "World" - } -} \ No newline at end of file diff --git a/aafwk/aafwk_standard/amszipfileunzipfilest/entry/src/main/js/default/i18n/zh-CN.json b/aafwk/aafwk_standard/amszipfileunzipfilest/entry/src/main/js/default/i18n/zh-CN.json deleted file mode 100644 index de6ee5748322f44942c1b003319d8e66c837675f..0000000000000000000000000000000000000000 --- a/aafwk/aafwk_standard/amszipfileunzipfilest/entry/src/main/js/default/i18n/zh-CN.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "strings": { - "hello": "您好", - "world": "世界" - } -} \ No newline at end of file diff --git a/aafwk/aafwk_standard/amszipfileunzipfilest/entry/src/main/js/default/pages/index/index.hml b/aafwk/aafwk_standard/amszipfileunzipfilest/entry/src/main/js/default/pages/index/index.hml deleted file mode 100644 index f64b040a5ae394dbaa5e185e1ecd4f4556b92184..0000000000000000000000000000000000000000 --- a/aafwk/aafwk_standard/amszipfileunzipfilest/entry/src/main/js/default/pages/index/index.hml +++ /dev/null @@ -1,5 +0,0 @@ -
- - {{ $t('strings.hello') }} {{ title }} - -
diff --git a/aafwk/aafwk_standard/amszipfileunzipfilest/entry/src/main/js/default/pages/index/index.js b/aafwk/aafwk_standard/amszipfileunzipfilest/entry/src/main/js/default/pages/index/index.js deleted file mode 100644 index ad355555d698b0cbc4d08d916abcaf0728f46056..0000000000000000000000000000000000000000 --- a/aafwk/aafwk_standard/amszipfileunzipfilest/entry/src/main/js/default/pages/index/index.js +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -import file from '@system.file' -import {Core, ExpectExtend, ReportExtend} from 'deccjsunit/index' - -const injecttRef = Object.getPrototypeOf(global) || global -injecttRef.regeneratorRuntime = require('@babel/runtime/regenerator') - -export default{ - data: { - title: "" - }, - onInit() { - this.title = this.$t('strings.world'); - }, - onShow() { - console.info('onShow finish') - const core = Core.getInstance() - const expectExtend = new ExpectExtend({ - 'id': 'extend' - }) - core.addService('expect', expectExtend) - core.init() - - const configService = core.getDefaultService('config') - configService.setConfig(this) - - require('../../../test/List.test.js') - core.execute() - }, - onReady() { - }, -} - diff --git a/aafwk/aafwk_standard/amszipfileunzipfilest/entry/src/main/js/resources/base/media/icon.png b/aafwk/aafwk_standard/amszipfileunzipfilest/entry/src/main/js/resources/base/media/icon.png deleted file mode 100644 index ce307a8827bd75456441ceb57d530e4c8d45d36c..0000000000000000000000000000000000000000 Binary files a/aafwk/aafwk_standard/amszipfileunzipfilest/entry/src/main/js/resources/base/media/icon.png and /dev/null differ diff --git a/aafwk/aafwk_standard/amszipfileunzipfilest/entry/src/main/js/test/List.test.js b/aafwk/aafwk_standard/amszipfileunzipfilest/entry/src/main/js/test/List.test.js deleted file mode 100644 index b5d5265591aba656f6112e40a64a7cf0f8af254d..0000000000000000000000000000000000000000 --- a/aafwk/aafwk_standard/amszipfileunzipfilest/entry/src/main/js/test/List.test.js +++ /dev/null @@ -1,15 +0,0 @@ -/* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -require('./ContextJsunit.test.js') diff --git a/aafwk/aafwk_standard/amszipfileunzipfilest/signature/openharmony_sx.p7b b/aafwk/aafwk_standard/amszipfileunzipfilest/signature/openharmony_sx.p7b deleted file mode 100644 index cc53179a48f88f20acc379c138a001e9a15838f6..0000000000000000000000000000000000000000 Binary files a/aafwk/aafwk_standard/amszipfileunzipfilest/signature/openharmony_sx.p7b and /dev/null differ diff --git a/appexecfwk/BUILD.gn b/appexecfwk/BUILD.gn index 0d49f0179c255adb0bd2186de1e110fa3d3954f5..5a5284ccba935edc6109393c1896d46f78d92d24 100644 --- a/appexecfwk/BUILD.gn +++ b/appexecfwk/BUILD.gn @@ -18,7 +18,7 @@ group("appexecfwk") { if (is_standard_system) { deps = [ "bundle_standard:bundle_standard", - "zlib/actszlibtest:ActsZlibTest", + "zlib:zlib", ] } } diff --git a/aafwk/aafwk_standard/amszipfileunzipfilest/BUILD.gn b/appexecfwk/zlib/BUILD.gn similarity index 54% rename from aafwk/aafwk_standard/amszipfileunzipfilest/BUILD.gn rename to appexecfwk/zlib/BUILD.gn index 596f51661880cbef8f637bcb9f75aa13f664aef9..030f1298e1b664abdfc7ea2e3f09ca3597232e12 100644 --- a/aafwk/aafwk_standard/amszipfileunzipfilest/BUILD.gn +++ b/appexecfwk/zlib/BUILD.gn @@ -11,21 +11,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//test/xts/tools/build/suite.gni") +import("//build/ohos_var.gni") -ohos_js_hap_suite("ActsZlibTest") { - hap_profile = "./entry/src/main/config.json" - deps = [ - ":hjs_demo_js_assets", - ":hjs_demo_resources", - ] - certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "ActsZipZlibTest" -} -ohos_js_assets("hjs_demo_js_assets") { - source_dir = "./entry/src/main/js/default" -} -ohos_resources("hjs_demo_resources") { - sources = [ "./entry/src/main/js/resources" ] - hap_profile = "./entry/src/main/config.json" +group("zlib") { + testonly = true + if (is_standard_system) { + deps = [ + "actszipfileandunzipfiletest:actszipfileandunzipfiletest", + "actszlibtest:ActsZlibTest", + ] + } } diff --git a/aafwk/aafwk_standard/amsZipfileUnzipfileST/BUILD.gn b/appexecfwk/zlib/actszipfileandunzipfiletest/BUILD.gn similarity index 91% rename from aafwk/aafwk_standard/amsZipfileUnzipfileST/BUILD.gn rename to appexecfwk/zlib/actszipfileandunzipfiletest/BUILD.gn index a35ad5e14abc8bf0f83663397e59f655d783d081..b2d5a9596b367646cf213a218fb3d2e709d6e10a 100644 --- a/aafwk/aafwk_standard/amsZipfileUnzipfileST/BUILD.gn +++ b/appexecfwk/zlib/actszipfileandunzipfiletest/BUILD.gn @@ -13,14 +13,14 @@ import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("ActsZlibTest") { +ohos_js_hap_suite("actszipfileandunzipfiletest") { hap_profile = "./entry/src/main/config.json" deps = [ ":hjs_demo_js_assets", ":hjs_demo_resources", ] certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "ActsZlibTest" + hap_name = "actszipfileandunzipfiletest" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/js/default" diff --git a/aafwk/aafwk_standard/amsZipfileUnzipfileST/Test.json b/appexecfwk/zlib/actszipfileandunzipfiletest/Test.json similarity index 87% rename from aafwk/aafwk_standard/amsZipfileUnzipfileST/Test.json rename to appexecfwk/zlib/actszipfileandunzipfiletest/Test.json index 4196bce65bb3e84546d2371168f25d4a1614c2a6..0c079a109296297c81b998b88e5fc37d5dad3205 100644 --- a/aafwk/aafwk_standard/amsZipfileUnzipfileST/Test.json +++ b/appexecfwk/zlib/actszipfileandunzipfiletest/Test.json @@ -1,18 +1,18 @@ -{ - "description": "Configuration for hjunit demo Tests", - "driver": { - "type": "JSUnitTest", - "test-timeout": "60000", - "package": "com.example.amsZipfileUnzipfileST", - "shell-timeout": "60000" - }, - "kits": [ - { - "test-file-name": [ - "ActsZipZlibTest.hap" - ], - "type": "AppInstallKit", - "cleanup-apps": true - } - ] -} +{ + "description": "Configuration for hjunit demo Tests", + "driver": { + "type": "JSUnitTest", + "test-timeout": "60000", + "package": "com.example.amsZipfileUnzipfileST", + "shell-timeout": "60000" + }, + "kits": [ + { + "test-file-name": [ + "actszipfileandunzipfiletest.hap" + ], + "type": "AppInstallKit", + "cleanup-apps": true + } + ] +} diff --git a/aafwk/aafwk_standard/amszipfileunzipfilest/entry/src/main/config.json b/appexecfwk/zlib/actszipfileandunzipfiletest/entry/src/main/config.json similarity index 72% rename from aafwk/aafwk_standard/amszipfileunzipfilest/entry/src/main/config.json rename to appexecfwk/zlib/actszipfileandunzipfiletest/entry/src/main/config.json index a48ce620ad9216e0dff64205741998ec516eeecc..807a97b14b35e359f6c3959e46286d9f953eb1d4 100644 --- a/aafwk/aafwk_standard/amszipfileunzipfilest/entry/src/main/config.json +++ b/appexecfwk/zlib/actszipfileandunzipfiletest/entry/src/main/config.json @@ -1,92 +1,88 @@ -{ - "app": { - "bundleName": "com.example.amsZipfileUnzipfileST", - "vendor": "example", - "version": { - "code": 1000000, - "name": "1.0.0" - } - }, - "deviceConfig": {}, - "module": { - "package": "com.example.amsZipfileUnzipfileST", - "name": ".MyApplication", - "mainAbility": "com.example.amsZipfileUnzipfileST.MainAbility", - "deviceType": [ - "phone", - "tablet", - "tv", - "wearable" - ], - "distro": { - "deliveryWithInstall": true, - "moduleName": "entry", - "moduleType": "entry", - "installationFree": false - }, - "abilities": [ - { - "skills": [ - { - "entities": [ - "entity.system.home" - ], - "actions": [ - "action.system.home" - ] - } - ], - "visible": true, - "name": "com.example.amsZipfileUnzipfileST.MainAbility", - "icon": "$media:icon", - "description": "$string:mainability_description", - "label": "$string:entry_MainAbility", - "type": "page", - "launchType": "standard" - } - ], - "js": [ - { - "pages": [ - "pages/index/index" - ], - "name": "default", - "window": { - "designWidth": 720, - "autoDesignWidth": true - } - } - ], - "reqPermissions": [ - - { - "name":"ohos.permission.GET_BUNDLE_INFO_PRIVILEGED", - "reason":"need use ohos.permission.GET_BUNDLE_INFO_PRIVILEGED" - }, - { - "name":"ohos.permission.INSTALL_BUNDLE", - "reason":"need use ohos.permission.INSTALL_BUNDLE" - }, - { - "name":"ohos.permission.GET_BUNDLE_INFO", - "reason":"need use ohos.permission.GET_BUNDLE_INFO" - }, - { - "name":" ohos.permission.MANAGE_MISSIONS", - "reason":"need use ohos.permission.MANAGE_MISSIONS" - }, - { - "name":"ohos.permission.CHANGE_ABILITY_ENABLED_STATE", - "reason":"need use ohos.permission.CHANGE_ABILITY_ENABLED_STATE" - }, - { - "name":"ohos.permission.REMOVE_CACHE_FILES", - "reason":"need use ohos.permission.REMOVE_CACHE_FILES" - }, - { - "name":"ohos.permission.LISTEN_BUNDLE_CHANGE", - "reason":"need use ohos.permission.LISTEN_BUNDLE_CHANGE" - } - ] - } -} \ No newline at end of file +{ + "app": { + "bundleName": "com.example.amsZipfileUnzipfileST", + "vendor": "example", + "version": { + "code": 1, + "name": "1.0" + }, + "apiVersion": { + "compatible": 4, + "target": 5, + "releaseType": "Beta1" + } + }, + "deviceConfig": {}, + "module": { + "package": "com.example.amsZipfileUnzipfileST", + "name": ".MyApplication", + "deviceType": [ + "phone" + ], + "distro": { + "deliveryWithInstall": true, + "moduleName": "entry", + "moduleType": "entry" + }, + "abilities": [ + { + "skills": [ + { + "entities": [ + "entity.system.home", + "flag.home.intent.from.system" + ], + "actions": [ + "action.system.home" + ] + } + ], + "name": "com.example.amsZipfileUnzipfileST.MainAbility", + "icon": "$media:icon", + "description": "$string:mainability_description", + "label": "$string:app_name", + "type": "page", + "launchType": "standard", + "visible": true + } + ], + "reqPermissions": [ + { + "name": "ohos.permission.INSTALL_BUNDLE", + "reason": "need use ohos.permission.INSTALL_BUNDLE" + }, + { + "name":"ohos.permission.GET_BUNDLE_INFO_PRIVILEGED", + "reason":"need use ohos.permission.GET_BUNDLE_INFO_PRIVILEGED" + }, + { + "name":"ohos.permission.GET_BUNDLE_INFO", + "reason":"need use ohos.permission.GET_BUNDLE_INFO" + }, + { + "name":"ohos.permission.CHANGE_ABILITY_ENABLED_STATE", + "reason":"need use ohos.permission.CHANGE_ABILITY_ENABLED_STATE" + }, + { + "name":"ohos.permission.REMOVE_CACHE_FILES", + "reason":"need use ohos.permission.REMOVE_CACHE_FILES" + }, + { + "name":"ohos.permission.LISTEN_BUNDLE_CHANGE", + "reason":"need use ohos.permission.LISTEN_BUNDLE_CHANGE" + } + ], + "js": [ + { + "pages": [ + "pages/index/index" + ], + "name": "default", + "window": { + "designWidth": 720, + "autoDesignWidth": false + } + } + ] + } +} diff --git a/aafwk/aafwk_standard/amszipfileunzipfilest/entry/src/main/js/default/app.js b/appexecfwk/zlib/actszipfileandunzipfiletest/entry/src/main/js/default/app.js similarity index 97% rename from aafwk/aafwk_standard/amszipfileunzipfilest/entry/src/main/js/default/app.js rename to appexecfwk/zlib/actszipfileandunzipfiletest/entry/src/main/js/default/app.js index c158442201abb1888ae8fb1d57f150c5ec26c36b..2a68c1992145a976957d7dcdd69a7e9c2e8e9877 100644 --- a/aafwk/aafwk_standard/amszipfileunzipfilest/entry/src/main/js/default/app.js +++ b/appexecfwk/zlib/actszipfileandunzipfiletest/entry/src/main/js/default/app.js @@ -1,22 +1,22 @@ -/* - * Copyright (c) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -export default { - onCreate() { - console.info('AceApplication onCreate'); - }, - onDestroy() { - console.info('AceApplication onDestroy'); - } -}; +/* + * Copyright (c) 2021 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +export default { + onCreate() { + console.info('AceApplication onCreate'); + }, + onDestroy() { + console.info('AceApplication onDestroy'); + } +}; diff --git a/aafwk/aafwk_standard/amsZipfileUnzipfileST/entry/src/main/js/default/i18n/en-US.json b/appexecfwk/zlib/actszipfileandunzipfiletest/entry/src/main/js/default/i18n/en-US.json similarity index 100% rename from aafwk/aafwk_standard/amsZipfileUnzipfileST/entry/src/main/js/default/i18n/en-US.json rename to appexecfwk/zlib/actszipfileandunzipfiletest/entry/src/main/js/default/i18n/en-US.json diff --git a/aafwk/aafwk_standard/amsZipfileUnzipfileST/entry/src/main/js/default/i18n/zh-CN.json b/appexecfwk/zlib/actszipfileandunzipfiletest/entry/src/main/js/default/i18n/zh-CN.json similarity index 100% rename from aafwk/aafwk_standard/amsZipfileUnzipfileST/entry/src/main/js/default/i18n/zh-CN.json rename to appexecfwk/zlib/actszipfileandunzipfiletest/entry/src/main/js/default/i18n/zh-CN.json diff --git a/appexecfwk/zlib/actszipfileandunzipfiletest/entry/src/main/js/default/pages/index/index.css b/appexecfwk/zlib/actszipfileandunzipfiletest/entry/src/main/js/default/pages/index/index.css new file mode 100644 index 0000000000000000000000000000000000000000..6fda792753f2e15f22b529c7b90a82185b2770bf --- /dev/null +++ b/appexecfwk/zlib/actszipfileandunzipfiletest/entry/src/main/js/default/pages/index/index.css @@ -0,0 +1,9 @@ +.container { + flex-direction: column; + justify-content: center; + align-items: center; +} + +.title { + font-size: 100px; +} diff --git a/aafwk/aafwk_standard/amsZipfileUnzipfileST/entry/src/main/js/default/pages/index/index.hml b/appexecfwk/zlib/actszipfileandunzipfiletest/entry/src/main/js/default/pages/index/index.hml similarity index 59% rename from aafwk/aafwk_standard/amsZipfileUnzipfileST/entry/src/main/js/default/pages/index/index.hml rename to appexecfwk/zlib/actszipfileandunzipfiletest/entry/src/main/js/default/pages/index/index.hml index f64b040a5ae394dbaa5e185e1ecd4f4556b92184..13ae33e07e3a90032d5fb5589183072449422c77 100644 --- a/aafwk/aafwk_standard/amsZipfileUnzipfileST/entry/src/main/js/default/pages/index/index.hml +++ b/appexecfwk/zlib/actszipfileandunzipfiletest/entry/src/main/js/default/pages/index/index.hml @@ -1,5 +1,5 @@
- {{ $t('strings.hello') }} {{ title }} + {{ title }}
diff --git a/aafwk/aafwk_standard/amsZipfileUnzipfileST/entry/src/main/js/default/pages/index/index.js b/appexecfwk/zlib/actszipfileandunzipfiletest/entry/src/main/js/default/pages/index/index.js similarity index 68% rename from aafwk/aafwk_standard/amsZipfileUnzipfileST/entry/src/main/js/default/pages/index/index.js rename to appexecfwk/zlib/actszipfileandunzipfiletest/entry/src/main/js/default/pages/index/index.js index ad355555d698b0cbc4d08d916abcaf0728f46056..40b59cd0b46903d415c158028262f49ec4923484 100644 --- a/aafwk/aafwk_standard/amsZipfileUnzipfileST/entry/src/main/js/default/pages/index/index.js +++ b/appexecfwk/zlib/actszipfileandunzipfiletest/entry/src/main/js/default/pages/index/index.js @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -12,35 +12,34 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import file from '@system.file' -import {Core, ExpectExtend, ReportExtend} from 'deccjsunit/index' +import {Core, ExpectExtend} from 'deccjsunit/index' -const injecttRef = Object.getPrototypeOf(global) || global -injecttRef.regeneratorRuntime = require('@babel/runtime/regenerator') +const injectRef = Object.getPrototypeOf(global) || global +injectRef.regeneratorRuntime = require('@babel/runtime/regenerator') -export default{ +export default { data: { - title: "" + title: 'Test MetaData' }, onInit() { - this.title = this.$t('strings.world'); + this.title = 'zip and unzip'; }, onShow() { - console.info('onShow finish') + console.info('onReady finish') const core = Core.getInstance() const expectExtend = new ExpectExtend({ 'id': 'extend' }) core.addService('expect', expectExtend) core.init() - const configService = core.getDefaultService('config') configService.setConfig(this) - require('../../../test/List.test.js') + require('../../../test/List.test') core.execute() }, onReady() { }, + onBackPress(){ + } } - diff --git a/appexecfwk/zlib/actszipfileandunzipfiletest/entry/src/main/js/resources/base/element/string.json b/appexecfwk/zlib/actszipfileandunzipfiletest/entry/src/main/js/resources/base/element/string.json new file mode 100644 index 0000000000000000000000000000000000000000..e6b09b2876ca224350c3065b7cf6117171abe2ad --- /dev/null +++ b/appexecfwk/zlib/actszipfileandunzipfiletest/entry/src/main/js/resources/base/element/string.json @@ -0,0 +1,12 @@ +{ + "string": [ + { + "name": "app_name", + "value": "actsbmsmetadatatest" + }, + { + "name": "mainability_description", + "value": "JS_Phone_Empty Feature Ability" + } + ] +} \ No newline at end of file diff --git a/aafwk/aafwk_standard/amsZipfileUnzipfileST/entry/src/main/js/resources/base/media/icon.png b/appexecfwk/zlib/actszipfileandunzipfiletest/entry/src/main/js/resources/base/media/icon.png similarity index 100% rename from aafwk/aafwk_standard/amsZipfileUnzipfileST/entry/src/main/js/resources/base/media/icon.png rename to appexecfwk/zlib/actszipfileandunzipfiletest/entry/src/main/js/resources/base/media/icon.png diff --git a/aafwk/aafwk_standard/amsZipfileUnzipfileST/entry/src/main/js/test/List.test.js b/appexecfwk/zlib/actszipfileandunzipfiletest/entry/src/main/js/test/List.test.js similarity index 92% rename from aafwk/aafwk_standard/amsZipfileUnzipfileST/entry/src/main/js/test/List.test.js rename to appexecfwk/zlib/actszipfileandunzipfiletest/entry/src/main/js/test/List.test.js index b5d5265591aba656f6112e40a64a7cf0f8af254d..2df36781349f30c3f4bf28e45e0f999bffdec345 100644 --- a/aafwk/aafwk_standard/amsZipfileUnzipfileST/entry/src/main/js/test/List.test.js +++ b/appexecfwk/zlib/actszipfileandunzipfiletest/entry/src/main/js/test/List.test.js @@ -12,4 +12,4 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -require('./ContextJsunit.test.js') +require('./actszipfileandunzipfiletest.test.js') diff --git a/aafwk/aafwk_standard/amsZipfileUnzipfileST/entry/src/main/js/test/ContextJsunit.test.js b/appexecfwk/zlib/actszipfileandunzipfiletest/entry/src/main/js/test/actszipfileandunzipfiletest.test.js similarity index 99% rename from aafwk/aafwk_standard/amsZipfileUnzipfileST/entry/src/main/js/test/ContextJsunit.test.js rename to appexecfwk/zlib/actszipfileandunzipfiletest/entry/src/main/js/test/actszipfileandunzipfiletest.test.js index 6969d5ad92450f369b2e96625a503b35d0b9723e..3ec51206fa1e6dfecaaa15ea3f37eb5a6b177e91 100644 --- a/aafwk/aafwk_standard/amsZipfileUnzipfileST/entry/src/main/js/test/ContextJsunit.test.js +++ b/appexecfwk/zlib/actszipfileandunzipfiletest/entry/src/main/js/test/actszipfileandunzipfiletest.test.js @@ -1539,7 +1539,7 @@ it('ACTS_ZipFile_2600', 0, async function (done) { }); try { var options = {}; - options.memLevel = zlib.MemLevel.MEM_LEVEL_MIN_MEMLEVEL; + options.memLevel = zlib.MemLevel.MEM_LEVEL_MIN; await zlib.zipFile(path, zipDest, options, (err, data) => { var zipStat = fileio.statSync(zipDest); @@ -1604,7 +1604,7 @@ it('ACTS_ZipFile_2700', 0, async function (done) { }); try { var options = {}; - options.memLevel = zlib.MemLevel.MEM_LEVEL_MAX_MEMLEVEL; + options.memLevel = zlib.MemLevel.MEM_LEVEL_MAX; await zlib.zipFile(path, zipDest, options, (err, data) => { var zipStat = fileio.statSync(zipDest); @@ -1669,7 +1669,7 @@ it('ACTS_ZipFile_2800', 0, async function (done) { }); try { var options = {}; - options.memLevel = zlib.MemLevel.MEM_LEVEL_DEFAULT_MEMLEVEL; + options.memLevel = zlib.MemLevel.MEM_LEVEL_DEFAULT; await zlib.zipFile(path, zipDest, options, (err, data) => { var zipStat = fileio.statSync(zipDest); diff --git a/aafwk/aafwk_standard/amsZipfileUnzipfileST/signature/openharmony_sx.p7b b/appexecfwk/zlib/actszipfileandunzipfiletest/signature/openharmony_sx.p7b similarity index 92% rename from aafwk/aafwk_standard/amsZipfileUnzipfileST/signature/openharmony_sx.p7b rename to appexecfwk/zlib/actszipfileandunzipfiletest/signature/openharmony_sx.p7b index cc53179a48f88f20acc379c138a001e9a15838f6..66b4457a8a81fb8d3356cf46d67226c850944858 100644 Binary files a/aafwk/aafwk_standard/amsZipfileUnzipfileST/signature/openharmony_sx.p7b and b/appexecfwk/zlib/actszipfileandunzipfiletest/signature/openharmony_sx.p7b differ