diff --git a/multimedia/BUILD.gn b/multimedia/BUILD.gn index 40b340bafa30c904b82a744ef8ad5d82dbe22731..0cd56a300a3352eb296a0f08ede945aceb993b6a 100644 --- a/multimedia/BUILD.gn +++ b/multimedia/BUILD.gn @@ -24,7 +24,6 @@ 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/imagePixelMap:image_pixelmap_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", diff --git a/multimedia/image/image_js_standard/imagePixelMap/BUILD.gn b/multimedia/image/image_js_standard/imagePixelMap/BUILD.gn deleted file mode 100644 index c0e91e71d043f14898d4c2abba28277a98f085ed..0000000000000000000000000000000000000000 --- a/multimedia/image/image_js_standard/imagePixelMap/BUILD.gn +++ /dev/null @@ -1,31 +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("//test/xts/tools/build/suite.gni") - -ohos_js_hap_suite("image_pixelmap_js_hap") { - hap_profile = "./src/main/config.json" - deps = [ - ":image_js_assets", - ":image_resources", - ] - certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "ActsImagePixelMapJsTest" -} -ohos_js_assets("image_js_assets") { - source_dir = "./src/main/js/default" -} -ohos_resources("image_resources") { - sources = [ "./src/main/resources" ] - hap_profile = "./src/main/config.json" -} \ No newline at end of file diff --git a/multimedia/image/image_js_standard/imagePixelMap/Test.json b/multimedia/image/image_js_standard/imagePixelMap/Test.json deleted file mode 100644 index 9e52c456022c385f55caeaff9f90dc9f26a10394..0000000000000000000000000000000000000000 --- a/multimedia/image/image_js_standard/imagePixelMap/Test.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "description": "Configuration for Image Tests", - "driver": { - "type": "JSUnitTest", - "test-timeout": "1500000", - "package": "ohos.acts.multimedia.image", - "shell-timeout": "120000" - }, - "kits": [ - { - "type": "PushKit", - "pre-push": [ - ], - "push": [ - ] - }, - - { - "type": "ShellKit", - "run-command": [ - "chmod -R 666 /data/media/*", - "setenforce 0", - "hilog -Q pidoff" - ], - "teardown-command":[ - "setenforce 1" - ] - }, - - { - "test-file-name": [ - "ActsImagePixelMapJsTest.hap" - ], - "type": "AppInstallKit", - "cleanup-apps": true - } - ] - -} \ No newline at end of file diff --git a/multimedia/image/image_js_standard/imagePixelMap/signature/openharmony_sx.p7b b/multimedia/image/image_js_standard/imagePixelMap/signature/openharmony_sx.p7b deleted file mode 100644 index d9fe0c1edd5ef09a357ed0bf05ed915a72278cca..0000000000000000000000000000000000000000 Binary files a/multimedia/image/image_js_standard/imagePixelMap/signature/openharmony_sx.p7b and /dev/null differ diff --git a/multimedia/image/image_js_standard/imagePixelMap/src/main/config.json b/multimedia/image/image_js_standard/imagePixelMap/src/main/config.json deleted file mode 100644 index 391a40f1a70c117f34d57c3e4d396cbe79df479e..0000000000000000000000000000000000000000 --- a/multimedia/image/image_js_standard/imagePixelMap/src/main/config.json +++ /dev/null @@ -1,104 +0,0 @@ -{ - "app": { - "apiVersion": { - "compatible": 6, - "releaseType": "Beta1", - "target": 7 - }, - "vendor": "acts", - "bundleName": "ohos.acts.multimedia.image", - "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.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.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", - "name": ".MyApplication", - "js": [ - { - "pages": [ - "pages/index/index" - ], - "name": "default", - "window": { - "designWidth": 720, - "autoDesignWidth": true - } - } - ] - } -} \ No newline at end of file diff --git a/multimedia/image/image_js_standard/imagePixelMap/src/main/js/default/app.js b/multimedia/image/image_js_standard/imagePixelMap/src/main/js/default/app.js deleted file mode 100644 index 8b3c3b3cb7930c465567b386bf230cb38a0d128e..0000000000000000000000000000000000000000 --- a/multimedia/image/image_js_standard/imagePixelMap/src/main/js/default/app.js +++ /dev/null @@ -1,23 +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'); - } -}; \ No newline at end of file diff --git a/multimedia/image/image_js_standard/imagePixelMap/src/main/js/default/i18n/en-US.json b/multimedia/image/image_js_standard/imagePixelMap/src/main/js/default/i18n/en-US.json deleted file mode 100644 index 0331845d4580b25c5af980f2ff65203583053b66..0000000000000000000000000000000000000000 --- a/multimedia/image/image_js_standard/imagePixelMap/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/multimedia/image/image_js_standard/imagePixelMap/src/main/js/default/i18n/pages/index/index.css b/multimedia/image/image_js_standard/imagePixelMap/src/main/js/default/i18n/pages/index/index.css deleted file mode 100644 index 53b12aeee6149cbc85a51a69bdadb6a06c635dd3..0000000000000000000000000000000000000000 --- a/multimedia/image/image_js_standard/imagePixelMap/src/main/js/default/i18n/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; - } -} \ No newline at end of file diff --git a/multimedia/image/image_js_standard/imagePixelMap/src/main/js/default/i18n/pages/index/index.hml b/multimedia/image/image_js_standard/imagePixelMap/src/main/js/default/i18n/pages/index/index.hml deleted file mode 100644 index e7b706af9e044f0ef934e80c6c23ddabf25e2f7d..0000000000000000000000000000000000000000 --- a/multimedia/image/image_js_standard/imagePixelMap/src/main/js/default/i18n/pages/index/index.hml +++ /dev/null @@ -1,5 +0,0 @@ -
- - {{ $t('strings.hello') }} {{ title }} - -
\ No newline at end of file diff --git a/multimedia/image/image_js_standard/imagePixelMap/src/main/js/default/i18n/pages/index/index.js b/multimedia/image/image_js_standard/imagePixelMap/src/main/js/default/i18n/pages/index/index.js deleted file mode 100644 index a2a05dae07aa3d9a816c0729268ce2ab139cd50c..0000000000000000000000000000000000000000 --- a/multimedia/image/image_js_standard/imagePixelMap/src/main/js/default/i18n/pages/index/index.js +++ /dev/null @@ -1,41 +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 {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 diff --git a/multimedia/image/image_js_standard/imagePixelMap/src/main/js/default/i18n/zh-CN.json b/multimedia/image/image_js_standard/imagePixelMap/src/main/js/default/i18n/zh-CN.json deleted file mode 100644 index 9106b0897838e8e7600cd824146a7c2f8ee6c574..0000000000000000000000000000000000000000 --- a/multimedia/image/image_js_standard/imagePixelMap/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/multimedia/image/image_js_standard/imagePixelMap/src/main/js/test/List.test.js b/multimedia/image/image_js_standard/imagePixelMap/src/main/js/test/List.test.js deleted file mode 100644 index 9fab9dced54a0546a06f5e3d1ca1e1b02cc1b621..0000000000000000000000000000000000000000 --- a/multimedia/image/image_js_standard/imagePixelMap/src/main/js/test/List.test.js +++ /dev/null @@ -1,16 +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('./pixelmap.test.js') \ No newline at end of file diff --git a/multimedia/image/image_js_standard/imagePixelMap/src/main/js/test/pixelmap.test.js b/multimedia/image/image_js_standard/imagePixelMap/src/main/js/test/pixelmap.test.js deleted file mode 100644 index 8ecb5bee19944d8854fe0c81cbf3b8973d786f03..0000000000000000000000000000000000000000 --- a/multimedia/image/image_js_standard/imagePixelMap/src/main/js/test/pixelmap.test.js +++ /dev/null @@ -1,90 +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 image from '@ohos.multimedia.image' -import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from 'deccjsunit/index' -import mypixelmap from '@ohos.xtstest.mypixelmap' - -describe('Image', function () { - - beforeAll(function () { - console.info('beforeAll case'); - }) - - beforeEach(function () { - isTimeOut = false; - console.info('beforeEach case'); - }) - - afterEach(function () { - console.info('afterEach case'); - }) - - afterAll(function () { - console.info('afterAll case'); - }) - - /* * - * @tc.number : TC_001 - * @tc.name : Test OH_GetImageInfo, OH_AccessPixels, OH_UnAccessPixels - * @tc.desc : - * @tc.size : - * @tc.type : Functional - * @tc.level : FWK Layer - */ - - it('TC_001', 0, async function (done) { - const color = new ArrayBuffer(96); - let opts = { alphaType: 0, editable: true, pixelFormat: 4, scaleMode: 1, size: { height: 4, width: 6 } } - image.createPixelMap(color, opts) - .then( pixelmap => { - if (pixelmap == null) { - console.info('TC_001 createPixelMap failed'); - expect(false).assertTrue() - done(); - return; - } - - console.info('TC_001 test |begin'); - - console.info('TC_001 test |GetImageInfo'); - mypixelmap.testGetImageInfo(pixelmap); - - console.info('TC_001 test |AccessPixels'); - mypixelmap.testAccessPixels(pixelmap); - - console.info('TC_001 test |release begin'); - pixelmap.release(); - console.info('TC_001 test |release end'); - - console.info('TC_001 test |UnAccessPixels'); - mypixelmap.testUnAccessPixels(pixelmap); - - console.info('TC_001 test |release again begin'); - pixelmap.release(); - console.info('TC_001 test |release again end'); - - expect(true).assertTrue(); - done(); - - console.info('TC_001 test |end'); - }) - .catch(error => { - console.log('TC_001 error: ' + error); - expect().assertFail(); - done(); - }) - }) -}) \ No newline at end of file diff --git a/multimedia/image/image_js_standard/imagePixelMap/src/main/resources/base/element/string.json b/multimedia/image/image_js_standard/imagePixelMap/src/main/resources/base/element/string.json deleted file mode 100644 index 1aa035668a0b8512bc32ec67cb574c1be6e31649..0000000000000000000000000000000000000000 --- a/multimedia/image/image_js_standard/imagePixelMap/src/main/resources/base/element/string.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "string": [ - { - "name": "entry_MainAbility", - "value": "ImageJSTestMain" - }, - { - "name": "mainability_description", - "value": "ImageJSTestMain Ability" - } - ] -} \ No newline at end of file diff --git a/multimedia/image/image_js_standard/imagePixelMap/src/main/resources/base/media/icon.png b/multimedia/image/image_js_standard/imagePixelMap/src/main/resources/base/media/icon.png deleted file mode 100644 index ce307a8827bd75456441ceb57d530e4c8d45d36c..0000000000000000000000000000000000000000 Binary files a/multimedia/image/image_js_standard/imagePixelMap/src/main/resources/base/media/icon.png and /dev/null differ