[Android] Battery Status API: some tweaks to the BatteryStatusManager.java.

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

 // Copyright 2014 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 android.content.Context;
 import android.content.Intent;
 
 import android.os.BatteryManager;
@@ skipping 10 matching lines @@
 
     @Override
     public void setUp() throws Exception {
         super.setUp();
         mBatteryStatusManager = BatteryStatusManagerForTests.getInstance(getContext());
     }
 
     @SmallTest
     public void testOnReceiveBatteryDischarging() {
         Intent intent = new Intent(Intent.ACTION_BATTERY_CHANGED);
+        intent.putExtra(BatteryManager.EXTRA_PRESENT, true);
         intent.putExtra(BatteryManager.EXTRA_LEVEL, 10);
         intent.putExtra(BatteryManager.EXTRA_SCALE, 100);
         intent.putExtra(BatteryManager.EXTRA_STATUS, BatteryManager.BATTERY_STATUS_DISCHARGING);
 
         mBatteryStatusManager.onReceive(intent);
 
         mBatteryStatusManager.verifyCalls("gotBatteryStatus");
         mBatteryStatusManager.verifyValues(false, Double.POSITIVE_INFINITY,
                 Double.POSITIVE_INFINITY, 0.1);
     }
 
     @SmallTest
     public void testOnReceiveBatteryCharging() {
         Intent intent = new Intent(Intent.ACTION_BATTERY_CHANGED);
+        intent.putExtra(BatteryManager.EXTRA_PRESENT, true);
         intent.putExtra(BatteryManager.EXTRA_LEVEL, 50);
         intent.putExtra(BatteryManager.EXTRA_SCALE, 100);
         intent.putExtra(BatteryManager.EXTRA_STATUS, BatteryManager.BATTERY_STATUS_CHARGING);
 
         mBatteryStatusManager.onReceive(intent);
 
         mBatteryStatusManager.verifyCalls("gotBatteryStatus");
         mBatteryStatusManager.verifyValues(true, Double.POSITIVE_INFINITY,
                 Double.POSITIVE_INFINITY, 0.5);
     }
 
     @SmallTest
     public void testOnReceiveBatteryFull() {
         Intent intent = new Intent(Intent.ACTION_BATTERY_CHANGED);
+        intent.putExtra(BatteryManager.EXTRA_PRESENT, true);
         intent.putExtra(BatteryManager.EXTRA_LEVEL, 100);
         intent.putExtra(BatteryManager.EXTRA_SCALE, 100);
         intent.putExtra(BatteryManager.EXTRA_STATUS, BatteryManager.BATTERY_STATUS_FULL);
 
         mBatteryStatusManager.onReceive(intent);
 
         mBatteryStatusManager.verifyCalls("gotBatteryStatus");
         mBatteryStatusManager.verifyValues(true, 0, Double.POSITIVE_INFINITY, 1);
     }
 
@@ skipping 38 matching lines @@
             assertEquals(chargingTime, mChargingTime);
             assertEquals(dischargingTime, mDischargingTime);
             assertEquals(level, mLevel);
         }
 
         private void verifyCalls(String names) {
             assertEquals(mCalls, names);
         }
 
         @Override
+        protected boolean ignoreBatteryPresentState() {
+            return false;
+        }
+
+        @Override
         protected void gotBatteryStatus(boolean charging, double chargingTime,
                 double dischargingTime, double level) {
             mCharging = charging;
             mChargingTime = chargingTime;
             mDischargingTime = dischargingTime;
             mLevel = level;
             mCalls = mCalls.concat("gotBatteryStatus");
         }
     }
 
 }