From 08b51065de7d0b7691561c81508463be64233123 Mon Sep 17 00:00:00 2001 From: hellohyh001 Date: Tue, 18 Oct 2022 18:29:21 +0800 Subject: [PATCH] add test Signed-off-by: hellohyh001 Change-Id: Ia0dcfec5a67c4d6ad61a4ec8bd74cb5a658ccc72 --- interfaces/native/src/sensor_agent.cpp | 3 + interfaces/plugin/src/sensor_js.cpp | 9 +- interfaces/plugin/src/sensor_napi_utils.cpp | 6 +- .../test/unittest/ExampleJsunit.test.js | 146 ++++++++++++++++++ 4 files changed, 158 insertions(+), 6 deletions(-) diff --git a/interfaces/native/src/sensor_agent.cpp b/interfaces/native/src/sensor_agent.cpp index 06572fe6..c370db5c 100755 --- a/interfaces/native/src/sensor_agent.cpp +++ b/interfaces/native/src/sensor_agent.cpp @@ -57,6 +57,7 @@ int32_t GetAllSensors(SensorInfo **sensorInfo, int32_t *count) } int32_t ret = proxy->GetAllSensors(sensorInfo, count); if (ret != OHOS::ERR_OK) { + SEN_HILOGE("GetAllSensors failed"); return NormalizeErrCode(ret); } return ret; @@ -71,6 +72,7 @@ int32_t ActivateSensor(int32_t sensorId, const SensorUser *user) } int32_t ret = proxy->ActivateSensor(sensorId, user); if (ret != OHOS::ERR_OK) { + SEN_HILOGE("ActivateSensor failed"); return NormalizeErrCode(ret); } return ret; @@ -85,6 +87,7 @@ int32_t DeactivateSensor(int32_t sensorId, const SensorUser *user) } int32_t ret = proxy->DeactivateSensor(sensorId, user); if (ret != OHOS::ERR_OK) { + SEN_HILOGE("DeactivateSensor failed"); return NormalizeErrCode(ret); } return ret; diff --git a/interfaces/plugin/src/sensor_js.cpp b/interfaces/plugin/src/sensor_js.cpp index 245aea79..c87bb402 100644 --- a/interfaces/plugin/src/sensor_js.cpp +++ b/interfaces/plugin/src/sensor_js.cpp @@ -1164,8 +1164,8 @@ napi_value Subscribe(napi_env env, napi_callback_info info, int32_t sensorTypeId return nullptr; } std::lock_guard subscribeCallbackLock(mutex_); - bool ret = SubscribeSensor(sensorTypeId, g_samplingPeriod[interval], DataCallbackImpl); - if (!ret) { + int32_t ret = SubscribeSensor(sensorTypeId, g_samplingPeriod[interval], DataCallbackImpl); + if (ret != OHOS::ERR_OK) { CHKCP((napiFail != nullptr), "subscribe fail"); CreateFailMessage(SUBSCRIBE_FAIL, SENSOR_SUBSCRIBE_FAILURE, "subscribe fail", asyncCallbackInfo); EmitAsyncCallbackWork(asyncCallbackInfo); @@ -1189,7 +1189,10 @@ napi_value Unsubscribe(napi_env env, napi_callback_info info, int32_t sensorType SEN_HILOGW("There are other client subscribe as well, not need unsubscribe"); return nullptr; } - CHKCP(UnsubscribeSensor(sensorTypeId), "UnsubscribeSensor failed"); + if (UnsubscribeSensor(sensorTypeId) != OHOS::ERR_OK) { + SEN_HILOGW("UnsubscribeSensor failed"); + return nullptr; + } return nullptr; } diff --git a/interfaces/plugin/src/sensor_napi_utils.cpp b/interfaces/plugin/src/sensor_napi_utils.cpp index 6b191381..4cfecb68 100644 --- a/interfaces/plugin/src/sensor_napi_utils.cpp +++ b/interfaces/plugin/src/sensor_napi_utils.cpp @@ -59,9 +59,9 @@ bool GetFloatArray(const napi_env &env, const napi_value &value, vector & napi_value element = nullptr; CHKNRF(env, napi_get_element(env, value, i, &element), "napi_get_element"); CHKNCF(env, IsMatchType(env, element, napi_number), "Wrong argument type. Number or function expected"); - double value = 0; - CHKNCF(env, GetNativeDouble(env, element, value), "Wrong argument type. get double fail"); - array.push_back(static_cast(value)); + double number = 0; + CHKNCF(env, GetNativeDouble(env, element, number), "Wrong argument type. get double fail"); + array.push_back(static_cast(number)); } return true; } diff --git a/interfaces/plugin/test/unittest/ExampleJsunit.test.js b/interfaces/plugin/test/unittest/ExampleJsunit.test.js index fa57bfef..3ab3807c 100755 --- a/interfaces/plugin/test/unittest/ExampleJsunit.test.js +++ b/interfaces/plugin/test/unittest/ExampleJsunit.test.js @@ -3870,4 +3870,150 @@ describe("SensorJsTest", function () { done(); } }) + + /* + * @tc.name:Sensor_SubscribeAccelerometer_001 + * @tc.desc:verify app info is not null + * @tc.type: FUNC + * @tc.require: AR000GH2TR + */ + it("Sensor_SubscribeAccelerometer_001", 0, async function (done) { + console.info('----------------------Sensor_SubscribeAccelerometer_001---------------------------'); + sensor.subscribeAccelerometer({ + interval: 'normal', + success: function(data) { + expect(typeof(data.x)).assertEqual("number"); + expect(typeof(data.y)).assertEqual("number"); + expect(typeof(data.z)).assertEqual("number"); + console.info("SensorJsTest001 success" + JSON.stringify(data)); + }, + fail: function(data, code) { + expect(false).assertTrue(); + console.error('Subscription failed. Code: ' + code + '; Data: ' + data); + }, + }); + setTimeout(()=>{ + try { + sensor.unsubscribeAccelerometer(); + } catch (error) { + console.info('SensorJsTest001 unsubscribe failed' + error); + expect(false).assertTrue(); + } + setTimeout(()=>{ + expect(true).assertTrue(); + done(); + }, 500); + }, 1000); + }) + + /* + * @tc.name:Sensor_SubscribeAccelerometer_002 + * @tc.desc:verify app info is not null + * @tc.type: FUNC + * @tc.require: AR000GH2TR + */ + it("Sensor_SubscribeAccelerometer_002", 0, async function (done) { + console.info('----------------------Sensor_SubscribeAccelerometer_002---------------------------'); + sensor.subscribeAccelerometer({ + interval: 'xxx', + success: function(data) { + expect(false).assertTrue(); + console.info("Sensor_SubscribeAccelerometer_002 success" + JSON.stringify(data)); + done(); + }, + fail: function(data, code) { + expect(true).assertTrue(); + console.error('Sensor_SubscribeAccelerometer_002 Subscription failed. Code: ' + code + '; Data: ' + data); + done(); + }, + }); + }) + + /* + * @tc.name:Sensor_SubscribeAccelerometer_003 + * @tc.desc:verify app info is not null + * @tc.type: FUNC + * @tc.require: AR000GH2TR + */ + it("Sensor_SubscribeAccelerometer_003", 0, async function (done) { + console.info('----------------------Sensor_SubscribeAccelerometer_003---------------------------'); + try { + sensor.subscribeAccelerometer({ + interval: 'xxx', + success: function(data) { + expect(false).assertTrue(); + console.info("Sensor_SubscribeAccelerometer_003 success" + JSON.stringify(data)); + } + }); + } catch (error) { + console.info('Sensor_SubscribeAccelerometer_003 Subscription failed' + error); + expect(false).assertTrue(); + } + setTimeout(()=>{ + expect(true).assertTrue(); + done(); + }, 500); + }) + + /* + * @tc.name:Sensor_SubscribeAccelerometer_004 + * @tc.desc:verify app info is not null + * @tc.type: FUNC + * @tc.require: AR000GH2TR + */ + it("Sensor_SubscribeAccelerometer_004", 0, async function (done) { + console.info('----------------------Sensor_SubscribeAccelerometer_004---------------------------'); + try { + sensor.subscribeAccelerometer({ + interval: 'normal', + }); + } catch (error) { + console.info('Sensor_SubscribeAccelerometer_004 Subscription failed' + error); + expect(false).assertTrue(); + } + setTimeout(()=>{ + expect(true).assertTrue(); + done(); + }, 500); + }) + + /* + * @tc.name:Sensor_UnsubscribeAccelerometer_001 + * @tc.desc:verify app info is not null + * @tc.type: FUNC + * @tc.require: AR000GH2TR + */ + it("Sensor_UnsubscribeAccelerometer_001", 0, async function (done) { + console.info('----------------------Sensor_UnsubscribeAccelerometer_001---------------------------'); + try { + sensor.unsubscribeAccelerometer(); + } catch (error) { + console.info(error); + expect(false).assertTrue(); + } + setTimeout(()=>{ + expect(true).assertTrue(); + done(); + }, 500); + }) + + /* + * @tc.name:Sensor_UnsubscribeAccelerometer_002 + * @tc.desc:verify app info is not null + * @tc.type: FUNC + * @tc.require: AR000GH2TR + */ + it("Sensor_UnsubscribeAccelerometer_002", 0, async function (done) { + console.info('----------------------Sensor_UnsubscribeAccelerometer_002---------------------------'); + try { + sensor.unsubscribeAccelerometer('xxx'); + } catch (error) { + console.info(error); + expect(false).assertTrue(); + } + setTimeout(()=>{ + expect(true).assertTrue(); + done(); + }, 500); + }) }) -- Gitee