Skip to content

X
Xts Acts

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

通知 9
Star 22
Fork 0
X
Xts Acts
提交 ea1b537b 编写于 作者: M mali
浏览文件
操作

Merge branch 'monthly_20221018' of https://gitee.com/s_c_p/xts_acts into monthly_20221018 

Signed-off-by: Nmali <mali81@huawei.com>
上级 3cb6bd3e 91ac62a3
隐藏空白更改
内联 并排
Showing with 33 addition and 156 deletion
multimedia/camera/camera_js_standard/Test.json
浏览文件 @ ea1b537b
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
"test-timeout": "3000000", "test-timeout": "3000000",
"bundle-name":"com.open.harmony.multimedia.cameratest", "bundle-name":"com.open.harmony.multimedia.cameratest",
"package-name": "com.open.harmony.multimedia.cameratest", "package-name": "com.open.harmony.multimedia.cameratest",
"shell-timeout": "60000", "shell-timeout": "600000",
"testcase-timeout": 100000 "testcase-timeout": 100000
}, },
"kits": [ "kits": [
......
multimedia/camera/camera_js_standard/entry/src/main/ets/test/CameraJSUnitOutput.test.ets
浏览文件 @ ea1b537b
...@@ -1221,14 +1221,9 @@ export default function cameraJSUnitOutput() { ...@@ -1221,14 +1221,9 @@ export default function cameraJSUnitOutput() {
} else { } else {
console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_PHOTO_OUTPUT_CALLBACK_ON_CAPTURE_START_0100 to operate"); console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_PHOTO_OUTPUT_CALLBACK_ON_CAPTURE_START_0100 to operate");
let count = 0; let count = 0;
photoOutput.on('captureStart', async (err, data) => { photoOutput.on('captureStart', async (data) => {
if (!err) { count++;
count++; console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_PHOTO_OUTPUT_CALLBACK_ON_CAPTURE_START_0100 success");
console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_PHOTO_OUTPUT_CALLBACK_ON_CAPTURE_START_0100 success");
} else {
expect().assertFail();
console.info(TAG + "Error in SUB_MULTIMEDIA_CAMERA_PHOTO_OUTPUT_CALLBACK_ON_CAPTURE_START_0100 FAILED: " + err.message);
}
await sleep(1000); await sleep(1000);
done(); done();
}) })
...@@ -1297,18 +1292,13 @@ export default function cameraJSUnitOutput() { ...@@ -1297,18 +1292,13 @@ export default function cameraJSUnitOutput() {
} else { } else {
console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_PHOTO_OUTPUT_CALLBACK_ON_CAPTURE_END_0100 to operate"); console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_PHOTO_OUTPUT_CALLBACK_ON_CAPTURE_END_0100 to operate");
let count = 0; let count = 0;
photoOutput.on('captureEnd', async (err, data) => { photoOutput.on('captureEnd', async (data) => {
if (!err) { count++;
count++; console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_PHOTO_OUTPUT_CALLBACK_ON_CAPTURE_END_0100 success");
console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_PHOTO_OUTPUT_CALLBACK_ON_CAPTURE_END_0100 success"); console.info(TAG + "SUB_MULTIMEDIA_CAMERA_PHOTO_OUTPUT_CALLBACK_ON_CAPTURE_END_0100, captureId = " + data.captureId);
console.info(TAG + "SUB_MULTIMEDIA_CAMERA_PHOTO_OUTPUT_CALLBACK_ON_CAPTURE_END_0100, captureId = " + data.captureId); console.info(TAG + "SUB_MULTIMEDIA_CAMERA_PHOTO_OUTPUT_CALLBACK_ON_CAPTURE_END_0100, frameCount = " + data.frameCount);
console.info(TAG + "SUB_MULTIMEDIA_CAMERA_PHOTO_OUTPUT_CALLBACK_ON_CAPTURE_END_0100, frameCount = " + data.frameCount); await sleep(1000);
} else { done();
expect().assertFail();
console.info(TAG + "Error in SUB_MULTIMEDIA_CAMERA_PHOTO_OUTPUT_CALLBACK_ON_CAPTURE_END_0100 FAILED: " + err.message);
}
await sleep(1000);
done();
}) })
await sleep(1000); await sleep(1000);
done(); done();
......
multimedia/camera/camera_js_standard/entry/src/main/ets/test/CameraSessionBaseTest.test.ets
浏览文件 @ ea1b537b
...@@ -616,157 +616,44 @@ export default function cameraSessionTest() { ...@@ -616,157 +616,44 @@ export default function cameraSessionTest() {
done(); done();
} }
}) })
/** /**
* @tc.number : SUB_MULTIMEDIA_CAMERA_SESSION_START_STOP_RELEASE_PROMISE_0100 * @tc.number : SUB_MULTIMEDIA_CAMERA_SESSION_START_STOP_PROMISE_0100
* @tc.name : Check capture session start/stop/release output with promise or not * @tc.name : Check capture session start/stop/release output with promise or not
* @tc.desc : Check capture session start/stop/release output with promise or not * @tc.desc : Check capture session start/stop/release output with promise or not
* @tc.size : MEDIUM * @tc.size : MEDIUM
* @tc.type : Function * @tc.type : Function
* @tc.level : Level 0 * @tc.level : Level 0
*/ */
it('SUB_MULTIMEDIA_CAMERA_SESSION_START_STOP_RELEASE_PROMISE_0100', 0, async function (done) { it('SUB_MULTIMEDIA_CAMERA_SESSION_START_STOP_PROMISE_0100', 0, async function (done) {
console.info("--------------SUB_MULTIMEDIA_CAMERA_SESSION_START_STOP_RELEASE_PROMISE_0100--------------"); console.info("--------------SUB_MULTIMEDIA_CAMERA_SESSION_START_STOP_PROMISE_0100--------------");
if (mCameraNum == 0) { if (mCameraNum == 0) {
console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_SESSION_START_STOP_RELEASE_PROMISE_0100 FAILED with NoCamera"); console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_SESSION_START_STOP_PROMISE_0100 FAILED with NoCamera");
expect().assertFail(); expect().assertFail();
done(); done();
} }
else { else {
for (let i = 0; i < mCameraNum; i++) { for (let i = 0; i < mCameraNum; i++) {
console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_SESSION_START_STOP_RELEASE_PROMISE_0100 start for camera[" + i + "]"); console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_SESSION_START_STOP_PROMISE_0100 start for camera[" + i + "]");
await startCameraSession(i); await startCameraSession(i);
await mCameraSession.start(); await mCameraSession.start();
console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_SESSION_START_STOP_RELEASE_PROMISE_0100 start PASSED"); console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_SESSION_START_STOP_PROMISE_0100 start PASSED");
await sleep(2000); await sleep(2000);
await mCameraSession.stop(); await mCameraSession.stop();
console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_SESSION_START_STOP_RELEASE_PROMISE_0100 stop PASSED"); console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_SESSION_START_STOP_PROMISE_0100 stop PASSED");
await sleep(500);
await mCameraSession.release();
console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_SESSION_START_STOP_RELEASE_PROMISE_0100 release PASSED");
await sleep(500); await sleep(500);
console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_SESSION_START_STOP_RELEASE_PROMISE_0100 end for camera[" + i + "]"); await stopCameraSession();
console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_SESSION_START_STOP_PROMISE_0100 end for camera[" + i + "]");
} }
console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_SESSION_START_STOP_RELEASE_PROMISE_0100 ends here"); console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_SESSION_START_STOP_PROMISE_0100 ends here");
done(); done();
} }
}) })
// /**
// * @tc.number : SUB_MULTIMEDIA_CAMERA_SESSION_ADD_REMOVE_OUTPUT_PROMISE_0101
// * @tc.name : Check capture session can add/remove output with promise or not for photo
// * @tc.desc : Check capture session can add/remove output with promise or not for photo
// * @tc.size : MEDIUM
// * @tc.type : Function
// * @tc.level : Level 2
// */
// it('SUB_MULTIMEDIA_CAMERA_SESSION_ADD_REMOVE_OUTPUT_PROMISE_0101', 2, async function (done) {
// console.info("--------------SUB_MULTIMEDIA_CAMERA_SESSION_ADD_REMOVE_OUTPUT_PROMISE_0101--------------");
// if (mCameraNum == 0) {
// console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_SESSION_ADD_REMOVE_OUTPUT_PROMISE_0101 FAILED with NoCamera");
// expect().assertFail();
// done();
// }
// else {
// await createInput(0);
// createOutput(0);
// if (!isEmpty(mPhotoOutput)) {
// if (!isEmpty(mPreviewOutput)) {
// console.info(TAG + "Start to addOutput mPreviewOutput");
// await mCameraSession.addOutput(mPreviewOutput);
// }
// mCameraSession.addOutput(mPhotoOutput);
// console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_SESSION_ADD_REMOVE_OUTPUT_PROMISE_0101 add PASSED");
// mCameraSession.addInput(mCameraInput);
// await mCameraSession.commitConfig();
// mCameraSession.beginConfig();
// if (!isEmpty(mPreviewOutput)) {
// console.info(TAG + "Start to removeOutput mPreviewOutput");
// mCameraSession.removeOutput(mPreviewOutput);
// }
// mCameraSession.removeOutput(mPhotoOutput);
// console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_SESSION_ADD_REMOVE_OUTPUT_PROMISE_0101 remove PASSED");
// mCameraSession.removeInput(mCameraInput);
// } else {
// console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_SESSION_ADD_REMOVE_OUTPUT_PROMISE_0101 FAILED");
// expect().assertFail();
// }
// await releaseInput();
// await releaseOutput();
// console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_SESSION_ADD_REMOVE_OUTPUT_PROMISE_0101 ends here");
// done();
// }
// })
// /**
// * @tc.number : SUB_MULTIMEDIA_CAMERA_SESSION_ADD_REMOVE_OUTPUT_PROMISE_0102
// * @tc.name : Check capture session can add/remove output with promise or not for video
// * @tc.desc : Check capture session can add/remove output with promise or not for video
// * @tc.size : MEDIUM
// * @tc.type : Function
// * @tc.level : Level 2
// */
// it('SUB_MULTIMEDIA_CAMERA_SESSION_ADD_REMOVE_OUTPUT_PROMISE_0102', 2, async function (done) {
// console.info("--------------SUB_MULTIMEDIA_CAMERA_SESSION_ADD_REMOVE_OUTPUT_PROMISE_0102--------------");
// if (mCameraNum == 0) {
// console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_SESSION_ADD_REMOVE_OUTPUT_PROMISE_0102 FAILED with NoCamera");
// expect().assertFail();
// done();
// }
// else {
// await createInput(0);
// createOutput(0);
// if (!isEmpty(mVideoOutput)) {
// if (!isEmpty(mPreviewOutput)) {
// console.info(TAG + "Start to addOutput mPreviewOutput");
// mCameraSession.addOutput(mPreviewOutput);
// }
// mCameraSession.addOutput(mVideoOutput);
// console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_SESSION_ADD_REMOVE_OUTPUT_PROMISE_0102 PASSED");
// mCameraSession.addInput(mCameraInput);
// await mCameraSession.commitConfig();
// mCameraSession.beginConfig();
// if (!isEmpty(mPreviewOutput)) {
// console.info(TAG + "Start to removeOutput mPreviewOutput");
// mCameraSession.removeOutput(mPreviewOutput);
// }
// mCameraSession.removeOutput(mVideoOutput);
// console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_SESSION_ADD_REMOVE_OUTPUT_PROMISE_0102 remove PASSED");
// mCameraSession.removeInput(mCameraInput);
// } else {
// console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_SESSION_ADD_REMOVE_OUTPUT_PROMISE_0102 FAILED");
// }
// await releaseInput();
// await releaseOutput();
// console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_SESSION_ADD_REMOVE_OUTPUT_PROMISE_0102 ends here");
// done();
// }
// })
/** /**
* @tc.number : SUB_MULTIMEDIA_CAMERA_SESSION_RELEASE_PROMISE_0100 * @tc.number : SUB_MULTIMEDIA_CAMERA_SESSION_RELEASE_PROMISE_0100
......
multimedia/camera/camera_js_standard/entry/src/main/ets/test/CameraSessionExposureTest.test.ets
浏览文件 @ ea1b537b
...@@ -74,12 +74,12 @@ let mVideoConfig = { ...@@ -74,12 +74,12 @@ let mVideoConfig = {
maxDuration: 500 maxDuration: 500
} }
let mPicWidthMax = 8192; let mPicWidthMax = 1;
let mPicHeightMax = 8192; let mPicHeightMax = 1;
let mMETERINGPoint = { let mMETERINGPoint = {
x: mPicWidthMax / 2, x: mPicWidthMax / 2.0,
y: mPicHeightMax / 2, y: mPicHeightMax / 2.0,
} }
let mMETERINGPointLT = { let mMETERINGPointLT = {
...@@ -898,9 +898,9 @@ export default function cameraSessionExposureTest() { ...@@ -898,9 +898,9 @@ export default function cameraSessionExposureTest() {
} else { } else {
for (let i = 0; i < mCameraNum; i++) { for (let i = 0; i < mCameraNum; i++) {
console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_SESSION_SET_GET_METERING_POINT_PROMISE_0101 start for camera[" + i + "]"); console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_SESSION_SET_GET_METERING_POINT_PROMISE_0101 start for camera[" + i + "]");
await startCameraSession(i); await startCameraSession(i);
mCameraSession.setMeteringPoint(mMETERINGPointLT); mCameraSession.setMeteringPoint(mMETERINGPointLT);
console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_SESSION_SET_GET_METERING_POINT_PROMISE_0101 finish"); console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_SESSION_SET_GET_METERING_POINT_PROMISE_0101 finish");
console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_SESSION_SET_GET_METERING_POINT_PROMISE_0101 PASSED with METERINGPoint is: " + mMETERINGPointLT.x + ", " + mMETERINGPointLT.y); console.info(TAG + "Entering SUB_MULTIMEDIA_CAMERA_SESSION_SET_GET_METERING_POINT_PROMISE_0101 PASSED with METERINGPoint is: " + mMETERINGPointLT.x + ", " + mMETERINGPointLT.y);
......
multimedia/camera/camera_js_standard/entry/src/main/ets/test/CameraSessionFocusTest.test.ets
浏览文件 @ ea1b537b
...@@ -71,12 +71,12 @@ let mVideoConfig = { ...@@ -71,12 +71,12 @@ let mVideoConfig = {
maxDuration: 500 maxDuration: 500
} }
let mPicWidthMax = 8192; let mPicWidthMax = 1;
let mPicHeightMax = 8192; let mPicHeightMax = 1;
let mFocusPoint = { let mFocusPoint = {
x: mPicWidthMax / 2, x: mPicWidthMax / 2.0,
y: mPicHeightMax / 2, y: mPicHeightMax / 2.0,
} }
let mFocusPointLT = { let mFocusPointLT = {
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或