Additions to the Android java-side Device Motion/Orientation fetching

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

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.content.browser;
 
 import org.chromium.base.ActivityStatus;
 import org.chromium.base.test.util.Feature;
 import org.chromium.content.app.LibraryLoader;
 import org.chromium.content.common.CommandLine;
@@ skipping 40 matching lines @@
         assertTrue(start);
         assertTrue("should contain all motion sensors",
                 mDeviceMotionAndOrientation.mActiveSensors.containsAll(
                         DeviceMotionAndOrientation.DEVICE_MOTION_SENSORS));
         assertTrue(mDeviceMotionAndOrientation.mDeviceMotionIsActive);
         assertFalse(mDeviceMotionAndOrientation.mDeviceOrientationIsActive);
 
         assertEquals(DeviceMotionAndOrientation.DEVICE_MOTION_SENSORS.size(),
                 mMockSensorManager.numRegistered);
         assertEquals(0, mMockSensorManager.numUnRegistered);
+        assertEquals(DeviceMotionAndOrientation.DEVICE_MOTION_SENSORS.size(),
+                mDeviceMotionAndOrientation.getNumberActiveDeviceMotionSensors());
     }
 
     @SmallTest
     public void testRegisterSensorsDeviceOrientation() {
         boolean start = mDeviceMotionAndOrientation.start(0,
                 DeviceMotionAndOrientation.DEVICE_ORIENTATION, 100);
 
         assertTrue(start);
         assertTrue("should contain all orientation sensors",
                 mDeviceMotionAndOrientation.mActiveSensors.containsAll(
@@ skipping 23 matching lines @@
                         DeviceMotionAndOrientation.DEVICE_ORIENTATION_SENSORS));
 
         Set<Integer> union = Sets.newHashSet(DeviceMotionAndOrientation.DEVICE_ORIENTATION_SENSORS);
         union.addAll(DeviceMotionAndOrientation.DEVICE_MOTION_SENSORS);
 
         assertEquals(union.size(), mDeviceMotionAndOrientation.mActiveSensors.size());
         assertTrue(mDeviceMotionAndOrientation.mDeviceMotionIsActive);
         assertTrue(mDeviceMotionAndOrientation.mDeviceOrientationIsActive);
         assertEquals(union.size(), mMockSensorManager.numRegistered);
         assertEquals(0, mMockSensorManager.numUnRegistered);
+        assertEquals(DeviceMotionAndOrientation.DEVICE_MOTION_SENSORS.size(),
+                mDeviceMotionAndOrientation.getNumberActiveDeviceMotionSensors());
     }
 
     @SmallTest
     public void testUnregisterSensorsDeviceMotion() {
         mDeviceMotionAndOrientation.start(0, DeviceMotionAndOrientation.DEVICE_MOTION, 100);
         mDeviceMotionAndOrientation.stop(DeviceMotionAndOrientation.DEVICE_MOTION);
 
         assertTrue("should contain no sensors",
                 mDeviceMotionAndOrientation.mActiveSensors.isEmpty());
         assertFalse(mDeviceMotionAndOrientation.mDeviceMotionIsActive);
         assertFalse(mDeviceMotionAndOrientation.mDeviceOrientationIsActive);
         assertEquals(DeviceMotionAndOrientation.DEVICE_MOTION_SENSORS.size(),
                 mMockSensorManager.numUnRegistered);
+        assertEquals(0, mDeviceMotionAndOrientation.getNumberActiveDeviceMotionSensors());
     }
 
     @SmallTest
     public void testUnregisterSensorsDeviceOrientation() {
         mDeviceMotionAndOrientation.start(0, DeviceMotionAndOrientation.DEVICE_ORIENTATION, 100);
         mDeviceMotionAndOrientation.stop(DeviceMotionAndOrientation.DEVICE_ORIENTATION);
 
         assertTrue("should contain no sensors",
                 mDeviceMotionAndOrientation.mActiveSensors.isEmpty());
         assertFalse(mDeviceMotionAndOrientation.mDeviceMotionIsActive);
@@ skipping 16 matching lines @@
         diff.removeAll(DeviceMotionAndOrientation.DEVICE_ORIENTATION_SENSORS);
 
         assertEquals(diff.size(), mMockSensorManager.numUnRegistered);
 
         mDeviceMotionAndOrientation.stop(DeviceMotionAndOrientation.DEVICE_ORIENTATION);
 
         assertTrue("should contain no sensors",
                 mDeviceMotionAndOrientation.mActiveSensors.isEmpty());
         assertEquals(diff.size() + DeviceMotionAndOrientation.DEVICE_ORIENTATION_SENSORS.size(),
                 mMockSensorManager.numUnRegistered);
+        assertEquals(0, mDeviceMotionAndOrientation.getNumberActiveDeviceMotionSensors());
     }
 
     @SmallTest
     public void testSensorChangedgotAccelerationAndOrientation() {
         boolean startOrientation = mDeviceMotionAndOrientation.start(0,
                 DeviceMotionAndOrientation.DEVICE_ORIENTATION, 100);
         boolean startMotion = mDeviceMotionAndOrientation.start(0,
                 DeviceMotionAndOrientation.DEVICE_MOTION, 100);
 
         assertTrue(startOrientation);
@@ skipping 127 matching lines @@
             numRegistered++;
             return true;
         }
 
         @Override
         public void unregisterListener(SensorEventListener listener, int sensorType) {
             numUnRegistered++;
         }
     }
 }