From 0f6a939dc886304fe8269b228af73b5581363d8a Mon Sep 17 00:00:00 2001 From: lwx1121892 Date: Tue, 31 Jan 2023 15:33:40 +0800 Subject: [PATCH] =?UTF-8?q?<=E5=BC=95=E5=85=A5=E6=96=B9=E6=B3=95=E4=BF=AE?= =?UTF-8?q?=E6=94=B9>?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: lwx1121892 --- .../media/media_js_standard/MediaTestBase.js | 13 +- .../media_js_standard/MediaTestBaseAV.js | 144 ------------------ .../main/ets/test/AVPlayerHlsFuncTest.test.js | 2 +- .../AVPlayerHttpCompatibilityTest.test.ets | 2 +- .../ets/test/AVPlayerHttpSeekTest.test.ets | 2 +- .../main/ets/test/AVPlayerLocalTest.test.js | 2 +- 6 files changed, 16 insertions(+), 149 deletions(-) delete mode 100644 multimedia/media/media_js_standard/MediaTestBaseAV.js diff --git a/multimedia/media/media_js_standard/MediaTestBase.js b/multimedia/media/media_js_standard/MediaTestBase.js index 5dc67db60..0d2cf22d0 100644 --- a/multimedia/media/media_js_standard/MediaTestBase.js +++ b/multimedia/media/media_js_standard/MediaTestBase.js @@ -112,6 +112,12 @@ export function printError(error, done) { done(); } +export function assertErr(opera, err, done) { + console.info(`case ${opera} error,errMessage is ${err.message}`); + expect().assertFail(); + done(); +} + // callback function for promise call back error export function failureCallback(error) { expect().assertFail(); @@ -130,7 +136,12 @@ export function checkDescription(actualDescription, descriptionKey, descriptionV console.info('case key is '+ descriptionKey[i]); console.info('case actual value is '+ property); console.info('case hope value is '+ descriptionValue[i]); - expect(property).assertEqual(descriptionValue[i]); + if (descriptionKey[i] == 'codec_mime') { + expect(property).assertEqual(CODECMIMEVALUE[descriptionValue[i]]); + } else { + expect(property).assertEqual(descriptionValue[i]); + } + } } diff --git a/multimedia/media/media_js_standard/MediaTestBaseAV.js b/multimedia/media/media_js_standard/MediaTestBaseAV.js deleted file mode 100644 index ddf517bea..000000000 --- a/multimedia/media/media_js_standard/MediaTestBaseAV.js +++ /dev/null @@ -1,144 +0,0 @@ -/* - * Copyright (C) 2022 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 featureAbility from '@ohos.ability.featureAbility' -import { UiDriver, BY, PointerMatrix } from '@ohos.uitest' -const CODECMIMEVALUE = ['video/avc', 'audio/mp4a-latm', 'audio/mpeg'] - -export async function getPermission(permissionNames) { - featureAbility.getContext().requestPermissionsFromUser(permissionNames, 0, async (data) => { - console.info("case request success" + JSON.stringify(data)); - }) -} - -export async function driveFn(num) { - console.info(`case come in driveFn 111`); - let driver = UiDriver.create(); - console.info(`case come in driveFn 222`); - console.info(`driver is ${JSON.stringify(driver)}`); - await msleepAsync(2000); - console.info(`UiDriver start`); - for (let i = 0; i < num; i++) { - let button = await driver.findComponent(BY.text('允许')); - console.info(`button is ${JSON.stringify(button)}`); - await msleepAsync(2000); - await button.click(); - } - await msleepAsync(2000); -} - -// File operation -export async function getFileDescriptor(fileName) { - let fileDescriptor = undefined; - let mgr = globalThis.abilityContext.resourceManager - await mgr.getRawFileDescriptor(fileName).then(value => { - fileDescriptor = {fd: value.fd, offset: value.offset, length: value.length}; - console.log('case getRawFileDescriptor success fileName: ' + fileName); - }).catch(error => { - console.log('case getRawFileDescriptor err: ' + error); - }); - return fileDescriptor; -} -export async function closeFileDescriptor(fileName) { - await globalThis.abilityContext.resourceManager.closeRawFileDescriptor(fileName).then(()=> { - console.log('case closeRawFileDescriptor ' + fileName); - }).catch(error => { - console.log('case closeRawFileDescriptor err: ' + error); - }); -} - - -// wait asynchronously -export async function msleepAsync(ms) { - return new Promise((resolve) => setTimeout(resolve, ms)); -} - -export function assertErr(opera, err, done) { - console.info(`case ${opera} error,errMessage is ${err.message}`); - expect().assertFail(); - done(); -} -// callback function for promise call back error -export function failureCallback(error) { - expect().assertFail(); - console.info(`case failureCallback promise called,errMessage is ${error.message}`); -} - -// callback function for promise catch error -export function catchCallback(error) { - expect().assertFail(); - console.info(`case error catch called,errMessage is ${error.message}`); -} -export function checkDescription(actualDescription, descriptionKey, descriptionValue) { - for (let i = 0; i < descriptionKey.length; i++) { - let property = actualDescription[descriptionKey[i]]; - console.info('case key is '+ descriptionKey[i]); - console.info('case actual value is '+ property); - console.info('case hope value is '+ descriptionValue[i]); - if (descriptionKey[i] == 'codec_mime') { - expect(property).assertEqual(CODECMIMEVALUE[descriptionValue[i]]); - } else { - expect(property).assertEqual(descriptionValue[i]); - } - - } -} - - -export async function getFd(pathName, fileType) { - let fdObject = { - fileAsset : null, - fdNumber : null - } - let displayName = pathName; - console.info('[mediaLibrary] fileType is ' + fileType); - const mediaTest = mediaLibrary.getMediaLibrary(globalThis.abilityContext); - let fileKeyObj = mediaLibrary.FileKey; - let mediaType; - let publicPath; - if (fileType == 'audio') { - mediaType = mediaLibrary.MediaType.AUDIO; - publicPath = await mediaTest.getPublicDirectory(mediaLibrary.DirectoryType.DIR_AUDIO); - } else { - mediaType = mediaLibrary.MediaType.VIDEO; - publicPath = await mediaTest.getPublicDirectory(mediaLibrary.DirectoryType.DIR_VIDEO); - } - console.info('[mediaLibrary] publicPath is ' + publicPath); - let dataUri = await mediaTest.createAsset(mediaType, displayName, publicPath); - if (dataUri != undefined) { - let args = dataUri.id.toString(); - let fetchOp = { - selections : fileKeyObj.ID + "=?", - selectionArgs : [args], - } - let fetchFileResult = await mediaTest.getFileAssets(fetchOp); - fdObject.fileAsset = await fetchFileResult.getAllObject(); - fdObject.fdNumber = await fdObject.fileAsset[0].open('rw'); - console.info('case getFd number is: ' + fdObject.fdNumber); - } - return fdObject; -} - -export async function closeFd(fileAsset, fdNumber) { - if (fileAsset != null) { - await fileAsset[0].close(fdNumber).then(() => { - console.info('[mediaLibrary] case close fd success'); - }).catch((err) => { - console.info('[mediaLibrary] case close fd failed'); - }); - } else { - console.info('[mediaLibrary] case fileAsset is null'); - } -} diff --git a/multimedia/media/media_js_standard/avPlayer/entry/src/main/ets/test/AVPlayerHlsFuncTest.test.js b/multimedia/media/media_js_standard/avPlayer/entry/src/main/ets/test/AVPlayerHlsFuncTest.test.js index da04abcf2..843c07d09 100644 --- a/multimedia/media/media_js_standard/avPlayer/entry/src/main/ets/test/AVPlayerHlsFuncTest.test.js +++ b/multimedia/media/media_js_standard/avPlayer/entry/src/main/ets/test/AVPlayerHlsFuncTest.test.js @@ -13,7 +13,7 @@ * limitations under the License. */ import media from '@ohos.multimedia.media' -import * as mediaTestBase from '../../../../../../MediaTestBaseAV'; +import * as mediaTestBase from '../../../../../../MediaTestBase'; import * as AVPlayerTestBase from '../../../../../../AVPlayerTestBase.js'; import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from 'deccjsunit/index'; diff --git a/multimedia/media/media_js_standard/avPlayer/entry/src/main/ets/test/AVPlayerHttpCompatibilityTest.test.ets b/multimedia/media/media_js_standard/avPlayer/entry/src/main/ets/test/AVPlayerHttpCompatibilityTest.test.ets index 19b272a1b..a21579719 100644 --- a/multimedia/media/media_js_standard/avPlayer/entry/src/main/ets/test/AVPlayerHttpCompatibilityTest.test.ets +++ b/multimedia/media/media_js_standard/avPlayer/entry/src/main/ets/test/AVPlayerHttpCompatibilityTest.test.ets @@ -14,7 +14,7 @@ */ import {testAVPlayerFun} from '../../../../../../AVPlayerTestBase.js'; -import * as mediaTestBase from '../../../../../../MediaTestBaseAV'; +import * as mediaTestBase from '../../../../../../MediaTestBase'; import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from 'deccjsunit/index'; export default function AVPlayerHttpCompatibilityTest() { diff --git a/multimedia/media/media_js_standard/avPlayer/entry/src/main/ets/test/AVPlayerHttpSeekTest.test.ets b/multimedia/media/media_js_standard/avPlayer/entry/src/main/ets/test/AVPlayerHttpSeekTest.test.ets index 28118a875..4ef610c57 100644 --- a/multimedia/media/media_js_standard/avPlayer/entry/src/main/ets/test/AVPlayerHttpSeekTest.test.ets +++ b/multimedia/media/media_js_standard/avPlayer/entry/src/main/ets/test/AVPlayerHttpSeekTest.test.ets @@ -14,7 +14,7 @@ */ import {testAVPlayerSeek} from '../../../../../../AVPlayerTestBase.js'; -import * as mediaTestBase from '../../../../../../MediaTestBaseAV'; +import * as mediaTestBase from '../../../../../../MediaTestBase'; import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from 'deccjsunit/index'; export default function AVPlayerHttpSeekTest() { diff --git a/multimedia/media/media_js_standard/avPlayer/entry/src/main/ets/test/AVPlayerLocalTest.test.js b/multimedia/media/media_js_standard/avPlayer/entry/src/main/ets/test/AVPlayerLocalTest.test.js index 8bd4d3e6b..6c241633c 100644 --- a/multimedia/media/media_js_standard/avPlayer/entry/src/main/ets/test/AVPlayerLocalTest.test.js +++ b/multimedia/media/media_js_standard/avPlayer/entry/src/main/ets/test/AVPlayerLocalTest.test.js @@ -13,7 +13,7 @@ * limitations under the License. */ -import * as mediaTestBase from '../../../../../../MediaTestBaseAV'; +import * as mediaTestBase from '../../../../../../MediaTestBase'; import media from '@ohos.multimedia.media' import audio from '@ohos.multimedia.audio'; import { testAVPlayerFun, AV_PLAYER_STATE, setSource } from '../../../../../../AVPlayerTestBase.js'; -- GitLab