!2475 zip代码变更路径

Merge pull request !2475 from kirl75/update_master_branch_0315_22

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",

aafwk/aafwk_standard/amsZipfileUnzipfileST/.gitignore

-*.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

aafwk/aafwk_standard/amsZipfileUnzipfileST/.idea/.gitignore

-# Default ignored files
-/shelf/
-/workspace.xml

aafwk/aafwk_standard/amsZipfileUnzipfileST/.idea/compiler.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="11" />
-  </component>
-</project>
\ No newline at end of file

aafwk/aafwk_standard/amsZipfileUnzipfileST/.idea/gradle.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GradleMigrationSettings" migrationVersion="1" />
-  <component name="GradleSettings">
-    <option name="linkedExternalProjectsSettings">
-      <GradleProjectSettings>
-        <option name="testRunner" value="PLATFORM" />
-        <option name="distributionType" value="LOCAL" />
-        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="E:\DevEco Studio 3.0.0.800\tools\gradle" />
-        <option name="gradleJvm" value="#JAVA_INTERNAL" />
-        <option name="modules">
-          <set>
-            <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/entry" />
-          </set>
-        </option>
-        <option name="resolveModulePerSourceSet" value="false" />
-        <option name="useQualifiedModuleNames" value="false" />
-      </GradleProjectSettings>
-    </option>
-  </component>
-</project>
\ No newline at end of file

aafwk/aafwk_standard/amsZipfileUnzipfileST/.idea/jarRepositories.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RemoteRepositoriesConfiguration">
-    <remote-repository>
-      <option name="id" value="central" />
-      <option name="name" value="Maven Central repository" />
-      <option name="url" value="https://repo1.maven.org/maven2" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="jboss.community" />
-      <option name="name" value="JBoss Community repository" />
-      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="maven2" />
-      <option name="name" value="maven2" />
-      <option name="url" value="https://developer.huawei.com/repo/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="maven" />
-      <option name="name" value="maven" />
-      <option name="url" value="https://repo.huaweicloud.com/repository/maven/" />
-    </remote-repository>
-  </component>
-</project>
\ No newline at end of file

aafwk/aafwk_standard/amsZipfileUnzipfileST/.idea/misc.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
-</project>
\ No newline at end of file

aafwk/aafwk_standard/amsZipfileUnzipfileST/entry/.gitignore

-/build
-/node_modules

aafwk/aafwk_standard/amsZipfileUnzipfileST/entry/src/main/js/default/pages/index/index.css

-.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;
-    }
-}

appexecfwk/BUILD.gn

@@ -18,7 +18,7 @@ group("appexecfwk") {
   if (is_standard_system) {
     deps = [
       "bundle_standard:bundle_standard",
-      "zlib/actszlibtest:ActsZlibTest",
+      "zlib:zlib",
     ]
   }
 }

appexecfwk/zlib/BUILD.gn

+# 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("//build/ohos_var.gni")
+
+group("zlib") {
+  testonly = true
+  if (is_standard_system) {
+    deps = [
+      "actszipfileandunzipfiletest:actszipfileandunzipfiletest",
+      "actszlibtest:ActsZlibTest",
+    ]
+  }
+}

aafwk/aafwk_standard/amsZipfileUnzipfileST/BUILD.gn → 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 = "ActsZipZlibTest"
+  hap_name = "actszipfileandunzipfiletest"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

aafwk/aafwk_standard/amsZipfileUnzipfileST/Test.json → appexecfwk/zlib/actszipfileandunzipfiletest/Test.json

-{
-    "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
+        }
+    ]
+}

aafwk/aafwk_standard/amsZipfileUnzipfileST/entry/src/main/config.json → appexecfwk/zlib/actszipfileandunzipfiletest/entry/src/main/config.json

@@ -3,78 +3,62 @@
     "bundleName": "com.example.amsZipfileUnzipfileST",
     "vendor": "example",
     "version": {
-      "code": 1000000,
-      "name": "1.0.0"
+      "code": 1,
+      "name": "1.0"
+    },
+    "apiVersion": {
+      "compatible": 4,
+      "target": 5,
+      "releaseType": "Beta1"
     }
   },
   "deviceConfig": {},
   "module": {
     "package": "com.example.amsZipfileUnzipfileST",
     "name": ".MyApplication",
-    "mainAbility": "com.example.amsZipfileUnzipfileST.MainAbility",
     "deviceType": [
-      "phone",
-      "tablet",
-      "tv",
-      "wearable"
+      "phone"
     ],
     "distro": {
       "deliveryWithInstall": true,
       "moduleName": "entry",
-      "moduleType": "entry",
-      "installationFree": false
+      "moduleType": "entry"
     },
     "abilities": [
       {
         "skills": [
           {
             "entities": [
-              "entity.system.home"
+              "entity.system.home",
+              "flag.home.intent.from.system"
             ],
             "actions": [
               "action.system.home"
             ]
           }
         ],
-        "visible": true,
         "name": "com.example.amsZipfileUnzipfileST.MainAbility",
         "icon": "$media:icon",
         "description": "$string:mainability_description",
-        "label": "$string:entry_MainAbility",
+        "label": "$string:app_name",
         "type": "page",
-        "launchType": "standard"
-      }
-    ],
-    "js": [
-      {
-        "pages": [
-          "pages/index/index"
-        ],
-        "name": "default",
-        "window": {
-          "designWidth": 720,
-          "autoDesignWidth": true
-        }
+        "launchType": "standard",
+        "visible": 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.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.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"
@@ -87,6 +71,18 @@
         "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
+        }
+      }
     ]
   }
-}
\ No newline at end of file
+}

aafwk/aafwk_standard/amsZipfileUnzipfileST/entry/src/main/js/default/app.js → appexecfwk/zlib/actszipfileandunzipfiletest/entry/src/main/js/default/app.js

-/*
- * 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');
+    }
+};

appexecfwk/zlib/actszipfileandunzipfiletest/entry/src/main/js/default/pages/index/index.css

+.container {
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+}
+
+.title {
+    font-size: 100px;
+}

aafwk/aafwk_standard/amsZipfileUnzipfileST/entry/src/main/js/default/pages/index/index.hml → appexecfwk/zlib/actszipfileandunzipfiletest/entry/src/main/js/default/pages/index/index.hml

 <div class="container">
     <text class="title">
-        {{ $t('strings.hello') }} {{ title }}
+        {{ title }}
     </text>
 </div>

aafwk/aafwk_standard/amsZipfileUnzipfileST/entry/src/main/js/default/pages/index/index.js → appexecfwk/zlib/actszipfileandunzipfiletest/entry/src/main/js/default/pages/index/index.js

 /*
- * 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(){
+    }
 }
-

aafwk/aafwk_standard/amsZipfileUnzipfileST/entry/src/main/js/resources/base/element/string.json → appexecfwk/zlib/actszipfileandunzipfiletest/entry/src/main/js/resources/base/element/string.json

 {
   "string": [
     {
-      "name": "entry_MainAbility",
-      "value": "entry_MainAbility"
+      "name": "app_name",
+      "value": "actsbmsmetadatatest"
     },
     {
       "name": "mainability_description",
-      "value": "JS_Empty Ability"
+      "value": "JS_Phone_Empty Feature Ability"
     }
   ]
 }
\ No newline at end of file

aafwk/aafwk_standard/amsZipfileUnzipfileST/entry/src/main/js/test/List.test.js → 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')

aafwk/aafwk_standard/amsZipfileUnzipfileST/entry/src/main/js/test/ContextJsunit.test.js → 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);