Skip to content

X
Xts Acts

OpenHarmony / Xts Acts
接近 2 年 前同步成功

通知 9
Star 22
Fork 0
X
Xts Acts
未验证 提交 3dca414d 编写于 作者: O openharmony_ci 提交者： Gitee
浏览文件
操作

!8257 ActsAVPlayerTest fail问题修复 ActsAvRecorderJsTest授权问题修复 用例上库 合入3.2release 

Merge pull request !8257 from Nicklaus/OpenHarmony-3.2-Release
上级 b879ba22 0933a8f7
展开全部 隐藏空白更改
内联 并排
Showing with 3533 addition and 174 deletion
multimedia/media/media_js_standard/AVPlayerTestBase.js
浏览文件 @ 3dca414d
...@@ -409,7 +409,7 @@ function setAVPlayerPlayAndPauseWithCallBack(src, avPlayer, playTime, done) { ...@@ -409,7 +409,7 @@ function setAVPlayerPlayAndPauseWithCallBack(src, avPlayer, playTime, done) {
avPlayer.surfaceId = surfaceID; avPlayer.surfaceId = surfaceID;
console.info('playPauseLoopWithCallBack play state is INITIALIZED') console.info('playPauseLoopWithCallBack play state is INITIALIZED')
// step 1: initialized -> prepared -> play // step 1: initialized -> prepared -> play
preparePromise(avPlayer); await preparePromise(avPlayer);
await sleep(2000); await sleep(2000);
avPlayer.play() avPlayer.play()
break; break;
...@@ -509,17 +509,18 @@ export async function createToRelease(src, avPlayer, done) { ...@@ -509,17 +509,18 @@ export async function createToRelease(src, avPlayer, done) {
avPlayer = await idle(src, avPlayer) avPlayer = await idle(src, avPlayer)
await setSource(avPlayer, src); await setSource(avPlayer, src);
console.info('CreateToRelease setSource'); console.info('CreateToRelease setSource');
if(avPlayer.state == AV_PLAYER_STATE.INITIALIZED) { await sleep(20)
avPlayer.surfaceId = surfaceID; avPlayer.surfaceId = surfaceID;
await avPlayer.release().then(() => { await avPlayer.release().then(() => {
console.info('CreateToRelease avPlayer from stop to release') expect(avPlayer.state).assertEqual(AV_PLAYER_STATE.RELEASED);
console.info(`case CreateToRelease loop is ${i}`); console.info('CreateToRelease avPlayer from stop to release')
expect(avPlayer.state).assertEqual(AV_PLAYER_STATE.RELEASED); console.info(`case CreateToRelease loop is ${i}`);
avPlayer = null; avPlayer = null;
}, mediaTestBase.failureCallback).catch(mediaTestBase.catchCallback); if(i == 999){
} done();
}
}, mediaTestBase.failureCallback).catch(mediaTestBase.catchCallback);
} }
done();
} }
export async function playToCompleted(src, avPlayer, done) { export async function playToCompleted(src, avPlayer, done) {
...@@ -540,7 +541,7 @@ async function playToCompletedLoop(src, avPlayer, done) { ...@@ -540,7 +541,7 @@ async function playToCompletedLoop(src, avPlayer, done) {
avPlayer.surfaceId = surfaceID; avPlayer.surfaceId = surfaceID;
console.info('playToCompletedLoop play state is INITIALIZED') console.info('playToCompletedLoop play state is INITIALIZED')
// step 1: initialized -> prepared -> play // step 1: initialized -> prepared -> play
preparePromise(avPlayer); await preparePromise(avPlayer);
await sleep(2000); await sleep(2000);
avPlayer.play() avPlayer.play()
break; break;
...@@ -599,7 +600,7 @@ export async function seekLoop(src, avPlayer, done) { ...@@ -599,7 +600,7 @@ export async function seekLoop(src, avPlayer, done) {
if(avPlayer.state == AV_PLAYER_STATE.INITIALIZED) { if(avPlayer.state == AV_PLAYER_STATE.INITIALIZED) {
avPlayer.surfaceId = surfaceID; avPlayer.surfaceId = surfaceID;
console.info('seekLoop case prepare success'); console.info('seekLoop case prepare success');
preparePromise(avPlayer); await preparePromise(avPlayer);
await sleep(2000); await sleep(2000);
} }
await avPlayer.play().then(() => { await avPlayer.play().then(() => {
...@@ -638,9 +639,9 @@ export async function seekLoopWithoutCallback(src, avPlayer, done) { ...@@ -638,9 +639,9 @@ export async function seekLoopWithoutCallback(src, avPlayer, done) {
console.info(`case Initialized in, surfaceID is ${surfaceID}`); console.info(`case Initialized in, surfaceID is ${surfaceID}`);
avPlayer = await idle(src, avPlayer) avPlayer = await idle(src, avPlayer)
await setSource(avPlayer, src); await setSource(avPlayer, src);
if(avPlayer.state == AV_PLAYER_STATE.INITIALIZED) { if(avPlayer.state == 'initialized') {
avPlayer.surfaceId = surfaceID; avPlayer.surfaceId = surfaceID;
preparePromise(avPlayer); await preparePromise(avPlayer);
await sleep(2000); await sleep(2000);
} }
await avPlayer.play().then(() => { await avPlayer.play().then(() => {
...@@ -679,7 +680,7 @@ export async function prepareToStopLoop(src, avPlayer, done) { ...@@ -679,7 +680,7 @@ export async function prepareToStopLoop(src, avPlayer, done) {
// prepare to stop loop 1000 times // prepare to stop loop 1000 times
for(var i = 0;i < 1000; i++){ for(var i = 0;i < 1000; i++){
await avPlayer.prepare().then(() => { await avPlayer.prepare().then(() => {
expect(avPlayer.state).assertEqual(AV_PLAYER_STATE.PREPARED); expect(avPlayer.state).assertEqual('prepared');
console.info('prepareToStopLoop avPlayer state is prepared') console.info('prepareToStopLoop avPlayer state is prepared')
}, mediaTestBase.failureCallback).catch(mediaTestBase.catchCallback); }, mediaTestBase.failureCallback).catch(mediaTestBase.catchCallback);
...@@ -717,13 +718,13 @@ export async function prepareToResetLoop(src, avPlayer, done) { ...@@ -717,13 +718,13 @@ export async function prepareToResetLoop(src, avPlayer, done) {
await avPlayer.play().then(() => { await avPlayer.play().then(() => {
console.info('prepareToResetLoop play success'); console.info('prepareToResetLoop play success');
expect(avPlayer.state).assertEqual(AV_PLAYER_STATE.PLAYING); expect(avPlayer.state).assertEqual('playing');
}, (err) => { }, (err) => {
console.error('prepareToResetLoop play filed,error message is :' + err.message) console.error('prepareToResetLoop play filed,error message is :' + err.message)
}) })
await avPlayer.reset().then(() => { await avPlayer.reset().then(() => {
expect(avPlayer.state).assertEqual(AV_PLAYER_STATE.IDLE); expect(avPlayer.state).assertEqual('idle');
console.info('prepareToResetLoop avPlayer state is reset') console.info('prepareToResetLoop avPlayer state is reset')
}, mediaTestBase.failureCallback).catch(mediaTestBase.catchCallback); }, mediaTestBase.failureCallback).catch(mediaTestBase.catchCallback);
...@@ -1029,7 +1030,7 @@ export function playTimeCallback(avPlayer, done) { ...@@ -1029,7 +1030,7 @@ export function playTimeCallback(avPlayer, done) {
break; break;
case AV_PLAYER_STATE.PAUSED: case AV_PLAYER_STATE.PAUSED:
console.info('playTimeWithCallback play state is PAUSED') console.info('playTimeWithCallback play state is PAUSED')
expect(avPlayer.state).assertEqual(AV_PLAYER_STATE.PAUSED); expect(avPlayer.state).assertEqual('paused');
start = Date.now(); start = Date.now();
console.info(`playTimeCallback start time is : ${start}`) console.info(`playTimeCallback start time is : ${start}`)
// step 3: pause -> playing loop // step 3: pause -> playing loop
...@@ -2076,7 +2077,7 @@ export async function avPlayerWithoutCallBack(src, avPlayer, done) { ...@@ -2076,7 +2077,7 @@ export async function avPlayerWithoutCallBack(src, avPlayer, done) {
console.info('avPlayerWithoutCallBack setSource'); console.info('avPlayerWithoutCallBack setSource');
if(avPlayer.state == AV_PLAYER_STATE.INITIALIZED) { if(avPlayer.state == AV_PLAYER_STATE.INITIALIZED) {
avPlayer.surfaceId = surfaceID; avPlayer.surfaceId = surfaceID;
preparePromise(avPlayer); await preparePromise(avPlayer);
await sleep(2000); await sleep(2000);
} }
if(avPlayer.state == AV_PLAYER_STATE.PREPARED){ if(avPlayer.state == AV_PLAYER_STATE.PREPARED){
...@@ -2108,7 +2109,7 @@ function setAVPlayerPlay(src, avPlayer, done) { ...@@ -2108,7 +2109,7 @@ function setAVPlayerPlay(src, avPlayer, done) {
avPlayer.surfaceId = surfaceID; avPlayer.surfaceId = surfaceID;
console.info('setAVPlayerPlay play state is INITIALIZED') console.info('setAVPlayerPlay play state is INITIALIZED')
// step 1: initialized -> prepared -> play // step 1: initialized -> prepared -> play
preparePromise(avPlayer) await preparePromise(avPlayer)
await sleep(3000); await sleep(3000);
avPlayer.play() avPlayer.play()
break; break;
...@@ -2118,12 +2119,12 @@ function setAVPlayerPlay(src, avPlayer, done) { ...@@ -2118,12 +2119,12 @@ function setAVPlayerPlay(src, avPlayer, done) {
break; break;
case AV_PLAYER_STATE.COMPLETED: case AV_PLAYER_STATE.COMPLETED:
expect(avPlayer.currentTime).assertEqual(avPlayer.duration); expect(avPlayer.currentTime).assertEqual(avPlayer.duration);
expect(avPlayer.state).assertEqual(AV_PLAYER_STATE.COMPLETED); expect(avPlayer.state).assertEqual('completed');
avPlayer.release().then(() => { avPlayer.release().then(() => {
}, mediaTestBase.failureCallback).catch(mediaTestBase.catchCallback); }, mediaTestBase.failureCallback).catch(mediaTestBase.catchCallback);
break; break;
case AV_PLAYER_STATE.RELEASED: case AV_PLAYER_STATE.RELEASED:
expect(avPlayer.state).assertEqual(AV_PLAYER_STATE.RELEASED); expect(avPlayer.state).assertEqual('released');
offCallback(avPlayer, ['stateChange', 'error']); offCallback(avPlayer, ['stateChange', 'error']);
avPlayer = null; avPlayer = null;
done(); done();
......
multimedia/media/media_js_standard/avPlayer/Test.json
浏览文件 @ 3dca414d
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
"test-timeout": "180000", "test-timeout": "180000",
"bundle-name": "ohos.acts.multimedia.avplayer", "bundle-name": "ohos.acts.multimedia.avplayer",
"module-name": "phone", "module-name": "phone",
"shell-timeout": "5000000", "shell-timeout": "9000000",
"testcase-timeout": 800000 "testcase-timeout": 850000
}, },
"kits": [ "kits": [
{ {
......
multimedia/media/media_js_standard/avPlayer/entry/src/main/ets/test/AVPlayerStabilityTest.test.js
浏览文件 @ 3dca414d
...@@ -81,7 +81,7 @@ export default function AVPlayerStabilityTest() { ...@@ -81,7 +81,7 @@ export default function AVPlayerStabilityTest() {
beforeAll(async function () { beforeAll(async function () {
console.info('beforeAll case'); console.info('beforeAll case');
for (var i = 0; i < VIDEO_SOURCES.length; i++) { for(var i = 0;i < VIDEO_SOURCES.length; i++){
await getStageFdRead(VIDEO_SOURCES[i]).then((testNumber) => { await getStageFdRead(VIDEO_SOURCES[i]).then((testNumber) => {
fdNumber = testNumber; fdNumber = testNumber;
console.info(TAG + 'this fdNumber is :' + fdNumber) console.info(TAG + 'this fdNumber is :' + fdNumber)
...@@ -107,12 +107,12 @@ export default function AVPlayerStabilityTest() { ...@@ -107,12 +107,12 @@ export default function AVPlayerStabilityTest() {
} }
beforeEach(async function () { beforeEach(async function() {
console.info('beforeEach case'); console.info('beforeEach case');
await AVPlayerTestBase.sleep(1000); await AVPlayerTestBase.sleep(1000);
}) })
afterEach(async function () { afterEach(async function() {
if (avPlayer != null) { if (avPlayer != null) {
avPlayer.release().then(() => { avPlayer.release().then(() => {
console.info(TAG + 'this testCase execution completed') console.info(TAG + 'this testCase execution completed')
...@@ -122,9 +122,9 @@ export default function AVPlayerStabilityTest() { ...@@ -122,9 +122,9 @@ export default function AVPlayerStabilityTest() {
await AVPlayerTestBase.sleep(1000); await AVPlayerTestBase.sleep(1000);
}) })
afterAll(async function () { afterAll(async function() {
console.info('afterAll case'); console.info('afterAll case');
for (var i = 0; i < fdNumbers.length; i++) { for(var i = 0;i < fdNumbers.length; i++){
await mediaTestBase.closeFdNumber(fdNumbers[i]); await mediaTestBase.closeFdNumber(fdNumbers[i]);
} }
}) })
...@@ -223,7 +223,7 @@ export default function AVPlayerStabilityTest() { ...@@ -223,7 +223,7 @@ export default function AVPlayerStabilityTest() {
*/ */
it('SUB_MULTIMEDIA_MEDIA_AVPLAYER_FORMAT_MP4_0500', 0, async function (done) { it('SUB_MULTIMEDIA_MEDIA_AVPLAYER_FORMAT_MP4_0500', 0, async function (done) {
console.info(TAG + 'SUB_MULTIMEDIA_MEDIA_AVPLAYER_FORMAT_MP4_0500 start') console.info(TAG + 'SUB_MULTIMEDIA_MEDIA_AVPLAYER_FORMAT_MP4_0500 start')
AVPlayerTestBase.avPlayerPlay(videos[4], avPlayer, done); AVPlayerTestBase.avPlayerPlay(videos[4], avPlayer,done);
console.info(TAG + 'SUB_MULTIMEDIA_MEDIA_AVPLAYER_FORMAT_MP4_0500 end') console.info(TAG + 'SUB_MULTIMEDIA_MEDIA_AVPLAYER_FORMAT_MP4_0500 end')
}) })
...@@ -761,7 +761,19 @@ export default function AVPlayerStabilityTest() { ...@@ -761,7 +761,19 @@ export default function AVPlayerStabilityTest() {
}) })
/* *
* @tc.number : SUB_MULTIMEDIA_MEDIA_AVPLAYER_FORMAT_SOURCE_0300
* @tc.name : 001.test play source 4k
* @tc.desc : Local Video play source
* @tc.size : MediumTest
* @tc.type : Function test
* @tc.level : Level2
*/
it('SUB_MULTIMEDIA_MEDIA_AVPLAYER_FORMAT_SOURCE_0300', 0, async function (done) {
console.info(TAG + 'SUB_MULTIMEDIA_MEDIA_AVPLAYER_FORMAT_SOURCE_0300 start')
AVPlayerTestBase.avPlayerPlay(videos[43], avPlayer, done);
console.info(TAG + 'SUB_MULTIMEDIA_MEDIA_AVPLAYER_FORMAT_SOURCE_0300 end')
})
/* * /* *
* @tc.number : SUB_MULTIMEDIA_MEDIA_AVPLAYER_STABILITY_01_0100 * @tc.number : SUB_MULTIMEDIA_MEDIA_AVPLAYER_STABILITY_01_0100
...@@ -791,19 +803,19 @@ export default function AVPlayerStabilityTest() { ...@@ -791,19 +803,19 @@ export default function AVPlayerStabilityTest() {
console.info(TAG + 'SUB_MULTIMEDIA_MEDIA_AVPLAYER_STABILITY_01_0200 end') console.info(TAG + 'SUB_MULTIMEDIA_MEDIA_AVPLAYER_STABILITY_01_0200 end')
}) })
/* * // /* *
* @tc.number : SUB_MULTIMEDIA_MEDIA_AVPLAYER_STABILITY_01_0300 // * @tc.number : SUB_MULTIMEDIA_MEDIA_AVPLAYER_STABILITY_01_0300
* @tc.name : 001.test complete->play->seek duration (1000 times) // * @tc.name : 001.test complete->play->seek duration (1000 times)
* @tc.desc : Local Video complete->play->seek duration (1000 times) // * @tc.desc : Local Video complete->play->seek duration (1000 times)
* @tc.size : MediumTest // * @tc.size : MediumTest
* @tc.type : Function test // * @tc.type : Function test
* @tc.level : Level3 // * @tc.level : Level3
*/ // */
it('SUB_MULTIMEDIA_MEDIA_AVPLAYER_STABILITY_01_0300', 0, async function (done) { // it('SUB_MULTIMEDIA_MEDIA_AVPLAYER_STABILITY_01_0300', 0, async function (done) {
console.info(TAG + 'SUB_MULTIMEDIA_MEDIA_AVPLAYER_STABILITY_01_0300 start') // console.info(TAG + 'SUB_MULTIMEDIA_MEDIA_AVPLAYER_STABILITY_01_0300 start')
AVPlayerTestBase.playToCompleted(videos[0], avPlayer, done); // AVPlayerTestBase.playToCompleted(videos[0], avPlayer, done);
console.info(TAG + 'SUB_MULTIMEDIA_MEDIA_AVPLAYER_STABILITY_01_0300 end') // console.info(TAG + 'SUB_MULTIMEDIA_MEDIA_AVPLAYER_STABILITY_01_0300 end')
}) // })
/* * /* *
* @tc.number : SUB_MULTIMEDIA_MEDIA_AVPLAYER_STABILITY_01_0400 * @tc.number : SUB_MULTIMEDIA_MEDIA_AVPLAYER_STABILITY_01_0400
...@@ -883,11 +895,11 @@ export default function AVPlayerStabilityTest() { ...@@ -883,11 +895,11 @@ export default function AVPlayerStabilityTest() {
* @tc.type : Function test * @tc.type : Function test
* @tc.level : Level3 * @tc.level : Level3
*/ */
// it('SUB_MULTIMEDIA_MEDIA_AVPLAYER_PERFORMANCE_01_0100', 0, async function (done) { // it('SUB_MULTIMEDIA_MEDIA_AVPLAYER_PERFORMANCE_01_0100', 0, async function (done) {
// console.info(TAG + 'SUB_MULTIMEDIA_MEDIA_AVPLAYER_PERFORMANCE_01_0100 start') // console.info(TAG + 'SUB_MULTIMEDIA_MEDIA_AVPLAYER_PERFORMANCE_01_0100 start')
// AVPlayerTestBase.createTimeWithCallback(videos[0], avPlayer, done); // AVPlayerTestBase.createTimeWithCallback(videos[0], avPlayer, done);
// console.info(TAG + 'SUB_MULTIMEDIA_MEDIA_AVPLAYER_PERFORMANCE_01_0100 end') // console.info(TAG + 'SUB_MULTIMEDIA_MEDIA_AVPLAYER_PERFORMANCE_01_0100 end')
// }) // })
/* * /* *
* @tc.number : SUB_MULTIMEDIA_MEDIA_AVPLAYER_PERFORMANCE_01_0110 * @tc.number : SUB_MULTIMEDIA_MEDIA_AVPLAYER_PERFORMANCE_01_0110
...@@ -1225,19 +1237,5 @@ export default function AVPlayerStabilityTest() { ...@@ -1225,19 +1237,5 @@ export default function AVPlayerStabilityTest() {
AVPlayerTestBase.firstFrameTime(videos[0], avPlayer, done); AVPlayerTestBase.firstFrameTime(videos[0], avPlayer, done);
console.info(TAG + 'SUB_MULTIMEDIA_MEDIA_AVPLAYER_PERFORMANCE_02_0100 end') console.info(TAG + 'SUB_MULTIMEDIA_MEDIA_AVPLAYER_PERFORMANCE_02_0100 end')
}) })
/* *
* @tc.number : SUB_MULTIMEDIA_MEDIA_AVPLAYER_FORMAT_SOURCE_0300
* @tc.name : 001.test play source 4k
* @tc.desc : Local Video play source
* @tc.size : MediumTest
* @tc.type : Function test
* @tc.level : Level2
*/
it('SUB_MULTIMEDIA_MEDIA_AVPLAYER_FORMAT_SOURCE_0300', 0, async function (done) {
console.info(TAG + 'SUB_MULTIMEDIA_MEDIA_AVPLAYER_FORMAT_SOURCE_0300 start')
AVPlayerTestBase.avPlayerPlay(videos[43], avPlayer, done);
console.info(TAG + 'SUB_MULTIMEDIA_MEDIA_AVPLAYER_FORMAT_SOURCE_0300 end')
})
}) })
} }
\ No newline at end of file
multimedia/media/media_js_standard/avRecorder/Test.json
浏览文件 @ 3dca414d
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
"description": "Configuration for avRecorder Tests", "description": "Configuration for avRecorder Tests",
"driver": { "driver": {
"type": "OHJSUnitTest", "type": "OHJSUnitTest",
"test-timeout": "1000000", "test-timeout": "2000000",
"shell-timeout": "1000000", "shell-timeout": "2000000",
"testcase-timeout": 60000, "testcase-timeout": 150000,
"bundle-name": "ohos.acts.multimedia.audio.avrecorder", "bundle-name": "ohos.acts.multimedia.audio.avrecorder",
"package-name": "ohos.acts.multimedia.audio.avrecorder" "package-name": "ohos.acts.multimedia.audio.avrecorder"
}, },
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或