!7604 【Openharmony4.0.3.2】【master分支】【sensor子系统】【ToC】【RK3568】【必现】修改

Merge pull request !7604 from ldy/master

sensors/sensor_standard/src/main/js/test/SensorGeneralalgorithm.test.js

@@ -1009,8 +1009,8 @@ describe("SensorJsTest_sensor_1", function () {
     it('SensorJsTest_107', TestType.FUNCTION | Size.MEDIUMTEST | Level.LEVEL3, async function (done) {
         console.info("---------------------------SensorJsTest_107----------------------------------");
         sensor.transformCoordinateSystem([1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5], {
-            'axisX': 1,
-            'axisY': 2
+            'x': 1,
+            'y': 2
         }, (error, data) => {
             if (error) {
                 console.info('SensorJsTest_107 failed');
@@ -1031,7 +1031,7 @@ describe("SensorJsTest_sensor_1", function () {
     it('SensorJsTest_108', TestType.FUNCTION | Size.MEDIUMTEST | Level.LEVEL3, async function (done) {
         console.info("---------------------------SensorJsTest_108----------------------------------");
         sensor.transformCoordinateSystem([3.40282e+38, 3.40282e+38, 3.40282e+38, 3.40282e+38, 3.40282e+38, 3.40282e+38,
-            3.40282e+38, 3.40282e+38, 3.40282e+38], { 'axisX': 1, 'axisY': 2 }, (error, data) => {
+            3.40282e+38, 3.40282e+38, 3.40282e+38], { 'x': 1, 'y': 2 }, (error, data) => {
                 if (error) {
                     console.info('SensorJsTest_108 failed');
                     expect(false).assertTrue();
@@ -1051,8 +1051,8 @@ describe("SensorJsTest_sensor_1", function () {
     it("SensorJsTest_109", TestType.FUNCTION | Size.MEDIUMTEST | Level.LEVEL3, async function (done) {
         console.info("---------------------------SensorJsTest_109----------------------------------");
         sensor.transformCoordinateSystem([1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5], {
-            'axisX': 1,
-            'axisY': 2
+            'x': 1,
+            'y': 2
         }).then((data) => {
             for (let i = 0; i < data.length; i++) {
                 console.info("SensorJsTest_109 data[ " + i + "] = " + data[i]);
@@ -1074,7 +1074,7 @@ describe("SensorJsTest_sensor_1", function () {
     it("SensorJsTest_110", TestType.FUNCTION | Size.MEDIUMTEST | Level.LEVEL3, async function (done) {
         console.info("---------------------------SensorJsTest_110----------------------------------");
         sensor.transformCoordinateSystem([3.40282e+39, 3.40282e+39, 3.40282e+39, 3.40282e+39, 3.40282e+39,
-            3.40282e+39, 3.40282e+39, 3.40282e+39, 3.40282e+39], { 'axisX': 1, 'axisY': 3 }).then((data) => {
+            3.40282e+39, 3.40282e+39, 3.40282e+39, 3.40282e+39], { 'x': 1, 'y': 3 }).then((data) => {
                 for (let i = 0; i < data.length; i++) {
                     console.info("SensorJsTest_110 data[ " + i + "] = " + data[i]);
                     expect(data[i]).assertEqual(transformCoordinateSystemResult[2][i]);

sensors/sensor_standard/src/main/js/test/SensorOnOffTest.test_newSensorGeomagnetic.js

@@ -2916,7 +2916,7 @@ describe("SensorJsTest_sensor_60", function () {
     */
      it('Sensor_TransformCoordinateSystem_001', 0, async function (done) {
         console.info("---------------------------Sensor_TransformCoordinateSystem_001----------------------------------");
-        sensor.transformRotationMatrix([1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5], {'axisX':1, 'axisY':2}, (error, data) => {
+        sensor.transformRotationMatrix([1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5], {'x':1, 'y':2}, (error, data) => {
             if (error) {
                 console.info('Sensor_TransformCoordinateSystem_001 failed');
                 expect(false).assertTrue();
@@ -2936,7 +2936,7 @@ describe("SensorJsTest_sensor_60", function () {
     it('Sensor_TransformCoordinateSystem_002', 0, async function (done) {
         console.info("---------------------------Sensor_TransformCoordinateSystem_002----------------------------------");
         sensor.transformRotationMatrix([3.40282e+38, 3.40282e+38, 3.40282e+38, 3.40282e+38, 
-		3.40282e+38, 3.40282e+38, 3.40282e+38, 3.40282e+38, 3.40282e+38], {'axisX':1, 'axisY':2}, (error, data) => {
+		3.40282e+38, 3.40282e+38, 3.40282e+38, 3.40282e+38, 3.40282e+38], {'x':1, 'y':2}, (error, data) => {
             if (error) {
                 console.info('Sensor_TransformCoordinateSystem_002 failed');
                 expect(false).assertTrue();
@@ -2955,7 +2955,7 @@ describe("SensorJsTest_sensor_60", function () {
     */
     it("Sensor_TransformCoordinateSystem_003", 0, async function (done) {
         console.info("---------------------------Sensor_TransformCoordinateSystem_003----------------------------------");
-        sensor.transformRotationMatrix([1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5], {'axisX':1, 'axisY':2}).then((data) => {
+        sensor.transformRotationMatrix([1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5], {'x':1, 'y':2}).then((data) => {
             for (var i = 0; i < data.length; i++) {
                 console.info("Sensor_TransformCoordinateSystem_003 data[ " + i + "] = " + data[i]);
                 expect(data[i]).assertEqual(transformCoordinateSystemResult[0][i]);
@@ -2976,7 +2976,7 @@ describe("SensorJsTest_sensor_60", function () {
     it("Sensor_TransformCoordinateSystem_004", 0, async function (done) {
         console.info("---------------------------Sensor_TransformCoordinateSystem_004----------------------------------");
         sensor.transformRotationMatrix([3.40282e+39, 3.40282e+39, 3.40282e+39, 3.40282e+39, 3.40282e+39, 
-		3.40282e+39, 3.40282e+39, 3.40282e+39, 3.40282e+39],{'axisX':1, 'axisY':3}).then((data) => {
+		3.40282e+39, 3.40282e+39, 3.40282e+39, 3.40282e+39],{'x':1, 'y':3}).then((data) => {
             for (var i = 0; i < data.length; i++) {
                 console.info("Sensor_TransformCoordinateSystem_004 data[ " + i + "] = " + data[i]);
                 expect(data[i]).assertEqual(transformCoordinateSystemResult[2][i]);
@@ -3093,7 +3093,7 @@ describe("SensorJsTest_sensor_60", function () {
         console.info('Sensor_TransformCoordinateSystem_008 start')
         try {
             sensor.transformRotationMatrix([0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0], 
-			{'axisX':1, 'axisY':1}).then((data)=>{
+			{'x':1, 'y':1}).then((data)=>{
                 console.info("Sensor_TransformCoordinateSystem_009" + data)
                 expect(true).assertfalse()
                 done()
@@ -3119,7 +3119,7 @@ describe("SensorJsTest_sensor_60", function () {
         console.info('Sensor_TransformCoordinateSystem_010 start')
         try {
             sensor.transformRotationMatrix([0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0],
-			{'axisX':1, 'axisY':1}, (error, data) => {
+			{'x':1, 'y':1}, (error, data) => {
                 if (error) {
                     console.info('Sensor_TransformCoordinateSystem_010 failed');
                     expect(false).assertTrue();