Modify video file name and fix SUB_MULTIMEDIA_CAMERA_SESSION_SET_GET_ZOOM_RATIO error

Signed-off-by: Nyygxr <wuhao30@huawei.com>

multimedia/camera/camera_js_standard/src/main/ets/MainAbility/test/CameraSessionBaseTest.test.ets

@@ -68,7 +68,7 @@ let mVideoConfig = {
     audioSourceType: 1,
     videoSourceType: 0,
     profile: mVideoProfileCfg,
-    url: 'file:///data/media/02.mp4',
+    url: 'file:///data/media/CameraSessionBase.mp4',
     orientationHint: 0,
     location: { latitude: 30, longitude: 130 },
     maxSize: 100,
@@ -178,7 +178,7 @@ export default function cameraSessionTest(surfaceId: any) {
 
     async function getVideoReceiveSurface() {
         console.log(TAG + 'Entering getVideoReceiveSurface')
-        await getFd('02.mp4');
+        await getFd('CameraSessionBase.mp4');
         mVideoConfig.url = mFdPath;
         media.createVideoRecorder((err, recorder) => {
             console.info(TAG + 'Entering create video receiver')
@@ -187,13 +187,13 @@ export default function cameraSessionTest(surfaceId: any) {
             console.info(TAG + 'videoRecorder.prepare called.')
             mVideoRecorder.prepare(mVideoConfig, (err) => {
                 console.info(TAG + 'videoRecorder.prepare success.')
-            })
                 mVideoRecorder.getInputSurface((err, id) => {
                     console.info(TAG + 'getInputSurface called')
                     mVideoSurface = id
                     console.info(TAG + 'getInputSurface surfaceId: ' + JSON.stringify(mVideoSurface))
                 })
             })
+        })
         console.log(TAG + 'Exit getVideoReceiveSurface')
     }
 

multimedia/camera/camera_js_standard/src/main/ets/MainAbility/test/CameraSessionExposureTest.test.ets

@@ -70,7 +70,7 @@ let mVideoConfig = {
     audioSourceType: 1,
     videoSourceType: 0,
     profile: mVideoProfileCfg,
-    url: 'file:///data/media/02.mp4',
+    url: 'file:///data/media/CameraSessionExposure.mp4',
     orientationHint: 0,
     location: { latitude: 30, longitude: 130 },
     maxSize: 100,
@@ -230,7 +230,7 @@ export default function cameraSessionExposureTest(surfaceId: any) {
 
     async function getVideoReceiveSurface() {
         console.log(TAG + 'Entering getVideoReceiveSurface')
-        await getFd('02.mp4');
+        await getFd('CameraSessionExposure.mp4');
         mVideoConfig.url = mFdPath;
         media.createVideoRecorder((err, recorder) => {
             console.info(TAG + 'Entering create video receiver')
@@ -239,13 +239,13 @@ export default function cameraSessionExposureTest(surfaceId: any) {
             console.info(TAG + 'videoRecorder.prepare called.')
             mVideoRecorder.prepare(mVideoConfig, (err) => {
                 console.info(TAG + 'videoRecorder.prepare success.')
-            })
                 mVideoRecorder.getInputSurface((err, id) => {
                     console.info(TAG + 'getInputSurface called')
                     mVideoSurface = id
                     console.info(TAG + 'getInputSurface surfaceId: ' + JSON.stringify(mVideoSurface))
                 })
             })
+        })
         console.log(TAG + 'Exit getVideoReceiveSurface')
     }
 

multimedia/camera/camera_js_standard/src/main/ets/MainAbility/test/CameraSessionFlashTest.test.ets

@@ -68,7 +68,7 @@ let mVideoConfig = {
     audioSourceType: 1,
     videoSourceType: 0,
     profile: mVideoProfileCfg,
-    url: 'file:///data/media/02.mp4',
+    url: 'file:///data/media/CameraSessionFlush.mp4',
     orientationHint: 0,
     location: { latitude: 30, longitude: 130 },
     maxSize: 100,
@@ -181,7 +181,7 @@ export default function cameraSessionFlashTest(surfaceId: any) {
 
     async function getVideoReceiveSurface() {
         console.log(TAG + 'Entering getVideoReceiveSurface')
-        await getFd('02.mp4');
+        await getFd('CameraSessionFlush.mp4');
         mVideoConfig.url = mFdPath;
         media.createVideoRecorder((err, recorder) => {
             console.info(TAG + 'Entering create video receiver')

multimedia/camera/camera_js_standard/src/main/ets/MainAbility/test/CameraSessionFocusTest.test.ets

@@ -67,7 +67,7 @@ let mVideoConfig = {
     audioSourceType: 1,
     videoSourceType: 0,
     profile: mVideoProfileCfg,
-    url: 'file:///data/media/02.mp4',
+    url: 'file:///data/media/CameraSessionFocus.mp4',
     orientationHint: 0,
     location: { latitude: 30, longitude: 130 },
     maxSize: 100,
@@ -227,7 +227,7 @@ export default function cameraSessionFocusTest(surfaceId: any) {
 
     async function getVideoReceiveSurface() {
         console.log(TAG + 'Entering getVideoReceiveSurface')
-        await getFd('02.mp4');
+        await getFd('CameraSessionFocus.mp4');
         mVideoConfig.url = mFdPath;
         media.createVideoRecorder((err, recorder) => {
             console.info(TAG + 'Entering create video receiver')

multimedia/camera/camera_js_standard/src/main/ets/MainAbility/test/CameraSessionVideoStabilizationTest.test.ets

@@ -67,7 +67,7 @@ let mVideoConfig = {
     audioSourceType: 1,
     videoSourceType: 0,
     profile: mVideoProfileCfg,
-    url: 'file:///data/media/02.mp4',
+    url: 'file:///data/media/CameraSessionVideoStabilization.mp4',
     orientationHint: 0,
     location: { latitude: 30, longitude: 130 },
     maxSize: 100,
@@ -180,7 +180,7 @@ export default function cameraSessionVideoStabilizationTest(surfaceId: any) {
 
     async function getVideoReceiveSurface() {
         console.log(TAG + 'Entering getVideoReceiveSurface')
-        await getFd('02.mp4');
+        await getFd('CameraSessionVideoStabilization.mp4');
         mVideoConfig.url = mFdPath;
         media.createVideoRecorder((err, recorder) => {
             console.info(TAG + 'Entering create video receiver')

multimedia/camera/camera_js_standard/src/main/ets/MainAbility/test/CameraSessionZoomRatioTest.test.ets

@@ -69,7 +69,7 @@ let mVideoConfig = {
     audioSourceType: 1,
     videoSourceType: 0,
     profile: mVideoProfileCfg,
-    url: 'file:///data/media/02.mp4',
+    url: 'file:///data/media/CameraSessionZoomRatio.mp4',
     orientationHint: 0,
     location: { latitude: 30, longitude: 130 },
     maxSize: 100,
@@ -182,7 +182,7 @@ export default function cameraSessionZoomRatioTest(surfaceId: any) {
 
     async function getVideoReceiveSurface() {
         console.log(TAG + 'Entering getVideoReceiveSurface')
-        await getFd('02.mp4');
+        await getFd('CameraSessionZoomRatio.mp4');
         mVideoConfig.url = mFdPath;
         media.createVideoRecorder((err, recorder) => {
             console.info(TAG + 'Entering create video receiver')
@@ -987,8 +987,8 @@ export default function cameraSessionZoomRatioTest(surfaceId: any) {
 
         /**
         * @tc.number    : SUB_MULTIMEDIA_CAMERA_SESSION_SET_GET_ZOOM_RATIO_CALLBACK_0103
-        * @tc.name      : Check capture session zoom ratio with callback(invalid value, max - 1)
-        * @tc.desc      : Check capture session zoom ratio with callback(invalid value, max - 1)
+        * @tc.name      : Check capture session zoom ratio with callback(invalid value, min - 1)
+        * @tc.desc      : Check capture session zoom ratio with callback(invalid value, min - 1)
         * @tc.size      : MEDIUM
         * @tc.type      : Function
         * @tc.level     : Level 0
@@ -1006,7 +1006,7 @@ export default function cameraSessionZoomRatioTest(surfaceId: any) {
     
                     await startCameraSession(mCameraInputArray[i]);
     
-                    mCameraSession.setZoomRatio((mZoomRatioMaxArray[i] - 1), async (err) => {
+                    mCameraSession.setZoomRatio((mZoomRatioMinArray[i] - 1), async (err) => {
                         console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_SESSION_SET_GET_ZOOM_RATIO_CALLBACK_0103 callback");
                         if (!err) {
                             console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_SESSION_SET_GET_ZOOM_RATIO_CALLBACK_0103 PASSED with ZoomRatio is: " + (mZoomRatioMaxArray[i] - 1));
@@ -1020,7 +1020,7 @@ export default function cameraSessionZoomRatioTest(surfaceId: any) {
                     mCameraSession.getZoomRatio(async (err, data) => {
                         console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_SESSION_SET_GET_ZOOM_RATIO_CALLBACK_0103 callback");
                         if (!err) {
-                            if (data != (mZoomRatioMaxArray[i] - 1)) {
+                            if (data != (mZoomRatioMinArray[i] - 1)) {
                                 console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_SESSION_SET_GET_ZOOM_RATIO_CALLBACK_0103 PASSED with ZoomRatio is: " + data);
                             } else {
                                 console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_SESSION_SET_GET_ZOOM_RATIO_CALLBACK_0103 FAILED with ZoomRatio is: " + data);
@@ -1045,8 +1045,8 @@ export default function cameraSessionZoomRatioTest(surfaceId: any) {
 
         /**
         * @tc.number    : SUB_MULTIMEDIA_CAMERA_SESSION_SET_GET_ZOOM_RATIO_PROMISE_0103
-        * @tc.name      : Check capture session set zoom ratio with promise(invalid value, max - 1)
-        * @tc.desc      : Check capture session set zoom ratio with promise(invalid value, max - 1)
+        * @tc.name      : Check capture session set zoom ratio with promise(invalid value, min - 1)
+        * @tc.desc      : Check capture session set zoom ratio with promise(invalid value, min - 1)
         * @tc.size      : MEDIUM
         * @tc.type      : Function
         * @tc.level     : Level 0
@@ -1064,14 +1064,14 @@ export default function cameraSessionZoomRatioTest(surfaceId: any) {
     
                     await startCameraSession(mCameraInputArray[i]);
     
-                    await mCameraSession.setZoomRatio((mZoomRatioMaxArray[i] - 1));
+                    await mCameraSession.setZoomRatio((mZoomRatioMinArray[i] - 1));
                     console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_SESSION_SET_GET_ZOOM_RATIO_PROMISE_0103 finish");
                     console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_SESSION_SET_GET_ZOOM_RATIO_PROMISE_0103 PASSED with ZoomRatio is: " + (mZoomRatioMaxArray[i] - 1));  
                     await sleep(500);
 
                     let zoomRatio = await mCameraSession.getZoomRatio();
                     console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_SESSION_SET_GET_ZOOM_RATIO_PROMISE_0103 finish");
-                    if (zoomRatio != (mZoomRatioMaxArray[i] - 1)) {
+                    if (zoomRatio != (mZoomRatioMinArray[i] - 1)) {
                         console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_SESSION_SET_GET_ZOOM_RATIO_PROMISE_0103 PASSED with ZoomRatio is: " + zoomRatio);
                     } else {
                         console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_SESSION_SET_GET_ZOOM_RATIO_PROMISE_0103 FAILED with ZoomRatio is: " + zoomRatio);
@@ -1091,8 +1091,8 @@ export default function cameraSessionZoomRatioTest(surfaceId: any) {
 
         /**
         * @tc.number    : SUB_MULTIMEDIA_CAMERA_SESSION_SET_GET_ZOOM_RATIO_CALLBACK_0104
-        * @tc.name      : Check capture session zoom ratio with callback(invalid value, max - 0.1)
-        * @tc.desc      : Check capture session zoom ratio with callback(invalid value, max - 0.1)
+        * @tc.name      : Check capture session zoom ratio with callback(invalid value, min - 0.1)
+        * @tc.desc      : Check capture session zoom ratio with callback(invalid value, min - 0.1)
         * @tc.size      : MEDIUM
         * @tc.type      : Function
         * @tc.level     : Level 0
@@ -1149,8 +1149,8 @@ export default function cameraSessionZoomRatioTest(surfaceId: any) {
 
         /**
         * @tc.number    : SUB_MULTIMEDIA_CAMERA_SESSION_SET_GET_ZOOM_RATIO_PROMISE_0104
-        * @tc.name      : Check capture session set zoom ratio with promise(invalid value, max - 0.1)
-        * @tc.desc      : Check capture session set zoom ratio with promise(invalid value, max - 0.1)
+        * @tc.name      : Check capture session set zoom ratio with promise(invalid value, min - 0.1)
+        * @tc.desc      : Check capture session set zoom ratio with promise(invalid value, min - 0.1)
         * @tc.size      : MEDIUM
         * @tc.type      : Function
         * @tc.level     : Level 0
@@ -1168,14 +1168,14 @@ export default function cameraSessionZoomRatioTest(surfaceId: any) {
     
                     await startCameraSession(mCameraInputArray[i]);
     
-                    await mCameraSession.setZoomRatio((mZoomRatioMaxArray[i] - 0.1));
+                    await mCameraSession.setZoomRatio((mZoomRatioMinArray[i] - 0.1));
                     console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_SESSION_SET_GET_ZOOM_RATIO_PROMISE_0104 finish");
                     console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_SESSION_SET_GET_ZOOM_RATIO_PROMISE_0104 PASSED with ZoomRatio is: " + (mZoomRatioMaxArray[i] - 0.1));  
                     await sleep(500);
 
                     let zoomRatio = await mCameraSession.getZoomRatio();
                     console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_SESSION_SET_GET_ZOOM_RATIO_PROMISE_0104 finish");
-                    if (zoomRatio != (mZoomRatioMaxArray[i] - 0.1)) {
+                    if (zoomRatio != (mZoomRatioMinArray[i] - 0.1)) {
                         console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_SESSION_SET_GET_ZOOM_RATIO_PROMISE_0104 PASSED with ZoomRatio is: " + zoomRatio);
                     } else {
                         console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_SESSION_SET_GET_ZOOM_RATIO_PROMISE_0104 FAILED with ZoomRatio is: " + zoomRatio);