Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1877)

Unified Diff: device/generic_sensor/platform_sensor_and_provider_unittest_linux.cc

Issue 2571613003: [sensors](CrOS/Linux) Add support for als sensor which has "intensity" naming. (Closed)
Patch Set: rebased Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « device/generic_sensor/linux/sensor_data_linux.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/generic_sensor/platform_sensor_and_provider_unittest_linux.cc
diff --git a/device/generic_sensor/platform_sensor_and_provider_unittest_linux.cc b/device/generic_sensor/platform_sensor_and_provider_unittest_linux.cc
index bf3891197c94b635cd1be4ac3aa6bd1e61371de2..e30846d3c8a3e8451a5cde792486057652bc327c 100644
--- a/device/generic_sensor/platform_sensor_and_provider_unittest_linux.cc
+++ b/device/generic_sensor/platform_sensor_and_provider_unittest_linux.cc
@@ -177,6 +177,7 @@ class PlatformSensorAndProviderLinuxTest : public ::testing::Test {
// Creates sensor files according to SensorPathsLinux.
// Existence of sensor read files mean existence of a sensor.
+ // If |frequency| or |scaling| is zero, the corresponding file is not created.
void InitializeSupportedSensor(SensorType type,
double frequency,
double offset,
@@ -186,7 +187,7 @@ class PlatformSensorAndProviderLinuxTest : public ::testing::Test {
EXPECT_TRUE(InitSensorData(type, &data));
base::FilePath sensor_dir = sensors_dir_.GetPath();
- if (!data.sensor_scale_name.empty()) {
+ if (!data.sensor_scale_name.empty() && scaling != 0) {
base::FilePath sensor_scale_file =
base::FilePath(sensor_dir).Append(data.sensor_scale_name);
WriteValueToFile(sensor_scale_file, scaling);
@@ -198,7 +199,7 @@ class PlatformSensorAndProviderLinuxTest : public ::testing::Test {
WriteValueToFile(sensor_offset_file, offset);
}
- if (!data.sensor_frequency_file_name.empty()) {
+ if (!data.sensor_frequency_file_name.empty() && frequency != 0) {
base::FilePath sensor_frequency_file =
base::FilePath(sensor_dir).Append(data.sensor_frequency_file_name);
WriteValueToFile(sensor_frequency_file, frequency);
@@ -511,22 +512,18 @@ TEST_F(PlatformSensorAndProviderLinuxTest,
sizeof(SensorReadingSharedBuffer),
SensorReadingSharedBuffer::GetOffset(SensorType::ACCELEROMETER));
- double sensor_values[3] = {4.5, -2.45, -3.29};
- InitializeSupportedSensor(
- SensorType::ACCELEROMETER, kAccelerometerFrequencyValue,
- kAccelerometerOffsetValue, kAccelerometerScalingValue, sensor_values);
-
// As long as WaitOnSensorReadingChangedEvent() waits until client gets a
- // a notification about readings changed, the frequency file must be deleted
- // to make the sensor device manager identify this sensor with ON_CHANGE
- // reporting mode. This will allow the MockPlatformSensorClient to
+ // a notification about readings changed, the frequency file must not be
+ // created to make the sensor device manager identify this sensor with
+ // ON_CHANGE reporting mode. This can be done by sending |kZero| as a
+ // frequency value, which means a file is not created.
+ // This will allow the MockPlatformSensorClient to
// receive a notification and test if reading values are right. Otherwise
// the test will not know when data is ready.
- SensorPathsLinux data;
- EXPECT_TRUE(InitSensorData(SensorType::ACCELEROMETER, &data));
- base::FilePath frequency_file = base::FilePath(sensors_dir_.GetPath())
- .Append(data.sensor_frequency_file_name);
- DeleteFile(frequency_file);
+ double sensor_values[3] = {4.5, -2.45, -3.29};
+ InitializeSupportedSensor(SensorType::ACCELEROMETER, kZero,
+ kAccelerometerOffsetValue,
+ kAccelerometerScalingValue, sensor_values);
InitializeMockUdevMethods(sensors_dir_.GetPath());
SetServiceStart();
@@ -567,22 +564,17 @@ TEST_F(PlatformSensorAndProviderLinuxTest, CheckGyroscopeReadingConversion) {
sizeof(SensorReadingSharedBuffer),
SensorReadingSharedBuffer::GetOffset(SensorType::GYROSCOPE));
- double sensor_values[3] = {2.2, -3.8, -108.7};
- InitializeSupportedSensor(SensorType::GYROSCOPE, kGyroscopeFrequencyValue,
- kGyroscopeOffsetValue, kGyroscopeScalingValue,
- sensor_values);
-
// As long as WaitOnSensorReadingChangedEvent() waits until client gets a
- // a notification about readings changed, the frequency file must be deleted
- // to make the sensor device manager identify this sensor with ON_CHANGE
- // reporting mode. This will allow the MockPlatformSensorClient to
+ // a notification about readings changed, the frequency file must not be
+ // created to make the sensor device manager identify this sensor with
+ // ON_CHANGE reporting mode. This can be done by sending |kZero| as a
+ // frequency value, which means a file is not created.
+ // This will allow the MockPlatformSensorClient to
// receive a notification and test if reading values are right. Otherwise
// the test will not know when data is ready.
- SensorPathsLinux data;
- EXPECT_TRUE(InitSensorData(SensorType::GYROSCOPE, &data));
- base::FilePath frequency_file = base::FilePath(sensors_dir_.GetPath())
- .Append(data.sensor_frequency_file_name);
- DeleteFile(frequency_file);
+ double sensor_values[3] = {2.2, -3.8, -108.7};
+ InitializeSupportedSensor(SensorType::GYROSCOPE, kZero, kGyroscopeOffsetValue,
+ kGyroscopeScalingValue, sensor_values);
InitializeMockUdevMethods(sensors_dir_.GetPath());
SetServiceStart();
@@ -624,22 +616,18 @@ TEST_F(PlatformSensorAndProviderLinuxTest, CheckMagnetometerReadingConversion) {
sizeof(SensorReadingSharedBuffer),
SensorReadingSharedBuffer::GetOffset(SensorType::MAGNETOMETER));
- double sensor_values[3] = {2.2, -3.8, -108.7};
- InitializeSupportedSensor(
- SensorType::MAGNETOMETER, kMagnetometerFrequencyValue,
- kMagnetometerOffsetValue, kMagnetometerScalingValue, sensor_values);
-
// As long as WaitOnSensorReadingChangedEvent() waits until client gets a
- // a notification about readings changed, the frequency file must be deleted
- // to make the sensor device manager identify this sensor with ON_CHANGE
- // reporting mode. This will allow the MockPlatformSensorClient to
+ // a notification about readings changed, the frequency file must not be
+ // created to make the sensor device manager identify this sensor with
+ // ON_CHANGE reporting mode. This can be done by sending |kZero| as a
+ // frequency value, which means a file is not created.
+ // This will allow the MockPlatformSensorClient to
// receive a notification and test if reading values are right. Otherwise
// the test will not know when data is ready.
- SensorPathsLinux data;
- EXPECT_TRUE(InitSensorData(SensorType::MAGNETOMETER, &data));
- base::FilePath frequency_file = base::FilePath(sensors_dir_.GetPath())
- .Append(data.sensor_frequency_file_name);
- DeleteFile(frequency_file);
+ double sensor_values[3] = {2.2, -3.8, -108.7};
+ InitializeSupportedSensor(SensorType::MAGNETOMETER, kZero,
+ kMagnetometerOffsetValue, kMagnetometerScalingValue,
+ sensor_values);
InitializeMockUdevMethods(sensors_dir_.GetPath());
SetServiceStart();
« no previous file with comments | « device/generic_sensor/linux/sensor_data_linux.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698