From 2c0a4ce63828bfe360fb5e35e6db567c073e8d96 Mon Sep 17 00:00:00 2001 From: wuzhihuitmac Date: Wed, 17 Jan 2024 03:29:44 +0000 Subject: [PATCH] modify ut case Signed-off-by: wuzhihuitmac Change-Id: I30d5e8d42febb9cd73981841a78f9c2d608c5152 --- frameworks/native/src/sensor_agent_proxy.cpp | 2 +- test/unittest/interfaces/js/BUILD.gn | 11 +- .../unittest/interfaces/js/barometer/BUILD.gn | 21 - .../interfaces/js/barometer/config.json | 62 --- test/unittest/interfaces/js/color/BUILD.gn | 21 - test/unittest/interfaces/js/color/config.json | 62 --- .../unittest/interfaces/js/gyroscope/BUILD.gn | 21 - .../interfaces/js/gyroscope/config.json | 74 --- .../unittest/interfaces/js/pedometer/BUILD.gn | 21 - .../interfaces/js/pedometer/config.json | 82 --- .../js/pedometer_detection/BUILD.gn | 21 - .../js/pedometer_detection/config.json | 82 --- test/unittest/interfaces/js/sar/BUILD.gn | 21 - test/unittest/interfaces/js/sar/config.json | 62 --- test/unittest/interfaces/js/sensor/BUILD.gn | 2 +- .../BarometerJsunit.test.js} | 70 ++- .../ColorJsunit.test.js} | 50 +- .../GyroscopeJsunit.test.js} | 70 ++- .../PedometerDetectionJsunit.test.js} | 112 ++--- .../PedometerJsunit.test.js} | 112 ++--- .../SarJsunit.test.js} | 49 +- .../SensorFrequencyJsunit.test.js} | 42 +- ...pleJsunit.test.js => SensorJsunit.test.js} | 471 +++++++++--------- .../js/sensor/common/CommonConstants.js | 72 +++ .../unittest/interfaces/js/sensor/config.json | 28 ++ .../interfaces/js/sensor_frequency/BUILD.gn | 21 - .../js/sensor_frequency/config.json | 85 ---- .../js/signature/openharmony_sx.p7b | Bin 3437 -> 0 bytes 28 files changed, 567 insertions(+), 1180 deletions(-) delete mode 100755 test/unittest/interfaces/js/barometer/BUILD.gn delete mode 100644 test/unittest/interfaces/js/barometer/config.json delete mode 100755 test/unittest/interfaces/js/color/BUILD.gn delete mode 100644 test/unittest/interfaces/js/color/config.json delete mode 100755 test/unittest/interfaces/js/gyroscope/BUILD.gn delete mode 100644 test/unittest/interfaces/js/gyroscope/config.json delete mode 100644 test/unittest/interfaces/js/pedometer/BUILD.gn delete mode 100644 test/unittest/interfaces/js/pedometer/config.json delete mode 100755 test/unittest/interfaces/js/pedometer_detection/BUILD.gn delete mode 100755 test/unittest/interfaces/js/pedometer_detection/config.json delete mode 100755 test/unittest/interfaces/js/sar/BUILD.gn delete mode 100644 test/unittest/interfaces/js/sar/config.json rename test/unittest/interfaces/js/{barometer/ExampleJsunit.test.js => sensor/BarometerJsunit.test.js} (88%) rename test/unittest/interfaces/js/{color/ExampleJsunit.test.js => sensor/ColorJsunit.test.js} (88%) rename test/unittest/interfaces/js/{gyroscope/ExampleJsunit.test.js => sensor/GyroscopeJsunit.test.js} (88%) rename test/unittest/interfaces/js/{pedometer_detection/ExampleJsunit.test.js => sensor/PedometerDetectionJsunit.test.js} (79%) rename test/unittest/interfaces/js/{pedometer/ExampleJsunit.test.js => sensor/PedometerJsunit.test.js} (78%) rename test/unittest/interfaces/js/{sar/ExampleJsunit.test.js => sensor/SarJsunit.test.js} (88%) rename test/unittest/interfaces/js/{sensor_frequency/ExampleJsunit.test.js => sensor/SensorFrequencyJsunit.test.js} (90%) rename test/unittest/interfaces/js/sensor/{ExampleJsunit.test.js => SensorJsunit.test.js} (92%) create mode 100755 test/unittest/interfaces/js/sensor/common/CommonConstants.js delete mode 100644 test/unittest/interfaces/js/sensor_frequency/BUILD.gn delete mode 100644 test/unittest/interfaces/js/sensor_frequency/config.json delete mode 100755 test/unittest/interfaces/js/signature/openharmony_sx.p7b diff --git a/frameworks/native/src/sensor_agent_proxy.cpp b/frameworks/native/src/sensor_agent_proxy.cpp index 40ac118d..91cde65e 100644 --- a/frameworks/native/src/sensor_agent_proxy.cpp +++ b/frameworks/native/src/sensor_agent_proxy.cpp @@ -179,7 +179,7 @@ int32_t SensorAgentProxy::SetBatch(int32_t sensorId, const SensorUser *user, int } if (samplingInterval < 0 || reportInterval < 0) { SEN_HILOGE("samplingInterval or reportInterval is invalid"); - return OHOS::Sensors::ERROR; + return PARAMETER_ERROR; } std::lock_guard subscribeLock(subscribeMutex_); if ((subscribeMap_.find(sensorId) == subscribeMap_.end()) || (subscribeMap_.at(sensorId) != user)) { diff --git a/test/unittest/interfaces/js/BUILD.gn b/test/unittest/interfaces/js/BUILD.gn index e11c1dac..661dd25d 100755 --- a/test/unittest/interfaces/js/BUILD.gn +++ b/test/unittest/interfaces/js/BUILD.gn @@ -13,14 +13,5 @@ group("unittest") { testonly = true - deps = [ - "barometer:BarometerJsTest", - "color:ColorJsTest", - "gyroscope:GyroscopeJsTest", - "pedometer:PedometerJsTest", - "pedometer_detection:PedometerDetectionJsTest", - "sar:SarJsTest", - "sensor:SensorJsTest", - "sensor_frequency:SensorFrequencyJsTest", - ] + deps = [ "sensor:SensorJsTest" ] } diff --git a/test/unittest/interfaces/js/barometer/BUILD.gn b/test/unittest/interfaces/js/barometer/BUILD.gn deleted file mode 100755 index 61cc010d..00000000 --- a/test/unittest/interfaces/js/barometer/BUILD.gn +++ /dev/null @@ -1,21 +0,0 @@ -# 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/js" -ohos_js_unittest("BarometerJsTest") { - module_out_path = module_output_path - hap_profile = "./config.json" - certificate_profile = "../signature/openharmony_sx.p7b" -} diff --git a/test/unittest/interfaces/js/barometer/config.json b/test/unittest/interfaces/js/barometer/config.json deleted file mode 100644 index 186fcb44..00000000 --- a/test/unittest/interfaces/js/barometer/config.json +++ /dev/null @@ -1,62 +0,0 @@ -{ - "app": { - "bundleName": "com.example.myapplication", - "vendor": "example", - "version": { - "code": 1, - "name": "1.0" - }, - "apiVersion": { - "compatible": 4, - "target": 5 - } - }, - "deviceConfig": {}, - "module": { - "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": "BarometerJsTest", - "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/test/unittest/interfaces/js/color/BUILD.gn b/test/unittest/interfaces/js/color/BUILD.gn deleted file mode 100755 index cf13f01f..00000000 --- a/test/unittest/interfaces/js/color/BUILD.gn +++ /dev/null @@ -1,21 +0,0 @@ -# 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/js" -ohos_js_unittest("ColorJsTest") { - module_out_path = module_output_path - hap_profile = "./config.json" - certificate_profile = "../signature/openharmony_sx.p7b" -} diff --git a/test/unittest/interfaces/js/color/config.json b/test/unittest/interfaces/js/color/config.json deleted file mode 100644 index 21b7b37d..00000000 --- a/test/unittest/interfaces/js/color/config.json +++ /dev/null @@ -1,62 +0,0 @@ -{ - "app": { - "bundleName": "com.example.myapplication", - "vendor": "example", - "version": { - "code": 1, - "name": "1.0" - }, - "apiVersion": { - "compatible": 4, - "target": 5 - } - }, - "deviceConfig": {}, - "module": { - "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": "ColorJsTest", - "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/test/unittest/interfaces/js/gyroscope/BUILD.gn b/test/unittest/interfaces/js/gyroscope/BUILD.gn deleted file mode 100755 index 4e921e2f..00000000 --- a/test/unittest/interfaces/js/gyroscope/BUILD.gn +++ /dev/null @@ -1,21 +0,0 @@ -# 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/js" -ohos_js_unittest("GyroscopeJsTest") { - module_out_path = module_output_path - hap_profile = "./config.json" - certificate_profile = "../signature/openharmony_sx.p7b" -} diff --git a/test/unittest/interfaces/js/gyroscope/config.json b/test/unittest/interfaces/js/gyroscope/config.json deleted file mode 100644 index 6baaf375..00000000 --- a/test/unittest/interfaces/js/gyroscope/config.json +++ /dev/null @@ -1,74 +0,0 @@ -{ - "app": { - "bundleName": "com.example.myapplication", - "vendor": "example", - "version": { - "code": 1, - "name": "1.0" - }, - "apiVersion": { - "compatible": 4, - "target": 5 - } - }, - "deviceConfig": {}, - "module": { - "reqPermissions": [ - { - "name": "ohos.permission.GYROSCOPE", - "reason": "", - "usedScene": { - "ability": [ - ".MainAbility" - ], - "when": "inuse" - } - } - ], - "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": "GyroscopeJsTest", - "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/test/unittest/interfaces/js/pedometer/BUILD.gn b/test/unittest/interfaces/js/pedometer/BUILD.gn deleted file mode 100644 index 4088531f..00000000 --- a/test/unittest/interfaces/js/pedometer/BUILD.gn +++ /dev/null @@ -1,21 +0,0 @@ -# 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/js" -ohos_js_unittest("PedometerJsTest") { - module_out_path = module_output_path - hap_profile = "./config.json" - certificate_profile = "../signature/openharmony_core.p7b" -} diff --git a/test/unittest/interfaces/js/pedometer/config.json b/test/unittest/interfaces/js/pedometer/config.json deleted file mode 100644 index 16f9dc8c..00000000 --- a/test/unittest/interfaces/js/pedometer/config.json +++ /dev/null @@ -1,82 +0,0 @@ -{ - "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": "PedometerJsTest", - "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/test/unittest/interfaces/js/pedometer_detection/BUILD.gn b/test/unittest/interfaces/js/pedometer_detection/BUILD.gn deleted file mode 100755 index 6b47c04f..00000000 --- a/test/unittest/interfaces/js/pedometer_detection/BUILD.gn +++ /dev/null @@ -1,21 +0,0 @@ -# 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/js" -ohos_js_unittest("PedometerDetectionJsTest") { - module_out_path = module_output_path - hap_profile = "./config.json" - certificate_profile = "../signature/openharmony_core.p7b" -} diff --git a/test/unittest/interfaces/js/pedometer_detection/config.json b/test/unittest/interfaces/js/pedometer_detection/config.json deleted file mode 100755 index 95cf5719..00000000 --- a/test/unittest/interfaces/js/pedometer_detection/config.json +++ /dev/null @@ -1,82 +0,0 @@ -{ - "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/test/unittest/interfaces/js/sar/BUILD.gn b/test/unittest/interfaces/js/sar/BUILD.gn deleted file mode 100755 index cb376253..00000000 --- a/test/unittest/interfaces/js/sar/BUILD.gn +++ /dev/null @@ -1,21 +0,0 @@ -# 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/js" -ohos_js_unittest("SarJsTest") { - module_out_path = module_output_path - hap_profile = "./config.json" - certificate_profile = "../signature/openharmony_sx.p7b" -} diff --git a/test/unittest/interfaces/js/sar/config.json b/test/unittest/interfaces/js/sar/config.json deleted file mode 100644 index cb7db1c8..00000000 --- a/test/unittest/interfaces/js/sar/config.json +++ /dev/null @@ -1,62 +0,0 @@ -{ - "app": { - "bundleName": "com.example.myapplication", - "vendor": "example", - "version": { - "code": 1, - "name": "1.0" - }, - "apiVersion": { - "compatible": 4, - "target": 5 - } - }, - "deviceConfig": {}, - "module": { - "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": "SarJsTest", - "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/test/unittest/interfaces/js/sensor/BUILD.gn b/test/unittest/interfaces/js/sensor/BUILD.gn index b0b9915f..ddf1f90c 100755 --- a/test/unittest/interfaces/js/sensor/BUILD.gn +++ b/test/unittest/interfaces/js/sensor/BUILD.gn @@ -17,5 +17,5 @@ module_output_path = "sensor/interfaces/js" ohos_js_unittest("SensorJsTest") { module_out_path = module_output_path hap_profile = "./config.json" - certificate_profile = "../signature/openharmony_sx.p7b" + certificate_profile = "../signature/openharmony_core.p7b" } diff --git a/test/unittest/interfaces/js/barometer/ExampleJsunit.test.js b/test/unittest/interfaces/js/sensor/BarometerJsunit.test.js similarity index 88% rename from test/unittest/interfaces/js/barometer/ExampleJsunit.test.js rename to test/unittest/interfaces/js/sensor/BarometerJsunit.test.js index cc01f289..90b98ca4 100755 --- a/test/unittest/interfaces/js/barometer/ExampleJsunit.test.js +++ b/test/unittest/interfaces/js/sensor/BarometerJsunit.test.js @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +import CommonConstants from './CommonConstants'; import sensor from '@ohos.sensor' import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index' @@ -55,11 +56,6 @@ describe("BarometerJsTest", function () { console.info('afterEach called') }) - const PARAMETER_ERROR_CODE = 401 - const SERVICE_EXCEPTION_CODE = 14500101 - const PARAMETER_ERROR_MSG = 'The parameter invalid.' - const SERVICE_EXCEPTION_MSG = 'Service exception.' - /* * @tc.number: BarometerJsTest_001 * @tc.name: BarometerJsTest @@ -93,8 +89,8 @@ describe("BarometerJsTest", function () { }); } catch (error) { console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } }) @@ -132,8 +128,8 @@ describe("BarometerJsTest", function () { }); } catch (error) { console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } }) @@ -176,8 +172,8 @@ describe("BarometerJsTest", function () { }); } catch (error) { console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } }) @@ -207,15 +203,15 @@ describe("BarometerJsTest", function () { 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); + expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } }); } catch (error) { console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } }) @@ -253,8 +249,8 @@ describe("BarometerJsTest", function () { }); } catch (error) { console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } }) @@ -292,8 +288,8 @@ describe("BarometerJsTest", function () { }); } catch (error) { console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } }) @@ -321,15 +317,15 @@ describe("BarometerJsTest", function () { 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); + expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } }); } catch (error) { console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } }) @@ -356,15 +352,15 @@ describe("BarometerJsTest", function () { try { sensor.off(-1, callback); } catch (error) { - expect(error.code).assertEqual(PARAMETER_ERROR_CODE) - expect(error.message).assertEqual(PARAMETER_ERROR_MSG) + expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE) + expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG) done(); } }); } catch (error) { console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } }) @@ -403,8 +399,8 @@ describe("BarometerJsTest", function () { }); } catch (error) { console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } }) @@ -446,8 +442,8 @@ describe("BarometerJsTest", function () { }); } catch (error) { console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } }) @@ -486,8 +482,8 @@ describe("BarometerJsTest", function () { }); } catch (error) { console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } }) @@ -529,8 +525,8 @@ describe("BarometerJsTest", function () { }); } catch (error) { console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } }) @@ -569,8 +565,8 @@ describe("BarometerJsTest", function () { }); } catch (error) { console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } }) diff --git a/test/unittest/interfaces/js/color/ExampleJsunit.test.js b/test/unittest/interfaces/js/sensor/ColorJsunit.test.js similarity index 88% rename from test/unittest/interfaces/js/color/ExampleJsunit.test.js rename to test/unittest/interfaces/js/sensor/ColorJsunit.test.js index 03b36578..d216bac8 100644 --- a/test/unittest/interfaces/js/color/ExampleJsunit.test.js +++ b/test/unittest/interfaces/js/sensor/ColorJsunit.test.js @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +import CommonConstants from './CommonConstants'; import sensor from '@ohos.sensor' import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index' @@ -57,11 +58,6 @@ describe("ColorJsTest", function () { console.info('afterEach called') }) - const PARAMETER_ERROR_CODE = 401 - const SERVICE_EXCEPTION_CODE = 14500101 - const PARAMETER_ERROR_MSG = 'The parameter invalid.' - const SERVICE_EXCEPTION_MSG = 'Service exception.' - /* * @tc.number: ColorJsTest_001 * @tc.name: ColorJsTest @@ -95,8 +91,8 @@ describe("ColorJsTest", function () { }); } catch (error) { console.info('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } }) @@ -134,8 +130,8 @@ describe("ColorJsTest", function () { }); } catch (error) { console.info('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } }) @@ -178,8 +174,8 @@ describe("ColorJsTest", function () { }); } catch (error) { console.info('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } }) @@ -209,15 +205,15 @@ describe("ColorJsTest", function () { 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); + expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } }); } catch (error) { console.info('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } }) @@ -244,15 +240,15 @@ describe("ColorJsTest", function () { try { sensor.off(-1, callback); } catch (error) { - expect(error.code).assertEqual(PARAMETER_ERROR_CODE) - expect(error.message).assertEqual(PARAMETER_ERROR_MSG) + expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE) + expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG) done(); } }); } catch (error) { console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } }) @@ -291,8 +287,8 @@ describe("ColorJsTest", function () { }); } catch (error) { console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } }) @@ -334,8 +330,8 @@ describe("ColorJsTest", function () { }); } catch (error) { console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } }) @@ -377,8 +373,8 @@ describe("ColorJsTest", function () { }); } catch (error) { console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } }) @@ -417,8 +413,8 @@ describe("ColorJsTest", function () { }); } catch (error) { console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } }) diff --git a/test/unittest/interfaces/js/gyroscope/ExampleJsunit.test.js b/test/unittest/interfaces/js/sensor/GyroscopeJsunit.test.js similarity index 88% rename from test/unittest/interfaces/js/gyroscope/ExampleJsunit.test.js rename to test/unittest/interfaces/js/sensor/GyroscopeJsunit.test.js index 2455b0f3..8e9662a9 100755 --- a/test/unittest/interfaces/js/gyroscope/ExampleJsunit.test.js +++ b/test/unittest/interfaces/js/sensor/GyroscopeJsunit.test.js @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +import CommonConstants from './CommonConstants'; import sensor from '@ohos.sensor' import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index' @@ -59,11 +60,6 @@ describe("GyroscopeJsTest", function () { console.info('afterEach called') }) - const PARAMETER_ERROR_CODE = 401 - const SERVICE_EXCEPTION_CODE = 14500101 - const PARAMETER_ERROR_MSG = 'The parameter invalid.' - const SERVICE_EXCEPTION_MSG = 'Service exception.' - /* * @tc.number: GyroscopeJsTest_001 * @tc.name: GyroscopeJsTest @@ -97,8 +93,8 @@ describe("GyroscopeJsTest", function () { }); } catch (error) { console.info('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } }) @@ -136,8 +132,8 @@ describe("GyroscopeJsTest", function () { }); } catch (error) { console.info('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } }) @@ -180,8 +176,8 @@ describe("GyroscopeJsTest", function () { }); } catch (error) { console.info('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } }) @@ -211,15 +207,15 @@ describe("GyroscopeJsTest", function () { 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); + expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } }); } catch (error) { console.info('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } }) @@ -257,8 +253,8 @@ describe("GyroscopeJsTest", function () { }); } catch (error) { console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } }) @@ -296,8 +292,8 @@ describe("GyroscopeJsTest", function () { }); } catch (error) { console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } }) @@ -325,15 +321,15 @@ describe("GyroscopeJsTest", function () { 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); + expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } }); } catch (error) { console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } }) @@ -360,15 +356,15 @@ describe("GyroscopeJsTest", function () { try { sensor.off(-1, callback); } catch (error) { - expect(error.code).assertEqual(PARAMETER_ERROR_CODE) - expect(error.message).assertEqual(PARAMETER_ERROR_MSG) + expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE) + expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG) done(); } }); } catch (error) { console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } }) @@ -407,8 +403,8 @@ describe("GyroscopeJsTest", function () { }); } catch (error) { console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } }) @@ -450,8 +446,8 @@ describe("GyroscopeJsTest", function () { }); } catch (error) { console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } }) @@ -490,8 +486,8 @@ describe("GyroscopeJsTest", function () { }); } catch (error) { console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } }) @@ -533,8 +529,8 @@ describe("GyroscopeJsTest", function () { }); } catch (error) { console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } }) @@ -573,8 +569,8 @@ describe("GyroscopeJsTest", function () { }); } catch (error) { console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } }) diff --git a/test/unittest/interfaces/js/pedometer_detection/ExampleJsunit.test.js b/test/unittest/interfaces/js/sensor/PedometerDetectionJsunit.test.js similarity index 79% rename from test/unittest/interfaces/js/pedometer_detection/ExampleJsunit.test.js rename to test/unittest/interfaces/js/sensor/PedometerDetectionJsunit.test.js index 88de45f0..96c44fe6 100755 --- a/test/unittest/interfaces/js/pedometer_detection/ExampleJsunit.test.js +++ b/test/unittest/interfaces/js/sensor/PedometerDetectionJsunit.test.js @@ -14,24 +14,12 @@ */ import abilityAccessCtrl from '@ohos.abilityAccessCtrl' import bundle from '@ohos.bundle' +import CommonConstants from './CommonConstants'; 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)); @@ -52,7 +40,7 @@ describe("PedometerDetectionJsTest", function () { let accountManager = osAccount.getAccountManager(); let userId = await accountManager.getOsAccountLocalIdFromProcess(); let appInfo = await bundle.getApplicationInfo('com.example.myapplication', 0, userId); - tokenID = appInfo.accessTokenId; + CommonConstants.tokenID = appInfo.accessTokenId; console.log('AccessTokenId accessTokenId:' + appInfo.accessTokenId + ', name:' + appInfo.name + ' ,bundleName:' + appInfo.bundleName) } catch(err) { @@ -80,8 +68,8 @@ describe("PedometerDetectionJsTest", function () { */ console.info('afterEach called') let atManager = abilityAccessCtrl.createAtManager(); - atManager.revokeUserGrantedPermission(tokenID, permissionNameUser, - PermissionFlag.PERMISSION_SYSTEM_FIXED) + atManager.revokeUserGrantedPermission(CommonConstants.tokenID, CommonConstants.permissionNameUser, + CommonConstants.PermissionFlag.PERMISSION_SYSTEM_FIXED) .catch((err) => { console.info('err:' + JSON.stringify(err)); expect(err.code).assertEqual(ERR_NOT_HAVE_PERMISSION); @@ -101,8 +89,8 @@ describe("PedometerDetectionJsTest", function () { it("PedometerDetectionJsTest_001", 0, async function (done) { console.info('----------------------PedometerDetectionJsTest_001---------------------------'); let atManager = abilityAccessCtrl.createAtManager(); - await atManager.grantUserGrantedPermission(tokenID, permissionNameUser, - PermissionFlag.PERMISSION_SYSTEM_FIXED) + await atManager.grantUserGrantedPermission(CommonConstants.tokenID, CommonConstants.permissionNameUser, + CommonConstants.PermissionFlag.PERMISSION_SYSTEM_FIXED) .then(() => { try { sensor.getSingleSensor(sensor.SensorId.PEDOMETER_DETECTION, (err, data) => { @@ -125,8 +113,8 @@ describe("PedometerDetectionJsTest", function () { }); } catch (err) { console.error('Sensor is not support'); - expect(err.code).assertEqual(PARAMETER_ERROR_CODE); - expect(err.message).assertEqual(PARAMETER_ERROR_MSG); + expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } }) @@ -149,8 +137,8 @@ describe("PedometerDetectionJsTest", function () { it("PedometerDetectionJsTest_002", 0, async function (done) { console.info('----------------------PedometerDetectionJsTest_002---------------------------'); let atManager = abilityAccessCtrl.createAtManager(); - await atManager.grantUserGrantedPermission(tokenID, permissionNameUser, - PermissionFlag.PERMISSION_SYSTEM_FIXED) + await atManager.grantUserGrantedPermission(CommonConstants.tokenID, CommonConstants.permissionNameUser, + CommonConstants.PermissionFlag.PERMISSION_SYSTEM_FIXED) .then(() => { try { sensor.getSingleSensor(sensor.SensorId.PEDOMETER_DETECTION, (err, data) => { @@ -163,15 +151,15 @@ describe("PedometerDetectionJsTest", function () { 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); + expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(err.message).assertEqual(CommonConstants.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); + expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } }) @@ -194,8 +182,8 @@ describe("PedometerDetectionJsTest", function () { it("PedometerDetectionJsTest_003", 0, async function (done) { console.info('----------------------PedometerDetectionJsTest_003---------------------------'); let atManager = abilityAccessCtrl.createAtManager(); - await atManager.grantUserGrantedPermission(tokenID, permissionNameUser, - PermissionFlag.PERMISSION_SYSTEM_FIXED) + await atManager.grantUserGrantedPermission(CommonConstants.tokenID, CommonConstants.permissionNameUser, + CommonConstants.PermissionFlag.PERMISSION_SYSTEM_FIXED) .then(() => { try { sensor.getSingleSensor(sensor.SensorId.PEDOMETER_DETECTION, (err, data) => { @@ -218,8 +206,8 @@ describe("PedometerDetectionJsTest", function () { }); } catch (err) { console.error('Sensor is not support'); - expect(err.code).assertEqual(PARAMETER_ERROR_CODE); - expect(err.message).assertEqual(PARAMETER_ERROR_MSG); + expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } }) @@ -242,8 +230,8 @@ describe("PedometerDetectionJsTest", function () { it("PedometerDetectionJsTest_004", 0, async function (done) { console.info('----------------------PedometerDetectionJsTest_004---------------------------'); let atManager = abilityAccessCtrl.createAtManager(); - await atManager.grantUserGrantedPermission(tokenID, permissionNameUser, - PermissionFlag.PERMISSION_SYSTEM_FIXED) + await atManager.grantUserGrantedPermission(CommonConstants.tokenID, CommonConstants.permissionNameUser, + CommonConstants.PermissionFlag.PERMISSION_SYSTEM_FIXED) .then(() => { try { sensor.getSingleSensor(sensor.SensorId.PEDOMETER_DETECTION, (err, data) => { @@ -266,8 +254,8 @@ describe("PedometerDetectionJsTest", function () { }); } catch (err) { console.error('Sensor is not support'); - expect(err.code).assertEqual(PARAMETER_ERROR_CODE); - expect(err.message).assertEqual(PARAMETER_ERROR_MSG); + expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } }) @@ -290,8 +278,8 @@ describe("PedometerDetectionJsTest", function () { it("PedometerDetectionJsTest_005", 0, async function (done) { console.info('----------------------PedometerDetectionJsTest_005---------------------------'); let atManager = abilityAccessCtrl.createAtManager(); - await atManager.grantUserGrantedPermission(tokenID, permissionNameUser, - PermissionFlag.PERMISSION_SYSTEM_FIXED) + await atManager.grantUserGrantedPermission(CommonConstants.tokenID, CommonConstants.permissionNameUser, + CommonConstants.PermissionFlag.PERMISSION_SYSTEM_FIXED) .then(() => { try { sensor.getSingleSensor(sensor.SensorId.PEDOMETER_DETECTION, (err, data) => { @@ -304,15 +292,15 @@ describe("PedometerDetectionJsTest", function () { 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); + expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(err.message).assertEqual(CommonConstants.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); + expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } }) @@ -335,8 +323,8 @@ describe("PedometerDetectionJsTest", function () { it("PedometerDetectionJsTest_006", 0, async function (done) { console.info('----------------------PedometerDetectionJsTest_006---------------------------'); let atManager = abilityAccessCtrl.createAtManager(); - await atManager.grantUserGrantedPermission(tokenID, permissionNameUser, - PermissionFlag.PERMISSION_SYSTEM_FIXED) + await atManager.grantUserGrantedPermission(CommonConstants.tokenID, CommonConstants.permissionNameUser, + CommonConstants.PermissionFlag.PERMISSION_SYSTEM_FIXED) .then(() => { try { sensor.getSingleSensor(sensor.SensorId.PEDOMETER_DETECTION, (err, data) => { @@ -348,15 +336,15 @@ describe("PedometerDetectionJsTest", function () { try { sensor.off(-1, callback); } catch (err) { - expect(err.code).assertEqual(PARAMETER_ERROR_CODE) - expect(err.message).assertEqual(PARAMETER_ERROR_MSG) + expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE) + expect(err.message).assertEqual(CommonConstants.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); + expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } }) @@ -379,8 +367,8 @@ describe("PedometerDetectionJsTest", function () { it("PedometerDetectionJsTest_007", 0, async function (done) { console.info('----------------------PedometerDetectionJsTest_007---------------------------'); let atManager = abilityAccessCtrl.createAtManager(); - await atManager.grantUserGrantedPermission(tokenID, permissionNameUser, - PermissionFlag.PERMISSION_SYSTEM_FIXED) + await atManager.grantUserGrantedPermission(CommonConstants.tokenID, CommonConstants.permissionNameUser, + CommonConstants.PermissionFlag.PERMISSION_SYSTEM_FIXED) .then(() => { try { sensor.getSingleSensor(sensor.SensorId.PEDOMETER_DETECTION, (err, data) => { @@ -404,8 +392,8 @@ describe("PedometerDetectionJsTest", function () { }); } catch (err) { console.error('Sensor is not support'); - expect(err.code).assertEqual(PARAMETER_ERROR_CODE); - expect(err.message).assertEqual(PARAMETER_ERROR_MSG); + expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } }) @@ -428,8 +416,8 @@ describe("PedometerDetectionJsTest", function () { it("PedometerDetectionJsTest_008", 0, async function (done) { console.info('----------------------PedometerDetectionJsTest_008---------------------------'); let atManager = abilityAccessCtrl.createAtManager(); - await atManager.grantUserGrantedPermission(tokenID, permissionNameUser, - PermissionFlag.PERMISSION_SYSTEM_FIXED) + await atManager.grantUserGrantedPermission(CommonConstants.tokenID, CommonConstants.permissionNameUser, + CommonConstants.PermissionFlag.PERMISSION_SYSTEM_FIXED) .then(() => { try { sensor.getSingleSensor(sensor.SensorId.PEDOMETER_DETECTION, (err, data) => { @@ -456,8 +444,8 @@ describe("PedometerDetectionJsTest", function () { }); } catch (err) { console.error('Sensor is not support'); - expect(err.code).assertEqual(PARAMETER_ERROR_CODE); - expect(err.message).assertEqual(PARAMETER_ERROR_MSG); + expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } }) @@ -480,8 +468,8 @@ describe("PedometerDetectionJsTest", function () { it("PedometerDetectionJsTest_009", 0, async function (done) { console.info('----------------------PedometerDetectionJsTest_009---------------------------'); let atManager = abilityAccessCtrl.createAtManager(); - await atManager.grantUserGrantedPermission(tokenID, permissionNameUser, - PermissionFlag.PERMISSION_SYSTEM_FIXED) + await atManager.grantUserGrantedPermission(CommonConstants.tokenID, CommonConstants.permissionNameUser, + CommonConstants.PermissionFlag.PERMISSION_SYSTEM_FIXED) .then(() => { try { sensor.getSingleSensor(sensor.SensorId.PEDOMETER_DETECTION, (err, data) => { @@ -505,8 +493,8 @@ describe("PedometerDetectionJsTest", function () { }); } catch (err) { console.error('Sensor is not support'); - expect(err.code).assertEqual(PARAMETER_ERROR_CODE); - expect(err.message).assertEqual(PARAMETER_ERROR_MSG); + expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } }) @@ -539,15 +527,15 @@ describe("PedometerDetectionJsTest", function () { 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); + expect(err.code).assertEqual(CommonConstants.PERMISSION_DENIED_CODE); + expect(err.message).assertEqual(CommonConstants.PERMISSION_DENIED_MSG); done(); } }); } catch (err) { console.error('Sensor is not support'); - expect(err.code).assertEqual(PARAMETER_ERROR_CODE); - expect(err.message).assertEqual(PARAMETER_ERROR_MSG); + expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } }) diff --git a/test/unittest/interfaces/js/pedometer/ExampleJsunit.test.js b/test/unittest/interfaces/js/sensor/PedometerJsunit.test.js similarity index 78% rename from test/unittest/interfaces/js/pedometer/ExampleJsunit.test.js rename to test/unittest/interfaces/js/sensor/PedometerJsunit.test.js index 85976c4c..cf10dabf 100644 --- a/test/unittest/interfaces/js/pedometer/ExampleJsunit.test.js +++ b/test/unittest/interfaces/js/sensor/PedometerJsunit.test.js @@ -14,24 +14,12 @@ */ import abilityAccessCtrl from '@ohos.abilityAccessCtrl' import bundle from '@ohos.bundle' +import CommonConstants from './CommonConstants'; 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("PedometerJsTest", function () { function callback(data) { console.info('callback' + JSON.stringify(data)); @@ -52,7 +40,7 @@ describe("PedometerJsTest", function () { let accountManager = osAccount.getAccountManager(); let userId = await accountManager.getOsAccountLocalIdFromProcess(); let appInfo = await bundle.getApplicationInfo('com.example.myapplication', 0, userId); - tokenID = appInfo.accessTokenId; + CommonConstants.tokenID = appInfo.accessTokenId; console.log('AccessTokenId accessTokenId:' + appInfo.accessTokenId + ', name:' + appInfo.name + ' ,bundleName:' + appInfo.bundleName) } catch(err) { @@ -80,8 +68,8 @@ describe("PedometerJsTest", function () { */ console.info('afterEach called') let atManager = abilityAccessCtrl.createAtManager(); - atManager.revokeUserGrantedPermission(tokenID, permissionNameUser, - PermissionFlag.PERMISSION_SYSTEM_FIXED) + atManager.revokeUserGrantedPermission(CommonConstants.tokenID, CommonConstants.permissionNameUser, + CommonConstants.PermissionFlag.PERMISSION_SYSTEM_FIXED) .catch((err) => { console.info('err:' + JSON.stringify(err)); expect(err.code).assertEqual(ERR_NOT_HAVE_PERMISSION); @@ -101,8 +89,8 @@ describe("PedometerJsTest", function () { it("PedometerJsTest_001", 0, async function (done) { console.info('----------------------PedometerJsTest_001---------------------------'); let atManager = abilityAccessCtrl.createAtManager(); - await atManager.grantUserGrantedPermission(tokenID, permissionNameUser, - PermissionFlag.PERMISSION_SYSTEM_FIXED) + await atManager.grantUserGrantedPermission(CommonConstants.tokenID, CommonConstants.permissionNameUser, + CommonConstants.PermissionFlag.PERMISSION_SYSTEM_FIXED) .then(() => { try { sensor.getSingleSensor(sensor.SensorId.PEDOMETER, (err, data) => { @@ -125,8 +113,8 @@ describe("PedometerJsTest", function () { }); } catch (err) { console.error('Sensor is not support'); - expect(err.code).assertEqual(PARAMETER_ERROR_CODE); - expect(err.message).assertEqual(PARAMETER_ERROR_MSG); + expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } }) @@ -149,8 +137,8 @@ describe("PedometerJsTest", function () { it("PedometerJsTest_002", 0, async function (done) { console.info('----------------------PedometerJsTest_002---------------------------'); let atManager = abilityAccessCtrl.createAtManager(); - await atManager.grantUserGrantedPermission(tokenID, permissionNameUser, - PermissionFlag.PERMISSION_SYSTEM_FIXED) + await atManager.grantUserGrantedPermission(CommonConstants.tokenID, CommonConstants.permissionNameUser, + CommonConstants.PermissionFlag.PERMISSION_SYSTEM_FIXED) .then(() => { try { sensor.getSingleSensor(sensor.SensorId.PEDOMETER, (err, data) => { @@ -163,15 +151,15 @@ describe("PedometerJsTest", function () { sensor.on(sensor.SensorId.PEDOMETER, 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); + expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(err.message).assertEqual(CommonConstants.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); + expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } }) @@ -194,8 +182,8 @@ describe("PedometerJsTest", function () { it("PedometerJsTest_003", 0, async function (done) { console.info('----------------------PedometerJsTest_003---------------------------'); let atManager = abilityAccessCtrl.createAtManager(); - await atManager.grantUserGrantedPermission(tokenID, permissionNameUser, - PermissionFlag.PERMISSION_SYSTEM_FIXED) + await atManager.grantUserGrantedPermission(CommonConstants.tokenID, CommonConstants.permissionNameUser, + CommonConstants.PermissionFlag.PERMISSION_SYSTEM_FIXED) .then(() => { try { sensor.getSingleSensor(sensor.SensorId.PEDOMETER, (err, data) => { @@ -218,8 +206,8 @@ describe("PedometerJsTest", function () { }); } catch (err) { console.error('Sensor is not support'); - expect(err.code).assertEqual(PARAMETER_ERROR_CODE); - expect(err.message).assertEqual(PARAMETER_ERROR_MSG); + expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } }) @@ -242,8 +230,8 @@ describe("PedometerJsTest", function () { it("PedometerJsTest_004", 0, async function (done) { console.info('----------------------PedometerJsTest_004---------------------------'); let atManager = abilityAccessCtrl.createAtManager(); - await atManager.grantUserGrantedPermission(tokenID, permissionNameUser, - PermissionFlag.PERMISSION_SYSTEM_FIXED) + await atManager.grantUserGrantedPermission(CommonConstants.tokenID, CommonConstants.permissionNameUser, + CommonConstants.PermissionFlag.PERMISSION_SYSTEM_FIXED) .then(() => { try { sensor.getSingleSensor(sensor.SensorId.PEDOMETER, (err, data) => { @@ -266,8 +254,8 @@ describe("PedometerJsTest", function () { }); } catch (err) { console.error('Sensor is not support'); - expect(err.code).assertEqual(PARAMETER_ERROR_CODE); - expect(err.message).assertEqual(PARAMETER_ERROR_MSG); + expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } }) @@ -290,8 +278,8 @@ describe("PedometerJsTest", function () { it("PedometerJsTest_005", 0, async function (done) { console.info('----------------------PedometerJsTest_005---------------------------'); let atManager = abilityAccessCtrl.createAtManager(); - await atManager.grantUserGrantedPermission(tokenID, permissionNameUser, - PermissionFlag.PERMISSION_SYSTEM_FIXED) + await atManager.grantUserGrantedPermission(CommonConstants.tokenID, CommonConstants.permissionNameUser, + CommonConstants.PermissionFlag.PERMISSION_SYSTEM_FIXED) .then(() => { try { sensor.getSingleSensor(sensor.SensorId.PEDOMETER, (err, data) => { @@ -304,15 +292,15 @@ describe("PedometerJsTest", function () { sensor.once(sensor.SensorId.PEDOMETER, 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); + expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(err.message).assertEqual(CommonConstants.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); + expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } }) @@ -335,8 +323,8 @@ describe("PedometerJsTest", function () { it("PedometerJsTest_006", 0, async function (done) { console.info('----------------------PedometerJsTest_006---------------------------'); let atManager = abilityAccessCtrl.createAtManager(); - await atManager.grantUserGrantedPermission(tokenID, permissionNameUser, - PermissionFlag.PERMISSION_SYSTEM_FIXED) + await atManager.grantUserGrantedPermission(CommonConstants.tokenID, CommonConstants.permissionNameUser, + CommonConstants.PermissionFlag.PERMISSION_SYSTEM_FIXED) .then(() => { try { sensor.getSingleSensor(sensor.SensorId.PEDOMETER, (err, data) => { @@ -348,15 +336,15 @@ describe("PedometerJsTest", function () { try { sensor.off(-1, callback); } catch (err) { - expect(err.code).assertEqual(PARAMETER_ERROR_CODE) - expect(err.message).assertEqual(PARAMETER_ERROR_MSG) + expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE) + expect(err.message).assertEqual(CommonConstants.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); + expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } }) @@ -379,8 +367,8 @@ describe("PedometerJsTest", function () { it("PedometerJsTest_007", 0, async function (done) { console.info('----------------------PedometerJsTest_007---------------------------'); let atManager = abilityAccessCtrl.createAtManager(); - await atManager.grantUserGrantedPermission(tokenID, permissionNameUser, - PermissionFlag.PERMISSION_SYSTEM_FIXED) + await atManager.grantUserGrantedPermission(CommonConstants.tokenID, CommonConstants.permissionNameUser, + CommonConstants.PermissionFlag.PERMISSION_SYSTEM_FIXED) .then(() => { try { sensor.getSingleSensor(sensor.SensorId.PEDOMETER, (err, data) => { @@ -404,8 +392,8 @@ describe("PedometerJsTest", function () { }); } catch (err) { console.error('Sensor is not support'); - expect(err.code).assertEqual(PARAMETER_ERROR_CODE); - expect(err.message).assertEqual(PARAMETER_ERROR_MSG); + expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } }) @@ -428,8 +416,8 @@ describe("PedometerJsTest", function () { it("PedometerJsTest_008", 0, async function (done) { console.info('----------------------PedometerJsTest_008---------------------------'); let atManager = abilityAccessCtrl.createAtManager(); - await atManager.grantUserGrantedPermission(tokenID, permissionNameUser, - PermissionFlag.PERMISSION_SYSTEM_FIXED) + await atManager.grantUserGrantedPermission(CommonConstants.tokenID, CommonConstants.permissionNameUser, + CommonConstants.PermissionFlag.PERMISSION_SYSTEM_FIXED) .then(() => { try { sensor.getSingleSensor(sensor.SensorId.PEDOMETER, (err, data) => { @@ -456,8 +444,8 @@ describe("PedometerJsTest", function () { }); } catch (err) { console.error('Sensor is not support'); - expect(err.code).assertEqual(PARAMETER_ERROR_CODE); - expect(err.message).assertEqual(PARAMETER_ERROR_MSG); + expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } }) @@ -480,8 +468,8 @@ describe("PedometerJsTest", function () { it("PedometerJsTest_009", 0, async function (done) { console.info('----------------------PedometerJsTest_009---------------------------'); let atManager = abilityAccessCtrl.createAtManager(); - await atManager.grantUserGrantedPermission(tokenID, permissionNameUser, - PermissionFlag.PERMISSION_SYSTEM_FIXED) + await atManager.grantUserGrantedPermission(CommonConstants.tokenID, CommonConstants.permissionNameUser, + CommonConstants.PermissionFlag.PERMISSION_SYSTEM_FIXED) .then(() => { try { sensor.getSingleSensor(sensor.SensorId.PEDOMETER, (err, data) => { @@ -505,8 +493,8 @@ describe("PedometerJsTest", function () { }); } catch (err) { console.error('Sensor is not support'); - expect(err.code).assertEqual(PARAMETER_ERROR_CODE); - expect(err.message).assertEqual(PARAMETER_ERROR_MSG); + expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } }) @@ -539,15 +527,15 @@ describe("PedometerJsTest", function () { sensor.on(sensor.SensorId.PEDOMETER, 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); + expect(err.code).assertEqual(CommonConstants.PERMISSION_DENIED_CODE); + expect(err.message).assertEqual(CommonConstants.PERMISSION_DENIED_MSG); done(); } }); } catch (err) { console.error('Sensor is not support'); - expect(err.code).assertEqual(PARAMETER_ERROR_CODE); - expect(err.message).assertEqual(PARAMETER_ERROR_MSG); + expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } }) diff --git a/test/unittest/interfaces/js/sar/ExampleJsunit.test.js b/test/unittest/interfaces/js/sensor/SarJsunit.test.js similarity index 88% rename from test/unittest/interfaces/js/sar/ExampleJsunit.test.js rename to test/unittest/interfaces/js/sensor/SarJsunit.test.js index 0ffab295..59da8504 100644 --- a/test/unittest/interfaces/js/sar/ExampleJsunit.test.js +++ b/test/unittest/interfaces/js/sensor/SarJsunit.test.js @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +import CommonConstants from './CommonConstants'; import sensor from '@ohos.sensor' import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index' @@ -55,10 +56,6 @@ describe("SarJsTest", function () { console.info('afterEach called') }) - const PARAMETER_ERROR_CODE = 401 - const SERVICE_EXCEPTION_CODE = 14500101 - const PARAMETER_ERROR_MSG = 'The parameter invalid.' - const SERVICE_EXCEPTION_MSG = 'Service exception.' /* * @tc.number: SarJsTest_001 @@ -93,8 +90,8 @@ describe("SarJsTest", function () { }); } catch (error) { console.info('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } }) @@ -132,8 +129,8 @@ describe("SarJsTest", function () { }); } catch (error) { console.info('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } }) @@ -176,8 +173,8 @@ describe("SarJsTest", function () { }); } catch (error) { console.info('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } }) @@ -207,15 +204,15 @@ describe("SarJsTest", function () { 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); + expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } }); } catch (error) { console.info('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } }) @@ -242,15 +239,15 @@ describe("SarJsTest", function () { try { sensor.off(-1, callback); } catch (error) { - expect(error.code).assertEqual(PARAMETER_ERROR_CODE) - expect(error.message).assertEqual(PARAMETER_ERROR_MSG) + expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE) + expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG) done(); } }); } catch (error) { console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } }) @@ -289,8 +286,8 @@ describe("SarJsTest", function () { }); } catch (error) { console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } }) @@ -332,8 +329,8 @@ describe("SarJsTest", function () { }); } catch (error) { console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } }) @@ -375,8 +372,8 @@ describe("SarJsTest", function () { }); } catch (error) { console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } }) @@ -415,8 +412,8 @@ describe("SarJsTest", function () { }); } catch (error) { console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } }) diff --git a/test/unittest/interfaces/js/sensor_frequency/ExampleJsunit.test.js b/test/unittest/interfaces/js/sensor/SensorFrequencyJsunit.test.js similarity index 90% rename from test/unittest/interfaces/js/sensor_frequency/ExampleJsunit.test.js rename to test/unittest/interfaces/js/sensor/SensorFrequencyJsunit.test.js index 7ef3f17e..a4058a79 100644 --- a/test/unittest/interfaces/js/sensor_frequency/ExampleJsunit.test.js +++ b/test/unittest/interfaces/js/sensor/SensorFrequencyJsunit.test.js @@ -12,15 +12,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +import CommonConstants from './CommonConstants'; import sensor from '@ohos.sensor' import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index' -const PERMISSION_DENIED_CODE = 201 -const PARAMETER_ERROR_CODE = 401 -const PARAMETER_ERROR_MSG = 'The parameter invalid.' -const PERMISSION_DENIED_MSG = 'Permission denied.' - describe("SensorFrequencyJsTest", function () { function callback(data) { console.info('callback' + JSON.stringify(data)); @@ -96,8 +92,8 @@ describe("SensorFrequencyJsTest", function () { }); } catch (err) { console.error('Sensor is not support'); - expect(err.code).assertEqual(PARAMETER_ERROR_CODE); - expect(err.message).assertEqual(PARAMETER_ERROR_MSG); + expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } }) @@ -134,8 +130,8 @@ describe("SensorFrequencyJsTest", function () { }); } catch (err) { console.error('Sensor is not support'); - expect(err.code).assertEqual(PARAMETER_ERROR_CODE); - expect(err.message).assertEqual(PARAMETER_ERROR_MSG); + expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } }) @@ -172,8 +168,8 @@ describe("SensorFrequencyJsTest", function () { }); } catch (err) { console.error('Sensor is not support'); - expect(err.code).assertEqual(PARAMETER_ERROR_CODE); - expect(err.message).assertEqual(PARAMETER_ERROR_MSG); + expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } }) @@ -210,8 +206,8 @@ describe("SensorFrequencyJsTest", function () { }); } catch (err) { console.error('Sensor is not support'); - expect(err.code).assertEqual(PARAMETER_ERROR_CODE); - expect(err.message).assertEqual(PARAMETER_ERROR_MSG); + expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } }) @@ -248,8 +244,8 @@ describe("SensorFrequencyJsTest", function () { }); } catch (err) { console.error('Sensor is not support'); - expect(err.code).assertEqual(PARAMETER_ERROR_CODE); - expect(err.message).assertEqual(PARAMETER_ERROR_MSG); + expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } }) @@ -286,8 +282,8 @@ describe("SensorFrequencyJsTest", function () { }); } catch (err) { console.error('Sensor is not support'); - expect(err.code).assertEqual(PARAMETER_ERROR_CODE); - expect(err.message).assertEqual(PARAMETER_ERROR_MSG); + expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } }) @@ -324,8 +320,8 @@ describe("SensorFrequencyJsTest", function () { }); } catch (err) { console.error('Sensor is not support'); - expect(err.code).assertEqual(PARAMETER_ERROR_CODE); - expect(err.message).assertEqual(PARAMETER_ERROR_MSG); + expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } }) @@ -362,8 +358,8 @@ describe("SensorFrequencyJsTest", function () { }); } catch (err) { console.error('Sensor is not support'); - expect(err.code).assertEqual(PARAMETER_ERROR_CODE); - expect(err.message).assertEqual(PARAMETER_ERROR_MSG); + expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } }) @@ -400,8 +396,8 @@ describe("SensorFrequencyJsTest", function () { }); } catch (err) { console.error('Sensor is not support'); - expect(err.code).assertEqual(PARAMETER_ERROR_CODE); - expect(err.message).assertEqual(PARAMETER_ERROR_MSG); + expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } }) diff --git a/test/unittest/interfaces/js/sensor/ExampleJsunit.test.js b/test/unittest/interfaces/js/sensor/SensorJsunit.test.js similarity index 92% rename from test/unittest/interfaces/js/sensor/ExampleJsunit.test.js rename to test/unittest/interfaces/js/sensor/SensorJsunit.test.js index 817f5aa1..184e2ab9 100644 --- a/test/unittest/interfaces/js/sensor/ExampleJsunit.test.js +++ b/test/unittest/interfaces/js/sensor/SensorJsunit.test.js @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +import CommonConstants from './CommonConstants'; import sensor from '@ohos.sensor' import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index' @@ -69,12 +70,6 @@ describe("SensorJsTest", function () { console.info('afterEach called') }) - const PARAMETER_ERROR_CODE = 401 - const SERVICE_EXCEPTION_CODE = 14500101 - const EPS = 0.01 - const PARAMETER_ERROR_MSG = 'The parameter invalid.' - const SERVICE_EXCEPTION_MSG = 'Service exception.' - /* * @tc.name: SensorJsTest * @tc.number: SensorJsTest_001 @@ -109,8 +104,8 @@ describe("SensorJsTest", function () { sensor.on(-1, onSensorCallback); } catch (error) { console.info(error); - expect(error.code).assertEqual(PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } }) @@ -194,8 +189,8 @@ describe("SensorJsTest", function () { sensor.once(-1, onceSensorCallback); } catch (error) { console.info(error); - expect(error.code).assertEqual(PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } }) @@ -234,8 +229,8 @@ describe("SensorJsTest", function () { sensor.off(-1, callback); } catch (error) { console.info(error); - expect(error.code).assertEqual(PARAMETER_ERROR_CODE) - expect(error.message).assertEqual(PARAMETER_ERROR_MSG) + expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE) + expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG) done(); } }) @@ -257,8 +252,8 @@ describe("SensorJsTest", function () { sensor.off(1000000, onSensorCallback); } catch (error) { console.info(error); - expect(error.code).assertEqual(PARAMETER_ERROR_CODE) - expect(error.message).assertEqual(PARAMETER_ERROR_MSG) + expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE) + expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG) done(); } }) @@ -299,8 +294,8 @@ describe("SensorJsTest", function () { sensor.off(sensor.SensorId.ACCELEROMETER, 5); } catch (error) { console.info(error); - expect(error.code).assertEqual(PARAMETER_ERROR_CODE) - expect(error.message).assertEqual(PARAMETER_ERROR_MSG) + expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE) + expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG) done(); } }) @@ -367,22 +362,22 @@ describe("SensorJsTest", function () { try { sensor.on(); } catch (error) { - expect(error.code).assertEqual(PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } try { sensor.once(); } catch (error) { - expect(error.code).assertEqual(PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } try { sensor.off(); } catch (error) { - expect(error.code).assertEqual(PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } }) @@ -578,13 +573,13 @@ describe("SensorJsTest", function () { } else { console.info('Sensor_GetGeomagneticField_001 success x: ' + data.x + ',y: ' + data.y + ',z: ' + data.z + ',geomagneticDip: ' + data.geomagneticDip + ',deflectionAngle: ' + data.deflectionAngle + ',levelIntensity: ' + data.levelIntensity + ',totalIntensity: ' + data.totalIntensity) - expect(Math.abs(data.x - GEOMAGNETIC_COMPONENT_YEAR_RESULT[j][0]) < EPS).assertTrue() - expect(Math.abs(data.y - GEOMAGNETIC_COMPONENT_YEAR_RESULT[j][1]) < EPS).assertTrue() - expect(Math.abs(data.z - GEOMAGNETIC_COMPONENT_YEAR_RESULT[j][2]) < EPS).assertTrue() - expect(Math.abs(data.deflectionAngle - GEOMAGNETIC_COMPONENT_YEAR_RESULT[j][3]) < EPS).assertTrue() - expect(Math.abs(data.geomagneticDip - GEOMAGNETIC_COMPONENT_YEAR_RESULT[j][4]) < EPS).assertTrue() - expect(Math.abs(data.levelIntensity - GEOMAGNETIC_COMPONENT_YEAR_RESULT[j][5]) < EPS).assertTrue() - expect(Math.abs(data.totalIntensity - GEOMAGNETIC_COMPONENT_YEAR_RESULT[j][6]) < EPS).assertTrue() + expect(Math.abs(data.x - GEOMAGNETIC_COMPONENT_YEAR_RESULT[j][0]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.y - GEOMAGNETIC_COMPONENT_YEAR_RESULT[j][1]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.z - GEOMAGNETIC_COMPONENT_YEAR_RESULT[j][2]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.deflectionAngle - GEOMAGNETIC_COMPONENT_YEAR_RESULT[j][3]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.geomagneticDip - GEOMAGNETIC_COMPONENT_YEAR_RESULT[j][4]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.levelIntensity - GEOMAGNETIC_COMPONENT_YEAR_RESULT[j][5]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.totalIntensity - GEOMAGNETIC_COMPONENT_YEAR_RESULT[j][6]) < CommonConstants.EPS).assertTrue() setTimeout(() => { resolve() }, 500) @@ -620,13 +615,13 @@ describe("SensorJsTest", function () { } else { console.info('Sensor_GetGeomagneticField_002 success x: ' + data.x + ',y: ' + data.y + ',z: ' + data.z + ',geomagneticDip: ' + data.geomagneticDip + ',deflectionAngle: ' + data.deflectionAngle + ',levelIntensity: ' + data.levelIntensity + ',totalIntensity: ' + data.totalIntensity) - expect(Math.abs(data.x - GEOMAGNETIC_COMPONENT_COORDINATES_RESULT[j][0]) < EPS).assertTrue() - expect(Math.abs(data.y - GEOMAGNETIC_COMPONENT_COORDINATES_RESULT[j][1]) < EPS).assertTrue() - expect(Math.abs(data.z - GEOMAGNETIC_COMPONENT_COORDINATES_RESULT[j][2]) < EPS).assertTrue() - expect(Math.abs(data.deflectionAngle - GEOMAGNETIC_COMPONENT_COORDINATES_RESULT[j][3]) < EPS).assertTrue() - expect(Math.abs(data.geomagneticDip - GEOMAGNETIC_COMPONENT_COORDINATES_RESULT[j][4]) < EPS).assertTrue() - expect(Math.abs(data.levelIntensity - GEOMAGNETIC_COMPONENT_COORDINATES_RESULT[j][5]) < EPS).assertTrue() - expect(Math.abs(data.totalIntensity - GEOMAGNETIC_COMPONENT_COORDINATES_RESULT[j][6]) < EPS).assertTrue() + expect(Math.abs(data.x - GEOMAGNETIC_COMPONENT_COORDINATES_RESULT[j][0]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.y - GEOMAGNETIC_COMPONENT_COORDINATES_RESULT[j][1]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.z - GEOMAGNETIC_COMPONENT_COORDINATES_RESULT[j][2]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.deflectionAngle - GEOMAGNETIC_COMPONENT_COORDINATES_RESULT[j][3]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.geomagneticDip - GEOMAGNETIC_COMPONENT_COORDINATES_RESULT[j][4]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.levelIntensity - GEOMAGNETIC_COMPONENT_COORDINATES_RESULT[j][5]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.totalIntensity - GEOMAGNETIC_COMPONENT_COORDINATES_RESULT[j][6]) < CommonConstants.EPS).assertTrue() setTimeout(() => { resolve() }, 500) @@ -657,13 +652,13 @@ describe("SensorJsTest", function () { } else { console.info('Sensor_GetGeomagneticField_003 success x: ' + data.x + ',y: ' + data.y + ',z: ' + data.z + ',geomagneticDip: ' + data.geomagneticDip + ',deflectionAngle: ' + data.deflectionAngle + ',levelIntensity: ' + data.levelIntensity + ',totalIntensity: ' + data.totalIntensity) - expect(Math.abs(data.x - geomagneticComponent[0]) < EPS).assertTrue() - expect(Math.abs(data.y - geomagneticComponent[1]) < EPS).assertTrue() - expect(Math.abs(data.z - geomagneticComponent[2]) < EPS).assertTrue() - expect(Math.abs(data.geomagneticDip - geomagneticComponent[3]) < EPS).assertTrue() - expect(Math.abs(data.deflectionAngle - geomagneticComponent[4]) < EPS).assertTrue() - expect(Math.abs(data.levelIntensity - geomagneticComponent[5]) < EPS).assertTrue() - expect(Math.abs(data.totalIntensity - geomagneticComponent[6]) < EPS).assertTrue() + expect(Math.abs(data.x - geomagneticComponent[0]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.y - geomagneticComponent[1]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.z - geomagneticComponent[2]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.geomagneticDip - geomagneticComponent[3]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.deflectionAngle - geomagneticComponent[4]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.levelIntensity - geomagneticComponent[5]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.totalIntensity - geomagneticComponent[6]) < CommonConstants.EPS).assertTrue() } setTimeout(() => { done() @@ -690,12 +685,12 @@ describe("SensorJsTest", function () { } else { console.info('Sensor_GetGeomagneticField_004 x: ' + data.x + ',y: ' + data.y + ',z: ' + data.z + ',geomagneticDip: ' + data.geomagneticDip + ',deflectionAngle: ' + data.deflectionAngle + ',levelIntensity: ' + data.levelIntensity + ',totalIntensity: ' + data.totalIntensity) - expect(Math.abs(data.x - geomagneticComponent[0]) < EPS).assertTrue() - expect(Math.abs(data.y - geomagneticComponent[1]) < EPS).assertTrue() - expect(Math.abs(data.z - geomagneticComponent[2]) < EPS).assertTrue() - expect(Math.abs(data.geomagneticDip - geomagneticComponent[3]) < EPS).assertTrue() - expect(Math.abs(data.deflectionAngle - geomagneticComponent[4]) < EPS).assertTrue() - expect(Math.abs(data.levelIntensity - geomagneticComponent[5]) < EPS).assertTrue() + expect(Math.abs(data.x - geomagneticComponent[0]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.y - geomagneticComponent[1]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.z - geomagneticComponent[2]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.geomagneticDip - geomagneticComponent[3]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.deflectionAngle - geomagneticComponent[4]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.levelIntensity - geomagneticComponent[5]) < CommonConstants.EPS).assertTrue() expect(data.totalIntensity).assertEqual(geomagneticComponent[6]) } setTimeout(() => { @@ -723,12 +718,12 @@ describe("SensorJsTest", function () { } else { console.info('Sensor_GetGeomagneticField_005 x: ' + data.x + ',y: ' + data.y + ',z: ' + data.z + ',geomagneticDip: ' + data.geomagneticDip + ',deflectionAngle: ' + data.deflectionAngle + ',levelIntensity: ' + data.levelIntensity + ',totalIntensity: ' + data.totalIntensity) - expect(Math.abs(data.x - geomagneticComponent[0]) < EPS).assertTrue() - expect(Math.abs(data.y - geomagneticComponent[1]) < EPS).assertTrue() - expect(Math.abs(data.z - geomagneticComponent[2]) < EPS).assertTrue() - expect(Math.abs(data.geomagneticDip - geomagneticComponent[3]) < EPS).assertTrue() - expect(Math.abs(data.deflectionAngle - geomagneticComponent[4]) < EPS).assertTrue() - expect(Math.abs(data.levelIntensity - geomagneticComponent[5]) < EPS).assertTrue() + expect(Math.abs(data.x - geomagneticComponent[0]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.y - geomagneticComponent[1]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.z - geomagneticComponent[2]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.geomagneticDip - geomagneticComponent[3]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.deflectionAngle - geomagneticComponent[4]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.levelIntensity - geomagneticComponent[5]) < CommonConstants.EPS).assertTrue() expect(data.totalIntensity).assertEqual(geomagneticComponent[6]) } setTimeout(() => { @@ -756,12 +751,12 @@ describe("SensorJsTest", function () { } else { console.info('Sensor_GetGeomagneticField_006 success x: ' + data.x + ',y: ' + data.y + ',z: ' + data.z + ',geomagneticDip: ' + data.geomagneticDip + ',deflectionAngle: ' + data.deflectionAngle + ',levelIntensity: ' + data.levelIntensity + ',totalIntensity: ' + data.totalIntensity) - expect(Math.abs(data.x - geomagneticComponent[0]) < EPS).assertTrue() - expect(Math.abs(data.y - geomagneticComponent[1]) < EPS).assertTrue() - expect(Math.abs(data.z - geomagneticComponent[2]) < EPS).assertTrue() - expect(Math.abs(data.geomagneticDip - geomagneticComponent[3]) < EPS).assertTrue() - expect(Math.abs(data.deflectionAngle - geomagneticComponent[4]) < EPS).assertTrue() - expect(Math.abs(data.levelIntensity - geomagneticComponent[5]) < EPS).assertTrue() + expect(Math.abs(data.x - geomagneticComponent[0]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.y - geomagneticComponent[1]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.z - geomagneticComponent[2]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.geomagneticDip - geomagneticComponent[3]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.deflectionAngle - geomagneticComponent[4]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.levelIntensity - geomagneticComponent[5]) < CommonConstants.EPS).assertTrue() expect(data.totalIntensity).assertEqual(geomagneticComponent[6]) } setTimeout(() => { @@ -893,13 +888,13 @@ describe("SensorJsTest", function () { } else { console.info('Sensor_GetGeomagneticField_011 success x: ' + data.x + ',y: ' + data.y + ',z: ' + data.z + ',geomagneticDip: ' + data.geomagneticDip + ',deflectionAngle: ' + data.deflectionAngle + ',levelIntensity: ' + data.levelIntensity + ',totalIntensity: ' + data.totalIntensity) - expect(Math.abs(data.x - geomagneticComponent[0]) < EPS).assertTrue() - expect(Math.abs(data.y - geomagneticComponent[1]) < EPS).assertTrue() - expect(Math.abs(data.z - geomagneticComponent[2]) < EPS).assertTrue() - expect(Math.abs(data.geomagneticDip - geomagneticComponent[3]) < EPS).assertTrue() - expect(Math.abs(data.deflectionAngle - geomagneticComponent[4]) < EPS).assertTrue() - expect(Math.abs(data.levelIntensity - geomagneticComponent[5]) < EPS).assertTrue() - expect(Math.abs(data.totalIntensity - geomagneticComponent[6]) < EPS).assertTrue() + expect(Math.abs(data.x - geomagneticComponent[0]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.y - geomagneticComponent[1]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.z - geomagneticComponent[2]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.geomagneticDip - geomagneticComponent[3]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.deflectionAngle - geomagneticComponent[4]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.levelIntensity - geomagneticComponent[5]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.totalIntensity - geomagneticComponent[6]) < CommonConstants.EPS).assertTrue() } setTimeout(() => { done() @@ -1260,13 +1255,13 @@ describe("SensorJsTest", function () { await sensor.getGeomagneticInfo({'latitude':80, 'longitude':0, 'altitude':0}, timeMillis[i]).then((data) => { console.info('Sensor_GetGeomagneticField_025 x: ' + data.x + ',y: ' + data.y + ',z: ' + data.z + ',geomagneticDip: ' + data.geomagneticDip + ',deflectionAngle: ' + data.deflectionAngle + ',levelIntensity: ' + data.levelIntensity + ',totalIntensity: ' + data.totalIntensity); - expect(Math.abs(data.x - GEOMAGNETIC_COMPONENT_YEAR_RESULT[i][0]) < EPS).assertTrue() - expect(Math.abs(data.y - GEOMAGNETIC_COMPONENT_YEAR_RESULT[i][1]) < EPS).assertTrue() - expect(Math.abs(data.z - GEOMAGNETIC_COMPONENT_YEAR_RESULT[i][2]) < EPS).assertTrue() - expect(Math.abs(data.deflectionAngle - GEOMAGNETIC_COMPONENT_YEAR_RESULT[i][3]) < EPS).assertTrue() - expect(Math.abs(data.geomagneticDip - GEOMAGNETIC_COMPONENT_YEAR_RESULT[i][4]) < EPS).assertTrue() - expect(Math.abs(data.levelIntensity - GEOMAGNETIC_COMPONENT_YEAR_RESULT[i][5]) < EPS).assertTrue() - expect(Math.abs(data.totalIntensity - GEOMAGNETIC_COMPONENT_YEAR_RESULT[i][6]) < EPS).assertTrue() + expect(Math.abs(data.x - GEOMAGNETIC_COMPONENT_YEAR_RESULT[i][0]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.y - GEOMAGNETIC_COMPONENT_YEAR_RESULT[i][1]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.z - GEOMAGNETIC_COMPONENT_YEAR_RESULT[i][2]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.deflectionAngle - GEOMAGNETIC_COMPONENT_YEAR_RESULT[i][3]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.geomagneticDip - GEOMAGNETIC_COMPONENT_YEAR_RESULT[i][4]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.levelIntensity - GEOMAGNETIC_COMPONENT_YEAR_RESULT[i][5]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.totalIntensity - GEOMAGNETIC_COMPONENT_YEAR_RESULT[i][6]) < CommonConstants.EPS).assertTrue() }).catch((error) => { console.info("promise::catch", error); }) @@ -1289,13 +1284,13 @@ describe("SensorJsTest", function () { await sensor.getGeomagneticInfo({'latitude':0, 'longitude':0, 'altitude':0}, Number.MIN_VALUE).then((data) => { console.info('Sensor_GetGeomagneticField_026 x: ' + data.x + ',y: ' + data.y + ',z: ' + data.z + ',geomagneticDip: ' + data.geomagneticDip + ',deflectionAngle: ' + data.deflectionAngle + ',levelIntensity: ' + data.levelIntensity + ',totalIntensity: ' + data.totalIntensity) - expect(Math.abs(data.x - geomagneticComponent[0]) < EPS).assertTrue() - expect(Math.abs(data.y - geomagneticComponent[1]) < EPS).assertTrue() - expect(Math.abs(data.z - geomagneticComponent[2]) < EPS).assertTrue() - expect(Math.abs(data.geomagneticDip - geomagneticComponent[3]) < EPS).assertTrue() - expect(Math.abs(data.deflectionAngle - geomagneticComponent[4]) < EPS).assertTrue() - expect(Math.abs(data.levelIntensity - geomagneticComponent[5]) < EPS).assertTrue() - expect(Math.abs(data.totalIntensity - geomagneticComponent[6]) < EPS).assertTrue() + expect(Math.abs(data.x - geomagneticComponent[0]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.y - geomagneticComponent[1]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.z - geomagneticComponent[2]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.geomagneticDip - geomagneticComponent[3]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.deflectionAngle - geomagneticComponent[4]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.levelIntensity - geomagneticComponent[5]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.totalIntensity - geomagneticComponent[6]) < CommonConstants.EPS).assertTrue() }).catch((error) => { console.info("promise::catch", error); }); @@ -1317,12 +1312,12 @@ describe("SensorJsTest", function () { await sensor.getGeomagneticInfo({'latitude':Number.MAX_VALUE, 'longitude':0, 'altitude':0}, timeMillis[0]).then((data) => { console.info('Sensor_GetGeomagneticField_027 x: ' + data.x + ',y: ' + data.y + ',z: ' + data.z + ',geomagneticDip: ' + data.geomagneticDip + ',deflectionAngle: ' + data.deflectionAngle + ',levelIntensity: ' + data.levelIntensity + ',totalIntensity: ' + data.totalIntensity) - expect(Math.abs(data.x - geomagneticComponent[0]) < EPS).assertTrue() - expect(Math.abs(data.y - geomagneticComponent[1]) < EPS).assertTrue() - expect(Math.abs(data.z - geomagneticComponent[2]) < EPS).assertTrue() - expect(Math.abs(data.geomagneticDip - geomagneticComponent[3]) < EPS).assertTrue() - expect(Math.abs(data.deflectionAngle - geomagneticComponent[4]) < EPS).assertTrue() - expect(Math.abs(data.levelIntensity - geomagneticComponent[5]) < EPS).assertTrue() + expect(Math.abs(data.x - geomagneticComponent[0]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.y - geomagneticComponent[1]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.z - geomagneticComponent[2]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.geomagneticDip - geomagneticComponent[3]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.deflectionAngle - geomagneticComponent[4]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.levelIntensity - geomagneticComponent[5]) < CommonConstants.EPS).assertTrue() expect(data.totalIntensity).assertEqual(geomagneticComponent[6]) }).catch((error) => { console.info("promise::catch", error) @@ -1345,12 +1340,12 @@ describe("SensorJsTest", function () { await sensor.getGeomagneticInfo({'latitude':Number.NaN, 'longitude':0, 'altitude':0}, timeMillis[0]).then((data) => { console.info('Sensor_GetGeomagneticField_028 x: ' + data.x + ',y: ' + data.y + ',z: ' + data.z + ',geomagneticDip: ' + data.geomagneticDip + ',deflectionAngle: ' + data.deflectionAngle + ',levelIntensity: ' + data.levelIntensity + ',totalIntensity: ' + data.totalIntensity) - expect(Math.abs(data.x - geomagneticComponent[0]) < EPS).assertTrue() - expect(Math.abs(data.y - geomagneticComponent[1]) < EPS).assertTrue() - expect(Math.abs(data.z - geomagneticComponent[2]) < EPS).assertTrue() - expect(Math.abs(data.geomagneticDip - geomagneticComponent[3]) < EPS).assertTrue() - expect(Math.abs(data.deflectionAngle - geomagneticComponent[4]) < EPS).assertTrue() - expect(Math.abs(data.levelIntensity - geomagneticComponent[5]) < EPS).assertTrue() + expect(Math.abs(data.x - geomagneticComponent[0]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.y - geomagneticComponent[1]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.z - geomagneticComponent[2]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.geomagneticDip - geomagneticComponent[3]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.deflectionAngle - geomagneticComponent[4]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.levelIntensity - geomagneticComponent[5]) < CommonConstants.EPS).assertTrue() expect(data.totalIntensity).assertEqual(geomagneticComponent[6]) }).catch((error) => { console.info("promise::catch", error) @@ -1371,12 +1366,12 @@ describe("SensorJsTest", function () { await sensor.getGeomagneticInfo({'latitude':Number.NEGATIVE_INFINITY, 'longitude':0, 'altitude':0}, timeMillis[0]).then((data) => { console.info('Sensor_GetGeomagneticField_029 x: ' + data.x + ',y: ' + data.y + ',z: ' + data.z + ',geomagneticDip: ' + data.geomagneticDip + ',deflectionAngle: ' + data.deflectionAngle + ',levelIntensity: ' + data.levelIntensity + ',totalIntensity: ' + data.totalIntensity) - expect(Math.abs(data.x - geomagneticComponent[0]) < EPS).assertTrue() - expect(Math.abs(data.y - geomagneticComponent[1]) < EPS).assertTrue() - expect(Math.abs(data.z - geomagneticComponent[2]) < EPS).assertTrue() - expect(Math.abs(data.geomagneticDip - geomagneticComponent[3]) < EPS).assertTrue() - expect(Math.abs(data.deflectionAngle - geomagneticComponent[4]) < EPS).assertTrue() - expect(Math.abs(data.levelIntensity - geomagneticComponent[5]) < EPS).assertTrue() + expect(Math.abs(data.x - geomagneticComponent[0]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.y - geomagneticComponent[1]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.z - geomagneticComponent[2]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.geomagneticDip - geomagneticComponent[3]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.deflectionAngle - geomagneticComponent[4]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.levelIntensity - geomagneticComponent[5]) < CommonConstants.EPS).assertTrue() expect(data.totalIntensity).assertEqual(geomagneticComponent[6]) }).catch((error) => { console.info("promise::catch", error) @@ -1474,13 +1469,13 @@ describe("SensorJsTest", function () { await sensor.getGeomagneticInfo({'latitude':0, 'longitude':0, 'altitude':Number.MIN_VALUE}, timeMillis[0]).then((data) => { console.info('Sensor_GetGeomagneticField_034 x: ' + data.x + ',y: ' + data.y + ',z: ' + data.z + ',geomagneticDip: ' + data.geomagneticDip + ',deflectionAngle: ' + data.deflectionAngle + ',levelIntensity: ' + data.levelIntensity + ',totalIntensity: ' + data.totalIntensity) - expect(Math.abs(data.x - geomagneticComponent[0]) < EPS).assertTrue() - expect(Math.abs(data.y - geomagneticComponent[1]) < EPS).assertTrue() - expect(Math.abs(data.z - geomagneticComponent[2]) < EPS).assertTrue() - expect(Math.abs(data.geomagneticDip - geomagneticComponent[3]) < EPS).assertTrue() - expect(Math.abs(data.deflectionAngle - geomagneticComponent[4]) < EPS).assertTrue() - expect(Math.abs(data.levelIntensity - geomagneticComponent[5]) < EPS).assertTrue() - expect(Math.abs(data.totalIntensity - geomagneticComponent[6]) < EPS).assertTrue() + expect(Math.abs(data.x - geomagneticComponent[0]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.y - geomagneticComponent[1]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.z - geomagneticComponent[2]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.geomagneticDip - geomagneticComponent[3]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.deflectionAngle - geomagneticComponent[4]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.levelIntensity - geomagneticComponent[5]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.totalIntensity - geomagneticComponent[6]) < CommonConstants.EPS).assertTrue() }).catch((error) => { console.info("promise::catch", error) }); @@ -1538,13 +1533,13 @@ describe("SensorJsTest", function () { await sensor.getGeomagneticInfo({'latitude':80, 'longitude':0, 'altitude':0}, timeMillis[i]).then((data) => { console.info('Sensor_GetGeomagneticField_037 x: ' + data.x + ',y: ' + data.y + ',z: ' + data.z + ',geomagneticDip: ' + data.geomagneticDip + ',deflectionAngle: ' + data.deflectionAngle + ',levelIntensity: ' + data.levelIntensity + ',totalIntensity: ' + data.totalIntensity); - expect(Math.abs(data.x - GEOMAGNETIC_COMPONENT_YEAR_RESULT[i][0]) < EPS).assertTrue() - expect(Math.abs(data.y - GEOMAGNETIC_COMPONENT_YEAR_RESULT[i][1]) < EPS).assertTrue() - expect(Math.abs(data.z - GEOMAGNETIC_COMPONENT_YEAR_RESULT[i][2]) < EPS).assertTrue() - expect(Math.abs(data.deflectionAngle - GEOMAGNETIC_COMPONENT_YEAR_RESULT[i][3]) < EPS).assertTrue() - expect(Math.abs(data.geomagneticDip - GEOMAGNETIC_COMPONENT_YEAR_RESULT[i][4]) < EPS).assertTrue() - expect(Math.abs(data.levelIntensity - GEOMAGNETIC_COMPONENT_YEAR_RESULT[i][5]) < EPS).assertTrue() - expect(Math.abs(data.totalIntensity - GEOMAGNETIC_COMPONENT_YEAR_RESULT[i][6]) < EPS).assertTrue() + expect(Math.abs(data.x - GEOMAGNETIC_COMPONENT_YEAR_RESULT[i][0]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.y - GEOMAGNETIC_COMPONENT_YEAR_RESULT[i][1]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.z - GEOMAGNETIC_COMPONENT_YEAR_RESULT[i][2]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.deflectionAngle - GEOMAGNETIC_COMPONENT_YEAR_RESULT[i][3]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.geomagneticDip - GEOMAGNETIC_COMPONENT_YEAR_RESULT[i][4]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.levelIntensity - GEOMAGNETIC_COMPONENT_YEAR_RESULT[i][5]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.totalIntensity - GEOMAGNETIC_COMPONENT_YEAR_RESULT[i][6]) < CommonConstants.EPS).assertTrue() }).catch((error) => { console.info("promise::catch", error) }); @@ -1660,13 +1655,13 @@ describe("SensorJsTest", function () { await sensor.getGeomagneticInfo({'latitude':GEOMAGNETIC_COORDINATES[i][0], 'longitude':GEOMAGNETIC_COORDINATES[i][1], 'altitude':GEOMAGNETIC_COORDINATES[i][2]}, timeMillis[0]).then((data) => { console.info('Sensor_GetGeomagneticField_043 x: ' + data.x + ',y: ' + data.y + ',z: ' + data.z + ',geomagneticDip: ' + data.geomagneticDip + ',deflectionAngle: ' + data.deflectionAngle + ',levelIntensity: ' + data.levelIntensity + ',totalIntensity: ' + data.totalIntensity) - expect(Math.abs(data.x - GEOMAGNETIC_COMPONENT_COORDINATES_RESULT[i][0]) < EPS).assertTrue() - expect(Math.abs(data.y - GEOMAGNETIC_COMPONENT_COORDINATES_RESULT[i][1]) < EPS).assertTrue() - expect(Math.abs(data.z - GEOMAGNETIC_COMPONENT_COORDINATES_RESULT[i][2]) < EPS).assertTrue() - expect(Math.abs(data.deflectionAngle - GEOMAGNETIC_COMPONENT_COORDINATES_RESULT[i][3]) < EPS).assertTrue() - expect(Math.abs(data.geomagneticDip - GEOMAGNETIC_COMPONENT_COORDINATES_RESULT[i][4]) < EPS).assertTrue() - expect(Math.abs(data.levelIntensity - GEOMAGNETIC_COMPONENT_COORDINATES_RESULT[i][5]) < EPS).assertTrue() - expect(Math.abs(data.totalIntensity - GEOMAGNETIC_COMPONENT_COORDINATES_RESULT[i][6]) < EPS).assertTrue() + expect(Math.abs(data.x - GEOMAGNETIC_COMPONENT_COORDINATES_RESULT[i][0]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.y - GEOMAGNETIC_COMPONENT_COORDINATES_RESULT[i][1]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.z - GEOMAGNETIC_COMPONENT_COORDINATES_RESULT[i][2]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.deflectionAngle - GEOMAGNETIC_COMPONENT_COORDINATES_RESULT[i][3]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.geomagneticDip - GEOMAGNETIC_COMPONENT_COORDINATES_RESULT[i][4]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.levelIntensity - GEOMAGNETIC_COMPONENT_COORDINATES_RESULT[i][5]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.totalIntensity - GEOMAGNETIC_COMPONENT_COORDINATES_RESULT[i][6]) < CommonConstants.EPS).assertTrue() }).catch((error) => { console.info("promise::catch", error); }); @@ -1805,8 +1800,8 @@ describe("SensorJsTest", function () { }); done() } catch(err) { - expect(err.code).assertEqual(PARAMETER_ERROR_CODE) - expect(err.message).assertEqual(PARAMETER_ERROR_MSG) + expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE) + expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG) done() } }) @@ -1828,8 +1823,8 @@ describe("SensorJsTest", function () { }); done() } catch(err) { - expect(err.code).assertEqual(PARAMETER_ERROR_CODE) - expect(err.message).assertEqual(PARAMETER_ERROR_MSG) + expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE) + expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG) done() } }) @@ -1851,8 +1846,8 @@ describe("SensorJsTest", function () { }); done() } catch(err) { - expect(err.code).assertEqual(PARAMETER_ERROR_CODE) - expect(err.message).assertEqual(PARAMETER_ERROR_MSG) + expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE) + expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG) done() } }) @@ -1874,8 +1869,8 @@ describe("SensorJsTest", function () { }); done() } catch(err) { - expect(err.code).assertEqual(PARAMETER_ERROR_CODE) - expect(err.message).assertEqual(PARAMETER_ERROR_MSG) + expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE) + expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG) done() } }) @@ -1897,8 +1892,8 @@ describe("SensorJsTest", function () { }, 500) }); } catch(err) { - expect(err.code).assertEqual(PARAMETER_ERROR_CODE) - expect(err.message).assertEqual(PARAMETER_ERROR_MSG) + expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE) + expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG) done() } }) @@ -1920,8 +1915,8 @@ describe("SensorJsTest", function () { }, 500) }); } catch(err) { - expect(err.code).assertEqual(PARAMETER_ERROR_CODE) - expect(err.message).assertEqual(PARAMETER_ERROR_MSG) + expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE) + expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG) done() } }) @@ -1943,8 +1938,8 @@ describe("SensorJsTest", function () { }, 500) }); } catch(err) { - expect(err.code).assertEqual(PARAMETER_ERROR_CODE) - expect(err.message).assertEqual(PARAMETER_ERROR_MSG) + expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE) + expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG) done() } }) @@ -1966,8 +1961,8 @@ describe("SensorJsTest", function () { }, 500) }); } catch(err) { - expect(err.code).assertEqual(PARAMETER_ERROR_CODE) - expect(err.message).assertEqual(PARAMETER_ERROR_MSG) + expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE) + expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG) done() } }) @@ -1985,13 +1980,13 @@ describe("SensorJsTest", function () { await sensor.getGeomagneticInfo({'latitude':80, 'longitude':0, 'altitude':0}, timeMillis[i], undefined).then((data) => { console.info('Sensor_GetGeomagneticField_058 x: ' + data.x + ',y: ' + data.y + ',z: ' + data.z + ',geomagneticDip: ' + data.geomagneticDip + ',deflectionAngle: ' + data.deflectionAngle + ',levelIntensity: ' + data.levelIntensity + ',totalIntensity: ' + data.totalIntensity); - expect(Math.abs(data.x - GEOMAGNETIC_COMPONENT_YEAR_RESULT[i][0]) < EPS).assertTrue() - expect(Math.abs(data.y - GEOMAGNETIC_COMPONENT_YEAR_RESULT[i][1]) < EPS).assertTrue() - expect(Math.abs(data.z - GEOMAGNETIC_COMPONENT_YEAR_RESULT[i][2]) < EPS).assertTrue() - expect(Math.abs(data.deflectionAngle - GEOMAGNETIC_COMPONENT_YEAR_RESULT[i][3]) < EPS).assertTrue() - expect(Math.abs(data.geomagneticDip - GEOMAGNETIC_COMPONENT_YEAR_RESULT[i][4]) < EPS).assertTrue() - expect(Math.abs(data.levelIntensity - GEOMAGNETIC_COMPONENT_YEAR_RESULT[i][5]) < EPS).assertTrue() - expect(Math.abs(data.totalIntensity - GEOMAGNETIC_COMPONENT_YEAR_RESULT[i][6]) < EPS).assertTrue() + expect(Math.abs(data.x - GEOMAGNETIC_COMPONENT_YEAR_RESULT[i][0]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.y - GEOMAGNETIC_COMPONENT_YEAR_RESULT[i][1]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.z - GEOMAGNETIC_COMPONENT_YEAR_RESULT[i][2]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.deflectionAngle - GEOMAGNETIC_COMPONENT_YEAR_RESULT[i][3]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.geomagneticDip - GEOMAGNETIC_COMPONENT_YEAR_RESULT[i][4]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.levelIntensity - GEOMAGNETIC_COMPONENT_YEAR_RESULT[i][5]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.totalIntensity - GEOMAGNETIC_COMPONENT_YEAR_RESULT[i][6]) < CommonConstants.EPS).assertTrue() }).catch((error) => { console.info("promise::catch", error); }) @@ -2012,13 +2007,13 @@ describe("SensorJsTest", function () { await sensor.getGeomagneticInfo({'latitude':80, 'longitude':0, 'altitude':0}, timeMillis[i], null).then((data) => { console.info('Sensor_GetGeomagneticField_059 x: ' + data.x + ',y: ' + data.y + ',z: ' + data.z + ',geomagneticDip: ' + data.geomagneticDip + ',deflectionAngle: ' + data.deflectionAngle + ',levelIntensity: ' + data.levelIntensity + ',totalIntensity: ' + data.totalIntensity); - expect(Math.abs(data.x - GEOMAGNETIC_COMPONENT_YEAR_RESULT[i][0]) < EPS).assertTrue() - expect(Math.abs(data.y - GEOMAGNETIC_COMPONENT_YEAR_RESULT[i][1]) < EPS).assertTrue() - expect(Math.abs(data.z - GEOMAGNETIC_COMPONENT_YEAR_RESULT[i][2]) < EPS).assertTrue() - expect(Math.abs(data.deflectionAngle - GEOMAGNETIC_COMPONENT_YEAR_RESULT[i][3]) < EPS).assertTrue() - expect(Math.abs(data.geomagneticDip - GEOMAGNETIC_COMPONENT_YEAR_RESULT[i][4]) < EPS).assertTrue() - expect(Math.abs(data.levelIntensity - GEOMAGNETIC_COMPONENT_YEAR_RESULT[i][5]) < EPS).assertTrue() - expect(Math.abs(data.totalIntensity - GEOMAGNETIC_COMPONENT_YEAR_RESULT[i][6]) < EPS).assertTrue() + expect(Math.abs(data.x - GEOMAGNETIC_COMPONENT_YEAR_RESULT[i][0]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.y - GEOMAGNETIC_COMPONENT_YEAR_RESULT[i][1]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.z - GEOMAGNETIC_COMPONENT_YEAR_RESULT[i][2]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.deflectionAngle - GEOMAGNETIC_COMPONENT_YEAR_RESULT[i][3]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.geomagneticDip - GEOMAGNETIC_COMPONENT_YEAR_RESULT[i][4]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.levelIntensity - GEOMAGNETIC_COMPONENT_YEAR_RESULT[i][5]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.totalIntensity - GEOMAGNETIC_COMPONENT_YEAR_RESULT[i][6]) < CommonConstants.EPS).assertTrue() }).catch((error) => { console.info("promise::catch", error); }) @@ -2039,13 +2034,13 @@ describe("SensorJsTest", function () { await sensor.getGeomagneticInfo({'latitude':80, 'longitude':0, 'altitude':0}, timeMillis[i], "abc").then((data) => { console.info('Sensor_GetGeomagneticField_060 x: ' + data.x + ',y: ' + data.y + ',z: ' + data.z + ',geomagneticDip: ' + data.geomagneticDip + ',deflectionAngle: ' + data.deflectionAngle + ',levelIntensity: ' + data.levelIntensity + ',totalIntensity: ' + data.totalIntensity); - expect(Math.abs(data.x - GEOMAGNETIC_COMPONENT_YEAR_RESULT[i][0]) < EPS).assertTrue() - expect(Math.abs(data.y - GEOMAGNETIC_COMPONENT_YEAR_RESULT[i][1]) < EPS).assertTrue() - expect(Math.abs(data.z - GEOMAGNETIC_COMPONENT_YEAR_RESULT[i][2]) < EPS).assertTrue() - expect(Math.abs(data.deflectionAngle - GEOMAGNETIC_COMPONENT_YEAR_RESULT[i][3]) < EPS).assertTrue() - expect(Math.abs(data.geomagneticDip - GEOMAGNETIC_COMPONENT_YEAR_RESULT[i][4]) < EPS).assertTrue() - expect(Math.abs(data.levelIntensity - GEOMAGNETIC_COMPONENT_YEAR_RESULT[i][5]) < EPS).assertTrue() - expect(Math.abs(data.totalIntensity - GEOMAGNETIC_COMPONENT_YEAR_RESULT[i][6]) < EPS).assertTrue() + expect(Math.abs(data.x - GEOMAGNETIC_COMPONENT_YEAR_RESULT[i][0]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.y - GEOMAGNETIC_COMPONENT_YEAR_RESULT[i][1]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.z - GEOMAGNETIC_COMPONENT_YEAR_RESULT[i][2]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.deflectionAngle - GEOMAGNETIC_COMPONENT_YEAR_RESULT[i][3]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.geomagneticDip - GEOMAGNETIC_COMPONENT_YEAR_RESULT[i][4]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.levelIntensity - GEOMAGNETIC_COMPONENT_YEAR_RESULT[i][5]) < CommonConstants.EPS).assertTrue() + expect(Math.abs(data.totalIntensity - GEOMAGNETIC_COMPONENT_YEAR_RESULT[i][6]) < CommonConstants.EPS).assertTrue() }).catch((error) => { console.info("promise::catch", error); }) @@ -2196,11 +2191,11 @@ describe("SensorJsTest", function () { console.info("Sensor_CreateRotationMatrix_004" + JSON.stringify(data)) expect(data.rotation.length).assertEqual(SENSOR_DATA_MATRIX[1].rotation.length) for (let i = 0; i < data.rotation.length; ++i) { - expect(Math.abs(data.rotation[i] - SENSOR_DATA_MATRIX[1].rotation[i]) < EPS).assertTrue() + expect(Math.abs(data.rotation[i] - SENSOR_DATA_MATRIX[1].rotation[i]) < CommonConstants.EPS).assertTrue() } expect(data.inclination.length).assertEqual(SENSOR_DATA_MATRIX[1].inclination.length) for (let i = 0; i < data.inclination.length; ++i) { - expect(Math.abs(data.inclination[i] - SENSOR_DATA_MATRIX[1].inclination[i]) < EPS).assertTrue() + expect(Math.abs(data.inclination[i] - SENSOR_DATA_MATRIX[1].inclination[i]) < CommonConstants.EPS).assertTrue() } done() }, (error) => { @@ -2242,8 +2237,8 @@ describe("SensorJsTest", function () { try { sensor.getRotationMatrix() } catch (err) { - expect(err.code).assertEqual(PARAMETER_ERROR_CODE) - expect(err.message).assertEqual(PARAMETER_ERROR_MSG) + expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE) + expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG) done() } }) @@ -2261,8 +2256,8 @@ describe("SensorJsTest", function () { try { sensor.getRotationMatrix(-1) } catch (err) { - expect(err.code).assertEqual(PARAMETER_ERROR_CODE) - expect(err.message).assertEqual(PARAMETER_ERROR_MSG) + expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE) + expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG) done() } }) @@ -2308,8 +2303,8 @@ describe("SensorJsTest", function () { done() }) } catch (err) { - expect(err.code).assertEqual(PARAMETER_ERROR_CODE) - expect(err.message).assertEqual(PARAMETER_ERROR_MSG) + expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE) + expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG) done() } }) @@ -2333,8 +2328,8 @@ describe("SensorJsTest", function () { done() }) } catch (err) { - expect(err.code).assertEqual(PARAMETER_ERROR_CODE) - expect(err.message).assertEqual(PARAMETER_ERROR_MSG) + expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE) + expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG) done() } }) @@ -2621,8 +2616,8 @@ describe("SensorJsTest", function () { done() }) } catch (err) { - expect(err.code).assertEqual(PARAMETER_ERROR_CODE) - expect(err.message).assertEqual(PARAMETER_ERROR_MSG) + expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE) + expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG) done() } }) @@ -2640,8 +2635,8 @@ describe("SensorJsTest", function () { try { sensor.getOrientation() } catch (err) { - expect(err.code).assertEqual(PARAMETER_ERROR_CODE) - expect(err.message).assertEqual(PARAMETER_ERROR_MSG) + expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE) + expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG) done() } }) @@ -2659,8 +2654,8 @@ describe("SensorJsTest", function () { try { sensor.getOrientation(-1) } catch (err) { - expect(err.code).assertEqual(PARAMETER_ERROR_CODE) - expect(err.message).assertEqual(PARAMETER_ERROR_MSG) + expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE) + expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG) done() } }) @@ -2706,8 +2701,8 @@ describe("SensorJsTest", function () { done() }) } catch (err) { - expect(err.code).assertEqual(PARAMETER_ERROR_CODE) - expect(err.message).assertEqual(PARAMETER_ERROR_MSG) + expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE) + expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG) done() } }) @@ -2731,8 +2726,8 @@ describe("SensorJsTest", function () { done() }) } catch (err) { - expect(err.code).assertEqual(PARAMETER_ERROR_CODE) - expect(err.message).assertEqual(PARAMETER_ERROR_MSG) + expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE) + expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG) done() } }) @@ -3065,8 +3060,8 @@ describe("SensorJsTest", function () { }); done() } catch(err) { - expect(err.code).assertEqual(PARAMETER_ERROR_CODE) - expect(err.message).assertEqual(PARAMETER_ERROR_MSG) + expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE) + expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG) done() } }) @@ -3088,8 +3083,8 @@ describe("SensorJsTest", function () { }); done() } catch(err) { - expect(err.code).assertEqual(PARAMETER_ERROR_CODE) - expect(err.message).assertEqual(PARAMETER_ERROR_MSG) + expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE) + expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG) done() } }) @@ -3111,8 +3106,8 @@ describe("SensorJsTest", function () { }); done() } catch(err) { - expect(err.code).assertEqual(PARAMETER_ERROR_CODE) - expect(err.message).assertEqual(PARAMETER_ERROR_MSG) + expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE) + expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG) done() } }) @@ -3134,8 +3129,8 @@ describe("SensorJsTest", function () { }, 500) }); } catch(err) { - expect(err.code).assertEqual(PARAMETER_ERROR_CODE) - expect(err.message).assertEqual(PARAMETER_ERROR_MSG) + expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE) + expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG) done() } }) @@ -3157,8 +3152,8 @@ describe("SensorJsTest", function () { }, 500) }); } catch(err) { - expect(err.code).assertEqual(PARAMETER_ERROR_CODE) - expect(err.message).assertEqual(PARAMETER_ERROR_MSG) + expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE) + expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG) done() } }) @@ -3180,8 +3175,8 @@ describe("SensorJsTest", function () { }, 500) }); } catch(err) { - expect(err.code).assertEqual(PARAMETER_ERROR_CODE) - expect(err.message).assertEqual(PARAMETER_ERROR_MSG) + expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE) + expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG) done() } }) @@ -3374,8 +3369,8 @@ describe("SensorJsTest", function () { done() }) } catch (err) { - expect(err.code).assertEqual(PARAMETER_ERROR_CODE) - expect(err.message).assertEqual(PARAMETER_ERROR_MSG) + expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE) + expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG) done() } console.info("Sensor_CreateQuaternion_005 end") @@ -3425,8 +3420,8 @@ describe("SensorJsTest", function () { done() }) } catch (err) { - expect(err.code).assertEqual(PARAMETER_ERROR_CODE) - expect(err.message).assertEqual(PARAMETER_ERROR_MSG) + expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE) + expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG) done() } console.info("Sensor_CreateQuaternion_007 end") @@ -3499,8 +3494,8 @@ describe("SensorJsTest", function () { done() }) } catch (err) { - expect(err.code).assertEqual(PARAMETER_ERROR_CODE) - expect(err.message).assertEqual(PARAMETER_ERROR_MSG) + expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE) + expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG) done() } }) @@ -3518,8 +3513,8 @@ describe("SensorJsTest", function () { try { sensor.getQuaternion() } catch (err) { - expect(err.code).assertEqual(PARAMETER_ERROR_CODE) - expect(err.message).assertEqual(PARAMETER_ERROR_MSG) + expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE) + expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG) done() } }) @@ -3537,8 +3532,8 @@ describe("SensorJsTest", function () { try { sensor.getQuaternion(-1) } catch (err) { - expect(err.code).assertEqual(PARAMETER_ERROR_CODE) - expect(err.message).assertEqual(PARAMETER_ERROR_MSG) + expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE) + expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG) done() } }) @@ -3585,8 +3580,8 @@ describe("SensorJsTest", function () { done() }) } catch (err) { - expect(err.code).assertEqual(PARAMETER_ERROR_CODE) - expect(err.message).assertEqual(PARAMETER_ERROR_MSG) + expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE) + expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG) done() } }) @@ -3610,8 +3605,8 @@ describe("SensorJsTest", function () { done() }) } catch (err) { - expect(err.code).assertEqual(PARAMETER_ERROR_CODE) - expect(err.message).assertEqual(PARAMETER_ERROR_MSG) + expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE) + expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG) done() } }) @@ -3706,8 +3701,8 @@ describe("SensorJsTest", function () { done() }) } catch (err) { - expect(err.code).assertEqual(PARAMETER_ERROR_CODE) - expect(err.message).assertEqual(PARAMETER_ERROR_MSG) + expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE) + expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG) done() } console.info("Sensor_GetGeomagneticDip_002 end") @@ -3726,8 +3721,8 @@ describe("SensorJsTest", function () { sensor.getInclination() } catch(error) { console.info(error); - expect(error.code).assertEqual(PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } console.info("Sensor_GetGeomagneticDip_003 end") @@ -3756,8 +3751,8 @@ describe("SensorJsTest", function () { }) } catch(error) { console.info(error); - expect(error.code).assertEqual(PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } console.info("Sensor_GetGeomagneticDip_004 end") @@ -3783,8 +3778,8 @@ describe("SensorJsTest", function () { }) } catch(error) { console.info(error); - expect(error.code).assertEqual(PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } console.info("Sensor_GetGeomagneticDip_005 end") @@ -3810,8 +3805,8 @@ describe("SensorJsTest", function () { }) } catch(error) { console.info(error); - expect(error.code).assertEqual(PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } console.info("Sensor_GetGeomagneticDip_006 end") @@ -3988,8 +3983,8 @@ describe("SensorJsTest", function () { sensor.getDeviceAltitude() } catch(error) { console.info(error); - expect(error.code).assertEqual(PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } console.info("Sensor_GetAltitude_005 end") @@ -4018,8 +4013,8 @@ describe("SensorJsTest", function () { }) } catch(error) { console.info(error); - expect(error.code).assertEqual(PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } console.info("Sensor_GetAltitude_006 end") @@ -4045,8 +4040,8 @@ describe("SensorJsTest", function () { }) } catch(error) { console.info(error); - expect(error.code).assertEqual(PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } console.info("Sensor_GetAltitude_007 end") @@ -4072,8 +4067,8 @@ describe("SensorJsTest", function () { }) } catch(error) { console.info(error); - expect(error.code).assertEqual(PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } console.info("Sensor_GetAltitude_008 end") @@ -4242,8 +4237,8 @@ describe("SensorJsTest", function () { sensor.transformRotationMatrix() } catch(error) { console.info(error); - expect(error.code).assertEqual(PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } console.info("Sensor_TransformCoordinateSystem_005 end") @@ -4271,8 +4266,8 @@ describe("SensorJsTest", function () { }) } catch(error) { console.info(error); - expect(error.code).assertEqual(PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } console.info("Sensor_TransformCoordinateSystem_006 end") @@ -4298,8 +4293,8 @@ describe("SensorJsTest", function () { }) } catch(error) { console.info(error); - expect(error.code).assertEqual(PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } console.info("Sensor_TransformCoordinateSystem_007 end") @@ -4325,8 +4320,8 @@ describe("SensorJsTest", function () { }) } catch(error) { console.info(error); - expect(error.code).assertEqual(PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } console.info("Sensor_TransformCoordinateSystem_008 end") @@ -4352,8 +4347,8 @@ describe("SensorJsTest", function () { }) } catch(error) { console.info(error); - expect(error.code).assertEqual(PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } console.info("Sensor_TransformCoordinateSystem_009 end") @@ -4381,8 +4376,8 @@ describe("SensorJsTest", function () { }) } catch(error) { console.info(error); - expect(error.code).assertEqual(PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } console.info("Sensor_TransformCoordinateSystem_010 end") @@ -4615,8 +4610,8 @@ describe("SensorJsTest", function () { }); } catch(error) { console.info(error); - expect(error.code).assertEqual(PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } }) @@ -4662,8 +4657,8 @@ describe("SensorJsTest", function () { }); } catch(error) { console.info(error); - expect(error.code).assertEqual(PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); + expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); done(); } }) diff --git a/test/unittest/interfaces/js/sensor/common/CommonConstants.js b/test/unittest/interfaces/js/sensor/common/CommonConstants.js new file mode 100755 index 00000000..bc05051c --- /dev/null +++ b/test/unittest/interfaces/js/sensor/common/CommonConstants.js @@ -0,0 +1,72 @@ +/* + * 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. + */ + +/** + * Common constants for test + */ +export default class CommonConstants { + /** + * Error message of parameter + */ + static PARAMETER_ERROR_MSG = 'The parameter invalid.'; + + /** + * Excption message of service + */ + static SERVICE_EXCEPTION_MSG = 'Service exception.'; + + /** + * Error code of parameter + */ + static PARAMETER_ERROR_CODE = 401; + + /** + * Exception code of service + */ + static SERVICE_EXCEPTION_CODE = 14500101 + + /** + * eps + */ + static EPS = 0.01; + + /** + * token id + */ + static tokenID = undefined + + /** + * user permission + */ + static permissionNameUser = 'ohos.permission.ACTIVITY_MOTION' + + /** + * Error code of permission denied + */ + static PERMISSION_DENIED_CODE = 201 + + /** + * Error message of permission denied + */ + static PERMISSION_DENIED_MSG = 'Permission denied.' + /** + * Flag of permission + */ + static PermissionFlag = { + PERMISSION_USER_SET:1, + PERMISSION_USER_FIXED:2, + PERMISSION_SYSTEM_FIXED:4 + } +} \ No newline at end of file diff --git a/test/unittest/interfaces/js/sensor/config.json b/test/unittest/interfaces/js/sensor/config.json index 6c42f27e..ed467a75 100644 --- a/test/unittest/interfaces/js/sensor/config.json +++ b/test/unittest/interfaces/js/sensor/config.json @@ -23,6 +23,34 @@ ], "when": "inuse" } + }, + { + "name": "ohos.permission.ACTIVITY_MOTION", + "reason": "need user ohos.permission.ACTIVITY_MOTION", + "usedScene": { + "ability": [ + ".MainAbility" + ], + "when": "inuse" + } + }, + { + "name": "ohos.permission.GYROSCOPE", + "reason": "", + "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", diff --git a/test/unittest/interfaces/js/sensor_frequency/BUILD.gn b/test/unittest/interfaces/js/sensor_frequency/BUILD.gn deleted file mode 100644 index 5df3235f..00000000 --- a/test/unittest/interfaces/js/sensor_frequency/BUILD.gn +++ /dev/null @@ -1,21 +0,0 @@ -# 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/js" -ohos_js_unittest("SensorFrequencyJsTest") { - module_out_path = module_output_path - hap_profile = "./config.json" - certificate_profile = "../signature/openharmony_core.p7b" -} diff --git a/test/unittest/interfaces/js/sensor_frequency/config.json b/test/unittest/interfaces/js/sensor_frequency/config.json deleted file mode 100644 index a3f87348..00000000 --- a/test/unittest/interfaces/js/sensor_frequency/config.json +++ /dev/null @@ -1,85 +0,0 @@ -{ - "app": { - "bundleName": "com.example.myapplication", - "vendor": "example", - "version": { - "code": 1, - "name": "1.0" - }, - "apiVersion": { - "compatible": 4, - "target": 5 - } - }, - "deviceConfig": {}, - "module": { - "reqPermissions": [ - { - "name": "ohos.permission.ACCELEROMETER", - "reason": "need user ohos.permission.ACCELEROMETER", - "usedScene": { - "ability": [ - ".MainAbility" - ], - "when": "inuse" - } - }, - { - "name": "ohos.permission.GYROSCOPE", - "reason": "need user ohos.permission.GYROSCOPE", - "usedScene": { - "ability": [ - ".MainAbility" - ], - "when": "inuse" - } - } - ], - "package": "com.example.myapplication", - "name": ".myapplication", - "deviceType": [ - "default", - "tablet", - "2in1" - ], - "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/test/unittest/interfaces/js/signature/openharmony_sx.p7b b/test/unittest/interfaces/js/signature/openharmony_sx.p7b deleted file mode 100755 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 -- Gitee