Skip to content

X
Xts Acts

OpenHarmony / Xts Acts
1 年多 前同步成功

通知 9
Star 22
Fork 0
X
Xts Acts
提交 c6b87946 编写于 作者: B bayanxing
浏览文件
操作

解决冲突 

Signed-off-by: Nbayanxing <bayanxing@kaihong.com>
上级 7237e727
展开全部 隐藏空白更改
内联 并排
Showing with 3504 addition and 144 deletion
multimedia/media/media_js_standard/AVPlayerTestBase.js
浏览文件 @ c6b87946
......@@ -516,10 +516,12 @@ export async function createToRelease(src, avPlayer, done) {
console.info(`case CreateToRelease loop is ${i}`);
expect(avPlayer.state).assertEqual(AV_PLAYER_STATE.RELEASED);
avPlayer = null;
if(i == 999){
done();
}
}, mediaTestBase.failureCallback).catch(mediaTestBase.catchCallback);
}
}
done();
}
export async function playToCompleted(src, avPlayer, done) {
......@@ -638,7 +640,7 @@ export async function seekLoopWithoutCallback(src, avPlayer, done) {
console.info(`case Initialized in, surfaceID is ${surfaceID}`);
avPlayer = await idle(src, avPlayer)
await setSource(avPlayer, src);
if(avPlayer.state == AV_PLAYER_STATE.INITIALIZED) {
if(avPlayer.state == 'initialized') {
avPlayer.surfaceId = surfaceID;
preparePromise(avPlayer);
await sleep(2000);
......@@ -679,7 +681,7 @@ export async function prepareToStopLoop(src, avPlayer, done) {
// prepare to stop loop 1000 times
for(var i = 0;i < 1000; i++){
await avPlayer.prepare().then(() => {
expect(avPlayer.state).assertEqual(AV_PLAYER_STATE.PREPARED);
expect(avPlayer.state).assertEqual('prepared');
console.info('prepareToStopLoop avPlayer state is prepared')
}, mediaTestBase.failureCallback).catch(mediaTestBase.catchCallback);
......@@ -717,13 +719,13 @@ export async function prepareToResetLoop(src, avPlayer, done) {
await avPlayer.play().then(() => {
console.info('prepareToResetLoop play success');
expect(avPlayer.state).assertEqual(AV_PLAYER_STATE.PLAYING);
expect(avPlayer.state).assertEqual('playing');
}, (err) => {
console.error('prepareToResetLoop play filed,error message is :' + err.message)
})
await avPlayer.reset().then(() => {
expect(avPlayer.state).assertEqual(AV_PLAYER_STATE.IDLE);
expect(avPlayer.state).assertEqual('idle');
console.info('prepareToResetLoop avPlayer state is reset')
}, mediaTestBase.failureCallback).catch(mediaTestBase.catchCallback);
......@@ -1029,7 +1031,7 @@ export function playTimeCallback(avPlayer, done) {
break;
case AV_PLAYER_STATE.PAUSED:
console.info('playTimeWithCallback play state is PAUSED')
expect(avPlayer.state).assertEqual(AV_PLAYER_STATE.PAUSED);
expect(avPlayer.state).assertEqual('paused');
start = Date.now();
console.info(`playTimeCallback start time is : ${start}`)
// step 3: pause -> playing loop
......@@ -2118,12 +2120,12 @@ function setAVPlayerPlay(src, avPlayer, done) {
break;
case AV_PLAYER_STATE.COMPLETED:
expect(avPlayer.currentTime).assertEqual(avPlayer.duration);
expect(avPlayer.state).assertEqual(AV_PLAYER_STATE.COMPLETED);
expect(avPlayer.state).assertEqual('completed');
avPlayer.release().then(() => {
}, mediaTestBase.failureCallback).catch(mediaTestBase.catchCallback);
break;
case AV_PLAYER_STATE.RELEASED:
expect(avPlayer.state).assertEqual(AV_PLAYER_STATE.RELEASED);
expect(avPlayer.state).assertEqual('released');
offCallback(avPlayer, ['stateChange', 'error']);
avPlayer = null;
done();
......
multimedia/media/media_js_standard/avPlayer/entry/src/main/ets/test/AVPlayerStabilityTest.test.js
浏览文件 @ c6b87946
......@@ -81,7 +81,7 @@ export default function AVPlayerStabilityTest() {
beforeAll(async function () {
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) => {
fdNumber = testNumber;
console.info(TAG + 'this fdNumber is :' + fdNumber)
......@@ -107,12 +107,12 @@ export default function AVPlayerStabilityTest() {
}
beforeEach(async function () {
beforeEach(async function() {
console.info('beforeEach case');
await AVPlayerTestBase.sleep(1000);
})
afterEach(async function () {
afterEach(async function() {
if (avPlayer != null) {
avPlayer.release().then(() => {
console.info(TAG + 'this testCase execution completed')
......@@ -122,9 +122,9 @@ export default function AVPlayerStabilityTest() {
await AVPlayerTestBase.sleep(1000);
})
afterAll(async function () {
afterAll(async function() {
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]);
}
})
......@@ -223,7 +223,7 @@ export default function AVPlayerStabilityTest() {
*/
it('SUB_MULTIMEDIA_MEDIA_AVPLAYER_FORMAT_MP4_0500', 0, async function (done) {
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')
})
......@@ -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
......@@ -883,11 +895,11 @@ export default function AVPlayerStabilityTest() {
* @tc.type : Function test
* @tc.level : Level3
*/
// it('SUB_MULTIMEDIA_MEDIA_AVPLAYER_PERFORMANCE_01_0100', 0, async function (done) {
// console.info(TAG + 'SUB_MULTIMEDIA_MEDIA_AVPLAYER_PERFORMANCE_01_0100 start')
// AVPlayerTestBase.createTimeWithCallback(videos[0], avPlayer, done);
// console.info(TAG + 'SUB_MULTIMEDIA_MEDIA_AVPLAYER_PERFORMANCE_01_0100 end')
// })
// it('SUB_MULTIMEDIA_MEDIA_AVPLAYER_PERFORMANCE_01_0100', 0, async function (done) {
// console.info(TAG + 'SUB_MULTIMEDIA_MEDIA_AVPLAYER_PERFORMANCE_01_0100 start')
// AVPlayerTestBase.createTimeWithCallback(videos[0], avPlayer, done);
// console.info(TAG + 'SUB_MULTIMEDIA_MEDIA_AVPLAYER_PERFORMANCE_01_0100 end')
// })
/* *
* @tc.number : SUB_MULTIMEDIA_MEDIA_AVPLAYER_PERFORMANCE_01_0110
......@@ -1225,19 +1237,5 @@ export default function AVPlayerStabilityTest() {
AVPlayerTestBase.firstFrameTime(videos[0], avPlayer, done);
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
浏览文件 @ c6b87946
......@@ -2,9 +2,9 @@
"description": "Configuration for avRecorder Tests",
"driver": {
"type": "OHJSUnitTest",
"test-timeout": "1000000",
"shell-timeout": "1000000",
"testcase-timeout": 60000,
"test-timeout": "2000000",
"shell-timeout": "2000000",
"testcase-timeout": 150000,
"bundle-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.
先完成此消息的编辑！
想要评论请 注册 或