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

Unified Diff: content/public/android/javatests/src/org/chromium/content/browser/DeviceSensorsTest.java

Issue 452613002: [Checkstyle] Update class member variable names to match style guides. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: boliu nits Created 6 years, 4 months 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
Index: content/public/android/javatests/src/org/chromium/content/browser/DeviceSensorsTest.java
diff --git a/content/public/android/javatests/src/org/chromium/content/browser/DeviceSensorsTest.java b/content/public/android/javatests/src/org/chromium/content/browser/DeviceSensorsTest.java
index 2b143ccfaaf57b77c6bf220103b7c984291053a9..6cd3e2551528821b7288d8faf6b34a0dc3fe0a03 100644
--- a/content/public/android/javatests/src/org/chromium/content/browser/DeviceSensorsTest.java
+++ b/content/public/android/javatests/src/org/chromium/content/browser/DeviceSensorsTest.java
@@ -44,8 +44,8 @@ public class DeviceSensorsTest extends AndroidTestCase {
assertFalse(mDeviceSensors.mDeviceOrientationIsActive);
assertEquals(DeviceSensors.DEVICE_MOTION_SENSORS.size(),
- mMockSensorManager.numRegistered);
- assertEquals(0, mMockSensorManager.numUnRegistered);
+ mMockSensorManager.mNumRegistered);
+ assertEquals(0, mMockSensorManager.mNumUnRegistered);
assertEquals(DeviceSensors.DEVICE_MOTION_SENSORS.size(),
mDeviceSensors.getNumberActiveDeviceMotionSensors());
}
@@ -63,8 +63,8 @@ public class DeviceSensorsTest extends AndroidTestCase {
assertTrue(mDeviceSensors.mDeviceOrientationIsActive);
assertEquals(DeviceSensors.DEVICE_ORIENTATION_SENSORS.size(),
- mMockSensorManager.numRegistered);
- assertEquals(0, mMockSensorManager.numUnRegistered);
+ mMockSensorManager.mNumRegistered);
+ assertEquals(0, mMockSensorManager.mNumUnRegistered);
}
@SmallTest
@@ -90,8 +90,8 @@ public class DeviceSensorsTest extends AndroidTestCase {
assertEquals(union.size(), mDeviceSensors.mActiveSensors.size());
assertTrue(mDeviceSensors.mDeviceMotionIsActive);
assertTrue(mDeviceSensors.mDeviceOrientationIsActive);
- assertEquals(union.size(), mMockSensorManager.numRegistered);
- assertEquals(0, mMockSensorManager.numUnRegistered);
+ assertEquals(union.size(), mMockSensorManager.mNumRegistered);
+ assertEquals(0, mMockSensorManager.mNumUnRegistered);
assertEquals(DeviceSensors.DEVICE_MOTION_SENSORS.size(),
mDeviceSensors.getNumberActiveDeviceMotionSensors());
}
@@ -106,7 +106,7 @@ public class DeviceSensorsTest extends AndroidTestCase {
assertFalse(mDeviceSensors.mDeviceMotionIsActive);
assertFalse(mDeviceSensors.mDeviceOrientationIsActive);
assertEquals(DeviceSensors.DEVICE_MOTION_SENSORS.size(),
- mMockSensorManager.numUnRegistered);
+ mMockSensorManager.mNumUnRegistered);
assertEquals(0, mDeviceSensors.getNumberActiveDeviceMotionSensors());
}
@@ -120,7 +120,7 @@ public class DeviceSensorsTest extends AndroidTestCase {
assertFalse(mDeviceSensors.mDeviceMotionIsActive);
assertFalse(mDeviceSensors.mDeviceOrientationIsActive);
assertEquals(DeviceSensors.DEVICE_ORIENTATION_SENSORS.size(),
- mMockSensorManager.numUnRegistered);
+ mMockSensorManager.mNumUnRegistered);
}
@SmallTest
@@ -136,14 +136,14 @@ public class DeviceSensorsTest extends AndroidTestCase {
Set<Integer> diff = new HashSet<Integer>(DeviceSensors.DEVICE_MOTION_SENSORS);
diff.removeAll(DeviceSensors.DEVICE_ORIENTATION_SENSORS);
- assertEquals(diff.size(), mMockSensorManager.numUnRegistered);
+ assertEquals(diff.size(), mMockSensorManager.mNumUnRegistered);
mDeviceSensors.stop(DeviceSensors.DEVICE_ORIENTATION);
assertTrue("should contain no sensors",
mDeviceSensors.mActiveSensors.isEmpty());
assertEquals(diff.size() + DeviceSensors.DEVICE_ORIENTATION_SENSORS.size(),
- mMockSensorManager.numUnRegistered);
+ mMockSensorManager.mNumUnRegistered);
assertEquals(0, mDeviceSensors.getNumberActiveDeviceMotionSensors());
}
@@ -316,9 +316,9 @@ public class DeviceSensorsTest extends AndroidTestCase {
private static class DeviceSensorsForTests extends DeviceSensors {
- private double value1 = 0;
- private double value2 = 0;
- private double value3 = 0;
+ private double mValue1 = 0;
+ private double mValue2 = 0;
+ private double mValue3 = 0;
private String mCalls = "";
private DeviceSensorsForTests(Context context) {
@@ -330,15 +330,15 @@ public class DeviceSensorsTest extends AndroidTestCase {
}
private void verifyValues(double v1, double v2, double v3) {
- assertEquals(v1, value1);
- assertEquals(v2, value2);
- assertEquals(v3, value3);
+ assertEquals(v1, mValue1);
+ assertEquals(v2, mValue2);
+ assertEquals(v3, mValue3);
}
private void verifyValuesEpsilon(double v1, double v2, double v3) {
- assertEquals(v1, value1, 0.1);
- assertEquals(v2, value2, 0.1);
- assertEquals(v3, value3, 0.1);
+ assertEquals(v1, mValue1, 0.1);
+ assertEquals(v2, mValue2, 0.1);
+ assertEquals(v3, mValue3, 0.1);
}
private void verifyCalls(String names) {
@@ -347,33 +347,33 @@ public class DeviceSensorsTest extends AndroidTestCase {
@Override
protected void gotOrientation(double alpha, double beta, double gamma) {
- value1 = alpha;
- value2 = beta;
- value3 = gamma;
+ mValue1 = alpha;
+ mValue2 = beta;
+ mValue3 = gamma;
mCalls = mCalls.concat("gotOrientation");
}
@Override
protected void gotAcceleration(double x, double y, double z) {
- value1 = x;
- value2 = y;
- value3 = z;
+ mValue1 = x;
+ mValue2 = y;
+ mValue3 = z;
mCalls = mCalls.concat("gotAcceleration");
}
@Override
protected void gotAccelerationIncludingGravity(double x, double y, double z) {
- value1 = x;
- value2 = y;
- value3 = z;
+ mValue1 = x;
+ mValue2 = y;
+ mValue3 = z;
mCalls = mCalls.concat("gotAccelerationIncludingGravity");
}
@Override
protected void gotRotationRate(double alpha, double beta, double gamma) {
- value1 = alpha;
- value2 = beta;
- value3 = gamma;
+ mValue1 = alpha;
+ mValue2 = beta;
+ mValue3 = gamma;
mCalls = mCalls.concat("gotRotationRate");
}
}
@@ -381,8 +381,8 @@ public class DeviceSensorsTest extends AndroidTestCase {
private static class MockSensorManager implements
DeviceSensors.SensorManagerProxy {
- private int numRegistered = 0;
- private int numUnRegistered = 0;
+ private int mNumRegistered = 0;
+ private int mNumUnRegistered = 0;
private MockSensorManager() {
}
@@ -390,13 +390,13 @@ public class DeviceSensorsTest extends AndroidTestCase {
@Override
public boolean registerListener(SensorEventListener listener, int sensorType, int rate,
Handler handler) {
- numRegistered++;
+ mNumRegistered++;
return true;
}
@Override
public void unregisterListener(SensorEventListener listener, int sensorType) {
- numUnRegistered++;
+ mNumUnRegistered++;
}
}
}

Powered by Google App Engine
This is Rietveld 408576698