From 73c0d7ec3e06ac8bdaa6ed467ffd9014c64493d5 Mon Sep 17 00:00:00 2001 From: fengzewu Date: Sat, 25 Jun 2022 15:11:45 +0800 Subject: [PATCH] finish format check and code check Signed-off-by: fengzewu --- multimedia/BUILD.gn | 2 +- .../image_js_standard/imageCreator/BUILD.gn | 60 +++++++++---------- .../src/main/js/test/creator.test.js | 25 ++++---- 3 files changed, 42 insertions(+), 45 deletions(-) diff --git a/multimedia/BUILD.gn b/multimedia/BUILD.gn index a769f719e..a76b1584a 100644 --- a/multimedia/BUILD.gn +++ b/multimedia/BUILD.gn @@ -21,11 +21,11 @@ group("multimedia") { "camera/camera_js_standard:camera_standard_ets_hap", "image/image_js_standard/image:image_js_hap", "image/image_js_standard/imageColorspace:image_colorspace_js_hap", + "image/image_js_standard/imageCreator:image_creator_js_hap", "image/image_js_standard/imageDecodeOptions:image_DecodeOptions_js_hap", "image/image_js_standard/imageExif:image_exif_js_hap", "image/image_js_standard/imagePixelMapFramework:image_pixelmapframework_js_hap", "image/image_js_standard/imageWebp:image_webp_js_hap", - "image/image_js_standard/imageCreator:image_creator_js_hap", "media/media_js_standard/audioCodecFormat:audio_codec_format_js_hap", "media/media_js_standard/audioDecoder:audio_decoder_js_hap", "media/media_js_standard/audioEncoder:audio_encoder_js_hap", diff --git a/multimedia/image/image_js_standard/imageCreator/BUILD.gn b/multimedia/image/image_js_standard/imageCreator/BUILD.gn index 939799fe0..74187b5f7 100644 --- a/multimedia/image/image_js_standard/imageCreator/BUILD.gn +++ b/multimedia/image/image_js_standard/imageCreator/BUILD.gn @@ -1,31 +1,31 @@ -# 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 +# 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_creator_js_hap") { - hap_profile = "./src/main/config.json" - deps = [ - ":image_creator_js_assets", - ":image_creator_resources", - ] - certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "ActsImageCreatorJsTest" -} -ohos_js_assets("image_creator_js_assets") { - source_dir = "./src/main/js/default" -} -ohos_resources("image_creator_resources") { - sources = [ "./src/main/resources" ] - hap_profile = "./src/main/config.json" -} \ No newline at end of file + +import("//test/xts/tools/build/suite.gni") + +ohos_js_hap_suite("image_creator_js_hap") { + hap_profile = "./src/main/config.json" + deps = [ + ":image_creator_js_assets", + ":image_creator_resources", + ] + certificate_profile = "./signature/openharmony_sx.p7b" + hap_name = "ActsImageCreatorJsTest" +} +ohos_js_assets("image_creator_js_assets") { + source_dir = "./src/main/js/default" +} +ohos_resources("image_creator_resources") { + sources = [ "./src/main/resources" ] + hap_profile = "./src/main/config.json" +} diff --git a/multimedia/image/image_js_standard/imageCreator/src/main/js/test/creator.test.js b/multimedia/image/image_js_standard/imageCreator/src/main/js/test/creator.test.js index b8e0e8d39..a0a0cf0f7 100644 --- a/multimedia/image/image_js_standard/imageCreator/src/main/js/test/creator.test.js +++ b/multimedia/image/image_js_standard/imageCreator/src/main/js/test/creator.test.js @@ -124,7 +124,7 @@ describe('ImageCreator', function () { creator.dequeueImage().then(img => { if (img == undefined) { expect(false).assertTrue(); - done() + done(); } else { img.getComponent(JPEG, (err, component) => { if (err) { @@ -343,7 +343,7 @@ describe('ImageCreator', function () { } else { expect(false).assertTrue(); console.info('Creator_002 finished'); - done() + done(); } }) @@ -373,7 +373,7 @@ describe('ImageCreator', function () { } else { expect(false).assertTrue(); console.info('Creator_003 finished'); - done() + done(); } }) @@ -402,7 +402,7 @@ describe('ImageCreator', function () { } else { expect(false).assertTrue(); console.info('Creator_004 finished'); - done() + done(); } }) @@ -422,7 +422,7 @@ describe('ImageCreator', function () { creator.dequeueImage((err, img) => { if (err) { expect(false).assertTrue(); - done() + done(); } else { console.info('Creator_005 dequeueImage call back Success'); expect(img != undefined).assertTrue(); @@ -432,7 +432,7 @@ describe('ImageCreator', function () { } else { expect(false).assertTrue(); console.info('Creator_005 finished'); - done() + done(); } }) @@ -453,13 +453,12 @@ describe('ImageCreator', function () { creator.dequeueImage().then(img => { if (img == undefined) { expect(false).assertTrue(); - done() - return; + done(); } else { img.getComponent(JPEG, (err, component) => { if (err) { expect(false).assertTrue(); - done() + done(); } else { expect(component.componentType == JPEG).assertTrue(); expect(component.byteBuffer != undefined).assertTrue(); @@ -490,7 +489,7 @@ describe('ImageCreator', function () { } else { expect(false).assertTrue(); console.info('Creator_006 createImageCreator failed'); - done() + done(); } }) @@ -563,7 +562,7 @@ describe('ImageCreator', function () { creator.dequeueImage((err, img) => { if (img == undefined) { expect(false).assertTrue(); - done() + done(); } else { img.getComponent(JPEG, (err, component) => { if (err) { @@ -672,7 +671,7 @@ describe('ImageCreator', function () { var creator = image.createImageCreator(WIDTH, HEIGHT, FORMAT, CAPACITY) expect(creator != undefined).assertTrue(); if (creator == undefined) { - done() + done(); return; } creator.on('imageRelease', () => { @@ -685,13 +684,11 @@ describe('ImageCreator', function () { if (img == undefined) { expect(false).assertTrue(); done(); - return; }else{ img.getComponent(JPEG, (err, component) => { if (component == undefined) { expect(false).assertTrue(); done(); - return; }else{ expect(component.componentType == JPEG).assertTrue(); expect(component.byteBuffer != undefined).assertTrue(); -- GitLab