OLD | NEW |
1 <!DOCTYPE html> | 1 <!DOCTYPE html> |
2 <script src="../resources/testharness.js"></script> | 2 <script src="../resources/testharness.js"></script> |
3 <script src="../resources/testharnessreport.js"></script> | 3 <script src="../resources/testharnessreport.js"></script> |
4 <script src="../resources/mojo-helpers.js"></script> | 4 <script src="../resources/mojo-helpers.js"></script> |
5 <script src="resources/sensor-helpers.js"></script> | 5 <script src="resources/sensor-helpers.js"></script> |
6 <script src="resources/generic-sensor-tests.js"></script> | 6 <script src="resources/generic-sensor-tests.js"></script> |
7 <script> | 7 <script> |
8 | 8 |
9 'use strict'; | 9 'use strict'; |
10 | 10 |
11 if (!window.testRunner) | 11 if (!window.testRunner) |
12 debug('This test cannot be run without the TestRunner'); | 12 debug('This test cannot be run without the TestRunner'); |
13 | 13 |
14 const kDefaultReadingX = 1.12345; | 14 const kDefaultReadingX = 1.12345; |
15 const kDefaultReadingY = 2.12345; | 15 const kDefaultReadingY = 2.12345; |
16 const kDefaultReadingZ = 3.12345; | 16 const kDefaultReadingZ = 3.12345; |
17 | 17 |
18 function update_sensor_reading(buffer, expects_modified_reading, readsCount) { | 18 function update_sensor_reading(buffer, expects_modified_reading, readsCount) { |
19 buffer[1] = window.performance.now(); | 19 buffer[1] = window.performance.now(); |
20 buffer[2] = kDefaultReadingX; | 20 buffer[2] = kDefaultReadingX; |
21 buffer[3] = kDefaultReadingY; | 21 buffer[3] = kDefaultReadingY; |
22 buffer[4] = kDefaultReadingZ; | 22 buffer[4] = kDefaultReadingZ; |
23 if (expects_modified_reading) | 23 if (expects_modified_reading) |
24 buffer[2] += readsCount; | 24 buffer[2] += readsCount; |
25 } | 25 } |
26 | 26 |
27 function verify_sensor_reading(reading) { | 27 function verify_sensor_reading(sensor, should_be_null) { |
28 return reading.x == kDefaultReadingX && | 28 if (should_be_null) { |
29 reading.y == kDefaultReadingY && | 29 return sensor.x == null && |
30 reading.z == kDefaultReadingZ; | 30 sensor.y == null && |
| 31 sensor.z == null && |
| 32 sensor.timestamp == null; |
| 33 } |
| 34 return sensor.x == kDefaultReadingX && |
| 35 sensor.y == kDefaultReadingY && |
| 36 sensor.z == kDefaultReadingZ && |
| 37 sensor.timestamp != null; |
31 } | 38 } |
32 | 39 |
33 runGenericSensorTests(Accelerometer, update_sensor_reading, verify_sensor_readin
g); | 40 runGenericSensorTests(Accelerometer, update_sensor_reading, verify_sensor_readin
g); |
34 | 41 |
35 sensor_test(sensor => { | 42 sensor_test(sensor => { |
36 let accelerometer = new Accelerometer({includeGravity: false}); | 43 let accelerometer = new Accelerometer({includeGravity: false}); |
37 accelerometer.start(); | 44 accelerometer.start(); |
38 let testPromise = sensor.mockSensorProvider.getCreatedSensor() | 45 let testPromise = sensor.mockSensorProvider.getCreatedSensor() |
39 .then(mockSensor => { | 46 .then(mockSensor => { |
40 return new Promise((resolve, reject) => { | 47 return new Promise((resolve, reject) => { |
41 let wrapper = new CallbackWrapper(() => { | 48 let wrapper = new CallbackWrapper(() => { |
42 let configuration = mockSensor.active_sensor_configurations_[0]; | 49 let configuration = mockSensor.active_sensor_configurations_[0]; |
43 assert_equals(accelerometer.includesGravity, false); | 50 assert_equals(accelerometer.includesGravity, false); |
44 accelerometer.stop(); | 51 accelerometer.stop(); |
45 assert_equals(accelerometer.state, 'idle'); | 52 assert_equals(accelerometer.state, 'idle'); |
46 resolve(mockSensor); | 53 resolve(mockSensor); |
47 }, reject); | 54 }, reject); |
48 accelerometer.onactivate = wrapper.callback; | 55 accelerometer.onactivate = wrapper.callback; |
49 accelerometer.onerror = reject; | 56 accelerometer.onerror = reject; |
50 }); | 57 }); |
51 }) | 58 }) |
52 .then(mockSensor => { return mockSensor.removeConfigurationCalled(); }); | 59 .then(mockSensor => { return mockSensor.removeConfigurationCalled(); }); |
53 | 60 |
54 return testPromise; | 61 return testPromise; |
55 }, 'Test that sensor can be successfully created with sensor specific configurat
ion parameter.'); | 62 }, 'Test that sensor can be successfully created with sensor specific configurat
ion parameter.'); |
56 | 63 |
57 </script> | 64 </script> |
OLD | NEW |