diff --git a/sensors/BUILD.gn b/sensors/BUILD.gn old mode 100644 new mode 100755 index aaa9a54d1746a6d496fab4ce45edee2ace2dc2fd..ad043b1e2ed7f7bc794c5e063d59f5cb92187a85 --- a/sensors/BUILD.gn +++ b/sensors/BUILD.gn @@ -15,7 +15,14 @@ import("//build/ohos_var.gni") group("sensor") { testonly = true - if (device_name == "rk3568") { + if (device_name == "m40") { + if (is_standard_system) { + deps = [ "sensor_standard:sensor_js_test" ] + } + } else if (device_name == "rk3568") { + if (is_standard_system) { + deps = [ "sensor_standard:sensor_js_test" ] + } } else { if (is_standard_system) { deps = [ "sensor_standard:sensor_js_test" ] diff --git a/sensors/miscdevice_standard/BUILD.gn b/sensors/miscdevice_standard/BUILD.gn index 60b99897b8438c1fe01aaa7c3a721f257d785832..bb3a4072d93f9fbd99d64e34f80b550310f35c6b 100755 --- a/sensors/miscdevice_standard/BUILD.gn +++ b/sensors/miscdevice_standard/BUILD.gn @@ -13,19 +13,19 @@ import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("sensor_js_test") { +ohos_js_hap_suite("miscdevice_js_test") { hap_profile = "./src/main/config.json" deps = [ - ":sensor_js_assets", - ":sensor_js_resources", + ":miscdevice_js_assets", + ":miscdevice_js_resources", ] certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "ActsSensorJSApiTest" + hap_name = "ActsmiscdeviceJSApiTest" } -ohos_js_assets("sensor_js_assets") { +ohos_js_assets("miscdevice_js_assets") { source_dir = "./src/main/js/default" } -ohos_resources("sensor_js_resources") { +ohos_resources("miscdevice_js_resources") { sources = [ "./src/main/resources" ] hap_profile = "./src/main/config.json" } diff --git a/sensors/miscdevice_standard/Test.json b/sensors/miscdevice_standard/Test.json index c1ac0ea0a3e6e2560e43ef672ff8a1ac28485a1f..08ab49d444686017fed40652af735610cca0f19d 100755 --- a/sensors/miscdevice_standard/Test.json +++ b/sensors/miscdevice_standard/Test.json @@ -1,5 +1,5 @@ { - "description": "Configuration for sensor js api Tests", + "description": "Configuration for miscdevice js api Tests", "driver": { "type": "JSUnitTest", "test-timeout": "160000", @@ -9,10 +9,10 @@ "kits": [ { "test-file-name": [ - "ActsSensorJSApiTest.hap" + "ActsmiscdeviceJSApiTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true } ] -} +} \ No newline at end of file diff --git a/sensors/miscdevice_standard/src/main/js/default/test/Vibrator.test.js b/sensors/miscdevice_standard/src/main/js/default/test/Vibrator.test.js index a97a8e8c0e852a5d9a9cbed2286c412a704edad8..a15fc2c7f9a8253a3f845586f423da10495c4f3b 100755 --- a/sensors/miscdevice_standard/src/main/js/default/test/Vibrator.test.js +++ b/sensors/miscdevice_standard/src/main/js/default/test/Vibrator.test.js @@ -232,7 +232,7 @@ describe("VibratorJsTest", function () { * @tc.require: Issue Number */ it("VibratorJsTest009", 0, async function (done) { - console.info('----------------------SensorJsTest001---------------------------'); + console.info('----------------------VibratorJsTest001---------------------------'); function stopPromise() { return new Promise((resolve, reject) => { vibrator.stop("time", (error) => { diff --git a/sensors/miscdevice_standard/src/main/resources/base/element/string.json b/sensors/miscdevice_standard/src/main/resources/base/element/string.json index 7ab5369dd846fbc8870f29fc2b3c79496838da4b..ad074eddc620c5cf6d5f37abe9d8370bb160bc89 100755 --- a/sensors/miscdevice_standard/src/main/resources/base/element/string.json +++ b/sensors/miscdevice_standard/src/main/resources/base/element/string.json @@ -2,7 +2,7 @@ "string": [ { "name": "app_name", - "value": "SensorJSApiTest" + "value": "miscdeviceJSApiTest" }, { "name": "mainability_description", diff --git a/sensors/sensor_standard/src/main/js/default/test/SensorOnOffTest.test.js b/sensors/sensor_standard/src/main/js/default/test/SensorOnOffTest.test.js old mode 100644 new mode 100755 index 6013610683cc365ef7ea7cb6b107928131aa6627..ffeaefa220f1a9b0046f53da3470d4fe720a56b9 --- a/sensors/sensor_standard/src/main/js/default/test/SensorOnOffTest.test.js +++ b/sensors/sensor_standard/src/main/js/default/test/SensorOnOffTest.test.js @@ -55,8 +55,12 @@ describe('SystemParameterTest', function () { console.info('SUB_SENSORS_Sensor_JSTest_0010 start'); await sensor.on(0, function (error, data) { if (error) { - console.info('testRegisterSensortest001 on error'); - expect(false).assertTrue(); + if (error.code == -1) { + console.info("testRegisterSensortest001 on error: sensor 0 not exit") + } else { + console.info('testRegisterSensortest001 on error :' + error.code); + expect(false).assertTrue(); + } done(); } else { console.info('testRegisterSensortest001 on success');