!3912 update XTS for Packing and YUV

Merge pull request !3912 from 冯泽悟/master

multimedia/BUILD.gn

@@ -25,9 +25,11 @@ group("multimedia") {
       "image/image_js_standard/imageDecodeOptions:image_DecodeOptions_js_hap",
       "image/image_js_standard/imageExif:image_exif_js_hap",
       "image/image_js_standard/imageModifyProperty:image_modifyProperty_js_hap",
+      "image/image_js_standard/imagePacking:image_packing_js_hap",
       "image/image_js_standard/imagePixelMapFramework:image_pixelmapframework_js_hap",
       "image/image_js_standard/imageReceiver:image_receiver_js_hap",
       "image/image_js_standard/imageWebp:image_webp_js_hap",
+      "image/image_js_standard/imageYUV:image_yuv_js_hap",
       "media/media_js_standard/audioPlayer:audio_player_js_hap",
       "media/media_js_standard/audioRecorder:audio_recorder_js_hap",
       "media/media_js_standard/recorderFormat:recorder_format_js_hap",

multimedia/image/image_js_standard/imagePacking/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("//test/xts/tools/build/suite.gni")
+
+ohos_js_hap_suite("image_packing_js_hap") {
+  hap_profile = "./src/main/config.json"
+  deps = [
+    ":image_packing_js_assets",
+    ":image_packing_resources",
+  ]
+  certificate_profile = "./signature/openharmony_sx.p7b"
+  hap_name = "ActsImagePackingJsTest"
+}
+ohos_js_assets("image_packing_js_assets") {
+  source_dir = "./src/main/js/default"
+}
+ohos_resources("image_packing_resources") {
+  sources = [ "./src/main/resources" ]
+  hap_profile = "./src/main/config.json"
+}

multimedia/image/image_js_standard/imagePacking/Test.json

+{
+    "description": "Configuration for Image Tests",
+    "driver": {
+        "type": "JSUnitTest",
+        "test-timeout": "1500000",
+        "package": "ohos.acts.multimedia.image.Packing",
+		"shell-timeout": "120000"
+    },
+    "kits": [
+		{
+            "type": "PushKit",
+            "pre-push": [
+            ],
+            "push": [		
+            ]
+        },
+   
+		{
+            "type": "ShellKit",
+            "run-command": [
+                "hilog -Q pidoff"
+            ],
+            "teardown-command":[
+              
+            ]
+        },
+        
+        {
+            "test-file-name": [
+                "ActsImagePackingJsTest.hap"
+            ],
+            "type": "AppInstallKit",
+            "cleanup-apps": true
+        }
+    ]
+    
+}
\ No newline at end of file

multimedia/image/image_js_standard/imagePacking/src/main/config.json

+{
+    "app": {
+      "apiVersion": {
+        "compatible": 6,
+        "releaseType": "Beta1",
+        "target": 7
+      },
+      "vendor": "acts",
+      "bundleName": "ohos.acts.multimedia.image.Packing",
+      "version": {
+        "code": 1000000,
+        "name": "1.0.0"
+      }
+    },
+    "deviceConfig": {
+      "default": {
+        "debug": true
+      }
+    },
+    "module": {
+      "abilities": [
+        {
+          "iconId": 16777218,
+          "skills": [
+            {
+              "entities": [
+                "entity.system.home"
+              ],
+              "actions": [
+                "action.system.home"
+              ]
+            }
+          ],
+          "descriptionId": 16777217,
+          "visible": true,
+          "labelId": 16777216,
+          "icon": "$media:icon",
+          "name": "ohos.acts.multimedia.image.Packing.MainAbility",
+          "description": "$string:mainability_description",
+          "label": "$string:entry_MainAbility",
+          "type": "page",
+          "homeAbility": true,
+          "launchType": "standard"
+        }
+      ],
+      "deviceType": [
+        "phone",
+        "tablet",
+        "tv",
+        "wearable"
+      ],
+      "mainAbility": "ohos.acts.multimedia.image.Packing.MainAbility",
+      "distro": {
+        "moduleType": "entry",
+        "installationFree": false,
+        "deliveryWithInstall": true,
+        "moduleName": "entry"
+      },
+      "reqPermissions": [
+              {
+                  "name": "ohos.permission.GET_BUNDLE_INFO",
+                  "reason": "use ohos.permission.GET_BUNDLE_INFO"
+              },
+              {
+                  "name": "ohos.permission.GET_BUNDLE_INFO_PRIVILEGED",
+                  "reason":"use ohos.permission.GET_BUNDLE_INFO_PRIVILEGED"
+              },
+              {
+                  "name" : "ohos.permission.GRANT_SENSITIVE_PERMISSIONS",
+                  "reason" : "use ohos.permission.GRANT_SENSITIVE_PERMISSIONS"
+              },
+              {
+                  "name" : "ohos.permission.REVOKE_SENSITIVE_PERMISSIONS",
+                  "reason" : "use ohos.permission.REVOKE_SENSITIVE_PERMISSIONS"
+              },
+              {
+                  "name": "ohos.permission.MEDIA_LOCATION",
+                  "reason":"use ohos.permission.MEDIA_LOCATION"
+              },
+              {
+                  "name": "ohos.permission.READ_MEDIA",
+                  "reason":"use ohos.permission.READ_MEDIA"
+              },
+              {
+                  "name": "ohos.permission.WRITE_MEDIA",
+                  "reason":"use ohos.permission.WRITE_MEDIA"
+              }
+      ],
+      "package": "ohos.acts.multimedia.image.Packing",
+      "name": ".MyApplication",
+      "js": [
+        {
+          "pages": [
+            "pages/index/index"
+          ],
+          "name": "default",
+          "window": {
+            "designWidth": 720,
+            "autoDesignWidth": true
+          }
+        }
+      ]
+    }
+  }
\ No newline at end of file

multimedia/image/image_js_standard/imagePacking/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');
+    }
+};
\ No newline at end of file

