[DeviceLight] Browser+java part

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

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 9b5ab7b7438e02a7b8012d249f1ac72d17fa6d64..91f291fc013b9336802079e5159406c38c9ba9bb 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
@@ -42,6 +42,7 @@ public class DeviceSensorsTest extends AndroidTestCase {
                         DeviceSensors.DEVICE_MOTION_SENSORS));
         assertTrue(mDeviceSensors.mDeviceMotionIsActive);
         assertFalse(mDeviceSensors.mDeviceOrientationIsActive);
+        assertFalse(mDeviceSensors.mDeviceLightIsActive);
 
         assertEquals(DeviceSensors.DEVICE_MOTION_SENSORS.size(),
                 mMockSensorManager.mNumRegistered);
@@ -60,6 +61,7 @@ public class DeviceSensorsTest extends AndroidTestCase {
                 mDeviceSensors.mActiveSensors.containsAll(
                         DeviceSensors.DEVICE_ORIENTATION_SENSORS));
         assertFalse(mDeviceSensors.mDeviceMotionIsActive);
+        assertFalse(mDeviceSensors.mDeviceLightIsActive);
         assertTrue(mDeviceSensors.mDeviceOrientationIsActive);
 
         assertEquals(DeviceSensors.DEVICE_ORIENTATION_SENSORS.size(),
@@ -90,6 +92,7 @@ public class DeviceSensorsTest extends AndroidTestCase {
         assertEquals(union.size(), mDeviceSensors.mActiveSensors.size());
         assertTrue(mDeviceSensors.mDeviceMotionIsActive);
         assertTrue(mDeviceSensors.mDeviceOrientationIsActive);
+        assertFalse(mDeviceSensors.mDeviceLightIsActive);
         assertEquals(union.size(), mMockSensorManager.mNumRegistered);
         assertEquals(0, mMockSensorManager.mNumUnRegistered);
         assertEquals(DeviceSensors.DEVICE_MOTION_SENSORS.size(),
@@ -97,6 +100,20 @@ public class DeviceSensorsTest extends AndroidTestCase {
     }
 
     @SmallTest
+    public void testRegisterSensorsDeviceLight() {
+        boolean start = mDeviceSensors.start(0, DeviceSensors.DEVICE_LIGHT, 100);
+
+        assertTrue(start);
+        assertTrue(mDeviceSensors.mDeviceLightIsActive);
+        assertFalse(mDeviceSensors.mDeviceMotionIsActive);
+        assertFalse(mDeviceSensors.mDeviceOrientationIsActive);
+
+        assertEquals(DeviceSensors.DEVICE_LIGHT_SENSORS.size(),
+                mMockSensorManager.mNumRegistered);
+        assertEquals(0, mMockSensorManager.mNumUnRegistered);
+    }
+
+    @SmallTest
     public void testUnregisterSensorsDeviceMotion() {
         mDeviceSensors.start(0, DeviceSensors.DEVICE_MOTION, 100);
         mDeviceSensors.stop(DeviceSensors.DEVICE_MOTION);
@@ -105,6 +122,7 @@ public class DeviceSensorsTest extends AndroidTestCase {
                 mDeviceSensors.mActiveSensors.isEmpty());
         assertFalse(mDeviceSensors.mDeviceMotionIsActive);
         assertFalse(mDeviceSensors.mDeviceOrientationIsActive);
+        assertFalse(mDeviceSensors.mDeviceLightIsActive);
         assertEquals(DeviceSensors.DEVICE_MOTION_SENSORS.size(),
                 mMockSensorManager.mNumUnRegistered);
         assertEquals(0, mDeviceSensors.getNumberActiveDeviceMotionSensors());
@@ -119,6 +137,7 @@ public class DeviceSensorsTest extends AndroidTestCase {
                 mDeviceSensors.mActiveSensors.isEmpty());
         assertFalse(mDeviceSensors.mDeviceMotionIsActive);
         assertFalse(mDeviceSensors.mDeviceOrientationIsActive);
+        assertFalse(mDeviceSensors.mDeviceLightIsActive);
         assertEquals(DeviceSensors.DEVICE_ORIENTATION_SENSORS.size(),
                 mMockSensorManager.mNumUnRegistered);
     }
@@ -148,6 +167,32 @@ public class DeviceSensorsTest extends AndroidTestCase {
     }
 
     @SmallTest
+    public void testUnregisterSensorsLight() {
+        mDeviceSensors.start(0, DeviceSensors.DEVICE_LIGHT, 100);
+        mDeviceSensors.stop(DeviceSensors.DEVICE_LIGHT);
+
+        assertTrue("should contain no sensors",
+                mDeviceSensors.mActiveSensors.isEmpty());
+        assertFalse(mDeviceSensors.mDeviceMotionIsActive);
+        assertFalse(mDeviceSensors.mDeviceOrientationIsActive);
+        assertFalse(mDeviceSensors.mDeviceLightIsActive);
+    }
+
+    @SmallTest
+    public void testSensorChangedgotLight() {
+        boolean startLight = mDeviceSensors.start(0,
+                DeviceSensors.DEVICE_LIGHT, 100);

[timvolodine, 2014/09/10 13:47:25]

i think this fits on one line?

[riju_, 2014/09/22 08:22:21]

No. Its 87 chars if I put in a single line, git cl format tells me to use 2
lines.

[timvolodine, 2014/09/22 11:12:37]

for java files we have a limit of 100 chars

+
+        assertTrue(startLight);
+        assertTrue(mDeviceSensors.mDeviceLightIsActive);
+
+        float[] values = {200};
+        mDeviceSensors.sensorChanged(Sensor.TYPE_LIGHT, values);
+        mDeviceSensors.verifyCalls("gotLight");
+        mDeviceSensors.verifyValue(200);
+    }
+
+    @SmallTest
     public void testSensorChangedgotOrientation() {
         boolean startOrientation = mDeviceSensors.start(0,
                 DeviceSensors.DEVICE_ORIENTATION, 100);
@@ -329,6 +374,10 @@ public class DeviceSensorsTest extends AndroidTestCase {
             return new DeviceSensorsForTests(context);
         }
 
+        private void verifyValue(double v1) {
+            assertEquals(v1, mValue1);
+        }
+
         private void verifyValues(double v1, double v2, double v3) {
             assertEquals(v1, mValue1);
             assertEquals(v2, mValue2);
@@ -346,6 +395,12 @@ public class DeviceSensorsTest extends AndroidTestCase {
         }
 
         @Override
+        protected void gotLight(double light) {
+            mValue1 = light;
+            mCalls = mCalls.concat("gotLight");
+        }
+
+        @Override
         protected void gotOrientation(double alpha, double beta, double gamma) {
             mValue1 = alpha;
             mValue2 = beta;