Index: device/battery/android/javatests/src/org/chromium/device/battery/BatteryStatusManagerTest.java |
diff --git a/device/battery/android/javatests/src/org/chromium/device/battery/BatteryStatusManagerTest.java b/device/battery/android/javatests/src/org/chromium/device/battery/BatteryStatusManagerTest.java |
index 2390d407c4f29e605d4ea187001f067e560e07d3..395eefcffc70aceb0809a9a9d8b1d07c8e3c7910 100644 |
--- a/device/battery/android/javatests/src/org/chromium/device/battery/BatteryStatusManagerTest.java |
+++ b/device/battery/android/javatests/src/org/chromium/device/battery/BatteryStatusManagerTest.java |
@@ -35,9 +35,6 @@ public class BatteryStatusManagerTest extends AndroidTestCase { |
private BatteryStatusManager mManager; |
- // Can be non-null only for versions L and higher. |
- private BatteryManagerForTesting mLollipopManager; |
- |
private void verifyValues( |
boolean charging, double chargingTime, double dischargingTime, double level) { |
assertEquals(charging, mCharging); |
@@ -46,11 +43,16 @@ public class BatteryStatusManagerTest extends AndroidTestCase { |
assertEquals(level, mLevel); |
} |
- private static class BatteryManagerForTesting extends BatteryManager { |
+ private static class FakeAndroidBatteryManager |
+ extends BatteryStatusManager.AndroidBatteryManagerWrapper { |
private int mChargeCounter; |
private int mCapacity; |
private int mAverageCurrent; |
+ private FakeAndroidBatteryManager() { |
+ super(null); |
+ } |
+ |
@Override |
public int getIntProperty(int id) { |
switch(id) { |
@@ -65,30 +67,30 @@ public class BatteryStatusManagerTest extends AndroidTestCase { |
return 0; |
} |
- public void setIntProperty(int id, int value) { |
+ public FakeAndroidBatteryManager setIntProperty(int id, int value) { |
switch(id) { |
case BatteryManager.BATTERY_PROPERTY_CHARGE_COUNTER : |
mChargeCounter = value; |
- return; |
+ return this; |
case BatteryManager.BATTERY_PROPERTY_CAPACITY: |
mCapacity = value; |
- return; |
+ return this; |
case BatteryManager.BATTERY_PROPERTY_CURRENT_AVERAGE: |
mAverageCurrent = value; |
- return; |
+ return this; |
} |
fail(); |
+ return this; |
} |
} |
@Override |
protected void setUp() throws Exception { |
super.setUp(); |
- initializeManager(null); |
+ initializeBatteryManager(null); |
} |
- public void initializeManager(BatteryManagerForTesting managerForTesting) { |
- mLollipopManager = managerForTesting; |
+ public void initializeBatteryManager(FakeAndroidBatteryManager managerForTesting) { |
mManager = BatteryStatusManager.createBatteryStatusManagerForTesting( |
getContext(), mCallback, managerForTesting); |
} |
@@ -174,17 +176,17 @@ public class BatteryStatusManagerTest extends AndroidTestCase { |
public void testLollipopChargingTimeEstimate() { |
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) return; |
- initializeManager(new BatteryManagerForTesting()); |
- |
Intent intent = new Intent(Intent.ACTION_BATTERY_CHANGED); |
intent.putExtra(BatteryManager.EXTRA_PRESENT, true); |
intent.putExtra(BatteryManager.EXTRA_PLUGGED, BatteryManager.BATTERY_PLUGGED_USB); |
intent.putExtra(BatteryManager.EXTRA_LEVEL, 50); |
intent.putExtra(BatteryManager.EXTRA_SCALE, 100); |
- mLollipopManager.setIntProperty(BatteryManager.BATTERY_PROPERTY_CHARGE_COUNTER, 1000); |
- mLollipopManager.setIntProperty(BatteryManager.BATTERY_PROPERTY_CAPACITY, 50); |
- mLollipopManager.setIntProperty(BatteryManager.BATTERY_PROPERTY_CURRENT_AVERAGE, 100); |
+ initializeBatteryManager( |
+ new FakeAndroidBatteryManager() |
+ .setIntProperty(BatteryManager.BATTERY_PROPERTY_CHARGE_COUNTER, 1000) |
+ .setIntProperty(BatteryManager.BATTERY_PROPERTY_CAPACITY, 50) |
+ .setIntProperty(BatteryManager.BATTERY_PROPERTY_CURRENT_AVERAGE, 100)); |
mManager.onReceive(intent); |
verifyValues(true, 0.5 * 10 * 3600, Double.POSITIVE_INFINITY, 0.5); |
@@ -194,8 +196,6 @@ public class BatteryStatusManagerTest extends AndroidTestCase { |
public void testLollipopDischargingTimeEstimate() { |
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) return; |
- initializeManager(new BatteryManagerForTesting()); |
- |
Intent intent = new Intent(Intent.ACTION_BATTERY_CHANGED); |
intent.putExtra(BatteryManager.EXTRA_PRESENT, true); |
intent.putExtra(BatteryManager.EXTRA_PLUGGED, 0); |
@@ -203,9 +203,11 @@ public class BatteryStatusManagerTest extends AndroidTestCase { |
intent.putExtra(BatteryManager.EXTRA_SCALE, 100); |
intent.putExtra(BatteryManager.EXTRA_STATUS, BatteryManager.BATTERY_STATUS_NOT_CHARGING); |
- mLollipopManager.setIntProperty(BatteryManager.BATTERY_PROPERTY_CHARGE_COUNTER, 1000); |
- mLollipopManager.setIntProperty(BatteryManager.BATTERY_PROPERTY_CAPACITY, 60); |
- mLollipopManager.setIntProperty(BatteryManager.BATTERY_PROPERTY_CURRENT_AVERAGE, -100); |
+ initializeBatteryManager( |
+ new FakeAndroidBatteryManager() |
+ .setIntProperty(BatteryManager.BATTERY_PROPERTY_CHARGE_COUNTER, 1000) |
+ .setIntProperty(BatteryManager.BATTERY_PROPERTY_CAPACITY, 60) |
+ .setIntProperty(BatteryManager.BATTERY_PROPERTY_CURRENT_AVERAGE, -100)); |
mManager.onReceive(intent); |
verifyValues(false, Double.POSITIVE_INFINITY, 0.6 * 10 * 3600, 0.6); |
@@ -215,8 +217,6 @@ public class BatteryStatusManagerTest extends AndroidTestCase { |
public void testLollipopDischargingTimeEstimateRounding() { |
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) return; |
- initializeManager(new BatteryManagerForTesting()); |
- |
Intent intent = new Intent(Intent.ACTION_BATTERY_CHANGED); |
intent.putExtra(BatteryManager.EXTRA_PRESENT, true); |
intent.putExtra(BatteryManager.EXTRA_PLUGGED, 0); |
@@ -224,9 +224,11 @@ public class BatteryStatusManagerTest extends AndroidTestCase { |
intent.putExtra(BatteryManager.EXTRA_SCALE, 100); |
intent.putExtra(BatteryManager.EXTRA_STATUS, BatteryManager.BATTERY_STATUS_NOT_CHARGING); |
- mLollipopManager.setIntProperty(BatteryManager.BATTERY_PROPERTY_CHARGE_COUNTER, 1999); |
- mLollipopManager.setIntProperty(BatteryManager.BATTERY_PROPERTY_CAPACITY, 90); |
- mLollipopManager.setIntProperty(BatteryManager.BATTERY_PROPERTY_CURRENT_AVERAGE, -1000); |
+ initializeBatteryManager( |
+ new FakeAndroidBatteryManager() |
+ .setIntProperty(BatteryManager.BATTERY_PROPERTY_CHARGE_COUNTER, 1999) |
+ .setIntProperty(BatteryManager.BATTERY_PROPERTY_CAPACITY, 90) |
+ .setIntProperty(BatteryManager.BATTERY_PROPERTY_CURRENT_AVERAGE, -1000)); |
mManager.onReceive(intent); |
verifyValues(false, Double.POSITIVE_INFINITY, Math.floor(0.9 * 1.999 * 3600), 0.9); |