multimedia/image/image_js_standard/imagePacking/src/main/js/default/i18n/en-US.json

+{
+  "strings": {
+    "hello": "Hello",
+    "world": "World"
+  }
+}
\ No newline at end of file

multimedia/image/image_js_standard/imagePacking/src/main/js/default/i18n/zh-CN.json

+{
+  "strings": {
+    "hello": "您好",
+    "world": "世界"
+  }
+}
\ No newline at end of file

multimedia/image/image_js_standard/imagePacking/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;
+    }
+}
\ No newline at end of file

multimedia/image/image_js_standard/imagePacking/src/main/js/default/pages/index/index.hml

+<div class="container">
+    <text class="title">
+        {{ $t('strings.hello') }} {{ title }}
+    </text>
+</div>
\ No newline at end of file

multimedia/image/image_js_standard/imagePacking/src/main/js/default/pages/index/index.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.
+ */
+
+import {Core, ExpectExtend} from 'deccjsunit/index'
+
+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')
+        this.timeout = 60000
+        configService.setConfig(this)
+        require('../../../test/List.test')
+        core.execute()
+    },
+    onReady() {
+    },
+}
\ No newline at end of file

multimedia/image/image_js_standard/imagePacking/src/main/js/test/List.test.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.
+ */
+
+require('./packing.test.js')
\ No newline at end of file

multimedia/image/image_js_standard/imagePacking/src/main/resources/base/element/string.json

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

multimedia/image/image_js_standard/imageYUV/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("//test/xts/tools/build/suite.gni")
+
+ohos_js_hap_suite("image_yuv_js_hap") {
+  hap_profile = "./src/main/config.json"
+  deps = [
+    ":image_yuv_js_assets",
+    ":image_yuv_resources",
+  ]
+  certificate_profile = "./signature/openharmony_sx.p7b"
+  hap_name = "ActsImageyuvJsTest"
+}
+ohos_js_assets("image_yuv_js_assets") {
+  source_dir = "./src/main/js/default"
+}
+ohos_resources("image_yuv_resources") {
+  sources = [ "./src/main/resources" ]
+  hap_profile = "./src/main/config.json"
+}

multimedia/image/image_js_standard/imageYUV/Test.json

+{
+    "description": "Configuration for Image Tests",
+    "driver": {
+        "type": "JSUnitTest",
+        "test-timeout": "1500000",
+        "package": "ohos.acts.multimedia.image.YUV",
+		"shell-timeout": "120000"
+    },
+    "kits": [
+		{
+            "type": "PushKit",
+            "pre-push": [
+            ],
+            "push": [		
+            ]
+        },
+   
+		{
+            "type": "ShellKit",
+            "run-command": [
+                "hilog -Q pidoff"
+            ],
+            "teardown-command":[
+              
+            ]
+        },
+        
+        {
+            "test-file-name": [
+                "ActsImageyuvJsTest.hap"
+            ],
+            "type": "AppInstallKit",
+            "cleanup-apps": true
+        }
+    ]
+    
+}
\ No newline at end of file

multimedia/image/image_js_standard/imageYUV/src/main/config.json

