diff --git a/sensors/miscdevice_standard/src/main/js/test/Vibrator_new.test.js b/sensors/miscdevice_standard/src/main/js/test/Vibrator_new.test.js index 36bc310a7cd5a521a80923fb3c4f0172f36c7190..917d2f03551a3b74dfc27e12ef0799f02a1e62ab 100644 --- a/sensors/miscdevice_standard/src/main/js/test/Vibrator_new.test.js +++ b/sensors/miscdevice_standard/src/main/js/test/Vibrator_new.test.js @@ -50,6 +50,14 @@ describe("VibratorJsTest_misc_2", function () { console.info('afterEach caled') }) + const OPERATION_FAIL_CODE = 14600101; + const PERMISSION_ERROR_CODE = 201; + const PARAMETER_ERROR_CODE = 401; + + const OPERATION_FAIL_MSG = 'Device operation failed.' + const PERMISSION_ERROR_MSG = 'Permission denied.' + const PARAMETER_ERROR_MSG = 'The parameter invalid.' + /* * @tc.name:VibratorJsTest001 * @tc.desc:Verification results of the incorrect parameters of the test interface. @@ -277,19 +285,26 @@ describe("VibratorJsTest_misc_2", function () { * @tc.number:SUB_SensorSystem_Vibrator_JsTest_0100 */ it("VibratorJsTest010", TestType.FUNCTION | Size.MEDIUMTEST | Level.LEVEL3, async function (done) { - function vibrateCallback(error) { - if (error) { - console.info('VibratorJsTest010 stop success'); - expect(true).assertTrue(); - } else { - console.info('VibratorJsTest010 stop off'); - expect(false).assertTrue(); + try { + function vibrateCallback(error) { + if (error) { + console.info('VibratorJsTest010 stop success'); + expect(true).assertTrue(); + } else { + console.info('VibratorJsTest010 stop off'); + expect(false).assertTrue(); + } + setTimeout(() => { + done(); + }, 500); } - setTimeout(() => { - done(); - }, 500); + vibrator.stop("", vibrateCallback); + } catch (error) { + console.info(error); + expect(error.code).assertEqual(PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(PARAMETER_ERROR_MSG); + done(); } - vibrator.stop("", vibrateCallback); }) /* @@ -403,19 +418,26 @@ describe("VibratorJsTest_misc_2", function () { * @tc.number:SUB_SensorSystem_Vibrator_JsTest_0160 */ it("VibratorJsTest016", TestType.FUNCTION | Size.MEDIUMTEST | Level.LEVEL3, async function (done) { - vibrator.stop("").then(() => { - console.log("VibratorJsTest016 stop error"); - expect(false).assertTrue(); - setTimeout(() => { - done(); - }, 500); - }, (error) => { - expect(true).assertTrue(); - console.log("VibratorJsTest016 stop success"); - setTimeout(() => { - done(); - }, 500); - }); + try { + vibrator.stop("").then(() => { + console.log("VibratorJsTest016 stop error"); + expect(false).assertTrue(); + setTimeout(() => { + done(); + }, 500); + }, (error) => { + expect(true).assertTrue(); + console.log("VibratorJsTest016 stop success"); + setTimeout(() => { + done(); + }, 500); + }); + } catch (error) { + console.info(error); + expect(error.code).assertEqual(PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(PARAMETER_ERROR_MSG); + done(); + } }) /* diff --git a/sensors/miscdevice_standard/src/main/js/test/Vibrator_newSupplement.test.js b/sensors/miscdevice_standard/src/main/js/test/Vibrator_newSupplement.test.js index 4ff9d56542b766134246c1aac000de49765ce7e8..3518811a949529c3f5a238df4d333a6ab7e002ab 100644 --- a/sensors/miscdevice_standard/src/main/js/test/Vibrator_newSupplement.test.js +++ b/sensors/miscdevice_standard/src/main/js/test/Vibrator_newSupplement.test.js @@ -52,6 +52,14 @@ describe("VibratorJsTest_misc_3", function () { vibrator.stop("time"); console.info('afterEach called') }) + + const OPERATION_FAIL_CODE = 14600101; + const PERMISSION_ERROR_CODE = 201; + const PARAMETER_ERROR_CODE = 401; + + const OPERATION_FAIL_MSG = 'Device operation failed.' + const PERMISSION_ERROR_MSG = 'Permission denied.' + const PARAMETER_ERROR_MSG = 'The parameter invalid.' /* * @tc.name:VibratorJsTest019 @@ -84,21 +92,28 @@ describe("VibratorJsTest_misc_3", function () { * @tc.number:SUB_SensorSystem_Vibrator_JsTest_0300 */ it("VibratorJsTest020", TestType.FUNCTION | Size.MEDIUMTEST | Level.LEVEL3, async function (done) { - vibrator.vibrate({ - type: "", - duration: 1000 - }, { - usage: "unknown" - }, (error)=>{ - if (error) { - expect(true).assertTrue(); - } else { - expect(false).assertTrue(); - } - setTimeout(()=>{ - done(); - }, 500); - }); + try { + vibrator.vibrate({ + type: "", + duration: 1000 + }, { + usage: "unknown" + }, (error)=>{ + if (error) { + expect(true).assertTrue(); + } else { + expect(false).assertTrue(); + } + setTimeout(()=>{ + done(); + }, 500); + }); + } catch (error) { + console.info(error); + expect(error.code).assertEqual(PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(PARAMETER_ERROR_MSG); + done(); + } }) /* @@ -133,22 +148,30 @@ describe("VibratorJsTest_misc_3", function () { * @tc.number:SUB_SensorSystem_Vibrator_JsTest_0320 */ it("VibratorJsTest022", TestType.FUNCTION | Size.MEDIUMTEST | Level.LEVEL3, async function (done) { - vibrator.vibrate({ - type: "preset", - effectId: "", - count: 3, - }, { - usage: "unknown" - }, (error)=>{ - if (error) { - expect(true).assertTrue(); - } else { - expect(false).assertTrue(); - } - setTimeout(()=>{ - done(); - }, 500); - }); + try { + vibrator.vibrate({ + type: "preset", + effectId: "", + count: 3, + }, { + usage: "unknown" + }, (error)=>{ + if (error) { + expect(true).assertTrue(); + } else { + expect(false).assertTrue(); + } + setTimeout(()=>{ + done(); + }, 500); + }); + } catch (error) { + console.info(error); + expect(error.code).assertEqual(PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(PARAMETER_ERROR_MSG); + done(); + } + }) /* @@ -157,22 +180,30 @@ describe("VibratorJsTest_misc_3", function () { * @tc.number:SUB_SensorSystem_Vibrator_JsTest_0330 */ it("VibratorJsTest023", TestType.FUNCTION | Size.MEDIUMTEST | Level.LEVEL3, async function (done) { - vibrator.vibrate({ - type: "preset", - effectId: "haptic.clock.timer", - count: 3, - }, { - usage: "" - }, (error)=>{ - if (error) { - expect(true).assertTrue(); - } else { - expect(false).assertTrue(); - } - setTimeout(()=>{ - done(); - }, 500); - }); + try { + vibrator.vibrate({ + type: "preset", + effectId: "haptic.clock.timer", + count: 3, + }, { + usage: "" + }, (error)=>{ + if (error) { + expect(true).assertTrue(); + } else { + expect(false).assertTrue(); + } + setTimeout(()=>{ + done(); + }, 500); + }); + } catch (error) { + console.info(error); + expect(error.code).assertEqual(PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(PARAMETER_ERROR_MSG); + done(); + } + }) /* @@ -215,17 +246,24 @@ describe("VibratorJsTest_misc_3", function () { * @tc.number:SUB_SensorSystem_Vibrator_JsTest_0360 */ it("VibratorJsTest026", TestType.FUNCTION | Size.MEDIUMTEST | Level.LEVEL3, async function (done) { - await vibrator.vibrate({ - type: "", - duration: 1000 - }, { - usage: "unknown" - }).then(()=>{ - expect(false).assertTrue(); - }).catch((error)=>{ - expect(true).assertTrue(); - }); - done(); + try { + await vibrator.vibrate({ + type: "", + duration: 1000 + }, { + usage: "unknown" + }).then(()=>{ + expect(false).assertTrue(); + }).catch((error)=>{ + expect(true).assertTrue(); + }); + done(); + } catch (error) { + console.info(error); + expect(error.code).assertEqual(PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(PARAMETER_ERROR_MSG); + done(); + } }) /* @@ -254,19 +292,26 @@ describe("VibratorJsTest_misc_3", function () { * @tc.number:SUB_SensorSystem_Vibrator_JsTest_0380 */ it("VibratorJsTest028", TestType.FUNCTION | Size.MEDIUMTEST | Level.LEVEL3, async function (done) { - vibrator.vibrate({ - type: "preset", - effectId: "", - count: 3, - }, { - usage: "unknown" - }).then(()=>{ - expect(false).assertTrue(); - done(); - }).catch((error)=>{ - expect(true).assertTrue(); + try { + vibrator.vibrate({ + type: "preset", + effectId: "", + count: 3, + }, { + usage: "unknown" + }).then(()=>{ + expect(false).assertTrue(); + done(); + }).catch((error)=>{ + expect(true).assertTrue(); + done(); + }); + } catch (error) { + console.info(error); + expect(error.code).assertEqual(PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(PARAMETER_ERROR_MSG); done(); - }); + } }) /* @@ -275,19 +320,26 @@ describe("VibratorJsTest_misc_3", function () { * @tc.number:SUB_SensorSystem_Vibrator_JsTest_0390 */ it("VibratorJsTest029", TestType.FUNCTION | Size.MEDIUMTEST | Level.LEVEL3, async function (done) { - vibrator.vibrate({ - type: "preset", - effectId: "haptic.clock.timer", - count: 3, - }, { - usage: "" - }).then(()=>{ - expect(false).assertTrue(); - done(); - }).catch((error)=>{ - expect(true).assertTrue(); + try { + vibrator.vibrate({ + type: "preset", + effectId: "haptic.clock.timer", + count: 3, + }, { + usage: "" + }).then(()=>{ + expect(false).assertTrue(); + done(); + }).catch((error)=>{ + expect(true).assertTrue(); + done(); + }); + } catch (error) { + console.info(error); + expect(error.code).assertEqual(PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(PARAMETER_ERROR_MSG); done(); - }); + } }) /* @@ -812,22 +864,29 @@ describe("VibratorJsTest_misc_3", function () { * @tc.number:SUB_SensorSystem_Vibrator_JsTest_0510 */ it("VibratorJsTest041", TestType.FUNCTION | Size.MEDIUMTEST | Level.LEVEL3, async function (done) { - vibrator.vibrate({ - type: "", - duration: 1000 - }, { - id:1, - usage: "unknown" - }, (error)=>{ - if (error) { - expect(true).assertTrue(); - } else { - expect(false).assertTrue(); - } - setTimeout(()=>{ - done(); - }, 500); - }); + try { + vibrator.vibrate({ + type: "", + duration: 1000 + }, { + id:1, + usage: "unknown" + }, (error)=>{ + if (error) { + expect(true).assertTrue(); + } else { + expect(false).assertTrue(); + } + setTimeout(()=>{ + done(); + }, 500); + }); + } catch (error) { + console.info(error); + expect(error.code).assertEqual(PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(PARAMETER_ERROR_MSG); + done(); + } }) /* @@ -863,23 +922,31 @@ describe("VibratorJsTest_misc_3", function () { * @tc.number:SUB_SensorSystem_Vibrator_JsTest_0530 */ it("VibratorJsTest043", TestType.FUNCTION | Size.MEDIUMTEST | Level.LEVEL3, async function (done) { - vibrator.vibrate({ - type: "preset", - effectId: "", - count: 3, - }, { - id:null, - usage: "unknown" - }, (error)=>{ - if (error) { - expect(true).assertTrue(); - } else { - expect(false).assertTrue(); - } - setTimeout(()=>{ - done(); - }, 500); - }); + try { + vibrator.vibrate({ + type: "preset", + effectId: "", + count: 3, + }, { + id:null, + usage: "unknown" + }, (error)=>{ + if (error) { + expect(true).assertTrue(); + } else { + expect(false).assertTrue(); + } + setTimeout(()=>{ + done(); + }, 500); + }); + } catch (error) { + console.info(error); + expect(error.code).assertEqual(PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(PARAMETER_ERROR_MSG); + done(); + } + }) }) } diff --git a/sensors/miscdevice_standard/src/main/js/test/Vibrator_old.test.js b/sensors/miscdevice_standard/src/main/js/test/Vibrator_old.test.js index 93f9f860564df99b70b769c7a036dbda30dc068b..5b9ccedda00cc2d945f3f01c43ee5384ad8f7190 100644 --- a/sensors/miscdevice_standard/src/main/js/test/Vibrator_old.test.js +++ b/sensors/miscdevice_standard/src/main/js/test/Vibrator_old.test.js @@ -50,9 +50,13 @@ describe("VibratorJsTest_misc_1", function () { console.info('afterEach caled') }) - let errMessages = ['Error: ParseParameter: "Get vibrate type fail"', 'Error: ParseParameter: "Wrong argument number"'] - - let errMessage; + const OPERATION_FAIL_CODE = 14600101; + const PERMISSION_ERROR_CODE = 201; + const PARAMETER_ERROR_CODE = 401; + + const OPERATION_FAIL_MSG = 'Device operation failed.' + const PERMISSION_ERROR_MSG = 'Permission denied.' + const PARAMETER_ERROR_MSG = 'The parameter invalid.' /* * @tc.name:SubVibratorJsTest0001 @@ -193,9 +197,9 @@ describe("VibratorJsTest_misc_1", function () { }, }, 25); } catch (error) { - errMessage = error.toString(); console.info('SubVibratorJsTest0007 error:' + error); - expect(errMessage).assertEqual(errMessages[0]); + expect(error.code).assertEqual(PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(PARAMETER_ERROR_MSG); done(); } }) @@ -242,9 +246,9 @@ describe("VibratorJsTest_misc_1", function () { try { vibrator.vibrate(); } catch (error) { - errMessage = error.toString(); console.info('SubVibratorJsTest0009 error:' + error); - expect(errMessage).assertEqual(errMessages[1]); + expect(error.code).assertEqual(PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(PARAMETER_ERROR_MSG); done(); } }) @@ -267,9 +271,9 @@ describe("VibratorJsTest_misc_1", function () { }, function () { }, 25); } catch (error) { - errMessage = error.toString(); console.info('SubVibratorJsTest0010 error:' + error); - expect(errMessage).assertEqual(errMessages[0]); + expect(error.code).assertEqual(PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(PARAMETER_ERROR_MSG); done(); } })