From f38c73e5e0a46341c4e4451a9b0c33208b6322d5 Mon Sep 17 00:00:00 2001 From: yygxr Date: Wed, 2 Nov 2022 05:09:55 -0700 Subject: [PATCH] fix xts case error for musl Signed-off-by: yygxr --- .../test/CameraJSUnitOutput.test.ets | 27 ++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/multimedia/camera/camera_js_standard/src/main/ets/MainAbility/test/CameraJSUnitOutput.test.ets b/multimedia/camera/camera_js_standard/src/main/ets/MainAbility/test/CameraJSUnitOutput.test.ets index 5777ca56e..c9c62b970 100755 --- a/multimedia/camera/camera_js_standard/src/main/ets/MainAbility/test/CameraJSUnitOutput.test.ets +++ b/multimedia/camera/camera_js_standard/src/main/ets/MainAbility/test/CameraJSUnitOutput.test.ets @@ -781,18 +781,21 @@ export default function cameraJSUnitOutput(surfaceId: any) { console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_CAPTURE_SESSION_ADD_METADATA_OUTPUT_CALLBACK_0100 captureSession == null || undefined") expect().assertFail(); } else { - captureSession.addOutput(metadataOutput, async (err) => { - if (!err) { - expect(true).assertTrue(); - console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_CAPTURE_SESSION_ADD_METADATA_OUTPUT_CALLBACK_0100 success"); - } else { - console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_CAPTURE_SESSION_ADD_METADATA_OUTPUT_CALLBACK_0100 FAILED: " + err.message); - expect().assertFail(); - } - console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_CAPTURE_SESSION_ADD_METADATA_OUTPUT_CALLBACK_0100 ends here"); - await sleep(1000); - done(); - }) + if (!isEmpty(metadataOutput)) { + captureSession.addOutput(metadataOutput, async (err) => { + if (!err) { + expect(true).assertTrue(); + console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_CAPTURE_SESSION_ADD_METADATA_OUTPUT_CALLBACK_0100 success"); + } else { + console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_CAPTURE_SESSION_ADD_METADATA_OUTPUT_CALLBACK_0100 FAILED: " + err.message); + expect().assertFail(); + } + console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_CAPTURE_SESSION_ADD_METADATA_OUTPUT_CALLBACK_0100 ends here"); + await sleep(1000); + done(); + }) + } + } await sleep(1000); done(); -- GitLab