+{
+    "app": {
+      "apiVersion": {
+        "compatible": 6,
+        "releaseType": "Beta1",
+        "target": 7
+      },
+      "vendor": "acts",
+      "bundleName": "ohos.acts.multimedia.image.YUV",
+      "version": {
+        "code": 1000000,
+        "name": "1.0.0"
+      }
+    },
+    "deviceConfig": {
+      "default": {
+        "debug": true
+      }
+    },
+    "module": {
+      "abilities": [
+        {
+          "iconId": 16777218,
+          "skills": [
+            {
+              "entities": [
+                "entity.system.home"
+              ],
+              "actions": [
+                "action.system.home"
+              ]
+            }
+          ],
+          "descriptionId": 16777217,
+          "visible": true,
+          "labelId": 16777216,
+          "icon": "$media:icon",
+          "name": "ohos.acts.multimedia.image.YUV.MainAbility",
+          "description": "$string:mainability_description",
+          "label": "$string:entry_MainAbility",
+          "type": "page",
+          "homeAbility": true,
+          "launchType": "standard"
+        }
+      ],
+      "deviceType": [
+        "phone",
+        "tablet",
+        "tv",
+        "wearable"
+      ],
+      "mainAbility": "ohos.acts.multimedia.image.YUV.MainAbility",
+      "distro": {
+        "moduleType": "entry",
+        "installationFree": false,
+        "deliveryWithInstall": true,
+        "moduleName": "entry"
+      },
+      "reqPermissions": [
+              {
+                  "name": "ohos.permission.GET_BUNDLE_INFO",
+                  "reason": "use ohos.permission.GET_BUNDLE_INFO"
+              },
+              {
+                  "name": "ohos.permission.GET_BUNDLE_INFO_PRIVILEGED",
+                  "reason":"use ohos.permission.GET_BUNDLE_INFO_PRIVILEGED"
+              },
+              {
+                  "name" : "ohos.permission.GRANT_SENSITIVE_PERMISSIONS",
+                  "reason" : "use ohos.permission.GRANT_SENSITIVE_PERMISSIONS"
+              },
+              {
+                  "name" : "ohos.permission.REVOKE_SENSITIVE_PERMISSIONS",
+                  "reason" : "use ohos.permission.REVOKE_SENSITIVE_PERMISSIONS"
+              },
+              {
+                  "name": "ohos.permission.MEDIA_LOCATION",
+                  "reason":"use ohos.permission.MEDIA_LOCATION"
+              },
+              {
+                  "name": "ohos.permission.READ_MEDIA",
+                  "reason":"use ohos.permission.READ_MEDIA"
+              },
+              {
+                  "name": "ohos.permission.WRITE_MEDIA",
+                  "reason":"use ohos.permission.WRITE_MEDIA"
+              }
+      ],
+      "package": "ohos.acts.multimedia.image.YUV",
+      "name": ".MyApplication",
+      "js": [
+        {
+          "pages": [
+            "pages/index/index"
+          ],
+          "name": "default",
+          "window": {
+            "designWidth": 720,
+            "autoDesignWidth": true
+          }
+        }
+      ]
+    }
+  }
\ No newline at end of file

multimedia/image/image_js_standard/imageYUV/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');
+    }
+};
\ No newline at end of file

multimedia/image/image_js_standard/imageYUV/src/main/js/default/i18n/en-US.json

+{
+  "strings": {
+    "hello": "Hello",
+    "world": "World"
+  }
+}
\ No newline at end of file

multimedia/image/image_js_standard/imageYUV/src/main/js/default/i18n/zh-CN.json

+{
+  "strings": {
+    "hello": "您好",
+    "world": "世界"
+  }
+}
\ No newline at end of file

multimedia/image/image_js_standard/imageYUV/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;
+    }
+}
\ No newline at end of file

multimedia/image/image_js_standard/imageYUV/src/main/js/default/pages/index/index.hml

+<div class="container">
+    <text class="title">
+        {{ $t('strings.hello') }} {{ title }}
+    </text>
+</div>
\ No newline at end of file

multimedia/image/image_js_standard/imageYUV/src/main/js/default/pages/index/index.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.
+ */
+
+import {Core, ExpectExtend} from 'deccjsunit/index'
+
+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')
+        this.timeout = 60000
+        configService.setConfig(this)
+        require('../../../test/List.test')
+        core.execute()
+    },
+    onReady() {
+    },
+}
\ No newline at end of file

multimedia/image/image_js_standard/imageYUV/src/main/js/test/List.test.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.
+ */
+
+require('./yuv.test.js')
\ No newline at end of file

multimedia/image/image_js_standard/imageYUV/src/main/resources/base/element/string.json

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