From 78a71a5de88a5b1df428a5635c4a527ec4251918 Mon Sep 17 00:00:00 2001 From: cff Date: Thu, 16 Mar 2023 07:20:27 +0000 Subject: [PATCH] =?UTF-8?q?wq=E6=B7=BB=E5=8A=A0=E8=AE=A1=E6=AD=A5=E5=99=A8?= =?UTF-8?q?=E6=A3=80=E6=B5=8B=E4=BC=A0=E6=84=9F=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: cff --- interfaces/plugin/test/unittest/BUILD.gn | 1 + .../plugin/test/unittest/barometer/BUILD.gn | 2 +- .../unittest/barometer/ExampleJsunit.test.js | 443 ++++++--------- .../plugin/test/unittest/gyroscope/BUILD.gn | 2 +- .../unittest/gyroscope/ExampleJsunit.test.js | 436 ++++++--------- .../unittest/pedometer_detection/BUILD.gn | 21 + .../pedometer_detection/ExampleJsunit.test.js | 521 ++++++++++++++++++ .../unittest/pedometer_detection/config.json | 82 +++ .../plugin/test/unittest/sensor/BUILD.gn | 2 +- .../unittest/sensor/ExampleJsunit.test.js | 8 +- .../sensor/signature/openharmony_sx.p7b | Bin 3437 -> 0 bytes .../openharmony_core.p7b} | Bin 3437 -> 3436 bytes .../signature/openharmony_sx.p7b | Bin 13 files changed, 960 insertions(+), 558 deletions(-) mode change 100644 => 100755 interfaces/plugin/test/unittest/BUILD.gn mode change 100644 => 100755 interfaces/plugin/test/unittest/barometer/BUILD.gn mode change 100644 => 100755 interfaces/plugin/test/unittest/barometer/ExampleJsunit.test.js mode change 100644 => 100755 interfaces/plugin/test/unittest/gyroscope/BUILD.gn mode change 100644 => 100755 interfaces/plugin/test/unittest/gyroscope/ExampleJsunit.test.js create mode 100755 interfaces/plugin/test/unittest/pedometer_detection/BUILD.gn create mode 100755 interfaces/plugin/test/unittest/pedometer_detection/ExampleJsunit.test.js create mode 100755 interfaces/plugin/test/unittest/pedometer_detection/config.json mode change 100644 => 100755 interfaces/plugin/test/unittest/sensor/BUILD.gn mode change 100644 => 100755 interfaces/plugin/test/unittest/sensor/ExampleJsunit.test.js delete mode 100644 interfaces/plugin/test/unittest/sensor/signature/openharmony_sx.p7b rename interfaces/plugin/test/unittest/{gyroscope/signature/openharmony_sx.p7b => signature/openharmony_core.p7b} (51%) mode change 100644 => 100755 rename interfaces/plugin/test/unittest/{barometer => }/signature/openharmony_sx.p7b (100%) mode change 100644 => 100755 diff --git a/interfaces/plugin/test/unittest/BUILD.gn b/interfaces/plugin/test/unittest/BUILD.gn old mode 100644 new mode 100755 index 5f2980c2..decb5d9c --- a/interfaces/plugin/test/unittest/BUILD.gn +++ b/interfaces/plugin/test/unittest/BUILD.gn @@ -16,6 +16,7 @@ group("unittest") { deps = [ "barometer:BarometerJsTest", "gyroscope:GyroscopeJsTest", + "pedometer_detection:PedometerDetectionJsTest", "sensor:SensorJsTest", ] } diff --git a/interfaces/plugin/test/unittest/barometer/BUILD.gn b/interfaces/plugin/test/unittest/barometer/BUILD.gn old mode 100644 new mode 100755 index 934fd87b..23e8ddce --- a/interfaces/plugin/test/unittest/barometer/BUILD.gn +++ b/interfaces/plugin/test/unittest/barometer/BUILD.gn @@ -17,5 +17,5 @@ module_output_path = "sensor/interfaces" ohos_js_unittest("BarometerJsTest") { module_out_path = module_output_path hap_profile = "./config.json" - certificate_profile = "./signature/openharmony_sx.p7b" + certificate_profile = "../signature/openharmony_sx.p7b" } diff --git a/interfaces/plugin/test/unittest/barometer/ExampleJsunit.test.js b/interfaces/plugin/test/unittest/barometer/ExampleJsunit.test.js old mode 100644 new mode 100755 index cb467907..3ec23a7e --- a/interfaces/plugin/test/unittest/barometer/ExampleJsunit.test.js +++ b/interfaces/plugin/test/unittest/barometer/ExampleJsunit.test.js @@ -31,28 +31,28 @@ describe("BarometerJsTest", function () { /* * @tc.setup: setup invoked before all testcases */ - console.info('beforeAll caled') + console.info('beforeAll called') }) afterAll(function() { /* * @tc.teardown: teardown invoked after all testcases */ - console.info('afterAll caled') + console.info('afterAll called') }) beforeEach(function() { /* * @tc.setup: setup invoked before each testcases */ - console.info('beforeEach caled') + console.info('beforeEach called') }) afterEach(function() { /* * @tc.teardown: teardown invoked after each testcases */ - console.info('afterEach caled') + console.info('afterEach called') }) const PARAMETER_ERROR_CODE = 401 @@ -69,33 +69,26 @@ describe("BarometerJsTest", function () { it("BarometerJsTest_001", 0, async function (done) { console.info('----------------------BarometerJsTest_001---------------------------'); try { - sensor.getSingleSensor(sensor.SensorId.BAROMETER, (err, data) => { - if(err) { - console.info('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); + sensor.getSingleSensor(sensor.SensorId.BAROMETER, (error, data) => { + if (error) { + console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); expect(false).assertTrue(); done(); } - expect(typeof(data)).assertEqual("object"); - if(data) { - try { - sensor.on(sensor.SensorId.BAROMETER, callback); - setTimeout(()=>{ - sensor.off(sensor.SensorId.BAROMETER); - done(); - }, 500); - } catch (error) { - console.info('On fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(false).assertTrue(); + try { + sensor.on(sensor.SensorId.BAROMETER, callback); + setTimeout(() => { + sensor.off(sensor.SensorId.BAROMETER); done(); - } - } else { - console.info('Program run failed'); + }, 500); + } catch (error) { + console.info('On fail, errCode:' + error.code + ' ,msg:' + error.message); expect(false).assertTrue(); done(); } }); } catch (error) { - console.info('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); + console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); expect(error.code).assertEqual(PARAMETER_ERROR_CODE); expect(error.message).assertEqual(PARAMETER_ERROR_MSG); done(); @@ -111,35 +104,26 @@ describe("BarometerJsTest", function () { it("BarometerJsTest_002", 0, async function (done) { console.info('----------------------BarometerJsTest_002---------------------------'); try { - sensor.getSingleSensor(sensor.SensorId.BAROMETER, (err, data) => { - if(err) { - console.info('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); + sensor.getSingleSensor(sensor.SensorId.BAROMETER, (error, data) => { + if (error) { + console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); expect(false).assertTrue(); done(); } - expect(typeof(data)).assertEqual("object"); - if(data) { - try { - sensor.on(sensor.SensorId.BAROMETER, callback, {'interval':100000000}); - setTimeout(()=>{ - console.info('------------------BarometerJsTest_002 off in-----------------------'); - sensor.off(sensor.SensorId.BAROMETER); - console.info('------------------BarometerJsTest_002 off end-----------------------'); - done(); - }, 500); - } catch (error) { - console.info('On fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(false).assertTrue(); + try { + sensor.on(sensor.SensorId.BAROMETER, callback, {'interval':100000000}); + setTimeout(() => { + sensor.off(sensor.SensorId.BAROMETER); done(); - } - } else { - console.info('Non-mobile devices cannot be excluded'); - expect(true).assertTrue(); + }, 500); + } catch (error) { + console.info('On fail, errCode:' + error.code + ' ,msg:' + error.message); + expect(false).assertTrue(); done(); } }); } catch (error) { - console.info('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); + console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); expect(error.code).assertEqual(PARAMETER_ERROR_CODE); expect(error.message).assertEqual(PARAMETER_ERROR_MSG); done(); @@ -155,40 +139,31 @@ describe("BarometerJsTest", function () { it("BarometerJsTest_003", 0, async function (done) { console.info('----------------------BarometerJsTest_003---------------------------'); try { - sensor.getSingleSensor(sensor.SensorId.BAROMETER, (err, data) => { - if(err) { - console.info('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); + sensor.getSingleSensor(sensor.SensorId.BAROMETER, (error, data) => { + if (error) { + console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); expect(false).assertTrue(); done(); } - expect(typeof(data)).assertEqual("object"); function onSensorCallback(data) { console.info('BarometerJsTest_003 callback in'); expect(true).assertTrue(); done(); } - if(data) { - try { - sensor.on(sensor.SensorId.BAROMETER, onSensorCallback, {'interval': 100000000}, 5); - setTimeout(()=>{ - console.info('----------------------BarometerJsTest_003 off in---------------------------'); - sensor.off(sensor.SensorId.BAROMETER); - console.info('----------------------BarometerJsTest_003 off end---------------------------'); - done(); - }, 500); - } catch (error) { - console.info('On fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(false).assertTrue(); + try { + sensor.on(sensor.SensorId.BAROMETER, onSensorCallback, {'interval': 100000000}, 5); + setTimeout(() => { + sensor.off(sensor.SensorId.BAROMETER); done(); - } - } else { - console.info('Non-mobile devices cannot be excluded'); - expect(true).assertTrue(); + }, 500); + } catch (error) { + console.info('On fail, errCode:' + error.code + ' ,msg:' + error.message); + expect(false).assertTrue(); done(); } }); } catch (error) { - console.info('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); + console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); expect(error.code).assertEqual(PARAMETER_ERROR_CODE); expect(error.message).assertEqual(PARAMETER_ERROR_MSG); done(); @@ -204,34 +179,25 @@ describe("BarometerJsTest", function () { it("BarometerJsTest_004", 0, async function (done) { console.info('----------------------BarometerJsTest_004---------------------------'); try { - sensor.getSingleSensor(sensor.SensorId.BAROMETER, (err, data) => { - if(err) { - console.info('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); + sensor.getSingleSensor(sensor.SensorId.BAROMETER, (error, data) => { + if (error) { + console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); expect(false).assertTrue(); done(); } - expect(typeof(data)).assertEqual("object"); - if(data) { - try { - sensor.on(sensor.SensorId.BAROMETER, callback, {'interval': -100000000}); - console.info('----------------------BarometerJsTest_004 off in---------------------------'); - sensor.off(sensor.SensorId.BAROMETER); - console.info('----------------------BarometerJsTest_004 off end---------------------------'); - done(); - } catch (error) { - console.info('On fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(SERVICE_EXCEPTION_CODE); - expect(error.message).assertEqual(SERVICE_EXCEPTION_MSG); - done(); - } - } else { - console.info('Non-mobile devices cannot be excluded'); - expect(true).assertTrue(); + try { + sensor.on(sensor.SensorId.BAROMETER, callback, {'interval': -100000000}); + sensor.off(sensor.SensorId.BAROMETER); + done(); + } catch (error) { + console.info('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('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); + console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); expect(error.code).assertEqual(PARAMETER_ERROR_CODE); expect(error.message).assertEqual(PARAMETER_ERROR_MSG); done(); @@ -247,33 +213,26 @@ describe("BarometerJsTest", function () { it("BarometerJsTest_005", 0, async function (done) { console.info('----------------------BarometerJsTest_005---------------------------'); try { - sensor.getSingleSensor(sensor.SensorId.BAROMETER, (err, data) => { - if(err) { - console.info('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); + sensor.getSingleSensor(sensor.SensorId.BAROMETER, (error, data) => { + if (error) { + console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); expect(false).assertTrue(); done(); } - expect(typeof(data)).assertEqual("object"); - if(data) { - try { - sensor.once(sensor.SensorId.BAROMETER, callback); - setTimeout(()=>{ - expect(true).assertTrue(); - done(); - }, 500); - } catch (error) { - console.error('Once fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(false).assertTrue(); + try { + sensor.once(sensor.SensorId.BAROMETER, callback); + setTimeout(() => { + expect(true).assertTrue(); done(); - } - } else { - console.info('Non-mobile devices cannot be excluded'); - expect(true).assertTrue(); + }, 500); + } catch (error) { + console.error('Once fail, errCode:' + error.code + ' ,msg:' + error.message); + expect(false).assertTrue(); done(); } }); } catch (error) { - console.info('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); + console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); expect(error.code).assertEqual(PARAMETER_ERROR_CODE); expect(error.message).assertEqual(PARAMETER_ERROR_MSG); done(); @@ -289,33 +248,26 @@ describe("BarometerJsTest", function () { it("BarometerJsTest_006", 0, async function (done) { console.info('----------------------BarometerJsTest_006---------------------------'); try { - sensor.getSingleSensor(sensor.SensorId.BAROMETER, (err, data) => { - if(err) { - console.info('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); + sensor.getSingleSensor(sensor.SensorId.BAROMETER, (error, data) => { + if (error) { + console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); expect(false).assertTrue(); done(); } - expect(typeof(data)).assertEqual("object"); - if(data) { - try{ - sensor.once(sensor.SensorId.BAROMETER, callback, 5); - setTimeout(()=>{ - expect(true).assertTrue(); - done(); - }, 500); - } catch (error) { - console.error('Once fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(false).assertTrue(); + try{ + sensor.once(sensor.SensorId.BAROMETER, callback, 5); + setTimeout(() => { + expect(true).assertTrue(); done(); - } - } else { - console.info('Non-mobile devices cannot be excluded'); - expect(true).assertTrue(); + }, 500); + } catch (error) { + console.error('Once fail, errCode:' + error.code + ' ,msg:' + error.message); + expect(false).assertTrue(); done(); } }); } catch (error) { - console.info('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); + console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); expect(error.code).assertEqual(PARAMETER_ERROR_CODE); expect(error.message).assertEqual(PARAMETER_ERROR_MSG); done(); @@ -331,30 +283,23 @@ describe("BarometerJsTest", function () { it("BarometerJsTest_007", 0, async function (done) { console.info('----------------------BarometerJsTest_007---------------------------'); try { - sensor.getSingleSensor(sensor.SensorId.BAROMETER, (err, data) => { - if(err) { - console.info('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); + sensor.getSingleSensor(sensor.SensorId.BAROMETER, (error, data) => { + if (error) { + console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); expect(false).assertTrue(); done(); } - expect(typeof(data)).assertEqual("object"); - if(data) { - try{ - sensor.once(sensor.SensorId.BAROMETER, 5); - } catch (error) { - console.error('On fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(PARAMETER_ERROR_MSG); - done(); - } - } else { - console.info('Non-mobile devices cannot be excluded'); - expect(true).assertTrue(); + try{ + sensor.once(sensor.SensorId.BAROMETER, 5); + } catch (error) { + console.error('On fail, errCode:' + error.code + ' ,msg:' + error.message); + expect(error.code).assertEqual(PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(PARAMETER_ERROR_MSG); done(); } }); } catch (error) { - console.info('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); + console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); expect(error.code).assertEqual(PARAMETER_ERROR_CODE); expect(error.message).assertEqual(PARAMETER_ERROR_MSG); done(); @@ -370,29 +315,22 @@ describe("BarometerJsTest", function () { it("BarometerJsTest_008", 0, async function (done) { console.info('----------------------BarometerJsTest_008---------------------------'); try { - sensor.getSingleSensor(sensor.SensorId.BAROMETER, (err, data) => { - if(err) { - console.info('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); + sensor.getSingleSensor(sensor.SensorId.BAROMETER, (error, data) => { + if (error) { + console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); expect(false).assertTrue(); done(); } - expect(typeof(data)).assertEqual("object"); - if(data) { - try { - sensor.off(-1, callback); - } catch (error) { - expect(error.code).assertEqual(PARAMETER_ERROR_CODE) - expect(error.message).assertEqual(PARAMETER_ERROR_MSG) - done(); - } - } else { - console.info('Non-mobile devices cannot be excluded'); - expect(true).assertTrue(); + try { + sensor.off(-1, callback); + } catch (error) { + expect(error.code).assertEqual(PARAMETER_ERROR_CODE) + expect(error.message).assertEqual(PARAMETER_ERROR_MSG) done(); } }); } catch (error) { - console.info('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); + console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); expect(error.code).assertEqual(PARAMETER_ERROR_CODE); expect(error.message).assertEqual(PARAMETER_ERROR_MSG); done(); @@ -408,36 +346,27 @@ describe("BarometerJsTest", function () { it("BarometerJsTest_009", 0, async function (done) { console.info('----------------------BarometerJsTest_009---------------------------'); try { - sensor.getSingleSensor(sensor.SensorId.BAROMETER, (err, data) => { - if(err) { - console.info('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); + sensor.getSingleSensor(sensor.SensorId.BAROMETER, (error, data) => { + if (error) { + console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); expect(false).assertTrue(); done(); - } - expect(typeof(data)).assertEqual("object"); - if(data) { - try { - sensor.on(sensor.SensorId.BAROMETER, callback); - sensor.on(sensor.SensorId.BAROMETER, callback2); - setTimeout(()=>{ - console.info('----------------------BarometerJsTest_009 off in---------------------------'); - sensor.off(sensor.SensorId.BAROMETER); - console.info('----------------------BarometerJsTest_009 off end---------------------------'); - done(); - }, 1000); - } catch (error) { - console.error('On fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(false).assertTrue(); + } + try { + sensor.on(sensor.SensorId.BAROMETER, callback); + sensor.on(sensor.SensorId.BAROMETER, callback2); + setTimeout(() => { + sensor.off(sensor.SensorId.BAROMETER); done(); - } - } else { - console.info('Non-mobile devices cannot be excluded'); - expect(true).assertTrue(); + }, 1000); + } catch (error) { + console.error('On fail, errCode:' + error.code + ' ,msg:' + error.message); + expect(false).assertTrue(); done(); } }); } catch (error) { - console.info('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); + console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); expect(error.code).assertEqual(PARAMETER_ERROR_CODE); expect(error.message).assertEqual(PARAMETER_ERROR_MSG); done(); @@ -453,41 +382,30 @@ describe("BarometerJsTest", function () { it("BarometerJsTest_010", 0, async function (done) { console.info('----------------------BarometerJsTest_010---------------------------'); try { - sensor.getSingleSensor(sensor.SensorId.BAROMETER, (err, data) => { - if(err) { - console.info('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); + sensor.getSingleSensor(sensor.SensorId.BAROMETER, (error, data) => { + if (error) { + console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); expect(false).assertTrue(); done(); } - expect(typeof(data)).assertEqual("object"); - if(data) { - try { - sensor.on(sensor.SensorId.BAROMETER, callback); - sensor.on(sensor.SensorId.BAROMETER, callback2); - setTimeout(()=>{ - console.info('----------------------BarometerJsTest_010 off in---------------------------'); - sensor.off(sensor.SensorId.BAROMETER, callback); - console.info('----------------------BarometerJsTest_010 off end---------------------------'); - }, 500); - setTimeout(()=>{ - console.info('----------------------BarometerJsTest_010 off in---------------------------'); - sensor.off(sensor.SensorId.BAROMETER, callback2); - console.info('----------------------BarometerJsTest_010 off end---------------------------'); - done(); - }, 1000); - } catch (error) { - console.error('On fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(false).assertTrue(); + try { + sensor.on(sensor.SensorId.BAROMETER, callback); + sensor.on(sensor.SensorId.BAROMETER, callback2); + setTimeout(() => { + sensor.off(sensor.SensorId.BAROMETER, callback); + }, 500); + setTimeout(() => { + sensor.off(sensor.SensorId.BAROMETER, callback2); done(); - } - } else { - console.info('Non-mobile devices cannot be excluded'); - expect(true).assertTrue(); + }, 1000); + } catch (error) { + console.error('On fail, errCode:' + error.code + ' ,msg:' + error.message); + expect(false).assertTrue(); done(); } }); } catch (error) { - console.info('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); + console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); expect(error.code).assertEqual(PARAMETER_ERROR_CODE); expect(error.message).assertEqual(PARAMETER_ERROR_MSG); done(); @@ -503,36 +421,27 @@ describe("BarometerJsTest", function () { it("BarometerJsTest_011", 0, async function (done) { console.info('----------------------BarometerJsTest_011---------------------------'); try { - sensor.getSingleSensor(sensor.SensorId.BAROMETER, (err, data) => { - if(err) { - console.info('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); + sensor.getSingleSensor(sensor.SensorId.BAROMETER, (error, data) => { + if (error) { + console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); expect(false).assertTrue(); done(); } - expect(typeof(data)).assertEqual("object"); - if(data) { - try { - sensor.on(sensor.SensorId.BAROMETER, callback, {'interval': 100000000}); - sensor.once(sensor.SensorId.BAROMETER, callback2); - setTimeout(()=>{ - console.info('----------------------BarometerJsTest_011 off in---------------------------'); - sensor.off(sensor.SensorId.BAROMETER); - console.info('----------------------BarometerJsTest_011 off end---------------------------'); - done(); - }, 1000); - } catch (error) { - console.error('On fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(false).assertTrue(); + try { + sensor.on(sensor.SensorId.BAROMETER, callback, {'interval': 100000000}); + sensor.once(sensor.SensorId.BAROMETER, callback2); + setTimeout(() => { + sensor.off(sensor.SensorId.BAROMETER); done(); - } - } else { - console.info('Non-mobile devices cannot be excluded'); - expect(true).assertTrue(); + }, 1000); + } catch (error) { + console.error('On fail, errCode:' + error.code + ' ,msg:' + error.message); + expect(false).assertTrue(); done(); } }); } catch (error) { - console.info('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); + console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); expect(error.code).assertEqual(PARAMETER_ERROR_CODE); expect(error.message).assertEqual(PARAMETER_ERROR_MSG); done(); @@ -548,41 +457,30 @@ describe("BarometerJsTest", function () { it("BarometerJsTest_012", 0, async function (done) { console.info('----------------------BarometerJsTest_012---------------------------'); try { - sensor.getSingleSensor(sensor.SensorId.BAROMETER, (err, data) => { - if(err) { - console.info('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); + sensor.getSingleSensor(sensor.SensorId.BAROMETER, (error, data) => { + if (error) { + console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); expect(false).assertTrue(); done(); } - expect(typeof(data)).assertEqual("object"); - if(data) { - try { - sensor.on(sensor.SensorId.BAROMETER, callback, {'interval': 100000000}); - sensor.on(sensor.SensorId.BAROMETER, callback2, {'interval': 100000000}); - setTimeout(()=>{ - console.info('----------------------BarometerJsTest_012 off in---------------------------'); - sensor.off(sensor.SensorId.BAROMETER, callback); - console.info('----------------------BarometerJsTest_012 off end---------------------------'); - }, 500); - setTimeout(()=>{ - console.info('----------------------BarometerJsTest_012 off in---------------------------'); - sensor.off(sensor.SensorId.BAROMETER, callback2); - console.info('----------------------BarometerJsTest_012 off end---------------------------'); - done(); - }, 1000); - } catch (error) { - console.error('On fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(false).assertTrue(); + try { + sensor.on(sensor.SensorId.BAROMETER, callback, {'interval': 100000000}); + sensor.on(sensor.SensorId.BAROMETER, callback2, {'interval': 100000000}); + setTimeout(() => { + sensor.off(sensor.SensorId.BAROMETER, callback); + }, 500); + setTimeout(() => { + sensor.off(sensor.SensorId.BAROMETER, callback2); done(); - } - } else { - console.info('Non-mobile devices cannot be excluded'); - expect(true).assertTrue(); + }, 1000); + } catch (error) { + console.error('On fail, errCode:' + error.code + ' ,msg:' + error.message); + expect(false).assertTrue(); done(); } }); } catch (error) { - console.info('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); + console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); expect(error.code).assertEqual(PARAMETER_ERROR_CODE); expect(error.message).assertEqual(PARAMETER_ERROR_MSG); done(); @@ -598,36 +496,27 @@ describe("BarometerJsTest", function () { it("BarometerJsTest_013", 0, async function (done) { console.info('----------------------BarometerJsTest_013---------------------------'); try { - sensor.getSingleSensor(sensor.SensorId.BAROMETER, (err, data) => { - if(err) { - console.info('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); + sensor.getSingleSensor(sensor.SensorId.BAROMETER, (error, data) => { + if (error) { + console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); expect(false).assertTrue(); done(); } - expect(typeof(data)).assertEqual("object"); - if(data) { - try { - sensor.on(sensor.SensorId.BAROMETER, callback, {'interval': 100000000}); - sensor.on(sensor.SensorId.BAROMETER, callback2, {'interval': 100000000}); - setTimeout(()=>{ - console.info('----------------------BarometerJsTest_013 off in---------------------------'); - sensor.off(sensor.SensorId.BAROMETER); - console.info('----------------------BarometerJsTest_013 off end---------------------------'); - done(); - }, 1000); - } catch (error) { - console.error('On fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(false).assertTrue(); + try { + sensor.on(sensor.SensorId.BAROMETER, callback, {'interval': 100000000}); + sensor.on(sensor.SensorId.BAROMETER, callback2, {'interval': 100000000}); + setTimeout(() => { + sensor.off(sensor.SensorId.BAROMETER); done(); - } - } else { - console.info('Non-mobile devices cannot be excluded'); - expect(true).assertTrue(); + }, 1000); + } catch (error) { + console.error('On fail, errCode:' + error.code + ' ,msg:' + error.message); + expect(false).assertTrue(); done(); } }); } catch (error) { - console.info('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); + console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); expect(error.code).assertEqual(PARAMETER_ERROR_CODE); expect(error.message).assertEqual(PARAMETER_ERROR_MSG); done(); diff --git a/interfaces/plugin/test/unittest/gyroscope/BUILD.gn b/interfaces/plugin/test/unittest/gyroscope/BUILD.gn old mode 100644 new mode 100755 index 87a6bd5f..2a40c6ac --- a/interfaces/plugin/test/unittest/gyroscope/BUILD.gn +++ b/interfaces/plugin/test/unittest/gyroscope/BUILD.gn @@ -17,5 +17,5 @@ module_output_path = "sensor/interfaces" ohos_js_unittest("GyroscopeJsTest") { module_out_path = module_output_path hap_profile = "./config.json" - certificate_profile = "./signature/openharmony_sx.p7b" + certificate_profile = "../signature/openharmony_sx.p7b" } diff --git a/interfaces/plugin/test/unittest/gyroscope/ExampleJsunit.test.js b/interfaces/plugin/test/unittest/gyroscope/ExampleJsunit.test.js old mode 100644 new mode 100755 index 6dd66fc2..ca0f429c --- a/interfaces/plugin/test/unittest/gyroscope/ExampleJsunit.test.js +++ b/interfaces/plugin/test/unittest/gyroscope/ExampleJsunit.test.js @@ -12,7 +12,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import deviceInfo from '@ohos.deviceInfo' import sensor from '@ohos.sensor' import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index' @@ -36,28 +35,28 @@ describe("GyroscopeJsTest", function () { /* * @tc.setup: setup invoked before all testcases */ - console.info('beforeAll caled') + console.info('beforeAll called') }) afterAll(function() { /* * @tc.teardown: teardown invoked after all testcases */ - console.info('afterAll caled') + console.info('afterAll called') }) beforeEach(function() { /* * @tc.setup: setup invoked before each testcases */ - console.info('beforeEach caled') + console.info('beforeEach called') }) afterEach(function() { /* * @tc.teardown: teardown invoked after each testcases */ - console.info('afterEach caled') + console.info('afterEach called') }) const PARAMETER_ERROR_CODE = 401 @@ -74,27 +73,20 @@ describe("GyroscopeJsTest", function () { it("GyroscopeJsTest_001", 0, async function (done) { console.info('----------------------GyroscopeJsTest_001---------------------------'); try { - sensor.getSingleSensor(sensor.SensorId.GYROSCOPE, (err, data) => { - if(err) { - console.info('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); + sensor.getSingleSensor(sensor.SensorId.GYROSCOPE, (error, data) => { + if (error) { + console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); expect(false).assertTrue(); done(); } - expect(typeof(data)).assertEqual("object"); - if(data) { - try { - sensor.on(sensor.SensorId.GYROSCOPE, callback); - setTimeout(()=>{ - sensor.off(sensor.SensorId.GYROSCOPE); - done(); - }, 500); - } catch (error) { - console.info('On fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(false).assertTrue(); + try { + sensor.on(sensor.SensorId.GYROSCOPE, callback); + setTimeout(() => { + sensor.off(sensor.SensorId.GYROSCOPE); done(); - } - } else { - console.info('Program run failed'); + }, 500); + } catch (error) { + console.error('On fail, errCode:' + error.code + ' ,msg:' + error.message); expect(false).assertTrue(); done(); } @@ -116,30 +108,21 @@ describe("GyroscopeJsTest", function () { it("GyroscopeJsTest_002", 0, async function (done) { console.info('----------------------GyroscopeJsTest_002---------------------------'); try { - sensor.getSingleSensor(sensor.SensorId.GYROSCOPE, (err, data) => { - if(err) { - console.info('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); + sensor.getSingleSensor(sensor.SensorId.GYROSCOPE, (error, data) => { + if (error) { + console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); expect(false).assertTrue(); done(); } - expect(typeof(data)).assertEqual("object"); - if(data) { - try { - sensor.on(sensor.SensorId.GYROSCOPE, callback, {'interval':100000000}); - setTimeout(()=>{ - console.info('------------------GyroscopeJsTest_002 off in-----------------------'); - sensor.off(sensor.SensorId.GYROSCOPE); - console.info('------------------GyroscopeJsTest_002 off end-----------------------'); - done(); - }, 500); - } catch (error) { - console.info('On fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(false).assertTrue(); + try { + sensor.on(sensor.SensorId.GYROSCOPE, callback, {'interval':100000000}); + setTimeout(() => { + sensor.off(sensor.SensorId.GYROSCOPE); done(); - } - } else { - console.info('Non-mobile devices cannot be excluded'); - expect(true).assertTrue(); + }, 500); + } catch (error) { + console.error('On fail, errCode:' + error.code + ' ,msg:' + error.message); + expect(false).assertTrue(); done(); } }); @@ -160,35 +143,26 @@ describe("GyroscopeJsTest", function () { it("GyroscopeJsTest_003", 0, async function (done) { console.info('----------------------GyroscopeJsTest_003---------------------------'); try { - sensor.getSingleSensor(sensor.SensorId.GYROSCOPE, (err, data) => { - if(err) { - console.info('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); + sensor.getSingleSensor(sensor.SensorId.GYROSCOPE, (error, data) => { + if (error) { + console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); expect(false).assertTrue(); done(); } - expect(typeof(data)).assertEqual("object"); function onSensorCallback(data) { - console.info('GyroscopeJsTest_003 callback in'); + console.error('GyroscopeJsTest_003 callback in'); expect(true).assertTrue(); done(); } - if(data) { - try { - sensor.on(sensor.SensorId.GYROSCOPE, onSensorCallback, {'interval': 100000000}, 5); - setTimeout(()=>{ - console.info('----------------------GyroscopeJsTest_003 off in---------------------------'); - sensor.off(sensor.SensorId.GYROSCOPE); - console.info('----------------------GyroscopeJsTest_003 off end---------------------------'); - done(); - }, 500); - } catch (error) { - console.info('On fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(false).assertTrue(); + try { + sensor.on(sensor.SensorId.GYROSCOPE, onSensorCallback, {'interval': 100000000}, 5); + setTimeout(() => { + sensor.off(sensor.SensorId.GYROSCOPE); done(); - } - } else { - console.info('Non-mobile devices cannot be excluded'); - expect(true).assertTrue(); + }, 500); + } catch (error) { + console.info('On fail, errCode:' + error.code + ' ,msg:' + error.message); + expect(false).assertTrue(); done(); } }); @@ -209,29 +183,20 @@ describe("GyroscopeJsTest", function () { it("GyroscopeJsTest_004", 0, async function (done) { console.info('----------------------GyroscopeJsTest_004---------------------------'); try { - sensor.getSingleSensor(sensor.SensorId.GYROSCOPE, (err, data) => { - if(err) { - console.info('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); + sensor.getSingleSensor(sensor.SensorId.GYROSCOPE, (error, data) => { + if (error) { + console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); expect(false).assertTrue(); done(); } - expect(typeof(data)).assertEqual("object"); - if(data) { - try { - sensor.on(sensor.SensorId.GYROSCOPE, callback, {'interval': -100000000}); - console.info('----------------------GyroscopeJsTest_004 off in---------------------------'); - sensor.off(sensor.SensorId.GYROSCOPE); - console.info('----------------------GyroscopeJsTest_004 off end---------------------------'); - done(); - } catch (error) { - console.info('On fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(SERVICE_EXCEPTION_CODE); - expect(error.message).assertEqual(SERVICE_EXCEPTION_MSG); - done(); - } - } else { - console.info('Non-mobile devices cannot be excluded'); - expect(true).assertTrue(); + try { + sensor.on(sensor.SensorId.GYROSCOPE, callback, {'interval': -100000000}); + sensor.off(sensor.SensorId.GYROSCOPE); + done(); + } catch (error) { + console.error('On fail, errCode:' + error.code + ' ,msg:' + error.message); + expect(error.code).assertEqual(SERVICE_EXCEPTION_CODE); + expect(error.message).assertEqual(SERVICE_EXCEPTION_MSG); done(); } }); @@ -252,33 +217,26 @@ describe("GyroscopeJsTest", function () { it("GyroscopeJsTest_005", 0, async function (done) { console.info('----------------------GyroscopeJsTest_005---------------------------'); try { - sensor.getSingleSensor(sensor.SensorId.GYROSCOPE, (err, data) => { - if(err) { - console.info('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); + sensor.getSingleSensor(sensor.SensorId.GYROSCOPE, (error, data) => { + if (error) { + console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); expect(false).assertTrue(); done(); } - expect(typeof(data)).assertEqual("object"); - if(data) { - try { - sensor.once(sensor.SensorId.GYROSCOPE, callback); - setTimeout(()=>{ - expect(true).assertTrue(); - done(); - }, 500); - } catch (error) { - console.error('Once fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(false).assertTrue(); + try { + sensor.once(sensor.SensorId.GYROSCOPE, callback); + setTimeout(() => { + expect(true).assertTrue(); done(); - } - } else { - console.info('Non-mobile devices cannot be excluded'); - expect(true).assertTrue(); + }, 500); + } catch (error) { + console.error('Once fail, errCode:' + error.code + ' ,msg:' + error.message); + expect(false).assertTrue(); done(); } }); } catch (error) { - console.info('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); + console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); expect(error.code).assertEqual(PARAMETER_ERROR_CODE); expect(error.message).assertEqual(PARAMETER_ERROR_MSG); done(); @@ -294,33 +252,26 @@ describe("GyroscopeJsTest", function () { it("GyroscopeJsTest_006", 0, async function (done) { console.info('----------------------GyroscopeJsTest_006---------------------------'); try { - sensor.getSingleSensor(sensor.SensorId.GYROSCOPE, (err, data) => { - if(err) { - console.info('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); + sensor.getSingleSensor(sensor.SensorId.GYROSCOPE, (error, data) => { + if (error) { + console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); expect(false).assertTrue(); done(); } - expect(typeof(data)).assertEqual("object"); - if(data) { - try{ - sensor.once(sensor.SensorId.GYROSCOPE, callback, 5); - setTimeout(()=>{ - expect(true).assertTrue(); - done(); - }, 500); - } catch (error) { - console.error('Once fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(false).assertTrue(); + try{ + sensor.once(sensor.SensorId.GYROSCOPE, callback, 5); + setTimeout(() => { + expect(true).assertTrue(); done(); - } - } else { - console.info('Non-mobile devices cannot be excluded'); - expect(true).assertTrue(); + }, 500); + } catch (error) { + console.error('Once fail, errCode:' + error.code + ' ,msg:' + error.message); + expect(false).assertTrue(); done(); } }); } catch (error) { - console.info('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); + console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); expect(error.code).assertEqual(PARAMETER_ERROR_CODE); expect(error.message).assertEqual(PARAMETER_ERROR_MSG); done(); @@ -336,30 +287,23 @@ describe("GyroscopeJsTest", function () { it("GyroscopeJsTest_007", 0, async function (done) { console.info('----------------------GyroscopeJsTest_007---------------------------'); try { - sensor.getSingleSensor(sensor.SensorId.GYROSCOPE, (err, data) => { - if(err) { - console.info('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); + sensor.getSingleSensor(sensor.SensorId.GYROSCOPE, (error, data) => { + if (error) { + console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); expect(false).assertTrue(); done(); } - expect(typeof(data)).assertEqual("object"); - if(data) { - try{ - sensor.once(sensor.SensorId.GYROSCOPE, 5); - } catch (error) { - console.error('On fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(PARAMETER_ERROR_MSG); - done(); - } - } else { - console.info('Non-mobile devices cannot be excluded'); - expect(true).assertTrue(); + try{ + sensor.once(sensor.SensorId.GYROSCOPE, 5); + } catch (error) { + console.error('On fail, errCode:' + error.code + ' ,msg:' + error.message); + expect(error.code).assertEqual(PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(PARAMETER_ERROR_MSG); done(); } }); } catch (error) { - console.info('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); + console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); expect(error.code).assertEqual(PARAMETER_ERROR_CODE); expect(error.message).assertEqual(PARAMETER_ERROR_MSG); done(); @@ -375,29 +319,22 @@ describe("GyroscopeJsTest", function () { it("GyroscopeJsTest_008", 0, async function (done) { console.info('----------------------GyroscopeJsTest_008---------------------------'); try { - sensor.getSingleSensor(sensor.SensorId.GYROSCOPE, (err, data) => { - if(err) { - console.info('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); + sensor.getSingleSensor(sensor.SensorId.GYROSCOPE, (error, data) => { + if (error) { + console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); expect(false).assertTrue(); done(); } - expect(typeof(data)).assertEqual("object"); - if(data) { - try { - sensor.off(-1, callback); - } catch (error) { - expect(error.code).assertEqual(PARAMETER_ERROR_CODE) - expect(error.message).assertEqual(PARAMETER_ERROR_MSG) - done(); - } - } else { - console.info('Non-mobile devices cannot be excluded'); - expect(true).assertTrue(); + try { + sensor.off(-1, callback); + } catch (error) { + expect(error.code).assertEqual(PARAMETER_ERROR_CODE) + expect(error.message).assertEqual(PARAMETER_ERROR_MSG) done(); } }); } catch (error) { - console.info('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); + console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); expect(error.code).assertEqual(PARAMETER_ERROR_CODE); expect(error.message).assertEqual(PARAMETER_ERROR_MSG); done(); @@ -413,36 +350,27 @@ describe("GyroscopeJsTest", function () { it("GyroscopeJsTest_009", 0, async function (done) { console.info('----------------------GyroscopeJsTest_009---------------------------'); try { - sensor.getSingleSensor(sensor.SensorId.GYROSCOPE, (err, data) => { - if(err) { - console.info('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); + sensor.getSingleSensor(sensor.SensorId.GYROSCOPE, (error, data) => { + if (error) { + console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); expect(false).assertTrue(); done(); } - expect(typeof(data)).assertEqual("object"); - if(data) { - try { - sensor.on(sensor.SensorId.GYROSCOPE, callback); - sensor.on(sensor.SensorId.GYROSCOPE, callback2); - setTimeout(()=>{ - console.info('----------------------GyroscopeJsTest_009 off in---------------------------'); - sensor.off(sensor.SensorId.GYROSCOPE); - console.info('----------------------GyroscopeJsTest_009 off end---------------------------'); - done(); - }, 1000); - } catch (error) { - console.error('On fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(false).assertTrue(); + try { + sensor.on(sensor.SensorId.GYROSCOPE, callback); + sensor.on(sensor.SensorId.GYROSCOPE, callback2); + setTimeout(() => { + sensor.off(sensor.SensorId.GYROSCOPE); done(); - } - } else { - console.info('Non-mobile devices cannot be excluded'); - expect(true).assertTrue(); + }, 1000); + } catch (error) { + console.error('On fail, errCode:' + error.code + ' ,msg:' + error.message); + expect(false).assertTrue(); done(); } }); } catch (error) { - console.info('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); + console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); expect(error.code).assertEqual(PARAMETER_ERROR_CODE); expect(error.message).assertEqual(PARAMETER_ERROR_MSG); done(); @@ -458,41 +386,30 @@ describe("GyroscopeJsTest", function () { it("GyroscopeJsTest_010", 0, async function (done) { console.info('----------------------GyroscopeJsTest_010---------------------------'); try { - sensor.getSingleSensor(sensor.SensorId.GYROSCOPE, (err, data) => { - if(err) { - console.info('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); + sensor.getSingleSensor(sensor.SensorId.GYROSCOPE, (error, data) => { + if (error) { + console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); expect(false).assertTrue(); done(); } - expect(typeof(data)).assertEqual("object"); - if(data) { - try { - sensor.on(sensor.SensorId.GYROSCOPE, callback); - sensor.on(sensor.SensorId.GYROSCOPE, callback2); - setTimeout(()=>{ - console.info('----------------------GyroscopeJsTest_010 off in---------------------------'); - sensor.off(sensor.SensorId.GYROSCOPE, callback); - console.info('----------------------GyroscopeJsTest_010 off end---------------------------'); - }, 500); - setTimeout(()=>{ - console.info('----------------------GyroscopeJsTest_010 off in---------------------------'); - sensor.off(sensor.SensorId.GYROSCOPE, callback2); - console.info('----------------------GyroscopeJsTest_010 off end---------------------------'); - done(); - }, 1000); - } catch (error) { - console.error('On fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(false).assertTrue(); + try { + sensor.on(sensor.SensorId.GYROSCOPE, callback); + sensor.on(sensor.SensorId.GYROSCOPE, callback2); + setTimeout(() => { + sensor.off(sensor.SensorId.GYROSCOPE, callback); + }, 500); + setTimeout(() => { + sensor.off(sensor.SensorId.GYROSCOPE, callback2); done(); - } - } else { - console.info('Non-mobile devices cannot be excluded'); - expect(true).assertTrue(); + }, 1000); + } catch (error) { + console.error('On fail, errCode:' + error.code + ' ,msg:' + error.message); + expect(false).assertTrue(); done(); } }); } catch (error) { - console.info('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); + console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); expect(error.code).assertEqual(PARAMETER_ERROR_CODE); expect(error.message).assertEqual(PARAMETER_ERROR_MSG); done(); @@ -508,36 +425,27 @@ describe("GyroscopeJsTest", function () { it("GyroscopeJsTest_011", 0, async function (done) { console.info('----------------------GyroscopeJsTest_011---------------------------'); try { - sensor.getSingleSensor(sensor.SensorId.GYROSCOPE, (err, data) => { - if(err) { - console.info('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); + sensor.getSingleSensor(sensor.SensorId.GYROSCOPE, (error, data) => { + if (error) { + console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); expect(false).assertTrue(); done(); } - expect(typeof(data)).assertEqual("object"); - if(data) { - try { - sensor.on(sensor.SensorId.GYROSCOPE, callback, {'interval': 100000000}); - sensor.once(sensor.SensorId.GYROSCOPE, callback2); - setTimeout(()=>{ - console.info('----------------------GyroscopeJsTest_011 off in---------------------------'); - sensor.off(sensor.SensorId.GYROSCOPE); - console.info('----------------------GyroscopeJsTest_011 off end---------------------------'); - done(); - }, 1000); - } catch (error) { - console.error('On fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(false).assertTrue(); + try { + sensor.on(sensor.SensorId.GYROSCOPE, callback, {'interval': 100000000}); + sensor.once(sensor.SensorId.GYROSCOPE, callback2); + setTimeout(() => { + sensor.off(sensor.SensorId.GYROSCOPE); done(); - } - } else { - console.info('Non-mobile devices cannot be excluded'); - expect(true).assertTrue(); + }, 1000); + } catch (error) { + console.error('On fail, errCode:' + error.code + ' ,msg:' + error.message); + expect(false).assertTrue(); done(); } }); } catch (error) { - console.info('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); + console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); expect(error.code).assertEqual(PARAMETER_ERROR_CODE); expect(error.message).assertEqual(PARAMETER_ERROR_MSG); done(); @@ -553,41 +461,30 @@ describe("GyroscopeJsTest", function () { it("GyroscopeJsTest_012", 0, async function (done) { console.info('----------------------GyroscopeJsTest_012---------------------------'); try { - sensor.getSingleSensor(sensor.SensorId.GYROSCOPE, (err, data) => { - if(err) { - console.info('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); + sensor.getSingleSensor(sensor.SensorId.GYROSCOPE, (error, data) => { + if (error) { + console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); expect(false).assertTrue(); done(); } - expect(typeof(data)).assertEqual("object"); - if(data) { - try { - sensor.on(sensor.SensorId.GYROSCOPE, callback, {'interval': 100000000}); - sensor.on(sensor.SensorId.GYROSCOPE, callback2, {'interval': 100000000}); - setTimeout(()=>{ - console.info('----------------------GyroscopeJsTest_012 off in---------------------------'); - sensor.off(sensor.SensorId.GYROSCOPE, callback); - console.info('----------------------GyroscopeJsTest_012 off end---------------------------'); - }, 500); - setTimeout(()=>{ - console.info('----------------------GyroscopeJsTest_012 off in---------------------------'); - sensor.off(sensor.SensorId.GYROSCOPE, callback2); - console.info('----------------------GyroscopeJsTest_012 off end---------------------------'); - done(); - }, 1000); - } catch (error) { - console.error('On fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(false).assertTrue(); + try { + sensor.on(sensor.SensorId.GYROSCOPE, callback, {'interval': 100000000}); + sensor.on(sensor.SensorId.GYROSCOPE, callback2, {'interval': 100000000}); + setTimeout(() => { + sensor.off(sensor.SensorId.GYROSCOPE, callback); + }, 500); + setTimeout(() => { + sensor.off(sensor.SensorId.GYROSCOPE, callback2); done(); - } - } else { - console.info('Non-mobile devices cannot be excluded'); - expect(true).assertTrue(); + }, 1000); + } catch (error) { + console.error('On fail, errCode:' + error.code + ' ,msg:' + error.message); + expect(false).assertTrue(); done(); } }); } catch (error) { - console.info('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); + console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); expect(error.code).assertEqual(PARAMETER_ERROR_CODE); expect(error.message).assertEqual(PARAMETER_ERROR_MSG); done(); @@ -603,36 +500,27 @@ describe("GyroscopeJsTest", function () { it("GyroscopeJsTest_013", 0, async function (done) { console.info('----------------------GyroscopeJsTest_013---------------------------'); try { - sensor.getSingleSensor(sensor.SensorId.GYROSCOPE, (err, data) => { - if(err) { - console.info('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); + sensor.getSingleSensor(sensor.SensorId.GYROSCOPE, (error, data) => { + if (error) { + console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); expect(false).assertTrue(); done(); } - expect(typeof(data)).assertEqual("object"); - if(data) { - try { - sensor.on(sensor.SensorId.GYROSCOPE, callback, {'interval': 100000000}); - sensor.on(sensor.SensorId.GYROSCOPE, callback2, {'interval': 100000000}); - setTimeout(()=>{ - console.info('----------------------GyroscopeJsTest_013 off in---------------------------'); - sensor.off(sensor.SensorId.GYROSCOPE); - console.info('----------------------GyroscopeJsTest_013 off end---------------------------'); - done(); - }, 1000); - } catch (error) { - console.error('On fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(false).assertTrue(); + try { + sensor.on(sensor.SensorId.GYROSCOPE, callback, {'interval': 100000000}); + sensor.on(sensor.SensorId.GYROSCOPE, callback2, {'interval': 100000000}); + setTimeout(() => { + sensor.off(sensor.SensorId.GYROSCOPE); done(); - } - } else { - console.info('Non-mobile devices cannot be excluded'); - expect(true).assertTrue(); + }, 1000); + } catch (error) { + console.error('On fail, errCode:' + error.code + ' ,msg:' + error.message); + expect(false).assertTrue(); done(); } }); } catch (error) { - console.info('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); + console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); expect(error.code).assertEqual(PARAMETER_ERROR_CODE); expect(error.message).assertEqual(PARAMETER_ERROR_MSG); done(); diff --git a/interfaces/plugin/test/unittest/pedometer_detection/BUILD.gn b/interfaces/plugin/test/unittest/pedometer_detection/BUILD.gn new file mode 100755 index 00000000..435d1134 --- /dev/null +++ b/interfaces/plugin/test/unittest/pedometer_detection/BUILD.gn @@ -0,0 +1,21 @@ +# Copyright (C) 2023 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import("//build/test.gni") + +module_output_path = "sensor/interfaces" +ohos_js_unittest("PedometerDetectionJsTest") { + module_out_path = module_output_path + hap_profile = "./config.json" + certificate_profile = "../signature/openharmony_core.p7b" +} diff --git a/interfaces/plugin/test/unittest/pedometer_detection/ExampleJsunit.test.js b/interfaces/plugin/test/unittest/pedometer_detection/ExampleJsunit.test.js new file mode 100755 index 00000000..5ac90e45 --- /dev/null +++ b/interfaces/plugin/test/unittest/pedometer_detection/ExampleJsunit.test.js @@ -0,0 +1,521 @@ +/* + * Copyright (C) 2023 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +import abilityAccessCtrl from '@ohos.abilityAccessCtrl' +import bundle from '@ohos.bundle' +import osAccount from '@ohos.account.osAccount' +import sensor from '@ohos.sensor' + +import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index' + +let PermissionFlag = { + PERMISSION_USER_SET:1, + PERMISSION_USER_FIXED:2, + PERMISSION_SYSTEM_FIXED:4 +} + +const PERMISSION_DENIED_CODE = 201 +const PARAMETER_ERROR_CODE = 401 +const PARAMETER_ERROR_MSG = 'The parameter invalid.' +const PERMISSION_DENIED_MSG = 'Permission denied.' +let tokenID = undefined +let permissionNameUser = 'ohos.permission.ACTIVITY_MOTION' + +describe("PedometerDetectionJsTest", function () { + function callback(data) { + console.info('callback' + JSON.stringify(data)); + expect(typeof(data.scalar)).assertEqual('number'); + } + + function callback2(data) { + console.info('callback2' + JSON.stringify(data)); + expect(typeof(data.scalar)).assertEqual('number'); + } + + beforeAll(async function() { + /* + * @tc.setup: setup invoked before all testcases + */ + console.info('beforeAll called') + try { + let accountManager = osAccount.getAccountManager(); + let userId = await accountManager.getOsAccountLocalIdFromProcess(); + let appInfo = await bundle.getApplicationInfo('com.example.myapplication', 0, userId); + tokenID = appInfo.accessTokenId; + console.log('AccessTokenId accessTokenId:' + appInfo.accessTokenId + ', name:' + appInfo.name + + ' ,bundleName:' + appInfo.bundleName) + } catch(err) { + console.error('exception in, msg:' + JSON.stringify(err)) + } + }) + + afterAll(function() { + /* + * @tc.teardown: teardown invoked after all testcases + */ + console.info('afterAll called') + }) + + beforeEach(function() { + /* + * @tc.setup: setup invoked before each testcases + */ + console.info('beforeEach called') + }) + + afterEach(function() { + /* + * @tc.teardown: teardown invoked after each testcases + */ + console.info('afterEach called') + let atManager = abilityAccessCtrl.createAtManager(); + atManager.revokeUserGrantedPermission(tokenID, permissionNameUser, + PermissionFlag.PERMISSION_SYSTEM_FIXED) + .catch((err) => { + console.info('err:' + JSON.stringify(err)); + expect(err.code).assertEqual(ERR_NOT_HAVE_PERMISSION); + }) + }) + + /* + * @tc.name:PedometerDetectionJsTest_001 + * @tc.desc:verify app info is not null + * @tc.type: FUNC + * @tc.require: Issue Number + */ + it("PedometerDetectionJsTest_001", 0, async function (done) { + console.info('----------------------PedometerDetectionJsTest_001---------------------------'); + let atManager = abilityAccessCtrl.createAtManager(); + await atManager.grantUserGrantedPermission(tokenID, permissionNameUser, + PermissionFlag.PERMISSION_SYSTEM_FIXED) + .then(() => { + try { + sensor.getSingleSensor(sensor.SensorId.PEDOMETER_DETECTION, (err, data) => { + if (err) { + console.error('getSingleSensor fail, errCode:' + err.code + ' ,msg:' + err.message); + expect(false).assertTrue(); + done(); + } + try { + sensor.on(sensor.SensorId.PEDOMETER_DETECTION, callback); + setTimeout(() => { + sensor.off(sensor.SensorId.PEDOMETER_DETECTION); + done(); + }, 500); + } catch (err) { + console.error('On fail, errCode:' + err.code + ' ,msg:' + err.message); + expect(false).assertTrue(); + done(); + } + }); + } catch (err) { + console.error('Sensor is not support'); + expect(err.code).assertEqual(PARAMETER_ERROR_CODE); + expect(err.message).assertEqual(PARAMETER_ERROR_MSG); + done(); + } + }) + .catch ((err) => { + console.error('err:' + JSON.stringify(err)); + done(); + }) + }) + + /* + * @tc.name:PedometerDetectionJsTest_002 + * @tc.desc:verify app info is not null + * @tc.type: FUNC + * @tc.require: Issue Number + */ + it("PedometerDetectionJsTest_002", 0, async function (done) { + console.info('----------------------PedometerDetectionJsTest_002---------------------------'); + let atManager = abilityAccessCtrl.createAtManager(); + await atManager.grantUserGrantedPermission(tokenID, permissionNameUser, + PermissionFlag.PERMISSION_SYSTEM_FIXED) + .then(() => { + try { + sensor.getSingleSensor(sensor.SensorId.PEDOMETER_DETECTION, (err, data) => { + if (err) { + console.error('getSingleSensor fail, errCode:' + err.code + ' ,msg:' + err.message); + expect(false).assertTrue(); + done(); + } + try { + sensor.on(sensor.SensorId.PEDOMETER_DETECTION, 5); + } catch (err) { + console.error('On fail, errCode:' + err.code + ' ,msg:' + err.message); + expect(err.code).assertEqual(PARAMETER_ERROR_CODE); + expect(err.message).assertEqual(PARAMETER_ERROR_MSG); + done(); + } + }); + } catch (err) { + console.error('Sensor is not support'); + expect(err.code).assertEqual(PARAMETER_ERROR_CODE); + expect(err.message).assertEqual(PARAMETER_ERROR_MSG); + done(); + } + }) + .catch ((err) => { + console.error('err:' + JSON.stringify(err)); + done(); + }) + }) + + /* + * @tc.name:PedometerDetectionJsTest_003 + * @tc.desc:verify app info is not null + * @tc.type: FUNC + * @tc.require: Issue Number + */ + it("PedometerDetectionJsTest_003", 0, async function (done) { + console.info('----------------------PedometerDetectionJsTest_003---------------------------'); + let atManager = abilityAccessCtrl.createAtManager(); + await atManager.grantUserGrantedPermission(tokenID, permissionNameUser, + PermissionFlag.PERMISSION_SYSTEM_FIXED) + .then(() => { + try { + sensor.getSingleSensor(sensor.SensorId.PEDOMETER_DETECTION, (err, data) => { + if (err) { + console.error('getSingleSensor fail, errCode:' + err.code + ' ,msg:' + err.message); + expect(false).assertTrue(); + done(); + } + try { + sensor.once(sensor.SensorId.PEDOMETER_DETECTION, callback); + setTimeout(() => { + expect(true).assertTrue(); + done(); + }, 500); + } catch (err) { + console.error('Once fail, errCode:' + err.code + ' ,msg:' + err.message); + expect(false).assertTrue(); + done(); + } + }); + } catch (err) { + console.error('Sensor is not support'); + expect(err.code).assertEqual(PARAMETER_ERROR_CODE); + expect(err.message).assertEqual(PARAMETER_ERROR_MSG); + done(); + } + }) + .catch ((err) => { + console.error('err:' + JSON.stringify(err)); + done(); + }) + }) + + /* + * @tc.name:PedometerDetectionJsTest_004 + * @tc.desc:verify app info is not null + * @tc.type: FUNC + * @tc.require: Issue Number + */ + it("PedometerDetectionJsTest_004", 0, async function (done) { + console.info('----------------------PedometerDetectionJsTest_004---------------------------'); + let atManager = abilityAccessCtrl.createAtManager(); + await atManager.grantUserGrantedPermission(tokenID, permissionNameUser, + PermissionFlag.PERMISSION_SYSTEM_FIXED) + .then(() => { + try { + sensor.getSingleSensor(sensor.SensorId.PEDOMETER_DETECTION, (err, data) => { + if (err) { + console.error('getSingleSensor fail, errCode:' + err.code + ' ,msg:' + err.message); + expect(false).assertTrue(); + done(); + } + try { + sensor.once(sensor.SensorId.PEDOMETER_DETECTION, callback, 5); + setTimeout(() => { + expect(true).assertTrue(); + done(); + }, 500); + } catch (err) { + console.error('Once fail, errCode:' + err.code + ' ,msg:' + err.message); + expect(false).assertTrue(); + done(); + } + }); + } catch (err) { + console.error('Sensor is not support'); + expect(err.code).assertEqual(PARAMETER_ERROR_CODE); + expect(err.message).assertEqual(PARAMETER_ERROR_MSG); + done(); + } + }) + .catch ((err) => { + console.error('err:' + JSON.stringify(err)); + done(); + }) + }) + + /* + * @tc.name:PedometerDetectionJsTest_005 + * @tc.desc:verify app info is not null + * @tc.type: FUNC + * @tc.require: Issue Number + */ + it("PedometerDetectionJsTest_005", 0, async function (done) { + console.info('----------------------PedometerDetectionJsTest_005---------------------------'); + let atManager = abilityAccessCtrl.createAtManager(); + await atManager.grantUserGrantedPermission(tokenID, permissionNameUser, + PermissionFlag.PERMISSION_SYSTEM_FIXED) + .then(() => { + try { + sensor.getSingleSensor(sensor.SensorId.PEDOMETER_DETECTION, (err, data) => { + if (err) { + console.error('getSingleSensor fail, errCode:' + err.code + ' ,msg:' + err.message); + expect(false).assertTrue(); + done(); + } + try { + sensor.once(sensor.SensorId.PEDOMETER_DETECTION, 5); + } catch (err) { + console.error('On fail, errCode:' + err.code + ' ,msg:' + err.message); + expect(err.code).assertEqual(PARAMETER_ERROR_CODE); + expect(err.message).assertEqual(PARAMETER_ERROR_MSG); + done(); + } + }); + } catch (err) { + console.error('Sensor is not support'); + expect(err.code).assertEqual(PARAMETER_ERROR_CODE); + expect(err.message).assertEqual(PARAMETER_ERROR_MSG); + done(); + } + }) + .catch ((err) => { + console.error('err:' + JSON.stringify(err)); + done(); + }) + }) + + /* + * @tc.name:PedometerDetectionJsTest_006 + * @tc.desc:verify app info is not null + * @tc.type: FUNC + * @tc.require: Issue Number + */ + it("PedometerDetectionJsTest_006", 0, async function (done) { + console.info('----------------------PedometerDetectionJsTest_006---------------------------'); + let atManager = abilityAccessCtrl.createAtManager(); + await atManager.grantUserGrantedPermission(tokenID, permissionNameUser, + PermissionFlag.PERMISSION_SYSTEM_FIXED) + .then(() => { + try { + sensor.getSingleSensor(sensor.SensorId.PEDOMETER_DETECTION, (err, data) => { + if (err) { + console.error('getSingleSensor fail, errCode:' + err.code + ' ,msg:' + err.message); + expect(false).assertTrue(); + done(); + } + try { + sensor.off(-1, callback); + } catch (err) { + expect(err.code).assertEqual(PARAMETER_ERROR_CODE) + expect(err.message).assertEqual(PARAMETER_ERROR_MSG) + done(); + } + }); + } catch (err) { + console.error('Sensor is not support'); + expect(err.code).assertEqual(PARAMETER_ERROR_CODE); + expect(err.message).assertEqual(PARAMETER_ERROR_MSG); + done(); + } + }) + .catch ((err) => { + console.error('err:' + JSON.stringify(err)); + done(); + }) + }) + + /* + * @tc.name:PedometerDetectionJsTest_007 + * @tc.desc:verify app info is not null + * @tc.type: FUNC + * @tc.require: Issue Number + */ + it("PedometerDetectionJsTest_007", 0, async function (done) { + console.info('----------------------PedometerDetectionJsTest_007---------------------------'); + let atManager = abilityAccessCtrl.createAtManager(); + await atManager.grantUserGrantedPermission(tokenID, permissionNameUser, + PermissionFlag.PERMISSION_SYSTEM_FIXED) + .then(() => { + try { + sensor.getSingleSensor(sensor.SensorId.PEDOMETER_DETECTION, (err, data) => { + if (err) { + console.error('getSingleSensor fail, errCode:' + err.code + ' ,msg:' + err.message); + expect(false).assertTrue(); + done(); + } + try { + sensor.on(sensor.SensorId.PEDOMETER_DETECTION, callback); + sensor.on(sensor.SensorId.PEDOMETER_DETECTION, callback2); + setTimeout(()=>{ + sensor.off(sensor.SensorId.PEDOMETER_DETECTION); + done(); + }, 1000); + } catch (err) { + console.error('On fail, errCode:' + err.code + ' ,msg:' + err.message); + expect(false).assertTrue(); + done(); + } + }); + } catch (err) { + console.error('Sensor is not support'); + expect(err.code).assertEqual(PARAMETER_ERROR_CODE); + expect(err.message).assertEqual(PARAMETER_ERROR_MSG); + done(); + } + }) + .catch ((err) => { + console.error('err:' + JSON.stringify(err)); + done(); + }) + }) + + /* + * @tc.name:PedometerDetectionJsTest_008 + * @tc.desc:verify app info is not null + * @tc.type: FUNC + * @tc.require: Issue Number + */ + it("PedometerDetectionJsTest_008", 0, async function (done) { + console.info('----------------------PedometerDetectionJsTest_008---------------------------'); + let atManager = abilityAccessCtrl.createAtManager(); + await atManager.grantUserGrantedPermission(tokenID, permissionNameUser, + PermissionFlag.PERMISSION_SYSTEM_FIXED) + .then(() => { + try { + sensor.getSingleSensor(sensor.SensorId.PEDOMETER_DETECTION, (err, data) => { + if (err) { + console.error('getSingleSensor fail, errCode:' + err.code + ' ,msg:' + err.message); + expect(false).assertTrue(); + done(); + } + try { + sensor.on(sensor.SensorId.PEDOMETER_DETECTION, callback); + sensor.on(sensor.SensorId.PEDOMETER_DETECTION, callback2); + setTimeout(() => { + sensor.off(sensor.SensorId.PEDOMETER_DETECTION, callback); + }, 500); + setTimeout(() => { + sensor.off(sensor.SensorId.PEDOMETER_DETECTION, callback2); + done(); + }, 1000); + } catch (err) { + console.error('On fail, errCode:' + err.code + ' ,msg:' + err.message); + expect(false).assertTrue(); + done(); + } + }); + } catch (err) { + console.error('Sensor is not support'); + expect(err.code).assertEqual(PARAMETER_ERROR_CODE); + expect(err.message).assertEqual(PARAMETER_ERROR_MSG); + done(); + } + }) + .catch ((err) => { + console.error('err:' + JSON.stringify(err)); + done(); + }) + }) + + /* + * @tc.name:PedometerDetectionJsTest_009 + * @tc.desc:verify app info is not null + * @tc.type: FUNC + * @tc.require: Issue Number + */ + it("PedometerDetectionJsTest_009", 0, async function (done) { + console.info('----------------------PedometerDetectionJsTest_009---------------------------'); + let atManager = abilityAccessCtrl.createAtManager(); + await atManager.grantUserGrantedPermission(tokenID, permissionNameUser, + PermissionFlag.PERMISSION_SYSTEM_FIXED) + .then(() => { + try { + sensor.getSingleSensor(sensor.SensorId.PEDOMETER_DETECTION, (err, data) => { + if (err) { + console.error('getSingleSensor fail, errCode:' + err.code + ' ,msg:' + err.message); + expect(false).assertTrue(); + done(); + } + try { + sensor.on(sensor.SensorId.PEDOMETER_DETECTION, callback); + sensor.once(sensor.SensorId.PEDOMETER_DETECTION, callback2); + setTimeout(() => { + sensor.off(sensor.SensorId.PEDOMETER_DETECTION); + done(); + }, 500); + } catch (err) { + console.error('On fail, errCode:' + err.code + ' ,msg:' + err.message); + expect(false).assertTrue(); + done(); + } + }); + } catch (err) { + console.error('Sensor is not support'); + expect(err.code).assertEqual(PARAMETER_ERROR_CODE); + expect(err.message).assertEqual(PARAMETER_ERROR_MSG); + done(); + } + }) + .catch ((err) => { + console.error('err:' + JSON.stringify(err)); + done(); + }) + }) + + /* + * @tc.name:PedometerDetectionJsTest_010 + * @tc.desc:verify app info is not null + * @tc.type: FUNC + * @tc.require: Issue Number + */ + it("PedometerDetectionJsTest_010", 0, async function (done) { + console.info('----------------------PedometerDetectionJsTest_010---------------------------'); + try { + sensor.getSingleSensor(sensor.SensorId.PEDOMETER_DETECTION, (err, data) => { + if (err) { + console.error('getSingleSensor fail, errCode:' + err.code + ' ,msg:' + err.message); + expect(false).assertTrue(); + done(); + } + expect(typeof(data)).assertEqual("object"); + if (data) { + try { + sensor.on(sensor.SensorId.PEDOMETER_DETECTION, callback); + } catch (err) { + console.error('On fail, errCode:' + err.code + ' ,msg:' + err.message); + expect(err.code).assertEqual(PERMISSION_DENIED_CODE); + expect(err.message).assertEqual(PERMISSION_DENIED_MSG); + done(); + } + } else { + console.error('Non-mobile devices cannot be excluded'); + expect(true).assertTrue(); + done(); + } + }); + } catch (err) { + console.error('Sensor is not support'); + expect(err.code).assertEqual(PARAMETER_ERROR_CODE); + expect(err.message).assertEqual(PARAMETER_ERROR_MSG); + done(); + } + }) +}) \ No newline at end of file diff --git a/interfaces/plugin/test/unittest/pedometer_detection/config.json b/interfaces/plugin/test/unittest/pedometer_detection/config.json new file mode 100755 index 00000000..95cf5719 --- /dev/null +++ b/interfaces/plugin/test/unittest/pedometer_detection/config.json @@ -0,0 +1,82 @@ +{ + "app": { + "bundleName": "com.example.myapplication", + "vendor": "example", + "version": { + "code": 1, + "name": "1.0" + }, + "apiVersion": { + "compatible": 4, + "target": 5 + } + }, + "deviceConfig": {}, + "module": { + "reqPermissions": [ + { + "name": "ohos.permission.ACTIVITY_MOTION", + "reason": "need user ohos.permission.ACTIVITY_MOTION", + "usedScene": { + "ability": [ + ".MainAbility" + ], + "when": "inuse" + } + }, + { + "name": "ohos.permission.GRANT_SENSITIVE_PERMISSIONS", + "reason": "user ohos.permission.GRANT_SENSITIVE_PERMISSIONS" + }, + { + "name": "ohos.permission.REVOKE_SENSITIVE_PERMISSIONS", + "reason": "user ohos.permission.REVOKE_SENSITIVE_PERMISSIONS" + } + ], + "package": "com.example.myapplication", + "name": ".myapplication", + "deviceType": [ + "default", + "tablet" + ], + "distro": { + "deliveryWithInstall": true, + "moduleName": "entry", + "moduleType": "entry" + }, + "abilities": [ + { + "visible": true, + "skills": [ + { + "entities": [ + "entity.system.home" + ], + "actions": [ + "action.system.home" + ] + } + ], + "name": "com.example.myapplication.MainAbility", + "icon": "$media:icon", + "description": "$string:mainability_description", + "label": "PedometerDetectionJsTest", + "type": "page", + "launchType": "standard" + } + ], + "js": [ + { + "pages": [ + "pages/index/index" + ], + "name": "default", + "window": { + "designWidth": 720, + "autoDesignWidth": false + } + } + ] + } + } + \ No newline at end of file diff --git a/interfaces/plugin/test/unittest/sensor/BUILD.gn b/interfaces/plugin/test/unittest/sensor/BUILD.gn old mode 100644 new mode 100755 index 1e7d26c0..6a4cef74 --- a/interfaces/plugin/test/unittest/sensor/BUILD.gn +++ b/interfaces/plugin/test/unittest/sensor/BUILD.gn @@ -17,5 +17,5 @@ module_output_path = "sensor/interfaces" ohos_js_unittest("SensorJsTest") { module_out_path = module_output_path hap_profile = "./config.json" - certificate_profile = "./signature/openharmony_sx.p7b" + certificate_profile = "../signature/openharmony_sx.p7b" } diff --git a/interfaces/plugin/test/unittest/sensor/ExampleJsunit.test.js b/interfaces/plugin/test/unittest/sensor/ExampleJsunit.test.js old mode 100644 new mode 100755 index 7407ea9b..69c40c73 --- a/interfaces/plugin/test/unittest/sensor/ExampleJsunit.test.js +++ b/interfaces/plugin/test/unittest/sensor/ExampleJsunit.test.js @@ -31,28 +31,28 @@ describe("SensorJsTest", function () { /* * @tc.setup: setup invoked before all testcases */ - console.info('beforeAll caled') + console.info('beforeAll called') }) afterAll(function() { /* * @tc.teardown: teardown invoked after all testcases */ - console.info('afterAll caled') + console.info('afterAll called') }) beforeEach(function() { /* * @tc.setup: setup invoked before each testcases */ - console.info('beforeEach caled') + console.info('beforeEach called') }) afterEach(function() { /* * @tc.teardown: teardown invoked after each testcases */ - console.info('afterEach caled') + console.info('afterEach called') }) const PARAMETER_ERROR_CODE = 401 diff --git a/interfaces/plugin/test/unittest/sensor/signature/openharmony_sx.p7b b/interfaces/plugin/test/unittest/sensor/signature/openharmony_sx.p7b deleted file mode 100644 index 9be1e98fa4c0c28ca997ed660112fa16b194f0f5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3437 zcmcgvX>b$g8MY4FF(5FQyMT=#m||qU)nQ9cId-MBB-<-lvSdq&snM}IENNF>t+bK| zgowuF2vC|SxSZxNN5eHhV%(WPpbeB9Fc3;JDMtzMBv1-XAc2N~c2_tCXW&OCGw6qQ z-s9VS-tT?h=bI0tMS+~WDXqHJyCPmLzdbE-fV8Nd&*MRZfG8(#POFZG3xs@Lb{0ry z=R8j3wWo!5g=yjKx#BoZMFS)uA)H}cTp@-^K`9VV?RC3J59@}eik*>n|pRKOLZ zxdn7G!Yv@9O#y<&eUy{)vMXb;fQR)ffVAADQsEMXm;IBMDLfLD0w^U;6%HVo-0Q_5 zCHEa?DBuauNpZzoF+tK27w#n~?u%toS-DhR4k@Q*{7x^8Q=D6&kd^_~J#VVG2LXkL zaAy=}U*?Jto)9hx5MGjdp9hcQAu@tfk_;l!PeyxPY<8b&+&D!CyaBh9=8BSVKLpk4 z4Ml3yY|&Th)vyK4cpC{!uU8v2YBlVV`d~(nz&<@{G1oe*DHub1z7~J5*;s2bX<)_* zV_GbsPQg`(&rpxRb_*Od7}++3+liSw-$!1 zs5*g}EHWhI3i|!-FcfzYL0`SL-rq>LENC;PMl)G(0(1U2%Va|smp0UFx0xd@soZA* zD5LYc4OlbE7@ARt#h}rr3>K@bf%B#^-c+xz8Hr)0D5ExIFltezN@Hn8>o5d~bSfYtkc+_Z&kI#-N5_GhCg*V-^TSO=!G~ z(fXy{n2XV+k}6w_W`dTOP2a4u0ly;ANZ>4OxSKAzFB!yBzdo`gX zO?o|H@WiAw$y6l?=^3jA_Hy0S)nTYs12;4hKE&ekQ|>?|ZLJ}#F`2BczC7kdE4@xV zZBD_)Otwjhz+NSaz?d45!;FsGSu-#qh#hStD%B}f!mCT!KqzSo>I`NGH_9Dea$1Qi zg29Ydt!~lQVR99_T7#Hije~(12drl-P)SV?QR*9sus`8th-8^OQ7@xI$(Yp|^;bL1 zR50O$mDXw6P>i7B(TJ)ciPzTE>XY%X6HAa)b#OBRXv&~%Bw|J#Y><i4=e%95bjtw|cJp=#P#Pf#*luqI_wR;fISDCJhAqSG6R%xItn%~QtZ@m%&u zjGGLX;t6Ls62eQvNmf@v+}J%54^CygxRZ`?8X#r|wkev7(s;Ou4T#y1XNNf)h;o7z z8a^Lfq<1uH`E{G9E z*(=)Css_LSk=>E9jr)s5^2-!+MN=Ds}>1hRma4`uCIz9%p3O77839E{xf z4c_I?**|1`K2tg4!Hvyrou4BsJQuv*UfF)<%CelYIS>D^o?X)3+MK%la6kooW8&G@BU)Y0hT`+mOm$Z_%rB=a%o>I z!2c6lHyKQN)VjiFwa!eE^p8jc$sy$vB+8i25lI~6KPFFh$!o$avA~rj#L6xvR|Z83 z*WD6T9e+5Pyy=F+)pNTf{ny3cy>7Rkd3o*TS?TZJ`NS^NF2%HMkyS{?uJ$`!P4_L^ z1`NFDUbNyg_qREifgktnp1_v{Jbb`7m}2PTyUdOmtJj~m z9bB=ecw4_^rw1IW=of+>nrW5=d3k`3qHCxsIN_F{T1A545};;+fsyC&qChi+YV zr~M63H8ZLCPYmsjY>ls9cL%I)F|JIW-#+48$+lD4k*(P*kDM%zx_fvu4u5ZYUnI}5 zdrycFq>xFU)&X3p@pP2u%$o}}YcRn(MhJ&B2o?KS@cIVz>Ye%o^xV?CB{_Qhu z;}_q1bvO^g{8<3!gYbo4Di{8qzV+(9 zdlmksohQmRTs@qB;(Wo?dER_ux6XQb@q$tQPW?CMu6GVQd;R=iR;-S{Kr%Zks7>b1 zNs{|-+jhObYE}NR&`TGGr^h^4bjh%c>R#@=8nM&Md>_a+zVulsl;){flFekV1t9ob z+SqfV_Pv3$2f)bQ8%Ul2>fdYR^1zs0BQF~olsOj5AodC&Q_7SMFzsz2 z9newxE&jodk~tNHwl%LBMMDbrk=(^b diff --git a/interfaces/plugin/test/unittest/gyroscope/signature/openharmony_sx.p7b b/interfaces/plugin/test/unittest/signature/openharmony_core.p7b old mode 100644 new mode 100755 similarity index 51% rename from interfaces/plugin/test/unittest/gyroscope/signature/openharmony_sx.p7b rename to interfaces/plugin/test/unittest/signature/openharmony_core.p7b index 9be1e98fa4c0c28ca997ed660112fa16b194f0f5..9e5de81be5c81f38750b2f308a3836b2aceb0a48 GIT binary patch delta 977 zcmYk5Pl)4m6vs_BGi#k0Jq(J>Wyj2IyVE9V+N9&o$}dgR^iSIU+O%nFMbjotnrV{$ zPul?tMaHAM)Wd>^W%vf(Kb-m<9NphQE_#mV80U z=pTpJNbB`mj=gIumWJ(Nq#yU=*p+kKaMUFxZ znFvJ($crzLWRZ9nMf(3damQ>hr-&|ZrKA4HFIE|4t zTjUbsj0A(S(a4C?hje<*Og1Ivi*C%Va3u&i4vah1c&WLxL7j*g4FQa6HYb5Jt7l3q z=u0eL8Y*Qt<|QCKVvfYcB9kh~FL}pM=QBH`BTA_vq5GYgQ4@j5J0 zZLw4hj9J#I`V32JlJZ2*Tf_J?rMsNIyht9;0Vo7m06Cy*V0lZHd9ak4aA8Gc6~JeP z@xde^6L4r0=%$)14?_$rMVuBf6GY&~qtR}>AW{()h#U(6SF;re+^U`!gRD>*^0^4e zsT7&5s5&SBryEEeOuJc&Dni-U3OkjSk#xm;ucM4Ox@}Kku~@S~pQiOmQl`POi>L{9 zYSO?{cG{AH6M8htm&Ya_$@&C3ml^ac@{p&ML0(A$a&kaaWlJ+_cF+ohh=S|5a!TXD z{^E61e5$>C&ikdJ zf8k&6uK!;Oi;vg+vmhQM!Z=BUD5i=B&XwUs2@Ksn*}QZ4_XTx&-FJ28tbO)(=D73y zC3)-g$9GPCKDv7IQ~Zh5$CsM>Y9GDeLF0JL^W0-+zLjg&K0Lg4>$|7l_~NbR-6!93 zzPaK;_mIfIRc5{V^{cvMAJZN^tuG7&x_o3jy?WXLw{anqO>eS2s)%Vgl{#T-M^K#R5k z5+G;`tWwC=RDbzq;Qcv^q%KR;Es+s?Nm0qNsY{~2rv4f0LQj;(h?c8NNtQVlWf-N) z7DWg+K&UJY#Z29*ktI_bG<#Y!ZixjJF=*Z9S!DVRuH+d5v#)hoSp>0vEmP!+bG49e zaw}0`<<$}YMblOEC{aZytQ9a7vl1t_h+ej#dA?l@hU=>ui$2UTDJ_zXluGm!=~yq zs|+!%(v=zweb(t!k1WcT1;LV5U>l>sf-mP&k4WH|sA{on(64Bw5w)q z)g#GbDe1M?bgLn_1s~+rZJC0gMa@|VL>k5b;var)0nb5LW$RX&_EXaq?^p2ttkUD9 z0%7E0wU!;((}p5I98Hh7q8Ll9YzE4JsUd)BKtKwym+e7Hs9OVb+CtVW5u27sw?Fe# zb!;9r3Qlj@0F)Zx`kv)X#^qtEJTvmeyfB*#8sgN>6hRl_t|M`E%ggaVirM`RUM@DO zBbev;c0@H>Iz#RC3OX~B)c%p1D_IW7_p*M4%A}g{v7@K_@v@AG%TKYVZ{5d|=QnA5 z5xBaH?2MlH|45b}?i|huJVC_qC`pl24Ue2{W*Z~I*kyG0qW%GKyLvD9$&J0^E4!6z zuc|+ObXWWH^ox(bqh5ale|+n))gHfk0ow>-9L@$WJ2~dro!vjabjiWwrFR{Po_t;V zJM)e<%KUKet)1sy3_f%2vzU&)-4MUO77kt5ed?zD^Dplm-#*UYc>Cs^@#nvOQ~Bv1 D{f|#| diff --git a/interfaces/plugin/test/unittest/barometer/signature/openharmony_sx.p7b b/interfaces/plugin/test/unittest/signature/openharmony_sx.p7b old mode 100644 new mode 100755 similarity index 100% rename from interfaces/plugin/test/unittest/barometer/signature/openharmony_sx.p7b rename to interfaces/plugin/test/unittest/signature/openharmony_sx.p7b -- Gitee