From 5cf07cd452c3b9fd44efaf287312de2853496d5a Mon Sep 17 00:00:00 2001
From: lidanyang16 <lidanyang16@huawei.com>
Date: Fri, 26 Aug 2022 17:19:14 +0800
Subject: [PATCH] <lidanyang16@huawei.com>

Signed-off-by: lidanyang16 <lidanyang16@huawei.com>
---
 sensors/BUILD.gn                              | 17 ++++-------
 .../src/main/js/default/test/List.test.js     |  2 +-
 ...brator.test.js => Vibrator_new.test.js.js} | 29 ++++++++++---------
 .../{vibrate.js => Vibrator_old.test.js.js}   |  0
 4 files changed, 21 insertions(+), 27 deletions(-)
 mode change 100755 => 100644 sensors/BUILD.gn
 rename sensors/miscdevice_standard/src/main/js/default/test/{Vibrator.test.js => Vibrator_new.test.js.js} (96%)
 rename sensors/miscdevice_standard/src/main/js/default/test/{vibrate.js => Vibrator_old.test.js.js} (100%)

diff --git a/sensors/BUILD.gn b/sensors/BUILD.gn
old mode 100755
new mode 100644
index ad043b1e2..198c9d65b
--- a/sensors/BUILD.gn
+++ b/sensors/BUILD.gn
@@ -15,17 +15,10 @@ import("//build/ohos_var.gni")
 
 group("sensor") {
   testonly = true
-  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" ]
-    }
+  if (is_standard_system) {
+    deps = [
+      "miscdevice_standard:miscdevice_js_test",
+      "sensor_standard:sensor_js_test",
+    ]
   }
 }
diff --git a/sensors/miscdevice_standard/src/main/js/default/test/List.test.js b/sensors/miscdevice_standard/src/main/js/default/test/List.test.js
index 7986a5a95..51af8de86 100755
--- a/sensors/miscdevice_standard/src/main/js/default/test/List.test.js
+++ b/sensors/miscdevice_standard/src/main/js/default/test/List.test.js
@@ -13,4 +13,4 @@
  * limitations under the License.
  */
 
-require('./Vibrator.test.js')
+require('./Vibrator_new.test.js')
diff --git a/sensors/miscdevice_standard/src/main/js/default/test/Vibrator.test.js b/sensors/miscdevice_standard/src/main/js/default/test/Vibrator_new.test.js.js
similarity index 96%
rename from sensors/miscdevice_standard/src/main/js/default/test/Vibrator.test.js
rename to sensors/miscdevice_standard/src/main/js/default/test/Vibrator_new.test.js.js
index adc70fb07..3dc649a21 100755
--- a/sensors/miscdevice_standard/src/main/js/default/test/Vibrator.test.js
+++ b/sensors/miscdevice_standard/src/main/js/default/test/Vibrator_new.test.js.js
@@ -395,16 +395,16 @@ describe("VibratorJsTest_miscdevice2", function () {
      * @tc.type: FUNC
      * @tc.require: Issue Number
      */
-    it("VibratorJsTest015", 0, async function (done) {
-        vibrator.vibrate("").then(() => {
-            console.log("VibratorJsTest015  vibrate error");
-            expect(false).assertTrue();
+	 it("VibratorJsTest015", 0, async function (done) {
+        vibrator.stop("preset").then(() => {
+            console.log("VibratorJsTest015 off success");
+            expect(true).assertTrue();
             setTimeout(() => {
                 done();
             }, 500);
         }, (error) => {
-            expect(true).assertTrue();
-            console.log("VibratorJsTest015  vibrate success");
+            expect(false).assertTrue();
+            console.log("VibratorJsTest015 off error");
             setTimeout(() => {
                 done();
             }, 500);
@@ -419,14 +419,14 @@ describe("VibratorJsTest_miscdevice2", function () {
      */
     it("VibratorJsTest016", 0, async function (done) {
         vibrator.stop("").then(() => {
-            console.log("VibratorJsTest016  stop error");
+            console.log("VibratorJsTest016 stop error");
             expect(false).assertTrue();
             setTimeout(() => {
                 done();
             }, 500);
         }, (error) => {
             expect(true).assertTrue();
-            console.log("VibratorJsTest016  stop success");
+            console.log("VibratorJsTest016 stop success");
             setTimeout(() => {
                 done();
             }, 500);
@@ -439,21 +439,22 @@ describe("VibratorJsTest_miscdevice2", function () {
      * @tc.type: FUNC
      * @tc.require: Issue Number
      */
-    it("VibratorJsTest017", 0, async function (done) {
-        vibrator.stop("preset").then(() => {
-            console.log("VibratorJsTest017  off success");
-            expect(true).assertTrue();
+        it("VibratorJsTest017", 0, async function (done) {
+        vibrator.vibrate("").then(() => {
+            console.log("VibratorJsTest017 vibrate error");
+            expect(false).assertTrue();
             setTimeout(() => {
                 done();
             }, 500);
         }, (error) => {
-            expect(false).assertTrue();
-            console.log("VibratorJsTest017  off error");
+            expect(true).assertTrue();
+            console.log("VibratorJsTest017 vibrate success");
             setTimeout(() => {
                 done();
             }, 500);
         });
     })
+	
 
     /*
      * @tc.name:VibratorJsTest018
diff --git a/sensors/miscdevice_standard/src/main/js/default/test/vibrate.js b/sensors/miscdevice_standard/src/main/js/default/test/Vibrator_old.test.js.js
similarity index 100%
rename from sensors/miscdevice_standard/src/main/js/default/test/vibrate.js
rename to sensors/miscdevice_standard/src/main/js/default/test/Vibrator_old.test.js.js
-- 
GitLab