From f4140dc01b23d3dd3c36c9e6e4aee640d6b9c394 Mon Sep 17 00:00:00 2001 From: fulizhong Date: Wed, 22 Jun 2022 13:52:17 +0800 Subject: [PATCH] modify test.json file Signed-off-by: FULIZHONG Signed-off-by: fulizhong --- .../media/media_js_standard/audioPlayer/Test.json | 15 ++++++++------- .../js/test/RecorderLocalTestAudioAPI.test.js | 2 +- .../js/test/RecorderLocalTestAudioFUNC.test.js | 2 +- .../media/media_js_standard/videoPlayer/Test.json | 15 ++++++++------- .../js/test/VideoRecorderAPICallbackTest.test.js | 2 +- .../js/test/VideoRecorderFuncCallbackTest.test.js | 8 ++++---- .../js/test/VideoRecorderFuncPromiseTest.test.js | 8 ++++---- 7 files changed, 27 insertions(+), 25 deletions(-) diff --git a/multimedia/media/media_js_standard/audioPlayer/Test.json b/multimedia/media/media_js_standard/audioPlayer/Test.json index 3a839ac35..2e8f8a801 100644 --- a/multimedia/media/media_js_standard/audioPlayer/Test.json +++ b/multimedia/media/media_js_standard/audioPlayer/Test.json @@ -14,6 +14,14 @@ "type": "AppInstallKit", "cleanup-apps": true }, + { + "type": "ShellKit", + "run-command": [ + "mkdir -p /data/app/el2/100/base/ohos.acts.multimedia.audio.audioplayer/haps/entry/files" + ], + "teardown-command":[ + ] + }, { "type": "PushKit", "pre-push": [ @@ -44,13 +52,6 @@ "./resource/audio/97.mp4 ->/data/app/el2/100/base/ohos.acts.multimedia.audio.audioplayer/haps/entry/files/", "./resource/audio/98.mp4 ->/data/app/el2/100/base/ohos.acts.multimedia.audio.audioplayer/haps/entry/files/" ] - }, - { - "type": "ShellKit", - "run-command": [ - ], - "teardown-command":[ - ] } ] } diff --git a/multimedia/media/media_js_standard/audioRecorder/src/main/js/test/RecorderLocalTestAudioAPI.test.js b/multimedia/media/media_js_standard/audioRecorder/src/main/js/test/RecorderLocalTestAudioAPI.test.js index f40e89cee..3561e530e 100644 --- a/multimedia/media/media_js_standard/audioRecorder/src/main/js/test/RecorderLocalTestAudioAPI.test.js +++ b/multimedia/media/media_js_standard/audioRecorder/src/main/js/test/RecorderLocalTestAudioAPI.test.js @@ -187,7 +187,7 @@ describe('RecorderLocalTestAudioAPI', function () { } let fetchFileResult = await mediaTest.getFileAssets(fetchOp); fileAsset = await fetchFileResult.getAllObject(); - fdNumber = await fileAsset[0].open('Rw'); + fdNumber = await fileAsset[0].open('rw'); fdPath = "fd://" + fdNumber.toString(); } } diff --git a/multimedia/media/media_js_standard/audioRecorder/src/main/js/test/RecorderLocalTestAudioFUNC.test.js b/multimedia/media/media_js_standard/audioRecorder/src/main/js/test/RecorderLocalTestAudioFUNC.test.js index 9757c53a8..2141b30a9 100644 --- a/multimedia/media/media_js_standard/audioRecorder/src/main/js/test/RecorderLocalTestAudioFUNC.test.js +++ b/multimedia/media/media_js_standard/audioRecorder/src/main/js/test/RecorderLocalTestAudioFUNC.test.js @@ -129,7 +129,7 @@ describe('RecorderLocalTestAudioFUNC', function () { } let fetchFileResult = await mediaTest.getFileAssets(fetchOp); fileAsset = await fetchFileResult.getAllObject(); - fdNumber = await fileAsset[0].open('Rw'); + fdNumber = await fileAsset[0].open('rw'); fdPath = "fd://" + fdNumber.toString(); } } diff --git a/multimedia/media/media_js_standard/videoPlayer/Test.json b/multimedia/media/media_js_standard/videoPlayer/Test.json index 21ba0fb2f..c15bb4f44 100644 --- a/multimedia/media/media_js_standard/videoPlayer/Test.json +++ b/multimedia/media/media_js_standard/videoPlayer/Test.json @@ -15,18 +15,19 @@ "cleanup-apps": true }, { - "type": "PushKit", - "pre-push": [ + "type": "ShellKit", + "run-command": [ + "mkdir -p /data/app/el2/100/base/ohos.acts.multimedia.video.videoplayer/haps/entry/files" ], - "push": [ - "./resource/audio/H264_AAC.mp4 ->/data/app/el2/100/base/ohos.acts.multimedia.video.videoplayer/haps/entry/files/" + "teardown-command":[ ] }, { - "type": "ShellKit", - "run-command": [ + "type": "PushKit", + "pre-push": [ ], - "teardown-command":[ + "push": [ + "./resource/audio/H264_AAC.mp4 ->/data/app/el2/100/base/ohos.acts.multimedia.video.videoplayer/haps/entry/files/" ] } ] diff --git a/multimedia/media/media_js_standard/videoRecorder/src/main/js/test/VideoRecorderAPICallbackTest.test.js b/multimedia/media/media_js_standard/videoRecorder/src/main/js/test/VideoRecorderAPICallbackTest.test.js index 46e385c19..7ae25c43d 100644 --- a/multimedia/media/media_js_standard/videoRecorder/src/main/js/test/VideoRecorderAPICallbackTest.test.js +++ b/multimedia/media/media_js_standard/videoRecorder/src/main/js/test/VideoRecorderAPICallbackTest.test.js @@ -133,7 +133,7 @@ describe('VideoRecorderAPICallbackTest', function () { } let fetchFileResult = await mediaTest.getFileAssets(fetchOp); fileAsset = await fetchFileResult.getAllObject(); - fdNumber = await fileAsset[0].open('Rw'); + fdNumber = await fileAsset[0].open('rw'); fdPath = "fd://" + fdNumber.toString(); } } diff --git a/multimedia/media/media_js_standard/videoRecorder/src/main/js/test/VideoRecorderFuncCallbackTest.test.js b/multimedia/media/media_js_standard/videoRecorder/src/main/js/test/VideoRecorderFuncCallbackTest.test.js index df8425ca1..2b8a219b5 100644 --- a/multimedia/media/media_js_standard/videoRecorder/src/main/js/test/VideoRecorderFuncCallbackTest.test.js +++ b/multimedia/media/media_js_standard/videoRecorder/src/main/js/test/VideoRecorderFuncCallbackTest.test.js @@ -167,7 +167,7 @@ describe('VideoRecorderFuncCallbackTest', function () { } let fetchFileResult = await mediaTest.getFileAssets(fetchOp); fileAsset = await fetchFileResult.getAllObject(); - fdNumber = await fileAsset[0].open('Rw'); + fdNumber = await fileAsset[0].open('rw'); fdPath = "fd://" + fdNumber.toString(); } } @@ -789,7 +789,7 @@ describe('VideoRecorderFuncCallbackTest', function () { it('SUB_MEDIA_VIDEO_RECORDER_FUNCTION_CALLBACK_2200', 0, async function (done) { await getFd('46.mp4'); videoConfig.url = fdPath; - videoConfig.videoFrameRate = 20; + configFile.videoFrameRate = 20; let videoRecorder = null; let mySteps = new Array(CREATE_EVENT, PREPARE_EVENT, GETSURFACE_EVENT, START_EVENT, RELEASE_EVENT, END_EVENT); eventEmitter.emit(mySteps[0], videoRecorder, mySteps, done); @@ -806,7 +806,7 @@ describe('VideoRecorderFuncCallbackTest', function () { it('SUB_MEDIA_VIDEO_RECORDER_FUNCTION_CALLBACK_2300', 0, async function (done) { await getFd('47.mp4'); videoConfig.url = fdPath; - videoConfig.videoFrameRate = 30; + configFile.videoFrameRate = 30; let videoRecorder = null; let mySteps = new Array(CREATE_EVENT, PREPARE_EVENT, GETSURFACE_EVENT, START_EVENT, RELEASE_EVENT, END_EVENT); eventEmitter.emit(mySteps[0], videoRecorder, mySteps, done); @@ -823,7 +823,7 @@ describe('VideoRecorderFuncCallbackTest', function () { it('SUB_MEDIA_VIDEO_RECORDER_FUNCTION_CALLBACK_2400', 0, async function (done) { await getFd('48.mp4'); videoConfig.url = fdPath; - videoConfig.videoFrameRate = 60; + configFile.videoFrameRate = 60; let videoRecorder = null; let mySteps = new Array(CREATE_EVENT, PREPARE_EVENT, GETSURFACE_EVENT, START_EVENT, RELEASE_EVENT, END_EVENT); eventEmitter.emit(mySteps[0], videoRecorder, mySteps, done); diff --git a/multimedia/media/media_js_standard/videoRecorder/src/main/js/test/VideoRecorderFuncPromiseTest.test.js b/multimedia/media/media_js_standard/videoRecorder/src/main/js/test/VideoRecorderFuncPromiseTest.test.js index 81c94c218..ff1670c8d 100644 --- a/multimedia/media/media_js_standard/videoRecorder/src/main/js/test/VideoRecorderFuncPromiseTest.test.js +++ b/multimedia/media/media_js_standard/videoRecorder/src/main/js/test/VideoRecorderFuncPromiseTest.test.js @@ -167,7 +167,7 @@ describe('VideoRecorderFuncPromiseTest', function () { } let fetchFileResult = await mediaTest.getFileAssets(fetchOp); fileAsset = await fetchFileResult.getAllObject(); - fdNumber = await fileAsset[0].open('Rw'); + fdNumber = await fileAsset[0].open('rw'); fdPath = "fd://" + fdNumber.toString(); } } @@ -1422,7 +1422,7 @@ describe('VideoRecorderFuncPromiseTest', function () { let videoOutput; await getFd('43.mp4'); videoConfig.url = fdPath; - videoConfig.videoFrameRate = 20; + configFile.videoFrameRate = 20; await media.createVideoRecorder().then((recorder) => { console.info('case createVideoRecorder called'); if (typeof (recorder) != 'undefined') { @@ -1471,7 +1471,7 @@ describe('VideoRecorderFuncPromiseTest', function () { let videoOutput; await getFd('44.mp4'); videoConfig.url = fdPath; - videoConfig.videoFrameRate = 30; + configFile.videoFrameRate = 30; await media.createVideoRecorder().then((recorder) => { console.info('case createVideoRecorder called'); if (typeof (recorder) != 'undefined') { @@ -1520,7 +1520,7 @@ describe('VideoRecorderFuncPromiseTest', function () { let videoOutput; await getFd('45.mp4'); videoConfig.url = fdPath; - videoConfig.videoFrameRate = 60; + configFile.videoFrameRate = 60; await media.createVideoRecorder().then((recorder) => { console.info('case createVideoRecorder called'); if (typeof (recorder) != 'undefined') { -- GitLab