!2309 zip功能测试代码变更

Merge pull request !2309 from kirl75/update_master_0309

aafwk/aafwk_standard/BUILD.gn

@@ -23,6 +23,7 @@ group("aafwk_standard") {
       "actsabilitydistributetest:ActsAbilityDistributeTest",
       "actsabilitydistributetest:ActsAbilityDistributeTest",
       "actsabilitymanageretstest:ActsAbilityManagerEtsTest",
+      "amsZipfileUnzipfileST:ActsZlibTest",
       "amsabilitymanager/amsMissionSnapshotTest:ActsAmsMissionSnapshotTest",
       "amsabilitymanager/amsMissionSnapshotTestSingleton:ActsAmsMissionSnapshotTestSingleton",
       "amsabilitymanager/amsMissionSnapshotTestSingletonS:ActsAmsMissionSnapshotTestSingletonS",
@@ -47,7 +48,6 @@ group("aafwk_standard") {
       "amsmultiapp/amsmultidataabilityclone:ActsAmsMultiDataAbilityClone",
       "amsmultiapp/amsmultidataabilityself:ActsAmsMultiDataAbilitySelf",
       "amsprocessmanageapi7:amsprocessmanageapi7",
-      "amszipfileunzipfilest:ActsAmsZipfileUnzipfileSTest",
       "context:context",
       "featureability:featureability",
       "formmanager:formmanager",

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/BUILD.gn → aafwk/aafwk_standard/amsZipfileUnzipfileST/BUILD.gn

@@ -13,14 +13,14 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ActsAmsZipfileUnzipfileSTest") {
+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 = "ActsAmsZipfileUnzipfileSTest"
+  hap_name = "ActsZlibTest"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

aafwk/aafwk_standard/amsZipfileUnzipfileST/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": [
+                "ActsZlibTest.hap"
+            ],
+            "type": "AppInstallKit",
+            "cleanup-apps": true
+        }
+    ]
+}

aafwk/aafwk_standard/amsZipfileUnzipfileST/entry/.gitignore

+/build
+/node_modules

aafwk/aafwk_standard/amszipfileunzipfilest/entry/src/main/config.json → aafwk/aafwk_standard/amsZipfileUnzipfileST/entry/src/main/config.json

-{
-  "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"
-            ],
-            "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
-      },
-      {
-        "name": "com.example.amsZipfileUnzipfileST.ServiceAbility",
-        "icon": "$media:icon",
-        "description": "$string:serviceability_description",
-        "type": "service"
-      },
-      {
-        "name": "com.example.amsZipfileUnzipfileST.ServiceAbility",
-        "icon": "$media:icon",
-        "description": "$string:serviceability_description",
-        "label": "$string:app_name",
-        "type": "page",
-        "launchType": "standard"
-      }
-    ],
-    "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.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
-        }
-      }
-    ]
-  }
+{
+  "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

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

aafwk/aafwk_standard/amszipfileunzipfilest/entry/src/main/js/default/pages/index/index.hml → aafwk/aafwk_standard/amsZipfileUnzipfileST/entry/src/main/js/default/pages/index/index.hml

 <div class="container">
     <text class="title">
-        测试zlib-1515-test
         {{ $t('strings.hello') }} {{ title }}
     </text>
 </div>

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

@@ -37,7 +37,7 @@ export default{
         const configService = core.getDefaultService('config')
         configService.setConfig(this)
 
-        require('../../../test/List.test')
+        require('../../../test/List.test.js')
         core.execute()
     },
     onReady() {

aafwk/aafwk_standard/amsZipfileUnzipfileST/entry/src/main/js/resources/base/element/string.json

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

aafwk/aafwk_standard/amszipfileunzipfilest/Test.json

-{
-    "description": "Configuration for hjunit demo Tests",
-    "driver": {
-        "type": "JSUnitTest",
-        "test-timeout": "120000",
-        "package": "com.example.amsZipfileUnzipfileST",
-        "shell-timeout": "600000"
-    },
-    "kits": [
-        {
-            "test-file-name": [
-                "ActsAmsZipfileUnzipfileSTest.hap"
-            ],
-            "type": "AppInstallKit",
-            "cleanup-apps": true
-        },
-        {
-            "type": "ShellKit",
-            "run-command": [
-                "remount",
-                "mkdir /data/test"
-            ]
-        },
-        {
-            "type": "PushKit",
-            "push": [
-                "./resource/appexecfwk/ceshi.txt->/data/test/ceshi.txt",
-                "./resource/appexecfwk/ceshitwo.zip->/data/test/ceshitwo.zip",
-                "./resource/appexecfwk/ceshitwo.txt->/data/test/ceshitwo.txt"
-                
-               
-            ]
-        },
-        
-        {
-            "type": "ShellKit",
-            "run-command": [
-                "remount",
-                "mkdir /data/testA"
-            ]
-        },
-        {
-            "type": "ShellKit",
-            "run-command": [
-                "chmod 777 /data/testA/*"
-            ]
-        },
-       
-        {
-            "type": "ShellKit",
-            "run-command": [
-                "chmod 777 /data/test/*"
-            ]
-        },
-       
-        {
-            "type": "ShellKit",
-            "run-command": [
-                "remount",
-                "mkdir /data/testb"
-            ]
-        },
-        {
-            "type": "ShellKit",
-            "run-command": [
-                "chmod 777 /data/testb/*"
-            ]
-        }
-       
-       
-       
-
-    ]
-}
-

aafwk/aafwk_standard/amszipfileunzipfilest/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/resources/base/element/string.json

-{
-  "string": [
-    {
-      "name": "app_name",
-      "value": "amsZipfileUnzipfileST"
-    },
-    {
-      "name": "mainability_description",
-      "value": "JS_Phone_Empty Feature Ability"
-    },
-    {
-      "name": "serviceability_description",
-      "value": "JS_Phone_Empty Feature Ability"
-    }
-  ]
-}
\ No newline at end of file