Skip to content

GitLab

T
tangled
Commit 21669c13 authored by timvolodine's avatar timvolodine Committed by Commit bot
Browse files
Options

[Android] Fix BatteryStatusManagerTest instrumentation tests for devices running L. 

Currently some instrumentation tests relating to Battery Status API appear to fail
on Android L devices. This patch contains the fix.

BUG=474637

Review URL: https://codereview.chromium.org/1061303003

Cr-Commit-Position: refs/heads/master@{#324225}
parent 86af4462
Show whitespace changes
Inline Side-by-side
Showing with 20 additions and 22 deletions
device/battery/android/java/src/org/chromium/device/battery/BatteryStatusManager.java
View file @ 21669c13
...@@ -142,7 +142,7 @@ class BatteryStatusManager { ...@@ -142,7 +142,7 @@ class BatteryStatusManager {
batteryStatus.dischargingTime = dischargingTimeSeconds; batteryStatus.dischargingTime = dischargingTimeSeconds;
batteryStatus.level = level; batteryStatus.level = level;
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { if (mLollipopBatteryManager != null) {
updateBatteryStatusForLollipop(batteryStatus); updateBatteryStatusForLollipop(batteryStatus);
} }
......
device/battery/android/javatests/src/org/chromium/device/battery/BatteryStatusManagerTest.java
View file @ 21669c13
...@@ -35,6 +35,9 @@ public class BatteryStatusManagerTest extends AndroidTestCase { ...@@ -35,6 +35,9 @@ public class BatteryStatusManagerTest extends AndroidTestCase {
private BatteryStatusManager mManager; private BatteryStatusManager mManager;
// Can be non-null only for versions L and higher.
private BatteryManagerForTesting mLollipopManager;
private void verifyValues( private void verifyValues(
boolean charging, double chargingTime, double dischargingTime, double level) { boolean charging, double chargingTime, double dischargingTime, double level) {
assertEquals(charging, mCharging); assertEquals(charging, mCharging);
...@@ -85,6 +88,7 @@ public class BatteryStatusManagerTest extends AndroidTestCase { ...@@ -85,6 +88,7 @@ public class BatteryStatusManagerTest extends AndroidTestCase {
} }
public void initializeManager(BatteryManagerForTesting managerForTesting) { public void initializeManager(BatteryManagerForTesting managerForTesting) {
mLollipopManager = managerForTesting;
mManager = BatteryStatusManager.createBatteryStatusManagerForTesting( mManager = BatteryStatusManager.createBatteryStatusManagerForTesting(
getContext(), mCallback, managerForTesting); getContext(), mCallback, managerForTesting);
} }
...@@ -168,11 +172,9 @@ public class BatteryStatusManagerTest extends AndroidTestCase { ...@@ -168,11 +172,9 @@ public class BatteryStatusManagerTest extends AndroidTestCase {
@SmallTest @SmallTest
public void testLollipopChargingTimeEstimate() { public void testLollipopChargingTimeEstimate() {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) return;
return;
BatteryManagerForTesting testManager = new BatteryManagerForTesting(); initializeManager(new BatteryManagerForTesting());
initializeManager(testManager);
Intent intent = new Intent(Intent.ACTION_BATTERY_CHANGED); Intent intent = new Intent(Intent.ACTION_BATTERY_CHANGED);
intent.putExtra(BatteryManager.EXTRA_PRESENT, true); intent.putExtra(BatteryManager.EXTRA_PRESENT, true);
...@@ -180,9 +182,9 @@ public class BatteryStatusManagerTest extends AndroidTestCase { ...@@ -180,9 +182,9 @@ public class BatteryStatusManagerTest extends AndroidTestCase {
intent.putExtra(BatteryManager.EXTRA_LEVEL, 50); intent.putExtra(BatteryManager.EXTRA_LEVEL, 50);
intent.putExtra(BatteryManager.EXTRA_SCALE, 100); intent.putExtra(BatteryManager.EXTRA_SCALE, 100);
testManager.setIntProperty(BatteryManager.BATTERY_PROPERTY_CHARGE_COUNTER, 1000); mLollipopManager.setIntProperty(BatteryManager.BATTERY_PROPERTY_CHARGE_COUNTER, 1000);
testManager.setIntProperty(BatteryManager.BATTERY_PROPERTY_CAPACITY, 50); mLollipopManager.setIntProperty(BatteryManager.BATTERY_PROPERTY_CAPACITY, 50);
testManager.setIntProperty(BatteryManager.BATTERY_PROPERTY_CURRENT_AVERAGE, 100); mLollipopManager.setIntProperty(BatteryManager.BATTERY_PROPERTY_CURRENT_AVERAGE, 100);
mManager.onReceive(intent); mManager.onReceive(intent);
verifyValues(true, 0.5 * 10 * 3600, Double.POSITIVE_INFINITY, 0.5); verifyValues(true, 0.5 * 10 * 3600, Double.POSITIVE_INFINITY, 0.5);
...@@ -190,11 +192,9 @@ public class BatteryStatusManagerTest extends AndroidTestCase { ...@@ -190,11 +192,9 @@ public class BatteryStatusManagerTest extends AndroidTestCase {
@SmallTest @SmallTest
public void testLollipopDischargingTimeEstimate() { public void testLollipopDischargingTimeEstimate() {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) return;
return;
BatteryManagerForTesting testManager = new BatteryManagerForTesting(); initializeManager(new BatteryManagerForTesting());
initializeManager(testManager);
Intent intent = new Intent(Intent.ACTION_BATTERY_CHANGED); Intent intent = new Intent(Intent.ACTION_BATTERY_CHANGED);
intent.putExtra(BatteryManager.EXTRA_PRESENT, true); intent.putExtra(BatteryManager.EXTRA_PRESENT, true);
...@@ -203,9 +203,9 @@ public class BatteryStatusManagerTest extends AndroidTestCase { ...@@ -203,9 +203,9 @@ public class BatteryStatusManagerTest extends AndroidTestCase {
intent.putExtra(BatteryManager.EXTRA_SCALE, 100); intent.putExtra(BatteryManager.EXTRA_SCALE, 100);
intent.putExtra(BatteryManager.EXTRA_STATUS, BatteryManager.BATTERY_STATUS_NOT_CHARGING); intent.putExtra(BatteryManager.EXTRA_STATUS, BatteryManager.BATTERY_STATUS_NOT_CHARGING);
testManager.setIntProperty(BatteryManager.BATTERY_PROPERTY_CHARGE_COUNTER, 1000); mLollipopManager.setIntProperty(BatteryManager.BATTERY_PROPERTY_CHARGE_COUNTER, 1000);
testManager.setIntProperty(BatteryManager.BATTERY_PROPERTY_CAPACITY, 60); mLollipopManager.setIntProperty(BatteryManager.BATTERY_PROPERTY_CAPACITY, 60);
testManager.setIntProperty(BatteryManager.BATTERY_PROPERTY_CURRENT_AVERAGE, -100); mLollipopManager.setIntProperty(BatteryManager.BATTERY_PROPERTY_CURRENT_AVERAGE, -100);
mManager.onReceive(intent); mManager.onReceive(intent);
verifyValues(false, Double.POSITIVE_INFINITY, 0.6 * 10 * 3600, 0.6); verifyValues(false, Double.POSITIVE_INFINITY, 0.6 * 10 * 3600, 0.6);
...@@ -213,11 +213,9 @@ public class BatteryStatusManagerTest extends AndroidTestCase { ...@@ -213,11 +213,9 @@ public class BatteryStatusManagerTest extends AndroidTestCase {
@SmallTest @SmallTest
public void testLollipopDischargingTimeEstimateRounding() { public void testLollipopDischargingTimeEstimateRounding() {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) return;
return;
BatteryManagerForTesting testManager = new BatteryManagerForTesting(); initializeManager(new BatteryManagerForTesting());
initializeManager(testManager);
Intent intent = new Intent(Intent.ACTION_BATTERY_CHANGED); Intent intent = new Intent(Intent.ACTION_BATTERY_CHANGED);
intent.putExtra(BatteryManager.EXTRA_PRESENT, true); intent.putExtra(BatteryManager.EXTRA_PRESENT, true);
...@@ -226,9 +224,9 @@ public class BatteryStatusManagerTest extends AndroidTestCase { ...@@ -226,9 +224,9 @@ public class BatteryStatusManagerTest extends AndroidTestCase {
intent.putExtra(BatteryManager.EXTRA_SCALE, 100); intent.putExtra(BatteryManager.EXTRA_SCALE, 100);
intent.putExtra(BatteryManager.EXTRA_STATUS, BatteryManager.BATTERY_STATUS_NOT_CHARGING); intent.putExtra(BatteryManager.EXTRA_STATUS, BatteryManager.BATTERY_STATUS_NOT_CHARGING);
testManager.setIntProperty(BatteryManager.BATTERY_PROPERTY_CHARGE_COUNTER, 1999); mLollipopManager.setIntProperty(BatteryManager.BATTERY_PROPERTY_CHARGE_COUNTER, 1999);
testManager.setIntProperty(BatteryManager.BATTERY_PROPERTY_CAPACITY, 90); mLollipopManager.setIntProperty(BatteryManager.BATTERY_PROPERTY_CAPACITY, 90);
testManager.setIntProperty(BatteryManager.BATTERY_PROPERTY_CURRENT_AVERAGE, -1000); mLollipopManager.setIntProperty(BatteryManager.BATTERY_PROPERTY_CURRENT_AVERAGE, -1000);
mManager.onReceive(intent); mManager.onReceive(intent);
verifyValues(false, Double.POSITIVE_INFINITY, Math.floor(0.9 * 1.999 * 3600), 0.9); verifyValues(false, Double.POSITIVE_INFINITY, Math.floor(0.9 * 1.999 * 3600), 0.9);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment