diff --git a/frameworks/js/napi/include/sensor_napi_error.h b/frameworks/js/napi/include/sensor_napi_error.h index 6b2e5b9f8e8244ce7a04ec271a8325ee2574f618..7a8bbb26595973831ac2c7baf3a00b36d7d0331a 100755 --- a/frameworks/js/napi/include/sensor_napi_error.h +++ b/frameworks/js/napi/include/sensor_napi_error.h @@ -28,7 +28,7 @@ const std::map ERROR_MESSAGES = { {SERVICE_EXCEPTION, "Service exception."}, {PERMISSION_DENIED, "Permission denied."}, {PARAMETER_ERROR, "The parameter invalid."}, - {SENSOR_NO_SUPPORT, "The Sensor is not supported by the device."}, + {SENSOR_NO_SUPPORT, "The sensor is not supported by the device."}, {NON_SYSTEM_API, "Non-system api."}, }; diff --git a/frameworks/js/napi/src/sensor_js.cpp b/frameworks/js/napi/src/sensor_js.cpp index a5517f8c76fb01bdad4fcebc607386db6257ed65..9d01a5b2ba705631ea8f54b5b444b3318b88236f 100644 --- a/frameworks/js/napi/src/sensor_js.cpp +++ b/frameworks/js/napi/src/sensor_js.cpp @@ -1069,7 +1069,7 @@ static napi_value GetSingleSensor(napi_env env, napi_callback_info info) } } if (asyncCallbackInfo->sensorInfos.empty()) { - ThrowErr(env, PARAMETER_ERROR, "Can't find the sensorId"); + ThrowErr(env, SENSOR_NO_SUPPORT, "The sensor is not supported by the device"); return nullptr; } } @@ -1116,7 +1116,7 @@ static napi_value GetSingleSensorSync(napi_env env, napi_callback_info info) } } if (sensorInfoVec.empty()) { - ThrowErr(env, SENSOR_NO_SUPPORT, "Can't find the sensorId"); + ThrowErr(env, SENSOR_NO_SUPPORT, "The sensor is not supported by the device"); return result; } if (!ConvertToSensorInfo(env, sensorInfoVec[0], result)) { diff --git a/test/unittest/interfaces/js/sensor/BarometerJsunit.test.js b/test/unittest/interfaces/js/sensor/BarometerJsunit.test.js index 647369c84e2464dbf7a07d02fe91eeab88b764ad..73d088c89143c64c7e9d8d0332039f84222e8314 100755 --- a/test/unittest/interfaces/js/sensor/BarometerJsunit.test.js +++ b/test/unittest/interfaces/js/sensor/BarometerJsunit.test.js @@ -89,8 +89,8 @@ describe("BarometerJsTest", function () { }); } catch (error) { console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.SENSOR_NO_SUPPORT_CODE); + expect(error.message).assertEqual(CommonConstants.SENSOR_NO_SUPPOR_MSG); done(); } }) @@ -128,8 +128,8 @@ describe("BarometerJsTest", function () { }); } catch (error) { console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.SENSOR_NO_SUPPORT_CODE); + expect(error.message).assertEqual(CommonConstants.SENSOR_NO_SUPPOR_MSG); done(); } }) @@ -172,8 +172,8 @@ describe("BarometerJsTest", function () { }); } catch (error) { console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.SENSOR_NO_SUPPORT_CODE); + expect(error.message).assertEqual(CommonConstants.SENSOR_NO_SUPPOR_MSG); done(); } }) @@ -210,8 +210,8 @@ describe("BarometerJsTest", function () { }); } catch (error) { console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.SENSOR_NO_SUPPORT_CODE); + expect(error.message).assertEqual(CommonConstants.SENSOR_NO_SUPPOR_MSG); done(); } }) @@ -249,8 +249,8 @@ describe("BarometerJsTest", function () { }); } catch (error) { console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.SENSOR_NO_SUPPORT_CODE); + expect(error.message).assertEqual(CommonConstants.SENSOR_NO_SUPPOR_MSG); done(); } }) @@ -288,8 +288,8 @@ describe("BarometerJsTest", function () { }); } catch (error) { console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.SENSOR_NO_SUPPORT_CODE); + expect(error.message).assertEqual(CommonConstants.SENSOR_NO_SUPPOR_MSG); done(); } }) @@ -324,8 +324,8 @@ describe("BarometerJsTest", function () { }); } catch (error) { console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.SENSOR_NO_SUPPORT_CODE); + expect(error.message).assertEqual(CommonConstants.SENSOR_NO_SUPPOR_MSG); done(); } }) @@ -359,8 +359,8 @@ describe("BarometerJsTest", function () { }); } catch (error) { console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.SENSOR_NO_SUPPORT_CODE); + expect(error.message).assertEqual(CommonConstants.SENSOR_NO_SUPPOR_MSG); done(); } }) @@ -399,8 +399,8 @@ describe("BarometerJsTest", function () { }); } catch (error) { console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.SENSOR_NO_SUPPORT_CODE); + expect(error.message).assertEqual(CommonConstants.SENSOR_NO_SUPPOR_MSG); done(); } }) @@ -442,8 +442,8 @@ describe("BarometerJsTest", function () { }); } catch (error) { console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.SENSOR_NO_SUPPORT_CODE); + expect(error.message).assertEqual(CommonConstants.SENSOR_NO_SUPPOR_MSG); done(); } }) @@ -482,8 +482,8 @@ describe("BarometerJsTest", function () { }); } catch (error) { console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.SENSOR_NO_SUPPORT_CODE); + expect(error.message).assertEqual(CommonConstants.SENSOR_NO_SUPPOR_MSG); done(); } }) @@ -525,8 +525,8 @@ describe("BarometerJsTest", function () { }); } catch (error) { console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.SENSOR_NO_SUPPORT_CODE); + expect(error.message).assertEqual(CommonConstants.SENSOR_NO_SUPPOR_MSG); done(); } }) @@ -565,8 +565,8 @@ describe("BarometerJsTest", function () { }); } catch (error) { console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.SENSOR_NO_SUPPORT_CODE); + expect(error.message).assertEqual(CommonConstants.SENSOR_NO_SUPPOR_MSG); done(); } }) diff --git a/test/unittest/interfaces/js/sensor/ColorJsunit.test.js b/test/unittest/interfaces/js/sensor/ColorJsunit.test.js index 81d4c1941e5dd6b4bfe727d7592eb36cc9a866e7..34f4fc8a747e40ece17a81cc486baafffdb363cf 100644 --- a/test/unittest/interfaces/js/sensor/ColorJsunit.test.js +++ b/test/unittest/interfaces/js/sensor/ColorJsunit.test.js @@ -91,8 +91,8 @@ describe("ColorJsTest", function () { }); } catch (error) { console.info('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.SENSOR_NO_SUPPORT_CODE); + expect(error.message).assertEqual(CommonConstants.SENSOR_NO_SUPPOR_MSG); done(); } }) @@ -130,8 +130,8 @@ describe("ColorJsTest", function () { }); } catch (error) { console.info('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.SENSOR_NO_SUPPORT_CODE); + expect(error.message).assertEqual(CommonConstants.SENSOR_NO_SUPPOR_MSG); done(); } }) @@ -174,8 +174,8 @@ describe("ColorJsTest", function () { }); } catch (error) { console.info('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.SENSOR_NO_SUPPORT_CODE); + expect(error.message).assertEqual(CommonConstants.SENSOR_NO_SUPPOR_MSG); done(); } }) @@ -212,8 +212,8 @@ describe("ColorJsTest", function () { }); } catch (error) { console.info('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.SENSOR_NO_SUPPORT_CODE); + expect(error.message).assertEqual(CommonConstants.SENSOR_NO_SUPPOR_MSG); done(); } }) @@ -247,8 +247,8 @@ describe("ColorJsTest", function () { }); } catch (error) { console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.SENSOR_NO_SUPPORT_CODE); + expect(error.message).assertEqual(CommonConstants.SENSOR_NO_SUPPOR_MSG); done(); } }) @@ -287,8 +287,8 @@ describe("ColorJsTest", function () { }); } catch (error) { console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.SENSOR_NO_SUPPORT_CODE); + expect(error.message).assertEqual(CommonConstants.SENSOR_NO_SUPPOR_MSG); done(); } }) @@ -330,8 +330,8 @@ describe("ColorJsTest", function () { }); } catch (error) { console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.SENSOR_NO_SUPPORT_CODE); + expect(error.message).assertEqual(CommonConstants.SENSOR_NO_SUPPOR_MSG); done(); } }) @@ -373,8 +373,8 @@ describe("ColorJsTest", function () { }); } catch (error) { console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.SENSOR_NO_SUPPORT_CODE); + expect(error.message).assertEqual(CommonConstants.SENSOR_NO_SUPPOR_MSG); done(); } }) @@ -413,8 +413,8 @@ describe("ColorJsTest", function () { }); } catch (error) { console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.SENSOR_NO_SUPPORT_CODE); + expect(error.message).assertEqual(CommonConstants.SENSOR_NO_SUPPOR_MSG); done(); } }) diff --git a/test/unittest/interfaces/js/sensor/GyroscopeJsunit.test.js b/test/unittest/interfaces/js/sensor/GyroscopeJsunit.test.js index 95800b4c17238caa1d6976ba3b4a54540c486e02..b496df47b4d26eee33e428ba2f06ef7555b21df4 100755 --- a/test/unittest/interfaces/js/sensor/GyroscopeJsunit.test.js +++ b/test/unittest/interfaces/js/sensor/GyroscopeJsunit.test.js @@ -93,8 +93,8 @@ describe("GyroscopeJsTest", function () { }); } catch (error) { console.info('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.SENSOR_NO_SUPPORT_CODE); + expect(error.message).assertEqual(CommonConstants.SENSOR_NO_SUPPOR_MSG); done(); } }) @@ -132,8 +132,8 @@ describe("GyroscopeJsTest", function () { }); } catch (error) { console.info('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.SENSOR_NO_SUPPORT_CODE); + expect(error.message).assertEqual(CommonConstants.SENSOR_NO_SUPPOR_MSG); done(); } }) @@ -176,8 +176,8 @@ describe("GyroscopeJsTest", function () { }); } catch (error) { console.info('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.SENSOR_NO_SUPPORT_CODE); + expect(error.message).assertEqual(CommonConstants.SENSOR_NO_SUPPOR_MSG); done(); } }) @@ -214,8 +214,8 @@ describe("GyroscopeJsTest", function () { }); } catch (error) { console.info('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.SENSOR_NO_SUPPORT_CODE); + expect(error.message).assertEqual(CommonConstants.SENSOR_NO_SUPPOR_MSG); done(); } }) @@ -253,8 +253,8 @@ describe("GyroscopeJsTest", function () { }); } catch (error) { console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.SENSOR_NO_SUPPORT_CODE); + expect(error.message).assertEqual(CommonConstants.SENSOR_NO_SUPPOR_MSG); done(); } }) @@ -292,8 +292,8 @@ describe("GyroscopeJsTest", function () { }); } catch (error) { console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.SENSOR_NO_SUPPORT_CODE); + expect(error.message).assertEqual(CommonConstants.SENSOR_NO_SUPPOR_MSG); done(); } }) @@ -328,8 +328,8 @@ describe("GyroscopeJsTest", function () { }); } catch (error) { console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.SENSOR_NO_SUPPORT_CODE); + expect(error.message).assertEqual(CommonConstants.SENSOR_NO_SUPPOR_MSG); done(); } }) @@ -363,8 +363,8 @@ describe("GyroscopeJsTest", function () { }); } catch (error) { console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.SENSOR_NO_SUPPORT_CODE); + expect(error.message).assertEqual(CommonConstants.SENSOR_NO_SUPPOR_MSG); done(); } }) @@ -403,8 +403,8 @@ describe("GyroscopeJsTest", function () { }); } catch (error) { console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.SENSOR_NO_SUPPORT_CODE); + expect(error.message).assertEqual(CommonConstants.SENSOR_NO_SUPPOR_MSG); done(); } }) @@ -446,8 +446,8 @@ describe("GyroscopeJsTest", function () { }); } catch (error) { console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.SENSOR_NO_SUPPORT_CODE); + expect(error.message).assertEqual(CommonConstants.SENSOR_NO_SUPPOR_MSG); done(); } }) @@ -486,8 +486,8 @@ describe("GyroscopeJsTest", function () { }); } catch (error) { console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.SENSOR_NO_SUPPORT_CODE); + expect(error.message).assertEqual(CommonConstants.SENSOR_NO_SUPPOR_MSG); done(); } }) @@ -529,8 +529,8 @@ describe("GyroscopeJsTest", function () { }); } catch (error) { console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.SENSOR_NO_SUPPORT_CODE); + expect(error.message).assertEqual(CommonConstants.SENSOR_NO_SUPPOR_MSG); done(); } }) @@ -569,8 +569,8 @@ describe("GyroscopeJsTest", function () { }); } catch (error) { console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.SENSOR_NO_SUPPORT_CODE); + expect(error.message).assertEqual(CommonConstants.SENSOR_NO_SUPPOR_MSG); done(); } }) diff --git a/test/unittest/interfaces/js/sensor/PedometerDetectionJsunit.test.js b/test/unittest/interfaces/js/sensor/PedometerDetectionJsunit.test.js index 7cc61498c7707ba30a96ea2f4ae84364a11aeff2..0422b97ee3d03aeb57a18a7b828f0ba8345ed7ef 100755 --- a/test/unittest/interfaces/js/sensor/PedometerDetectionJsunit.test.js +++ b/test/unittest/interfaces/js/sensor/PedometerDetectionJsunit.test.js @@ -113,8 +113,8 @@ describe("PedometerDetectionJsTest", function () { }); } catch (err) { console.error('Sensor is not support'); - expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); - expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); + expect(err.code).assertEqual(CommonConstants.SENSOR_NO_SUPPORT_CODE); + expect(err.message).assertEqual(CommonConstants.SENSOR_NO_SUPPOR_MSG); done(); } }) @@ -158,8 +158,8 @@ describe("PedometerDetectionJsTest", function () { }); } catch (err) { console.error('Sensor is not support'); - expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); - expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); + expect(err.code).assertEqual(CommonConstants.SENSOR_NO_SUPPORT_CODE); + expect(err.message).assertEqual(CommonConstants.SENSOR_NO_SUPPOR_MSG); done(); } }) @@ -206,8 +206,8 @@ describe("PedometerDetectionJsTest", function () { }); } catch (err) { console.error('Sensor is not support'); - expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); - expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); + expect(err.code).assertEqual(CommonConstants.SENSOR_NO_SUPPORT_CODE); + expect(err.message).assertEqual(CommonConstants.SENSOR_NO_SUPPOR_MSG); done(); } }) @@ -254,8 +254,8 @@ describe("PedometerDetectionJsTest", function () { }); } catch (err) { console.error('Sensor is not support'); - expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); - expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); + expect(err.code).assertEqual(CommonConstants.SENSOR_NO_SUPPORT_CODE); + expect(err.message).assertEqual(CommonConstants.SENSOR_NO_SUPPOR_MSG); done(); } }) @@ -299,8 +299,8 @@ describe("PedometerDetectionJsTest", function () { }); } catch (err) { console.error('Sensor is not support'); - expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); - expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); + expect(err.code).assertEqual(CommonConstants.SENSOR_NO_SUPPORT_CODE); + expect(err.message).assertEqual(CommonConstants.SENSOR_NO_SUPPOR_MSG); done(); } }) @@ -343,8 +343,8 @@ describe("PedometerDetectionJsTest", function () { }); } catch (err) { console.error('Sensor is not support'); - expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); - expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); + expect(err.code).assertEqual(CommonConstants.SENSOR_NO_SUPPORT_CODE); + expect(err.message).assertEqual(CommonConstants.SENSOR_NO_SUPPOR_MSG); done(); } }) @@ -392,8 +392,8 @@ describe("PedometerDetectionJsTest", function () { }); } catch (err) { console.error('Sensor is not support'); - expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); - expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); + expect(err.code).assertEqual(CommonConstants.SENSOR_NO_SUPPORT_CODE); + expect(err.message).assertEqual(CommonConstants.SENSOR_NO_SUPPOR_MSG); done(); } }) @@ -444,8 +444,8 @@ describe("PedometerDetectionJsTest", function () { }); } catch (err) { console.error('Sensor is not support'); - expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); - expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); + expect(err.code).assertEqual(CommonConstants.SENSOR_NO_SUPPORT_CODE); + expect(err.message).assertEqual(CommonConstants.SENSOR_NO_SUPPOR_MSG); done(); } }) @@ -493,8 +493,8 @@ describe("PedometerDetectionJsTest", function () { }); } catch (err) { console.error('Sensor is not support'); - expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); - expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); + expect(err.code).assertEqual(CommonConstants.SENSOR_NO_SUPPORT_CODE); + expect(err.message).assertEqual(CommonConstants.SENSOR_NO_SUPPOR_MSG); done(); } }) @@ -534,8 +534,8 @@ describe("PedometerDetectionJsTest", function () { }); } catch (err) { console.error('Sensor is not support'); - expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); - expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); + expect(err.code).assertEqual(CommonConstants.SENSOR_NO_SUPPORT_CODE); + expect(err.message).assertEqual(CommonConstants.SENSOR_NO_SUPPOR_MSG); done(); } }) diff --git a/test/unittest/interfaces/js/sensor/PedometerJsunit.test.js b/test/unittest/interfaces/js/sensor/PedometerJsunit.test.js index cd846ded3744ab27ea4e87fd25dc01ca87dc8aed..ef160095e6c5c824e79f22273ed047d0ea544040 100644 --- a/test/unittest/interfaces/js/sensor/PedometerJsunit.test.js +++ b/test/unittest/interfaces/js/sensor/PedometerJsunit.test.js @@ -113,8 +113,8 @@ describe("PedometerJsTest", function () { }); } catch (err) { console.error('Sensor is not support'); - expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); - expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); + expect(err.code).assertEqual(CommonConstants.SENSOR_NO_SUPPORT_CODE); + expect(err.message).assertEqual(CommonConstants.SENSOR_NO_SUPPOR_MSG); done(); } }) @@ -158,8 +158,8 @@ describe("PedometerJsTest", function () { }); } catch (err) { console.error('Sensor is not support'); - expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); - expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); + expect(err.code).assertEqual(CommonConstants.SENSOR_NO_SUPPORT_CODE); + expect(err.message).assertEqual(CommonConstants.SENSOR_NO_SUPPOR_MSG); done(); } }) @@ -206,8 +206,8 @@ describe("PedometerJsTest", function () { }); } catch (err) { console.error('Sensor is not support'); - expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); - expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); + expect(err.code).assertEqual(CommonConstants.SENSOR_NO_SUPPORT_CODE); + expect(err.message).assertEqual(CommonConstants.SENSOR_NO_SUPPOR_MSG); done(); } }) @@ -254,8 +254,8 @@ describe("PedometerJsTest", function () { }); } catch (err) { console.error('Sensor is not support'); - expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); - expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); + expect(err.code).assertEqual(CommonConstants.SENSOR_NO_SUPPORT_CODE); + expect(err.message).assertEqual(CommonConstants.SENSOR_NO_SUPPOR_MSG); done(); } }) @@ -299,8 +299,8 @@ describe("PedometerJsTest", function () { }); } catch (err) { console.error('Sensor is not support'); - expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); - expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); + expect(err.code).assertEqual(CommonConstants.SENSOR_NO_SUPPORT_CODE); + expect(err.message).assertEqual(CommonConstants.SENSOR_NO_SUPPOR_MSG); done(); } }) @@ -343,8 +343,8 @@ describe("PedometerJsTest", function () { }); } catch (err) { console.error('Sensor is not support'); - expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); - expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); + expect(err.code).assertEqual(CommonConstants.SENSOR_NO_SUPPORT_CODE); + expect(err.message).assertEqual(CommonConstants.SENSOR_NO_SUPPOR_MSG); done(); } }) @@ -392,8 +392,8 @@ describe("PedometerJsTest", function () { }); } catch (err) { console.error('Sensor is not support'); - expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); - expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); + expect(err.code).assertEqual(CommonConstants.SENSOR_NO_SUPPORT_CODE); + expect(err.message).assertEqual(CommonConstants.SENSOR_NO_SUPPOR_MSG); done(); } }) @@ -444,8 +444,8 @@ describe("PedometerJsTest", function () { }); } catch (err) { console.error('Sensor is not support'); - expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); - expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); + expect(err.code).assertEqual(CommonConstants.SENSOR_NO_SUPPORT_CODE); + expect(err.message).assertEqual(CommonConstants.SENSOR_NO_SUPPOR_MSG); done(); } }) @@ -493,8 +493,8 @@ describe("PedometerJsTest", function () { }); } catch (err) { console.error('Sensor is not support'); - expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); - expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); + expect(err.code).assertEqual(CommonConstants.SENSOR_NO_SUPPORT_CODE); + expect(err.message).assertEqual(CommonConstants.SENSOR_NO_SUPPOR_MSG); done(); } }) @@ -534,8 +534,8 @@ describe("PedometerJsTest", function () { }); } catch (err) { console.error('Sensor is not support'); - expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); - expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); + expect(err.code).assertEqual(CommonConstants.SENSOR_NO_SUPPORT_CODE); + expect(err.message).assertEqual(CommonConstants.SENSOR_NO_SUPPOR_MSG); done(); } }) diff --git a/test/unittest/interfaces/js/sensor/SarJsunit.test.js b/test/unittest/interfaces/js/sensor/SarJsunit.test.js index 8f61a07433ca123abc168b869444fbc5cbbe9e8b..1734f44a393fa8e42f5e6f9602179d4003e96401 100644 --- a/test/unittest/interfaces/js/sensor/SarJsunit.test.js +++ b/test/unittest/interfaces/js/sensor/SarJsunit.test.js @@ -90,8 +90,8 @@ describe("SarJsTest", function () { }); } catch (error) { console.info('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.SENSOR_NO_SUPPORT_CODE); + expect(error.message).assertEqual(CommonConstants.SENSOR_NO_SUPPOR_MSG); done(); } }) @@ -129,8 +129,8 @@ describe("SarJsTest", function () { }); } catch (error) { console.info('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.SENSOR_NO_SUPPORT_CODE); + expect(error.message).assertEqual(CommonConstants.SENSOR_NO_SUPPOR_MSG); done(); } }) @@ -173,8 +173,8 @@ describe("SarJsTest", function () { }); } catch (error) { console.info('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.SENSOR_NO_SUPPORT_CODE); + expect(error.message).assertEqual(CommonConstants.SENSOR_NO_SUPPOR_MSG); done(); } }) @@ -211,8 +211,8 @@ describe("SarJsTest", function () { }); } catch (error) { console.info('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.SENSOR_NO_SUPPORT_CODE); + expect(error.message).assertEqual(CommonConstants.SENSOR_NO_SUPPOR_MSG); done(); } }) @@ -246,8 +246,8 @@ describe("SarJsTest", function () { }); } catch (error) { console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.SENSOR_NO_SUPPORT_CODE); + expect(error.message).assertEqual(CommonConstants.SENSOR_NO_SUPPOR_MSG); done(); } }) @@ -286,8 +286,8 @@ describe("SarJsTest", function () { }); } catch (error) { console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.SENSOR_NO_SUPPORT_CODE); + expect(error.message).assertEqual(CommonConstants.SENSOR_NO_SUPPOR_MSG); done(); } }) @@ -329,8 +329,8 @@ describe("SarJsTest", function () { }); } catch (error) { console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.SENSOR_NO_SUPPORT_CODE); + expect(error.message).assertEqual(CommonConstants.SENSOR_NO_SUPPOR_MSG); done(); } }) @@ -372,8 +372,8 @@ describe("SarJsTest", function () { }); } catch (error) { console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.SENSOR_NO_SUPPORT_CODE); + expect(error.message).assertEqual(CommonConstants.SENSOR_NO_SUPPOR_MSG); done(); } }) @@ -412,8 +412,8 @@ describe("SarJsTest", function () { }); } catch (error) { console.error('getSingleSensor fail, errCode:' + error.code + ' ,msg:' + error.message); - expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.SENSOR_NO_SUPPORT_CODE); + expect(error.message).assertEqual(CommonConstants.SENSOR_NO_SUPPOR_MSG); done(); } }) diff --git a/test/unittest/interfaces/js/sensor/SensorFrequencyJsunit.test.js b/test/unittest/interfaces/js/sensor/SensorFrequencyJsunit.test.js index a4058a79e12a064acdedab5b3005fac6ea7bfa97..d930fee391523efaaea88f1d2e3baacc7d94663f 100644 --- a/test/unittest/interfaces/js/sensor/SensorFrequencyJsunit.test.js +++ b/test/unittest/interfaces/js/sensor/SensorFrequencyJsunit.test.js @@ -92,8 +92,8 @@ describe("SensorFrequencyJsTest", function () { }); } catch (err) { console.error('Sensor is not support'); - expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); - expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); + expect(err.code).assertEqual(CommonConstants.SENSOR_NO_SUPPORT_CODE); + expect(err.message).assertEqual(CommonConstants.SENSOR_NO_SUPPOR_MSG); done(); } }) @@ -130,8 +130,8 @@ describe("SensorFrequencyJsTest", function () { }); } catch (err) { console.error('Sensor is not support'); - expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); - expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); + expect(err.code).assertEqual(CommonConstants.SENSOR_NO_SUPPORT_CODE); + expect(err.message).assertEqual(CommonConstants.SENSOR_NO_SUPPOR_MSG); done(); } }) @@ -168,8 +168,8 @@ describe("SensorFrequencyJsTest", function () { }); } catch (err) { console.error('Sensor is not support'); - expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); - expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); + expect(err.code).assertEqual(CommonConstants.SENSOR_NO_SUPPORT_CODE); + expect(err.message).assertEqual(CommonConstants.SENSOR_NO_SUPPOR_MSG); done(); } }) @@ -206,8 +206,8 @@ describe("SensorFrequencyJsTest", function () { }); } catch (err) { console.error('Sensor is not support'); - expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); - expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); + expect(err.code).assertEqual(CommonConstants.SENSOR_NO_SUPPORT_CODE); + expect(err.message).assertEqual(CommonConstants.SENSOR_NO_SUPPOR_MSG); done(); } }) @@ -244,8 +244,8 @@ describe("SensorFrequencyJsTest", function () { }); } catch (err) { console.error('Sensor is not support'); - expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); - expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); + expect(err.code).assertEqual(CommonConstants.SENSOR_NO_SUPPORT_CODE); + expect(err.message).assertEqual(CommonConstants.SENSOR_NO_SUPPOR_MSG); done(); } }) @@ -282,8 +282,8 @@ describe("SensorFrequencyJsTest", function () { }); } catch (err) { console.error('Sensor is not support'); - expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); - expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); + expect(err.code).assertEqual(CommonConstants.SENSOR_NO_SUPPORT_CODE); + expect(err.message).assertEqual(CommonConstants.SENSOR_NO_SUPPOR_MSG); done(); } }) @@ -320,8 +320,8 @@ describe("SensorFrequencyJsTest", function () { }); } catch (err) { console.error('Sensor is not support'); - expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); - expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); + expect(err.code).assertEqual(CommonConstants.SENSOR_NO_SUPPORT_CODE); + expect(err.message).assertEqual(CommonConstants.SENSOR_NO_SUPPOR_MSG); done(); } }) @@ -358,8 +358,8 @@ describe("SensorFrequencyJsTest", function () { }); } catch (err) { console.error('Sensor is not support'); - expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); - expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); + expect(err.code).assertEqual(CommonConstants.SENSOR_NO_SUPPORT_CODE); + expect(err.message).assertEqual(CommonConstants.SENSOR_NO_SUPPOR_MSG); done(); } }) @@ -396,8 +396,8 @@ describe("SensorFrequencyJsTest", function () { }); } catch (err) { console.error('Sensor is not support'); - expect(err.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); - expect(err.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); + expect(err.code).assertEqual(CommonConstants.SENSOR_NO_SUPPORT_CODE); + expect(err.message).assertEqual(CommonConstants.SENSOR_NO_SUPPOR_MSG); done(); } }) diff --git a/test/unittest/interfaces/js/sensor/SensorJsunit.test.js b/test/unittest/interfaces/js/sensor/SensorJsunit.test.js index c355b965a8e0f6cc5737136aaceee9dc1010b759..4f1e03bc004dbc10ce7bc304396819d9482144d8 100644 --- a/test/unittest/interfaces/js/sensor/SensorJsunit.test.js +++ b/test/unittest/interfaces/js/sensor/SensorJsunit.test.js @@ -5116,8 +5116,8 @@ describe("SensorJsTest", function () { }); } catch(error) { console.info(error); - expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.SENSOR_NO_SUPPORT_CODE); + expect(error.message).assertEqual(CommonConstants.SENSOR_NO_SUPPOR_MSG); done(); } }) @@ -5169,8 +5169,8 @@ describe("SensorJsTest", function () { }); } catch(error) { console.info(error); - expect(error.code).assertEqual(CommonConstants.PARAMETER_ERROR_CODE); - expect(error.message).assertEqual(CommonConstants.PARAMETER_ERROR_MSG); + expect(error.code).assertEqual(CommonConstants.SENSOR_NO_SUPPORT_CODE); + expect(error.message).assertEqual(CommonConstants.SENSOR_NO_SUPPOR_MSG); done(); } }) diff --git a/test/unittest/interfaces/js/sensor/common/CommonConstants.js b/test/unittest/interfaces/js/sensor/common/CommonConstants.js index bc05051cdda5bcd6e1ef95ffb70579dccf01d802..f072b91e08f545e2adc15a15a1850eb62f09b59b 100755 --- a/test/unittest/interfaces/js/sensor/common/CommonConstants.js +++ b/test/unittest/interfaces/js/sensor/common/CommonConstants.js @@ -27,6 +27,11 @@ export default class CommonConstants { */ static SERVICE_EXCEPTION_MSG = 'Service exception.'; + /** + * Excption message of sensorId no support + */ + static SENSOR_NO_SUPPOR_MSG = 'The sensor is not supported by the device.'; + /** * Error code of parameter */ @@ -37,6 +42,11 @@ export default class CommonConstants { */ static SERVICE_EXCEPTION_CODE = 14500101 + /** + * Exception code of sensorId no support + */ + static SENSOR_NO_SUPPORT_CODE = 14500102 + /** * eps */