| Index: device/sensors/sensor_manager_android_unittest.cc
|
| diff --git a/device/sensors/sensor_manager_android_unittest.cc b/device/sensors/sensor_manager_android_unittest.cc
|
| index b584eed15699e37d9a676029ef6a4279a71b1f9b..fc45d515043cb8f02b615670c579c625dbbda19c 100644
|
| --- a/device/sensors/sensor_manager_android_unittest.cc
|
| +++ b/device/sensors/sensor_manager_android_unittest.cc
|
| @@ -55,13 +55,13 @@ class AndroidSensorManagerTest : public testing::Test {
|
| double alpha,
|
| double beta,
|
| double gamma) {
|
| - ASSERT_TRUE(buffer->data.allAvailableSensorsAreActive);
|
| + ASSERT_TRUE(buffer->data.all_available_sensors_are_active);
|
| ASSERT_EQ(alpha, buffer->data.alpha);
|
| - ASSERT_TRUE(buffer->data.hasAlpha);
|
| + ASSERT_TRUE(buffer->data.has_alpha);
|
| ASSERT_EQ(beta, buffer->data.beta);
|
| - ASSERT_TRUE(buffer->data.hasBeta);
|
| + ASSERT_TRUE(buffer->data.has_beta);
|
| ASSERT_EQ(gamma, buffer->data.gamma);
|
| - ASSERT_TRUE(buffer->data.hasGamma);
|
| + ASSERT_TRUE(buffer->data.has_gamma);
|
| }
|
|
|
| std::unique_ptr<DeviceLightHardwareBuffer> light_buffer_;
|
| @@ -77,39 +77,39 @@ TEST_F(AndroidSensorManagerTest, ThreeDeviceMotionSensorsActive) {
|
| sensorManager.SetNumberActiveDeviceMotionSensors(3);
|
|
|
| sensorManager.StartFetchingDeviceMotionData(motion_buffer_.get());
|
| - ASSERT_FALSE(motion_buffer_->data.allAvailableSensorsAreActive);
|
| + ASSERT_FALSE(motion_buffer_->data.all_available_sensors_are_active);
|
|
|
| sensorManager.GotAcceleration(nullptr, nullptr, 1, 2, 3);
|
| - ASSERT_FALSE(motion_buffer_->data.allAvailableSensorsAreActive);
|
| - ASSERT_EQ(1, motion_buffer_->data.accelerationX);
|
| - ASSERT_TRUE(motion_buffer_->data.hasAccelerationX);
|
| - ASSERT_EQ(2, motion_buffer_->data.accelerationY);
|
| - ASSERT_TRUE(motion_buffer_->data.hasAccelerationY);
|
| - ASSERT_EQ(3, motion_buffer_->data.accelerationZ);
|
| - ASSERT_TRUE(motion_buffer_->data.hasAccelerationZ);
|
| + ASSERT_FALSE(motion_buffer_->data.all_available_sensors_are_active);
|
| + ASSERT_EQ(1, motion_buffer_->data.acceleration_x);
|
| + ASSERT_TRUE(motion_buffer_->data.has_acceleration_x);
|
| + ASSERT_EQ(2, motion_buffer_->data.acceleration_y);
|
| + ASSERT_TRUE(motion_buffer_->data.has_acceleration_y);
|
| + ASSERT_EQ(3, motion_buffer_->data.acceleration_z);
|
| + ASSERT_TRUE(motion_buffer_->data.has_acceleration_z);
|
|
|
| sensorManager.GotAccelerationIncludingGravity(nullptr, nullptr, 4, 5, 6);
|
| - ASSERT_FALSE(motion_buffer_->data.allAvailableSensorsAreActive);
|
| - ASSERT_EQ(4, motion_buffer_->data.accelerationIncludingGravityX);
|
| - ASSERT_TRUE(motion_buffer_->data.hasAccelerationIncludingGravityX);
|
| - ASSERT_EQ(5, motion_buffer_->data.accelerationIncludingGravityY);
|
| - ASSERT_TRUE(motion_buffer_->data.hasAccelerationIncludingGravityY);
|
| - ASSERT_EQ(6, motion_buffer_->data.accelerationIncludingGravityZ);
|
| - ASSERT_TRUE(motion_buffer_->data.hasAccelerationIncludingGravityZ);
|
| + ASSERT_FALSE(motion_buffer_->data.all_available_sensors_are_active);
|
| + ASSERT_EQ(4, motion_buffer_->data.acceleration_including_gravity_x);
|
| + ASSERT_TRUE(motion_buffer_->data.has_acceleration_including_gravity_x);
|
| + ASSERT_EQ(5, motion_buffer_->data.acceleration_including_gravity_y);
|
| + ASSERT_TRUE(motion_buffer_->data.has_acceleration_including_gravity_y);
|
| + ASSERT_EQ(6, motion_buffer_->data.acceleration_including_gravity_z);
|
| + ASSERT_TRUE(motion_buffer_->data.has_acceleration_including_gravity_z);
|
|
|
| sensorManager.GotRotationRate(nullptr, nullptr, 7, 8, 9);
|
| - ASSERT_TRUE(motion_buffer_->data.allAvailableSensorsAreActive);
|
| - ASSERT_EQ(7, motion_buffer_->data.rotationRateAlpha);
|
| - ASSERT_TRUE(motion_buffer_->data.hasRotationRateAlpha);
|
| - ASSERT_EQ(8, motion_buffer_->data.rotationRateBeta);
|
| - ASSERT_TRUE(motion_buffer_->data.hasRotationRateBeta);
|
| - ASSERT_EQ(9, motion_buffer_->data.rotationRateGamma);
|
| - ASSERT_TRUE(motion_buffer_->data.hasRotationRateGamma);
|
| + ASSERT_TRUE(motion_buffer_->data.all_available_sensors_are_active);
|
| + ASSERT_EQ(7, motion_buffer_->data.rotation_rate_alpha);
|
| + ASSERT_TRUE(motion_buffer_->data.has_rotation_rate_alpha);
|
| + ASSERT_EQ(8, motion_buffer_->data.rotation_rate_beta);
|
| + ASSERT_TRUE(motion_buffer_->data.has_rotation_rate_beta);
|
| + ASSERT_EQ(9, motion_buffer_->data.rotation_rate_gamma);
|
| + ASSERT_TRUE(motion_buffer_->data.has_rotation_rate_gamma);
|
| ASSERT_EQ(kDeviceSensorIntervalMicroseconds / 1000.,
|
| motion_buffer_->data.interval);
|
|
|
| sensorManager.StopFetchingDeviceMotionData();
|
| - ASSERT_FALSE(motion_buffer_->data.allAvailableSensorsAreActive);
|
| + ASSERT_FALSE(motion_buffer_->data.all_available_sensors_are_active);
|
| }
|
|
|
| TEST_F(AndroidSensorManagerTest, TwoDeviceMotionSensorsActive) {
|
| @@ -118,18 +118,18 @@ TEST_F(AndroidSensorManagerTest, TwoDeviceMotionSensorsActive) {
|
| sensorManager.SetNumberActiveDeviceMotionSensors(2);
|
|
|
| sensorManager.StartFetchingDeviceMotionData(motion_buffer_.get());
|
| - ASSERT_FALSE(motion_buffer_->data.allAvailableSensorsAreActive);
|
| + ASSERT_FALSE(motion_buffer_->data.all_available_sensors_are_active);
|
|
|
| sensorManager.GotAcceleration(nullptr, nullptr, 1, 2, 3);
|
| - ASSERT_FALSE(motion_buffer_->data.allAvailableSensorsAreActive);
|
| + ASSERT_FALSE(motion_buffer_->data.all_available_sensors_are_active);
|
|
|
| sensorManager.GotAccelerationIncludingGravity(nullptr, nullptr, 1, 2, 3);
|
| - ASSERT_TRUE(motion_buffer_->data.allAvailableSensorsAreActive);
|
| + ASSERT_TRUE(motion_buffer_->data.all_available_sensors_are_active);
|
| ASSERT_EQ(kDeviceSensorIntervalMicroseconds / 1000.,
|
| motion_buffer_->data.interval);
|
|
|
| sensorManager.StopFetchingDeviceMotionData();
|
| - ASSERT_FALSE(motion_buffer_->data.allAvailableSensorsAreActive);
|
| + ASSERT_FALSE(motion_buffer_->data.all_available_sensors_are_active);
|
| }
|
|
|
| TEST_F(AndroidSensorManagerTest, ZeroDeviceMotionSensorsActive) {
|
| @@ -138,12 +138,12 @@ TEST_F(AndroidSensorManagerTest, ZeroDeviceMotionSensorsActive) {
|
| sensorManager.SetNumberActiveDeviceMotionSensors(0);
|
|
|
| sensorManager.StartFetchingDeviceMotionData(motion_buffer_.get());
|
| - ASSERT_TRUE(motion_buffer_->data.allAvailableSensorsAreActive);
|
| + ASSERT_TRUE(motion_buffer_->data.all_available_sensors_are_active);
|
| ASSERT_EQ(kDeviceSensorIntervalMicroseconds / 1000.,
|
| motion_buffer_->data.interval);
|
|
|
| sensorManager.StopFetchingDeviceMotionData();
|
| - ASSERT_FALSE(motion_buffer_->data.allAvailableSensorsAreActive);
|
| + ASSERT_FALSE(motion_buffer_->data.all_available_sensors_are_active);
|
| }
|
|
|
| TEST_F(AndroidSensorManagerTest, DeviceOrientationSensorsActive) {
|
| @@ -151,13 +151,13 @@ TEST_F(AndroidSensorManagerTest, DeviceOrientationSensorsActive) {
|
| FakeSensorManagerAndroid sensorManager;
|
|
|
| sensorManager.StartFetchingDeviceOrientationData(orientation_buffer_.get());
|
| - ASSERT_FALSE(orientation_buffer_->data.allAvailableSensorsAreActive);
|
| + ASSERT_FALSE(orientation_buffer_->data.all_available_sensors_are_active);
|
|
|
| sensorManager.GotOrientation(nullptr, nullptr, 1, 2, 3);
|
| VerifyOrientationBufferValues(orientation_buffer_.get(), 1, 2, 3);
|
|
|
| sensorManager.StopFetchingDeviceOrientationData();
|
| - ASSERT_FALSE(orientation_buffer_->data.allAvailableSensorsAreActive);
|
| + ASSERT_FALSE(orientation_buffer_->data.all_available_sensors_are_active);
|
| }
|
|
|
| TEST_F(AndroidSensorManagerTest, DeviceOrientationAbsoluteSensorsActive) {
|
| @@ -166,13 +166,13 @@ TEST_F(AndroidSensorManagerTest, DeviceOrientationAbsoluteSensorsActive) {
|
|
|
| sensorManager.StartFetchingDeviceOrientationAbsoluteData(
|
| orientation_absolute_buffer_.get());
|
| - ASSERT_FALSE(orientation_buffer_->data.allAvailableSensorsAreActive);
|
| + ASSERT_FALSE(orientation_buffer_->data.all_available_sensors_are_active);
|
|
|
| sensorManager.GotOrientationAbsolute(nullptr, nullptr, 4, 5, 6);
|
| VerifyOrientationBufferValues(orientation_absolute_buffer_.get(), 4, 5, 6);
|
|
|
| sensorManager.StopFetchingDeviceOrientationData();
|
| - ASSERT_FALSE(orientation_buffer_->data.allAvailableSensorsAreActive);
|
| + ASSERT_FALSE(orientation_buffer_->data.all_available_sensors_are_active);
|
| }
|
|
|
| // DeviceLight
|
|
|