未验证 提交 7d47e085 编写于 作者: O openharmony_ci 提交者: Gitee

!4817 【Sensor】【Master】在build.gn中增加子系统与部件配置字段,修改地磁用例,同时适配32位与64位

Merge pull request !4817 from ldy/master
...@@ -21,6 +21,8 @@ ohos_js_hap_suite("miscdevice_js_test") { ...@@ -21,6 +21,8 @@ ohos_js_hap_suite("miscdevice_js_test") {
] ]
certificate_profile = "./signature/openharmony_sx.p7b" certificate_profile = "./signature/openharmony_sx.p7b"
hap_name = "ActsmiscdeviceJSApiTest" hap_name = "ActsmiscdeviceJSApiTest"
subsystem_name = "sensors"
part_name = "miscdevice"
} }
ohos_js_assets("miscdevice_js_assets") { ohos_js_assets("miscdevice_js_assets") {
js2abc = true js2abc = true
......
...@@ -21,6 +21,8 @@ ohos_js_hap_suite("sensor_js_test") { ...@@ -21,6 +21,8 @@ ohos_js_hap_suite("sensor_js_test") {
] ]
certificate_profile = "./signature/openharmony_sx.p7b" certificate_profile = "./signature/openharmony_sx.p7b"
hap_name = "ActsSensorJSApiTest" hap_name = "ActsSensorJSApiTest"
subsystem_name = "sensors"
part_name = "sensor"
} }
ohos_js_assets("sensor_js_assets") { ohos_js_assets("sensor_js_assets") {
js2abc = true js2abc = true
......
...@@ -175,7 +175,8 @@ describe("SensorJsTest_sensor_2", function () { ...@@ -175,7 +175,8 @@ describe("SensorJsTest_sensor_2", function () {
it('SensorGeomagenticAlgorithmJSTest003', TestType.FUNCTION | Size.MEDIUMTEST | Level.LEVEL3, async function (done) { it('SensorGeomagenticAlgorithmJSTest003', TestType.FUNCTION | Size.MEDIUMTEST | Level.LEVEL3, async function (done) {
console.info("------------------SensorGeomagenticAlgorithmJSTest003-------------------------"); console.info("------------------SensorGeomagenticAlgorithmJSTest003-------------------------");
let geomagneticComponent = [-1417119616, 23146989568, -6406359552, -15.442885398864746, let geomagneticComponent = [-1417119616, 23146989568, -6406359552, -15.442885398864746,
93.50342559814453, 23190329344, 24058943488] 93.50342559814453, 23190329344, 24058943488, 27779.234375, -6214.9794921875, -14924.6611328125,
-27.667943954467773, -12.610970497131348, 28465.9765625, 32141.2109375]
sensor.getGeomagneticField({ 'latitude': 0, 'longitude': 0, 'altitude': 0 }, Number.MAX_VALUE, sensor.getGeomagneticField({ 'latitude': 0, 'longitude': 0, 'altitude': 0 }, Number.MAX_VALUE,
(error, data) => { (error, data) => {
if (error) { if (error) {
...@@ -186,13 +187,13 @@ describe("SensorJsTest_sensor_2", function () { ...@@ -186,13 +187,13 @@ describe("SensorJsTest_sensor_2", function () {
+ ',geomagneticDip: ' + data.geomagneticDip + ',geomagneticDip: ' + data.geomagneticDip
+ ',deflectionAngle: ' + data.deflectionAngle + ',levelIntensity: ' + data.levelIntensity + ',deflectionAngle: ' + data.deflectionAngle + ',levelIntensity: ' + data.levelIntensity
+ ',totalIntensity: ' + data.totalIntensity) + ',totalIntensity: ' + data.totalIntensity)
expect(data.x).assertEqual(geomagneticComponent[0]) expect(geomagneticComponent).assertContain(data.x)
expect(data.y).assertEqual(geomagneticComponent[1]) expect(geomagneticComponent).assertContain(data.y)
expect(data.z).assertEqual(geomagneticComponent[2]) expect(geomagneticComponent).assertContain(data.z)
expect(data.geomagneticDip).assertEqual(geomagneticComponent[3]) expect(geomagneticComponent).assertContain(data.geomagneticDip)
expect(data.deflectionAngle).assertEqual(geomagneticComponent[4]) expect(geomagneticComponent).assertContain(data.deflectionAngle)
expect(data.levelIntensity).assertEqual(geomagneticComponent[5]) expect(geomagneticComponent).assertContain(data.levelIntensity)
expect(data.totalIntensity).assertEqual(geomagneticComponent[6]) expect(geomagneticComponent).assertContain(data.totalIntensity)
} }
setTimeout(() => { setTimeout(() => {
done() done()
...@@ -842,20 +843,21 @@ describe("SensorJsTest_sensor_2", function () { ...@@ -842,20 +843,21 @@ describe("SensorJsTest_sensor_2", function () {
it("SensorGeomagenticAlgorithmJSTest027", TestType.FUNCTION | Size.MEDIUMTEST | Level.LEVEL3, async function (done) { it("SensorGeomagenticAlgorithmJSTest027", TestType.FUNCTION | Size.MEDIUMTEST | Level.LEVEL3, async function (done) {
console.info('------------------SensorGeomagenticAlgorithmJSTest027------------------'); console.info('------------------SensorGeomagenticAlgorithmJSTest027------------------');
let geomagneticComponent = [-1417119616, 23146989568, -6406359552, -15.442885398864746, let geomagneticComponent = [-1417119616, 23146989568, -6406359552, -15.442885398864746,
93.50342559814453, 23190329344, 24058943488] 93.50342559814453, 23190329344, 24058943488, 27779.234375, -6214.9794921875, -14924.6611328125,
-27.667943954467773, -12.610970497131348, 28465.9765625, 32141.2109375]
await sensor.getGeomagneticField({ 'latitude': 0, 'longitude': 0, 'altitude': 0 }, await sensor.getGeomagneticField({ 'latitude': 0, 'longitude': 0, 'altitude': 0 },
Number.MAX_VALUE).then((data) => { Number.MAX_VALUE).then((data) => {
console.info('SensorGeomagenticAlgorithmJSTest027 x: ' + data.x + ',y: ' + data.y + ',z: ' + data.z console.info('SensorGeomagenticAlgorithmJSTest027 x: ' + data.x + ',y: ' + data.y + ',z: ' + data.z
+ ',geomagneticDip: ' + data.geomagneticDip + ',geomagneticDip: ' + data.geomagneticDip
+ ',deflectionAngle: ' + data.deflectionAngle + ',levelIntensity: ' + data.levelIntensity + ',deflectionAngle: ' + data.deflectionAngle + ',levelIntensity: ' + data.levelIntensity
+ ',totalIntensity: ' + data.totalIntensity) + ',totalIntensity: ' + data.totalIntensity)
expect(data.x).assertEqual(geomagneticComponent[0]) expect(geomagneticComponent).assertContain(data.x)
expect(data.y).assertEqual(geomagneticComponent[1]) expect(geomagneticComponent).assertContain(data.y)
expect(data.z).assertEqual(geomagneticComponent[2]) expect(geomagneticComponent).assertContain(data.z)
expect(data.geomagneticDip).assertEqual(geomagneticComponent[3]) expect(geomagneticComponent).assertContain(data.geomagneticDip)
expect(data.deflectionAngle).assertEqual(geomagneticComponent[4]) expect(geomagneticComponent).assertContain(data.deflectionAngle)
expect(data.levelIntensity).assertEqual(geomagneticComponent[5]) expect(geomagneticComponent).assertContain(data.levelIntensity)
expect(data.totalIntensity).assertEqual(geomagneticComponent[6]) expect(geomagneticComponent).assertContain(data.totalIntensity)
}).catch((error) => { }).catch((error) => {
console.info("promise::catch", error) console.info("promise::catch", error)
}); });
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册