diff --git a/sensors/miscdevice_standard/Test.json b/sensors/miscdevice_standard/Test.json index 741aeefa18b39167aa54ffb8e564886539e712ba..b4fff3555b4755b6460f6793e7d5f9896757a2dd 100644 --- a/sensors/miscdevice_standard/Test.json +++ b/sensors/miscdevice_standard/Test.json @@ -4,8 +4,8 @@ "type": "OHJSUnitTest", "test-timeout": "160000", "shell-timeout": "160000", - "bundle-name": "ohos.acts.sensors.sensor.function", - "package-name": "ohos.acts.sensors.sensor.function" + "bundle-name": "ohos.acts.sensors.miscdevice.function", + "package-name": "ohos.acts.sensors.miscdevice.function" }, "kits": [ { diff --git a/sensors/miscdevice_standard/signature/openharmony_sx.p7b b/sensors/miscdevice_standard/signature/openharmony_sx.p7b index 7a778ac45dbfb702e755f024ab39bac1b6c3ec82..f62e57843a01e48680fab35001f4d57e01a8db7d 100644 Binary files a/sensors/miscdevice_standard/signature/openharmony_sx.p7b and b/sensors/miscdevice_standard/signature/openharmony_sx.p7b differ diff --git a/sensors/miscdevice_standard/src/main/config.json b/sensors/miscdevice_standard/src/main/config.json index 1a4a776282f23d439ced0d84b5b36a3504d610bf..10c69e5a41afa032e46d53f301a19a67bb679a79 100644 --- a/sensors/miscdevice_standard/src/main/config.json +++ b/sensors/miscdevice_standard/src/main/config.json @@ -1,6 +1,6 @@ { "app": { - "bundleName": "ohos.acts.sensors.sensor.function", + "bundleName": "ohos.acts.sensors.miscdevice.function", "vendor": "example", "version": { "code": 1, @@ -13,7 +13,7 @@ }, "deviceConfig": {}, "module": { - "package": "ohos.acts.sensors.sensor.function", + "package": "ohos.acts.sensors.miscdevice.function", "name": ".entry", "deviceType": [ "tablet", diff --git a/sensors/sensor_standard/src/main/js/test/List.test.js b/sensors/sensor_standard/src/main/js/test/List.test.js index ba989db8fc6e13d5a2146920b02de0bc77bb9437..1fb9167ca5e734a48d0fb6342893f1ee4e37a3d4 100644 --- a/sensors/sensor_standard/src/main/js/test/List.test.js +++ b/sensors/sensor_standard/src/main/js/test/List.test.js @@ -19,6 +19,7 @@ import SensorJsTest_sensor_60 from './SensorOnOffTest.test_newSensorGeomagnetic. import SensorJsTest_sensor_3 from './SensorOnOffTest.test_oldAccelerometer.js' import SensorJsTest_sensor_25 from './Subscribe_subscribeAccelerometer.js' import SensorJsTest_sensor_39 from './SensorOnOffTest.test_newAccelerometer.js' +import SensorJsTest_sensor_43 from './SensorOnOffTest.test_newGyroScope.js' export default function testsuite() { SensorJsTest_sensor_1() @@ -28,4 +29,5 @@ SystemParameterTest() SensorJsTest_sensor_3() SensorJsTest_sensor_25() SensorJsTest_sensor_39() +SensorJsTest_sensor_43() } diff --git a/sensors/sensor_standard/src/main/js/test/SensorOnOffTest.test_newGyroScope.js b/sensors/sensor_standard/src/main/js/test/SensorOnOffTest.test_newGyroScope.js index e95107de8a44c6743cf4584f6dc113fcdc3cb0ed..bf22d766c54d8f68d9130f70aa2552d1f015f652 100644 --- a/sensors/sensor_standard/src/main/js/test/SensorOnOffTest.test_newGyroScope.js +++ b/sensors/sensor_standard/src/main/js/test/SensorOnOffTest.test_newGyroScope.js @@ -78,11 +78,25 @@ describe("SensorJsTest_sensor_43", function () { */ it("newGyroScope_SensorJsTest014", TestType.FUNCTION | Size.MEDIUMTEST | Level.LEVEL0, async function (done) { console.info('---------newGyroScope_SensorJsTest014--------------'); - sensor.on(sensor.SensorId.GYROSCOPE, callback); - setTimeout(()=>{ - sensor.off(sensor.SensorId.GYROSCOPE); + try{ + sensor.getSingleSensor(sensor.SensorId.GYROSCOPE,(error, data) => { + if (error) { + console.info('newGyroScope_SensorJsTest014 error'); + } else { + expect(typeof(data)).assertEqual("object"); + sensor.on(sensor.SensorId.GYROSCOPE, callback); + setTimeout(()=>{ + sensor.off(sensor.SensorId.GYROSCOPE); + done(); + }, 500); + } + }) + } catch (error) { + console.info('newGyroScope_SensorJsTest014 Device does not support!'); + expect(error.code).assertEqual(PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(PARAMETER_ERROR_MSG); done(); - }, 500); + } }) /* @@ -113,13 +127,27 @@ describe("SensorJsTest_sensor_43", function () { */ it("newGyroScope_SensorJsTest016", TestType.FUNCTION | Size.MEDIUMTEST | Level.LEVEL3, async function (done) { console.info('---------newGyroScope_SensorJsTest016--------------'); - sensor.on(sensor.SensorId.GYROSCOPE, callback, {'interval': 100000000}); - setTimeout(()=>{ - console.info('---------newGyroScope_SensorJsTest016 off in--------------'); - sensor.off(sensor.SensorId.GYROSCOPE); - console.info('---------newGyroScope_SensorJsTest016 off end--------------'); + try{ + sensor.getSingleSensor(sensor.SensorId.GYROSCOPE,(error, data) => { + if (error) { + console.info('newGyroScope_SensorJsTest016 error'); + } else { + expect(typeof(data)).assertEqual("object"); + sensor.on(sensor.SensorId.GYROSCOPE, callback, {'interval': 100000000}); + setTimeout(()=>{ + console.info('---------newGyroScope_SensorJsTest016 off in--------------'); + sensor.off(sensor.SensorId.GYROSCOPE); + console.info('---------newGyroScope_SensorJsTest016 off end--------------'); + done(); + }, 500); + } + }) + } catch (error) { + console.info('newGyroScope_SensorJsTest016 Device does not support!'); + expect(error.code).assertEqual(PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(PARAMETER_ERROR_MSG); done(); - }, 500); + } }) /* @@ -136,19 +164,27 @@ describe("SensorJsTest_sensor_43", function () { expect(typeof (data.z)).assertEqual("number"); expect(typeof (data.timestamp)).assertEqual("number"); } - try { - sensor.on(sensor.SensorId.GYROSCOPE, onSensorCallback, {'interval': 100000000}, 5); + try{ + sensor.getSingleSensor(sensor.SensorId.GYROSCOPE,(error, data) => { + if (error) { + console.info('newGyroScope_SensorJsTest017 error'); + } else { + expect(typeof(data)).assertEqual("object"); + sensor.on(sensor.SensorId.GYROSCOPE, onSensorCallback, {'interval': 100000000}, 5); + setTimeout(()=>{ + console.info('---------newGyroScope_SensorJsTest017 off in--------------'); + sensor.off(sensor.SensorId.GYROSCOPE); + console.info('---------newGyroScope_SensorJsTest017 off end--------------'); + done(); + }, 500); + } + }) } catch (error) { - console.info("newGyroScope_SensorJsTest017 error:" +error); - expect(false).assertTrue(); - done(); - } - setTimeout(()=>{ - console.info('---------newGyroScope_SensorJsTest017 off in--------------'); - sensor.off(sensor.SensorId.GYROSCOPE); - console.info('---------newGyroScope_SensorJsTest017 off end--------------'); + console.info("newGyroScope_SensorJsTest017 Device does not support!"); + expect(error.code).assertEqual(PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(PARAMETER_ERROR_MSG); done(); - }, 500); + } }) /* @@ -157,11 +193,25 @@ describe("SensorJsTest_sensor_43", function () { * @tc.desc: Once Normal Subscription Scenario Use Case */ it("newGyroScope_SensorJsTest018", TestType.FUNCTION | Size.MEDIUMTEST | Level.LEVEL3, async function (done) { - sensor.once(sensor.SensorId.GYROSCOPE, callback); - setTimeout(()=>{ - expect(true).assertTrue(); + try{ + sensor.getSingleSensor(sensor.SensorId.GYROSCOPE,(error, data) => { + if (error) { + console.info('newGyroScope_SensorJsTest018 error'); + } else { + expect(typeof(data)).assertEqual("object"); + sensor.once(sensor.SensorId.GYROSCOPE, callback); + setTimeout(()=>{ + expect(true).assertTrue(); + done(); + }, 500); + } + }) + } catch (error) { + console.info("newGyroScope_SensorJsTest018 Device does not support!"); + expect(error.code).assertEqual(PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(PARAMETER_ERROR_MSG); done(); - }, 500); + } }) /* @@ -199,11 +249,19 @@ describe("SensorJsTest_sensor_43", function () { expect(typeof (data.timestamp)).assertEqual("number"); done(); } - try{ - sensor.once(sensor.SensorId.GYROSCOPE, onceSensorCallback, 5); - } catch (error) { - console.info('newGyroScope_SensorJsTest020 error:' +error); - expect(false).assertTrue(); + try{ + sensor.getSingleSensor(sensor.SensorId.GYROSCOPE,(error, data) => { + if (error) { + console.info('newGyroScope_SensorJsTest020 error'); + } else { + expect(typeof(data)).assertEqual("object"); + sensor.once(sensor.SensorId.GYROSCOPE, onceSensorCallback, 5); + } + }) + } catch (error) { + console.info("newGyroScope_SensorJsTest020 error:" +error); + expect(error.code).assertEqual(PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(PARAMETER_ERROR_MSG); done(); } }) @@ -217,7 +275,7 @@ describe("SensorJsTest_sensor_43", function () { try { sensor.off(invalid, callback); } catch (error) { - console.info('newGyroScope_SensorJsTest021 error:' +error); + console.info('newGyroScope_SensorJsTest021 Device does not support!'); expect(error.code).assertEqual(PARAMETER_ERROR_CODE) expect(error.message).assertEqual(PARAMETER_ERROR_MSG) done(); @@ -235,28 +293,42 @@ describe("SensorJsTest_sensor_43", function () { expect(false).assertTrue(); done(); } - sensor.on(sensor.SensorId.GYROSCOPE, onSensorCallback); - sensor.off(sensor.SensorId.GYROSCOPE, onSensorCallback); - setTimeout(()=>{ - expect(true).assertTrue(); + try{ + sensor.getSingleSensor(sensor.SensorId.GYROSCOPE,(error, data) => { + if (error) { + console.info('newGyroScope_SensorJsTest022 error'); + } else { + expect(typeof(data)).assertEqual("object"); + sensor.on(sensor.SensorId.GYROSCOPE, onSensorCallback); + sensor.off(sensor.SensorId.GYROSCOPE, onSensorCallback); + setTimeout(()=>{ + expect(true).assertTrue(); + done(); + }, 500); + } + }) + } catch (error) { + console.info("newGyroScope_SensorJsTest022 error:" +error); + expect(error.code).assertEqual(PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(PARAMETER_ERROR_MSG); done(); - }, 500); + } }) /* * @tc.number:SUB_SensorsSystem_GYROSCOPE_JSTest_0230 - * @tc.name: newnewGyroScope_SensorJsTest023 + * @tc.name: newGyroScope_SensorJsTest023 * @tc.desc:SensorId1000000 of incoming exception */ - it("newnewGyroScope_SensorJsTest023", TestType.FUNCTION | Size.MEDIUMTEST | Level.LEVEL3, async function (done) { + it("newGyroScope_SensorJsTest023", TestType.FUNCTION | Size.MEDIUMTEST | Level.LEVEL3, async function (done) { function onSensorCallback(data) { - console.info('newnewGyroScope_SensorJsTest023 on error'); + console.info('newGyroScope_SensorJsTest023 on error'); expect(false).assertTrue(); } try { sensor.off(1000000, onSensorCallback); } catch (error) { - console.info("newnewGyroScope_SensorJsTest023 error:" +error); + console.info("newGyroScope_SensorJsTest023 error:" +error); expect(error.code).assertEqual(PARAMETER_ERROR_CODE) expect(error.message).assertEqual(PARAMETER_ERROR_MSG) done(); @@ -269,26 +341,40 @@ describe("SensorJsTest_sensor_43", function () { * @tc.desc:Call interface multiple times */ it("newGyroScope_SensorJsTest024", TestType.FUNCTION | Size.MEDIUMTEST | Level.LEVEL3, async function (done) { - sensor.on(sensor.SensorId.GYROSCOPE, (data)=>{ - console.info("newGyroScope_SensorJsTest024 callback: " + JSON.stringify(data)); - expect(typeof (data.x)).assertEqual("number"); - expect(typeof (data.y)).assertEqual("number"); - expect(typeof (data.z)).assertEqual("number"); - expect(typeof (data.timestamp)).assertEqual("number"); - }); - sensor.on(sensor.SensorId.GYROSCOPE, (data)=>{ - console.info("newGyroScope_SensorJsTest024 callback2: " + JSON.stringify(data)); - expect(typeof (data.x)).assertEqual("number"); - expect(typeof (data.y)).assertEqual("number"); - expect(typeof (data.z)).assertEqual("number"); - expect(typeof (data.timestamp)).assertEqual("number"); - }); - setTimeout(()=>{ - console.info('---------newGyroScope_SensorJsTest024 off in--------------'); - sensor.off(sensor.SensorId.GYROSCOPE); - console.info('---------newGyroScope_SensorJsTest024 off end--------------'); + try{ + sensor.getSingleSensor(sensor.SensorId.GYROSCOPE,(error, data) => { + if (error) { + console.info('newGyroScope_SensorJsTest024 error'); + } else { + expect(typeof(data)).assertEqual("object"); + sensor.on(sensor.SensorId.GYROSCOPE, (data)=>{ + console.info("newGyroScope_SensorJsTest024 callback: " + JSON.stringify(data)); + expect(typeof (data.x)).assertEqual("number"); + expect(typeof (data.y)).assertEqual("number"); + expect(typeof (data.z)).assertEqual("number"); + expect(typeof (data.timestamp)).assertEqual("number"); + }); + sensor.on(sensor.SensorId.GYROSCOPE, (data)=>{ + console.info("newGyroScope_SensorJsTest024 callback2: " + JSON.stringify(data)); + expect(typeof (data.x)).assertEqual("number"); + expect(typeof (data.y)).assertEqual("number"); + expect(typeof (data.z)).assertEqual("number"); + expect(typeof (data.timestamp)).assertEqual("number"); + }); + setTimeout(()=>{ + console.info('---------newGyroScope_SensorJsTest024 off in--------------'); + sensor.off(sensor.SensorId.GYROSCOPE); + console.info('---------newGyroScope_SensorJsTest024 off end--------------'); + done(); + }, 1000); + } + }) + } catch (error) { + console.info("newGyroScope_SensorJsTest024 Device does not support!"); + expect(error.code).assertEqual(PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(PARAMETER_ERROR_MSG); done(); - }, 1000); + } }) /* @@ -300,7 +386,7 @@ describe("SensorJsTest_sensor_43", function () { try { sensor.off(sensor.SensorId.GYROSCOPE, 5); } catch (error) { - console.info('newGyroScope_SensorJsTest025 error:'+error); + console.info('newGyroScope_SensorJsTest025 Device does not support!'); expect(error.code).assertEqual(PARAMETER_ERROR_CODE) expect(error.message).assertEqual(PARAMETER_ERROR_MSG) done(); @@ -314,27 +400,41 @@ describe("SensorJsTest_sensor_43", function () { */ it("newGyroScope_SensorJsTest026", TestType.FUNCTION | Size.MEDIUMTEST | Level.LEVEL3, async function (done) { console.info('---------newGyroScope_SensorJsTest026--------------'); - sensor.on(sensor.SensorId.GYROSCOPE, (data)=>{ - console.info("newGyroScope_SensorJsTest026 callback: " + JSON.stringify(data)); - expect(typeof (data.x)).assertEqual("number"); - expect(typeof (data.y)).assertEqual("number"); - expect(typeof (data.z)).assertEqual("number"); - expect(typeof (data.timestamp)).assertEqual("number"); - }, {'interval': 100000000}); - sensor.once(sensor.SensorId.GYROSCOPE, (data)=>{ - console.info("newGyroScope_SensorJsTest026 callback2: " + JSON.stringify(data)); - expect(typeof (data.x)).assertEqual("number"); - expect(typeof (data.y)).assertEqual("number"); - expect(typeof (data.z)).assertEqual("number"); - expect(typeof (data.timestamp)).assertEqual("number"); - }); - setTimeout(()=>{ - console.info('---------newGyroScope_SensorJsTest026 off in--------------'); - sensor.off(sensor.SensorId.GYROSCOPE); - console.info('---------newGyroScope_SensorJsTest026 off end--------------'); + try{ + sensor.getSingleSensor(sensor.SensorId.GYROSCOPE,(error, data) => { + if (error) { + console.info('newGyroScope_SensorJsTest024 error'); + } else { + expect(typeof(data)).assertEqual("object"); + sensor.on(sensor.SensorId.GYROSCOPE, (data)=>{ + console.info("newGyroScope_SensorJsTest026 callback: " + JSON.stringify(data)); + expect(typeof (data.x)).assertEqual("number"); + expect(typeof (data.y)).assertEqual("number"); + expect(typeof (data.z)).assertEqual("number"); + expect(typeof (data.timestamp)).assertEqual("number"); + }, {'interval': 100000000}); + sensor.once(sensor.SensorId.GYROSCOPE, (data)=>{ + console.info("newGyroScope_SensorJsTest026 callback2: " + JSON.stringify(data)); + expect(typeof (data.x)).assertEqual("number"); + expect(typeof (data.y)).assertEqual("number"); + expect(typeof (data.z)).assertEqual("number"); + expect(typeof (data.timestamp)).assertEqual("number"); + }); + setTimeout(()=>{ + console.info('---------newGyroScope_SensorJsTest026 off in--------------'); + sensor.off(sensor.SensorId.GYROSCOPE); + console.info('---------newGyroScope_SensorJsTest026 off end--------------'); + done(); + }, 1000); + } + }) + } catch (error) { + console.info("newGyroScope_SensorJsTest026 Device does not support!"); + expect(error.code).assertEqual(PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(PARAMETER_ERROR_MSG); done(); - }, 1000); - }) + } + }) /* * @tc.number:SUB_SensorsSystem_GYROSCOPE_JSTest_0270 @@ -343,27 +443,41 @@ describe("SensorJsTest_sensor_43", function () { */ it("newGyroScope_SensorJsTest027", TestType.FUNCTION | Size.MEDIUMTEST | Level.LEVEL3, async function (done) { console.info('---------newGyroScope_SensorJsTest027--------------'); - sensor.on(sensor.SensorId.GYROSCOPE, (data)=>{ - console.info("newGyroScope_SensorJsTest027 callback: " + JSON.stringify(data)); - expect(typeof (data.x)).assertEqual("number"); - expect(typeof (data.y)).assertEqual("number"); - expect(typeof (data.z)).assertEqual("number"); - expect(typeof (data.timestamp)).assertEqual("number"); - }, {'interval': 100000000}); - sensor.on(sensor.SensorId.GYROSCOPE, (data)=>{ - console.info("newGyroScope_SensorJsTest027 callback2: " + JSON.stringify(data)); - expect(typeof (data.x)).assertEqual("number"); - expect(typeof (data.y)).assertEqual("number"); - expect(typeof (data.z)).assertEqual("number"); - expect(typeof (data.timestamp)).assertEqual("number"); - }, {'interval': 100000000}); - setTimeout(()=>{ - console.info('---------newGyroScope_SensorJsTest027 off in--------------'); - sensor.off(sensor.SensorId.GYROSCOPE); - console.info('---------newGyroScope_SensorJsTest027 off end--------------'); - done(); - }, 1000); - }) + try{ + sensor.getSingleSensor(sensor.SensorId.GYROSCOPE,(error, data) => { + if (error) { + console.info('newGyroScope_SensorJsTest024 error'); + } else { + expect(typeof(data)).assertEqual("object"); + sensor.on(sensor.SensorId.GYROSCOPE, (data)=>{ + console.info("newGyroScope_SensorJsTest027 callback: " + JSON.stringify(data)); + expect(typeof (data.x)).assertEqual("number"); + expect(typeof (data.y)).assertEqual("number"); + expect(typeof (data.z)).assertEqual("number"); + expect(typeof (data.timestamp)).assertEqual("number"); + }, {'interval': 100000000}); + sensor.on(sensor.SensorId.GYROSCOPE, (data)=>{ + console.info("newGyroScope_SensorJsTest027 callback2: " + JSON.stringify(data)); + expect(typeof (data.x)).assertEqual("number"); + expect(typeof (data.y)).assertEqual("number"); + expect(typeof (data.z)).assertEqual("number"); + expect(typeof (data.timestamp)).assertEqual("number"); + }, {'interval': 100000000}); + setTimeout(()=>{ + console.info('---------newGyroScope_SensorJsTest027 off in--------------'); + sensor.off(sensor.SensorId.GYROSCOPE); + console.info('---------newGyroScope_SensorJsTest027 off end--------------'); + done(); + }, 1000); + } + }) + } catch (error) { + console.info("newGyroScope_SensorJsTest027 Device does not support!"); + expect(error.code).assertEqual(PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(PARAMETER_ERROR_MSG); + done(); + } + }) /* * @tc.number:SUB_SensorsSystem_GYROSCOPE_JSTest_0280 @@ -375,7 +489,7 @@ describe("SensorJsTest_sensor_43", function () { try { sensor.on(); } catch (error) { - console.info("newGyroScope_SensorJsTest028 error:" +error); + console.info("newGyroScope_SensorJsTest028_on error:" +error); expect(error.code).assertEqual(PARAMETER_ERROR_CODE); expect(error.message).assertEqual(PARAMETER_ERROR_MSG); done(); @@ -383,7 +497,7 @@ describe("SensorJsTest_sensor_43", function () { try { sensor.once(); } catch (error) { - console.info("newGyroScope_SensorJsTest028 error:" +error); + console.info("newGyroScope_SensorJsTest028_once error:" +error); expect(error.code).assertEqual(PARAMETER_ERROR_CODE); expect(error.message).assertEqual(PARAMETER_ERROR_MSG); done(); @@ -391,7 +505,7 @@ describe("SensorJsTest_sensor_43", function () { try { sensor.off(); } catch (error) { - console.info("newGyroScope_SensorJsTest028 error:" +error); + console.info("newGyroScope_SensorJsTest028_off error:" +error); expect(error.code).assertEqual(PARAMETER_ERROR_CODE); expect(error.message).assertEqual(PARAMETER_ERROR_MSG); done(); @@ -405,24 +519,38 @@ describe("SensorJsTest_sensor_43", function () { */ it("newGyroScope_SensorJsTest029", TestType.FUNCTION | Size.MEDIUMTEST | Level.LEVEL3, async function (done) { console.info('----------------------newGyroScope_SensorJsTest029--------------'); - sensor.on(sensor.SensorId.GYROSCOPE, callback); - sensor.on(sensor.SensorId.GYROSCOPE, callback2); - setTimeout(() => { - console.info('----------------------newGyroScope_SensorJsTest029 off in--------------'); - try { - sensor.off(sensor.SensorId.GYROSCOPE, callback); - } catch (error) { - console.info("newGyroScope_SensorJsTest029 error:" + error); - } - console.info('----------------------newGyroScope_SensorJsTest029 off end--------------'); - }, 500); - setTimeout(() => { - console.info('----------------------newGyroScope_SensorJsTest029 off in--------------'); - sensor.off(sensor.SensorId.GYROSCOPE, callback2); - console.info('----------------------newGyroScope_SensorJsTest029 off end--------------'); - done(); - }, 1000); - }) + try{ + sensor.getSingleSensor(sensor.SensorId.GYROSCOPE,(error, data) => { + if (error) { + console.info('newGyroScope_SensorJsTest029 error'); + } else { + expect(typeof(data)).assertEqual("object"); + sensor.on(sensor.SensorId.GYROSCOPE, callback); + sensor.on(sensor.SensorId.GYROSCOPE, callback2); + setTimeout(() => { + console.info('----------------------newGyroScope_SensorJsTest029 off in--------------'); + try { + sensor.off(sensor.SensorId.GYROSCOPE, callback); + } catch (error) { + console.info("newGyroScope_SensorJsTest029 error:" + error); + } + console.info('----------------------newGyroScope_SensorJsTest029 off end--------------'); + }, 500); + setTimeout(() => { + console.info('----------------------newGyroScope_SensorJsTest029 off in--------------'); + sensor.off(sensor.SensorId.GYROSCOPE, callback2); + console.info('----------------------newGyroScope_SensorJsTest029 off end--------------'); + done(); + }, 1000); + } + }) + } catch (error) { + console.info("newGyroScope_SensorJsTest029 Device does not support!"); + expect(error.code).assertEqual(PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(PARAMETER_ERROR_MSG); + done(); + } + }) /* * @tc.number: SUB_SensorsSystem_GYROSCOPE_JSTest_0300 @@ -431,23 +559,104 @@ describe("SensorJsTest_sensor_43", function () { */ it("newGyroScope_SensorJsTest030", TestType.FUNCTION | Size.MEDIUMTEST | Level.LEVEL3, async function (done) { console.info('----------------------newGyroScope_SensorJsTest030--------------'); - sensor.on(sensor.SensorId.GYROSCOPE, callback, { 'interval': 100000000 }); - sensor.on(sensor.SensorId.GYROSCOPE, callback2, { 'interval': 100000000 }); - setTimeout(() => { - console.info('----------------------newGyroScope_SensorJsTest030 off in--------------'); - try { - sensor.off(sensor.SensorId.GYROSCOPE, callback); - } catch (error) { - console.info("newGyroScope_SensorJsTest030 error:" + error); - } - console - console.info('----------------------newGyroScope_SensorJsTest030 off end--------------'); - }, 500); - setTimeout(() => { - console.info('----------------------newGyroScope_SensorJsTest030_2 off in--------------'); - sensor.off(sensor.SensorId.GYROSCOPE, callback2); - console.info('----------------------newGyroScope_SensorJsTest030_2 off end--------------'); - done(); - }, 1000); - }) + try{ + sensor.getSingleSensor(sensor.SensorId.GYROSCOPE,(error, data) => { + if (error) { + console.info('newGyroScope_SensorJsTest029 error'); + } else { + expect(typeof(data)).assertEqual("object"); + sensor.on(sensor.SensorId.GYROSCOPE, callback, { 'interval': 100000000 }); + sensor.on(sensor.SensorId.GYROSCOPE, callback2, { 'interval': 100000000 }); + setTimeout(() => { + console.info('----------------------newGyroScope_SensorJsTest030 off in--------------'); + try { + sensor.off(sensor.SensorId.GYROSCOPE, callback); + } catch (error) { + console.info("newGyroScope_SensorJsTest030 error:" + error); + } + console + console.info('----------------------newGyroScope_SensorJsTest030 off end--------------'); + }, 500); + setTimeout(() => { + console.info('----------------------newGyroScope_SensorJsTest030_2 off in--------------'); + sensor.off(sensor.SensorId.GYROSCOPE, callback2); + console.info('----------------------newGyroScope_SensorJsTest030_2 off end--------------'); + done(); + }, 1000); + } + }) + } catch (error) { + console.info("newGyroScope_SensorJsTest030 Device does not support!"); + expect(error.code).assertEqual(PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(PARAMETER_ERROR_MSG); + done(); + } + }) + + /* + * @tc.number: SUB_SensorsSystem_GYROSCOPE_JSTest_0310 + * @tc.name: newGyroScope_SensorJsTest031 + * @tc.desc:Verification results of the incorrect parameters of the test interface + */ + it("newGyroScope_SensorJsTest031", TestType.FUNCTION | Size.MEDIUMTEST | Level.LEVEL3, async function (done) { + console.info('----------------------newGyroScope_SensorJsTest031--------------'); + try{ + sensor.getSingleSensor(sensor.SensorId.GYROSCOPE,(error, data) => { + if (error) { + console.info('newGyroScope_SensorJsTest031 error'); + } else { + expect(typeof(data)).assertEqual("object"); + console.info('----------------------newGyroScope_SensorJsTest031 off in--------------'); + try{ + sensor.off(-1, callback); + console.info('----------------------newGyroScope_SensorJsTest031 off end--------------'); + } catch (error) { + console.info("newGyroScope_SensorJsTest031 error:" + error); + expect(error.code).assertEqual(PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(PARAMETER_ERROR_MSG); + done(); + } + } + }) + } catch (error) { + console.info("newGyroScope_SensorJsTest031 Device does not support!"); + expect(error.code).assertEqual(PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(PARAMETER_ERROR_MSG); + done(); + } + }) + + /* + * @tc.number: SUB_SensorsSystem_GYROSCOPE_JSTest_0320 + * @tc.name: newGyroScope_SensorJsTest032 + * @tc.desc:Verification results of the incorrect parameters of the test interface + */ + it("newGyroScope_SensorJsTest032", TestType.FUNCTION | Size.MEDIUMTEST | Level.LEVEL3, async function (done) { + console.info('----------------------newGyroScope_SensorJsTest032--------------'); + try{ + sensor.getSingleSensor(sensor.SensorId.GYROSCOPE,(error, data) => { + if (error) { + console.info('newGyroScope_SensorJsTest032 error'); + } else { + try { + sensor.on(sensor.SensorId.GYROSCOPE, callback, {'interval': -100000000}); + console.info('----------------------newGyroScope_SensorJsTest032 off in---------------------------'); + sensor.off(sensor.SensorId.GYROSCOPE); + console.info('----------------------newGyroScope_SensorJsTest032 off end---------------------------'); + done(); + } catch (error) { + console.info('newGyroScope_SensorJsTest032 On fail, errCode:' + error.code + ' ,msg:' + error.message); + expect(error.code).assertEqual(SERVICE_EXCEPTION_CODE); + expect(error.message).assertEqual(SERVICE_EXCEPTION_MSG); + done(); + } + } + }) + } catch (error) { + console.info("newGyroScope_SensorJsTest032 Device does not support!"); + expect(error.code).assertEqual(PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(PARAMETER_ERROR_MSG); + done(); + } + }) })} diff --git a/sensors/sensor_standard/src/main/js/test/SensorOnOffTest.test_newMagneticField.js b/sensors/sensor_standard/src/main/js/test/SensorOnOffTest.test_newMagneticField.js index 520769dbf9565828b8f659c8d1478c651139a130..6e97975306acf15d9b15e3f3a0dd64dd88488d76 100644 --- a/sensors/sensor_standard/src/main/js/test/SensorOnOffTest.test_newMagneticField.js +++ b/sensors/sensor_standard/src/main/js/test/SensorOnOffTest.test_newMagneticField.js @@ -15,8 +15,8 @@ import sensor from '@ohos.sensor' import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect, TestType, Size, Level } from '@ohos/hypium' -export default function SensorJsTest_sensor_39() { -describe("SensorJsTest_sensor_39", function () { +export default function SensorJsTest_sensor_37() { +describe("SensorJsTest_sensor_37", function () { function callback(data) { console.info("callback" + JSON.stringify(data)); expect(typeof (data.x)).assertEqual("number");