From 24f1b18be127c6f505292c92ab001d71511bb5a7 Mon Sep 17 00:00:00 2001 From: hellohyh001 Date: Fri, 11 Mar 2022 17:52:18 +0800 Subject: [PATCH] Signed-off-by:hellohyh001 Signed-off-by: hellohyh001 --- interfaces/plugin/src/sensor_js.cpp | 3 - .../test/unittest/ExampleJsunit.test.js | 521 +++++------------- 2 files changed, 130 insertions(+), 394 deletions(-) diff --git a/interfaces/plugin/src/sensor_js.cpp b/interfaces/plugin/src/sensor_js.cpp index e675dc0e..02c4c67f 100644 --- a/interfaces/plugin/src/sensor_js.cpp +++ b/interfaces/plugin/src/sensor_js.cpp @@ -161,9 +161,6 @@ static napi_value Once(napi_env env, napi_callback_info info) int32_t ret = SubscribeSensor(sensorTypeId, 200000000, DataCallbackImpl); if (ret < 0) { HiLog::Error(LABEL, "%{public}s subscribe Sensor failed", __func__); - asyncCallbackInfo->type = FAIL; - asyncCallbackInfo->error.code = ret; - EmitAsyncCallbackWork(asyncCallbackInfo); g_onceCallbackInfos.erase(sensorTypeId); return nullptr; } diff --git a/interfaces/plugin/test/unittest/ExampleJsunit.test.js b/interfaces/plugin/test/unittest/ExampleJsunit.test.js index 8889bba6..b7c00665 100644 --- a/interfaces/plugin/test/unittest/ExampleJsunit.test.js +++ b/interfaces/plugin/test/unittest/ExampleJsunit.test.js @@ -17,6 +17,16 @@ import sensor from '@ohos.sensor' import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index' describe("SensorJsTest", function () { + function callback(data) { + console.info("callback" + JSON.stringify(data)); + expect(typeof(data.x)).assertEqual("number"); + } + + function callback2() { + console.info("callback2" + JSON.stringify(data)); + expect(typeof(data.x)).assertEqual("number"); + } + beforeAll(function() { /* * @tc.setup: setup invoked before all testcases @@ -53,51 +63,11 @@ describe("SensorJsTest", function () { */ it("SensorJsTest001", 0, async function (done) { console.info('----------------------SensorJsTest001---------------------------'); - function offPromise() { - return new Promise((resolve, reject) => { - sensor.off(0, (error) =>{ - if(error) { - console.info('SensorJsTest001 off error'); - expect(false).assertTrue(); - console.info('setTimeout ..start') - setTimeout(()=>{ - reject(); - }, 500); - } else { - console.info('SensorJsTest001 off success'); - expect(true).assertTrue(); - setTimeout(()=>{ - resolve(); - }, 500); - } - }, 1000) - }) - } - - let promise = new Promise((resolve, reject) => { - sensor.on(0, function(error, data) { - if (error) { - console.info('SensorJsTest001 on error'); - expect(false).assertTrue(); - setTimeout(()=>{ - reject(); - }, 500); - } else { - console.info('SensorJsTest001 on success'); - expect(typeof(data.x)).assertEqual("number"); - setTimeout(()=>{ - resolve(); - }, 500); - } - }); - }) - - await promise.then(() =>{ - return offPromise(); - }, ()=>{ - console.info("SensorJsTest001 reject"); - }) - done(); + sensor.on(0, callback); + setTimeout(()=>{ + sensor.off(0); + done(); + }, 500); }) /* @@ -108,19 +78,16 @@ describe("SensorJsTest", function () { */ it("SensorJsTest002", 0, async function (done) { console.info('----------------------SensorJsTest002---------------------------'); - function onSensorCallback(error, data) { - if (error) { - console.info('SensorJsTest002 on success'); - expect(true).assertTrue(); - } else { - console.info('SensorJsTest002 on error'); - expect(false).assertTrue(); - } - setTimeout(()=>{ - done(); - }, 500); + function onSensorCallback(data) { + console.info('SensorJsTest002 on error'); + expect(false).assertTrue(); + done(); } sensor.on(-1, onSensorCallback); + setTimeout(()=>{ + expect(true).assertTrue(); + done(); + }, 500); }) /* @@ -131,52 +98,13 @@ describe("SensorJsTest", function () { */ it("SensorJsTest003", 0, async function (done) { console.info('----------------------SensorJsTest003---------------------------'); - function offPromise() { - return new Promise((resolve, reject) => { - sensor.off(0, (error) =>{ - if(error) { - console.info('SensorJsTest003 off error'); - expect(false).assertTrue(); - setTimeout(()=>{ - done(); - reject(); - }, 500); - } else { - console.info('SensorJsTest003 off success'); - expect(true).assertTrue(); - setTimeout(()=>{ - done(); - resolve(); - }, 500); - } - }, 1000) - }) - } - - let promise = new Promise((resolve, reject) => { - sensor.on(0, function(error, data) { - if (error) { - console.info('SensorJsTest003 on error'); - expect(false).assertTrue(); - setTimeout(()=>{ - reject(); - }, 500); - } else { - console.info('SensorJsTest003 on success'); - expect(typeof(data.x)).assertEqual("number"); - setTimeout(()=>{ - resolve(); - }, 500); - } - }, {'interval': 200000000}); - }) - - await promise.then(() =>{ - return offPromise(); - }, ()=>{ - console.info("SensorJsTest003 reject"); - }) - done(); + sensor.on(0, callback, {'interval': 100000000}); + setTimeout(()=>{ + console.info('----------------------SensorJsTest003 off in---------------------------'); + sensor.off(0); + console.info('----------------------SensorJsTest003 off end---------------------------'); + done(); + }, 500); }) /* @@ -187,8 +115,16 @@ describe("SensorJsTest", function () { */ it("SensorJsTest004", 0, function () { console.info('----------------------SensorJsTest004---------------------------'); - sensor.on(0, function(){}, {'interval': 100000000}, 5); - expect(true).assertTrue(); + function onSensorCallback(data) { + console.info('SensorJsTest004 on error'); + expect(false).assertTrue(); + done(); + } + sensor.on(0, onSensorCallback, {'interval': 100000000}, 5); + setTimeout(()=>{ + expect(true).assertTrue(); + done(); + }, 500); console.info('----------------------SensorJsTest004--------------------------- end'); }) @@ -199,19 +135,11 @@ describe("SensorJsTest", function () { * @tc.require: Issue Number */ it("SensorJsTest005", 0, async function (done) { - function onceSensorCallback(error, data) { - if (error) { - console.info('SensorJsTest005 once error'); - expect(false).assertTrue(); - } else { - console.info('SensorJsTest005 once success'); - expect(typeof(data.x)).assertEqual("number"); - } - setTimeout(()=>{ - done(); - }, 500); - } - sensor.once(0, onceSensorCallback); + sensor.once(0, callback); + setTimeout(()=>{ + expect(true).assertTrue(); + done(); + }, 500); }) /* @@ -221,19 +149,16 @@ describe("SensorJsTest", function () { * @tc.require: Issue Number */ it("SensorJsTest006", 0, async function (done) { - function onceSensorCallback(error, data) { - if (error) { - console.info('SensorJsTest006 on success'); - expect(true).assertTrue(); - } else { - console.info('SensorJsTest006 on error' + data.x); - expect(false).assertTrue(); - } - setTimeout(()=>{ - done(); - }, 500); + function onceSensorCallback(data) { + console.info('SensorJsTest006 on error'); + expect(false).assertTrue(); + done(); } sensor.once(-1, onceSensorCallback); + setTimeout(()=>{ + expect(true).assertTrue(); + done(); + }, 500); }) /* @@ -243,8 +168,16 @@ describe("SensorJsTest", function () { * @tc.require: Issue Number */ it("SensorJsTest007", 0, function () { - sensor.once(0, function(){}, 5); - expect(true).assertTrue(); + function onceSensorCallback(data) { + console.info('SensorJsTest007 on error'); + expect(false).assertTrue(); + done(); + } + sensor.once(0, onceSensorCallback, 5); + setTimeout(()=>{ + expect(true).assertTrue(); + done(); + }, 500); }) /* @@ -254,19 +187,11 @@ describe("SensorJsTest", function () { * @tc.require: Issue Number */ it("SensorJsTest008", 0, async function (done) { - function offCallback(error) { - if (error) { - console.info('SensorJsTest008 off success'); - expect(true).assertTrue(); - } else { - console.info('SensorJsTest008 off error'); - expect(false).assertTrue(); - } - setTimeout(()=>{ - done(); - }, 500); - } - sensor.off(-1, offCallback); + sensor.off(-1, callback); + setTimeout(()=>{ + expect(true).assertTrue(); + done(); + }, 500); }) /* @@ -276,19 +201,17 @@ describe("SensorJsTest", function () { * @tc.require: Issue Number */ it("SensorJsTest009", 0, async function (done) { - function offCallback(error) { - if (error) { - console.info('SensorJsTest009 off success'); - expect(true).assertTrue(); - } else { - console.info('SensorJsTest009 off error'); - expect(false).assertTrue(); - } - setTimeout(()=>{ - done(); - }, 500); + function onSensorCallback(data) { + console.info('SensorJsTest009 on error'); + expect(false).assertTrue(); + done(); } - sensor.off(0, offCallback); + sensor.on(0, onSensorCallback); + sensor.off(0, onSensorCallback); + setTimeout(()=>{ + expect(true).assertTrue(); + done(); + }, 500); }) /* @@ -298,19 +221,16 @@ describe("SensorJsTest", function () { * @tc.require: Issue Number */ it("SensorJsTest010", 0, async function (done) { - function offCallback(error) { - if (error) { - console.info('SensorJsTest010 off success'); - expect(true).assertTrue(); - } else { - console.info('SensorJsTest010 off error'); - expect(false).assertTrue(); - } - setTimeout(()=>{ - done(); - }, 500); + function onSensorCallback(data) { + console.info('SensorJsTest010 on error'); + expect(false).assertTrue(); + done(); } - sensor.off(1000000, offCallback); + sensor.off(1000000, onSensorCallback); + setTimeout(()=>{ + expect(true).assertTrue(); + done(); + }, 500); }) /* @@ -320,19 +240,14 @@ describe("SensorJsTest", function () { * @tc.require: Issue Number */ it("SensorJsTest011", 0, async function (done) { - function onceSensorCallback(error, data) { - if (error) { - console.info('SensorJsTest011 once success'); - expect(true).assertTrue(); - } else { - console.info('SensorJsTest011 once error' + data.x); - expect(false).assertTrue(); - } - setTimeout(()=>{ - done(); - }, 500); - } - sensor.once(1000000, onceSensorCallback); + sensor.on(0, callback); + sensor.on(0, callback2); + setTimeout(()=>{ + console.info('----------------------SensorJsTest011 off in---------------------------'); + sensor.off(0); + console.info('----------------------SensorJsTest011 off end---------------------------'); + done(); + }, 1000); }) /* @@ -342,19 +257,15 @@ describe("SensorJsTest", function () { * @tc.require: Issue Number */ it("SensorJsTest012", 0, async function (done) { - function offCallback(error) { - if (error) { - console.info('SensorJsTest012 off success'); - expect(true).assertTrue(); - } else { - console.info('SensorJsTest012 off error'); - expect(false).assertTrue(); - } - setTimeout(()=>{ - done(); - }, 500); - } - sensor.on(1000000, offCallback); + sensor.on(0, callback); + sensor.on(0, callback2); + setTimeout(()=>{ + console.info('----------------------SensorJsTest012 off in---------------------------'); + sensor.off(0, callback); + sensor.off(0, callback2); + console.info('----------------------SensorJsTest012 off end---------------------------'); + done(); + }, 1000); }) /* @@ -368,7 +279,6 @@ describe("SensorJsTest", function () { expect(true).assertTrue(); }) - /* * @tc.name:SensorJsTest014 * @tc.desc:verify app info is not null @@ -377,72 +287,15 @@ describe("SensorJsTest", function () { */ it("SensorJsTest014", 0, async function (done) { console.info('----------------------SensorJsTest014---------------------------'); - function offPromise2() { - return new Promise((resolve, reject) => { - sensor.off(0, (error) =>{ - if(error) { - console.info('SensorJsTest014 off2 success'); - expect(true).assertTrue(); - setTimeout(()=>{ - done(); - reject() - }, 500); - } else { - console.info('SensorJsTest014 off2 error'); - expect(false).assertTrue(); - setTimeout(()=>{ - done(); - resolve() - }, 500); - } - }); - }) - } - - function offPromise1() { - return new Promise((resolve, reject) => { - sensor.off(0, (error) =>{ - if(error) { - console.info('SensorJsTest014 off1 error'); - expect(false).assertTrue(); - setTimeout(()=>{ - reject(); - }, 500); - } else { - console.info('SensorJsTest014 off1 success'); - expect(true).assertTrue(); - setTimeout(()=>{ - resolve(); - }, 500); - } - }); - }) - } - - let promise = new Promise((resolve, reject) => { - sensor.on(0, function(error, data) { - if (error) { - console.info('SensorJsTest014 on error'); - expect(false).assertTrue(); - setTimeout(()=>{ - reject(); - }, 500); - } else { - console.info('SensorJsTest014 on success'); - expect(typeof(data.x)).assertEqual("number"); - setTimeout(()=>{ - resolve(); - }, 500); - } - }); - }) - - await promise.then(() =>{ - return offPromise1(); - }).then(()=>{ - return offPromise2(); - }); - done(); + sensor.on(0, callback, {'interval': 100000000}); + sensor.once(0, callback2); + setTimeout(()=>{ + console.info('----------------------SensorJsTest014 off in---------------------------'); + sensor.off(0, callback); + sensor.off(0, callback2); + console.info('----------------------SensorJsTest014 off end---------------------------'); + done(); + }, 1000); }) /* @@ -453,74 +306,17 @@ describe("SensorJsTest", function () { */ it("SensorJsTest015", 0, async function (done) { console.info('----------------------SensorJsTest015---------------------------'); - function offPromise() { - return new Promise((resolve, reject) => { - sensor.off(0, (error) =>{ - if(error) { - console.info('SensorJsTest015 off error'); - expect(false).assertTrue(); - setTimeout(()=>{ - done(); - reject(); - }, 500); - } else { - console.info('SensorJsTest015 off success'); - expect(true).assertTrue(); - setTimeout(()=>{ - done(); - resolve(); - }, 500); - } - }); - }) - } - function onPromise2() { - return new Promise((resolve, reject) => { - sensor.on(0, function(error, data) { - if (error) { - console.info('SensorJsTest015 on2 error'); - expect(false).assertTrue(); - setTimeout(()=>{ - reject(); - }, 500); - } else { - console.info('SensorJsTest015 on2 success'); - expect(typeof(data.x)).assertEqual("number"); - setTimeout(()=>{ - resolve(); - }, 500); - } - }); - }) - } - - let onPromise1 = new Promise((resolve, reject) => { - sensor.on(0, function(error, data) { - if (error) { - console.info('SensorJsTest015 on1 error'); - expect(false).assertTrue(); - setTimeout(()=>{ - reject(); - }, 500); - } else { - console.info('SensorJsTest015 on1 success'); - expect(typeof(data.x)).assertEqual("number"); - setTimeout(()=>{ - resolve(); - }, 500); - } - }); - }) - - await onPromise1.then(() =>{ - return onPromise2(); - }).then(()=>{ - return offPromise(); - }); - done(); + sensor.on(0, callback, {'interval': 100000000}); + sensor.on(0, callback2, {'interval': 100000000}); + setTimeout(()=>{ + console.info('----------------------SensorJsTest015 off in---------------------------'); + sensor.off(0, callback); + sensor.off(0, callback2); + console.info('----------------------SensorJsTest015 off end---------------------------'); + done(); + }, 1000); }) - /* * @tc.name:SensorJsTest016 * @tc.desc:verify app info is not null @@ -529,71 +325,14 @@ describe("SensorJsTest", function () { */ it("SensorJsTest016", 0, async function (done) { console.info('----------------------SensorJsTest016---------------------------'); - function offPromise() { - return new Promise((resolve, reject) => { - sensor.off(0, (error) =>{ - if(error) { - console.info('SensorJsTest016 off error'); - expect(false).assertTrue(); - setTimeout(()=>{ - done(); - reject(); - }, 500); - } else { - console.info('SensorJsTest016 off success'); - expect(true).assertTrue(); - setTimeout(()=>{ - done(); - resolve(); - }, 500); - } - }); - }) - } - function oncePromise() { - return new Promise((resolve, reject) => { - sensor.once(0, function(error, data) { - if (error) { - console.info('SensorJsTest016 once error'); - expect(false).assertTrue(); - setTimeout(()=>{ - reject(); - }, 500); - } else { - console.info('SensorJsTest016 once success'); - expect(typeof(data.x)).assertEqual("number"); - setTimeout(()=>{ - resolve(); - }, 500); - } - }); - }) - } - - let onPromise1 = new Promise((resolve, reject) => { - sensor.on(0, function(error, data) { - if (error) { - console.info('SensorJsTest016 on1 error'); - expect(false).assertTrue(); - setTimeout(()=>{ - reject(); - }, 500); - } else { - console.info('SensorJsTest016 on1 success'); - expect(typeof(data.x)).assertEqual("number"); - setTimeout(()=>{ - resolve(); - }, 500); - } - }); - }) - - await onPromise1.then(() =>{ - return oncePromise(); - }).then(()=>{ - return offPromise(); - }); - done(); + sensor.on(0, callback, {'interval': 100000000}); + sensor.on(0, callback2, {'interval': 100000000}); + setTimeout(()=>{ + console.info('----------------------SensorJsTest016 off in---------------------------'); + sensor.off(0); + console.info('----------------------SensorJsTest016 off end---------------------------'); + done(); + }, 1000); }) let GEOMAGNETIC_COMPONENT_YEAR_RESULT = [ -- Gitee