Skip to content

X
Xts Acts

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

通知 9
Star 22
Fork 0
X
Xts Acts
提交 a9eedeac 编写于 作者: Y yygxr
浏览文件
操作

fix xts case error for musl 

Signed-off-by: Nyygxr <wuhao30@huawei.com>
上级 4631b50a
隐藏空白更改
内联 并排
Showing with 49 addition and 45 deletion
multimedia/camera/camera_js_standard/src/main/ets/MainAbility/test/CameraSessionBaseTest.test.ets
浏览文件 @ a9eedeac
...@@ -1046,37 +1046,39 @@ export default function cameraSessionTest(surfaceId: any) { ...@@ -1046,37 +1046,39 @@ export default function cameraSessionTest(surfaceId: any) {
await createInput(i); await createInput(i);
await createOutput(i); await createOutput(i);
mCameraSession.addInput(mCameraInput, async (err) => {
console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_SESSION_ADD_REMOVE_INPUT_CALLBACK_0100 callback");
if (!err) {
console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_SESSION_ADD_REMOVE_INPUT_CALLBACK_0100 PASSED");
} else {
console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_SESSION_ADD_REMOVE_INPUT_CALLBACK_0100 FAILED : " + err.message);
expect().assertFail();
}
})
await mCameraSession.addOutput(mPreviewOutput);
await mCameraSession.addOutput(mPhotoOutput);
await sleep(500);
await commitCameraSessionConfig(); if (!isEmpty(mPreviewOutput) && !isEmpty(mPhotoOutput)) {
await sleep(1); mCameraSession.addInput(mCameraInput, async (err) => {
await beginCameraSessionConfig(); console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_SESSION_ADD_REMOVE_INPUT_CALLBACK_0100 callback");
await sleep(1); if (!err) {
console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_SESSION_ADD_REMOVE_INPUT_CALLBACK_0100 PASSED");
mCameraSession.removeInput(mCameraInput, async (err) => { } else {
console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_SESSION_ADD_REMOVE_INPUT_CALLBACK_0100 callback"); console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_SESSION_ADD_REMOVE_INPUT_CALLBACK_0100 FAILED : " + err.message);
if (!err) { expect().assertFail();
console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_SESSION_ADD_REMOVE_INPUT_CALLBACK_0100 PASSED"); }
} else { })
console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_SESSION_ADD_REMOVE_INPUT_CALLBACK_0100 FAILED : " + err.message); await mCameraSession.addOutput(mPreviewOutput);
expect().assertFail(); await mCameraSession.addOutput(mPhotoOutput);
} await sleep(500);
})
await mCameraSession.removeOutput(mPreviewOutput); await commitCameraSessionConfig();
await mCameraSession.removeOutput(mPhotoOutput); await sleep(1);
await sleep(500); await beginCameraSessionConfig();
await sleep(1);
mCameraSession.removeInput(mCameraInput, async (err) => {
console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_SESSION_ADD_REMOVE_INPUT_CALLBACK_0100 callback");
if (!err) {
console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_SESSION_ADD_REMOVE_INPUT_CALLBACK_0100 PASSED");
} else {
console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_SESSION_ADD_REMOVE_INPUT_CALLBACK_0100 FAILED : " + err.message);
expect().assertFail();
}
})
await mCameraSession.removeOutput(mPreviewOutput);
await mCameraSession.removeOutput(mPhotoOutput);
await sleep(500);
}
await releaseInput(); await releaseInput();
await releaseOutput(); await releaseOutput();
...@@ -1112,20 +1114,22 @@ export default function cameraSessionTest(surfaceId: any) { ...@@ -1112,20 +1114,22 @@ export default function cameraSessionTest(surfaceId: any) {
await createInput(i); await createInput(i);
await createOutput(i); await createOutput(i);
await mCameraSession.addInput(mCameraInput); if (!isEmpty(mPreviewOutput) && !isEmpty(mPhotoOutput)) {
await mCameraSession.addOutput(mPreviewOutput); await mCameraSession.addInput(mCameraInput);
await mCameraSession.addOutput(mPhotoOutput); await mCameraSession.addOutput(mPreviewOutput);
await sleep(500); await mCameraSession.addOutput(mPhotoOutput);
await sleep(500);
await commitCameraSessionConfig(); await commitCameraSessionConfig();
await sleep(1); await sleep(1);
await beginCameraSessionConfig(); await beginCameraSessionConfig();
await sleep(1); await sleep(1);
await mCameraSession.removeInput(mCameraInput); await mCameraSession.removeInput(mCameraInput);
await mCameraSession.removeOutput(mPreviewOutput); await mCameraSession.removeOutput(mPreviewOutput);
await mCameraSession.removeOutput(mPhotoOutput); await mCameraSession.removeOutput(mPhotoOutput);
await sleep(500); await sleep(500);
}
await releaseInput(); await releaseInput();
await releaseOutput(); await releaseOutput();
...@@ -1158,7 +1162,7 @@ export default function cameraSessionTest(surfaceId: any) { ...@@ -1158,7 +1162,7 @@ export default function cameraSessionTest(surfaceId: any) {
await createInput(0); await createInput(0);
await createOutput(0); await createOutput(0);
if (!isEmpty(mPreviewOutput)) { if (!isEmpty(mPreviewOutput) && !isEmpty(mPhotoOutput)) {
mCameraSession.addOutput(mPreviewOutput, async (err) => { mCameraSession.addOutput(mPreviewOutput, async (err) => {
console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_SESSION_ADD_REMOVE_OUTPUT_CALLBACK_0100 add callback"); console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_SESSION_ADD_REMOVE_OUTPUT_CALLBACK_0100 add callback");
if (!err) { if (!err) {
...@@ -1222,7 +1226,7 @@ export default function cameraSessionTest(surfaceId: any) { ...@@ -1222,7 +1226,7 @@ export default function cameraSessionTest(surfaceId: any) {
await createInput(0); await createInput(0);
await createOutput(0); await createOutput(0);
if (!isEmpty(mPreviewOutput)) { if (!isEmpty(mPreviewOutput) && !isEmpty(mPhotoOutput)) {
await mCameraSession.addOutput(mPreviewOutput); await mCameraSession.addOutput(mPreviewOutput);
await mCameraSession.addOutput(mPhotoOutput); await mCameraSession.addOutput(mPhotoOutput);
console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_SESSION_ADD_REMOVE_OUTPUT_PROMISE_0100 add PASSED"); console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_SESSION_ADD_REMOVE_OUTPUT_PROMISE_0100 add PASSED");
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或