Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(64)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: device/battery/android/javatests/src/org/chromium/device/battery/BatteryStatusManagerTest.java

Issue 641703002: Rewrite the Android implementation of BatteryMonitor directly in Java. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@battery-status-api-to-mojo
Patch Set: webview, build! Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « device/battery/android/java/src/org/chromium/device/battery/BatteryStatusManager.java ('k') | device/battery/battery.gyp » ('j') | device/battery/battery.gyp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 4fb2d80526bf25e647b24a9d6bde41f66cf6de7c..addcdde2865092e319b66541dd1a4f292c26cb92 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
@@ -4,25 +4,49 @@
package org.chromium.device.battery;
-import android.content.Context;
import android.content.Intent;
-
import android.os.BatteryManager;
-
import android.test.AndroidTestCase;
import android.test.suitebuilder.annotation.SmallTest;
+import org.chromium.mojom.device.BatteryStatus;
+
/**
* Test suite for BatteryStatusManager.
*/
public class BatteryStatusManagerTest extends AndroidTestCase {
+ // Values reported in the most recent callback from |mManager|.
+ private boolean mCharging = false;
+ private double mChargingTime = 0;
+ private double mDischargingTime = 0;
+ private double mLevel = 0;
+
+ private BatteryStatusManager.BatteryStatusCallback mCallback =
+ new BatteryStatusManager.BatteryStatusCallback() {
+ @Override
+ public void onBatteryStatusChanged(BatteryStatus batteryStatus) {
+ mCharging = batteryStatus.charging;
+ mChargingTime = batteryStatus.chargingTime;
+ mDischargingTime = batteryStatus.dischargingTime;
+ mLevel = batteryStatus.level;
+ }
+ };
+
+ private BatteryStatusManager mManager;
- private BatteryStatusManagerForTests mBatteryStatusManager;
+ private void verifyValues(
+ boolean charging, double chargingTime, double dischargingTime, double level) {
+ assertEquals(charging, mCharging);
+ assertEquals(chargingTime, mChargingTime);
+ assertEquals(dischargingTime, mDischargingTime);
+ assertEquals(level, mLevel);
+ }
@Override
- public void setUp() throws Exception {
+ protected void setUp() throws Exception {
super.setUp();
- mBatteryStatusManager = BatteryStatusManagerForTests.getInstance(getContext());
+ mManager =
+ BatteryStatusManager.createBatteryStatusManagerForTesting(getContext(), mCallback);
}
@SmallTest
@@ -34,11 +58,8 @@ public class BatteryStatusManagerTest extends AndroidTestCase {
intent.putExtra(BatteryManager.EXTRA_SCALE, 100);
intent.putExtra(BatteryManager.EXTRA_STATUS, BatteryManager.BATTERY_STATUS_NOT_CHARGING);
- mBatteryStatusManager.onReceive(intent);
-
- mBatteryStatusManager.verifyCalls("gotBatteryStatus");
- mBatteryStatusManager.verifyValues(false, Double.POSITIVE_INFINITY,
- Double.POSITIVE_INFINITY, 0.1);
+ mManager.onReceive(intent);
+ verifyValues(false, Double.POSITIVE_INFINITY, Double.POSITIVE_INFINITY, 0.1);
}
@SmallTest
@@ -50,11 +71,8 @@ public class BatteryStatusManagerTest extends AndroidTestCase {
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);
+ mManager.onReceive(intent);
+ verifyValues(true, Double.POSITIVE_INFINITY, Double.POSITIVE_INFINITY, 0.5);
}
@SmallTest
@@ -66,11 +84,8 @@ public class BatteryStatusManagerTest extends AndroidTestCase {
intent.putExtra(BatteryManager.EXTRA_SCALE, 100);
intent.putExtra(BatteryManager.EXTRA_STATUS, BatteryManager.BATTERY_STATUS_NOT_CHARGING);
- mBatteryStatusManager.onReceive(intent);
-
- mBatteryStatusManager.verifyCalls("gotBatteryStatus");
- mBatteryStatusManager.verifyValues(true, Double.POSITIVE_INFINITY,
- Double.POSITIVE_INFINITY, 0.5);
+ mManager.onReceive(intent);
+ verifyValues(true, Double.POSITIVE_INFINITY, Double.POSITIVE_INFINITY, 0.5);
}
@SmallTest
@@ -82,10 +97,8 @@ public class BatteryStatusManagerTest extends AndroidTestCase {
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);
+ mManager.onReceive(intent);
+ verifyValues(true, 0, Double.POSITIVE_INFINITY, 1);
}
@SmallTest
@@ -94,10 +107,8 @@ public class BatteryStatusManagerTest extends AndroidTestCase {
intent.putExtra(BatteryManager.EXTRA_PRESENT, false);
intent.putExtra(BatteryManager.EXTRA_PLUGGED, BatteryManager.BATTERY_PLUGGED_USB);
- mBatteryStatusManager.onReceive(intent);
-
- mBatteryStatusManager.verifyCalls("gotBatteryStatus");
- mBatteryStatusManager.verifyValues(true, 0, Double.POSITIVE_INFINITY, 1);
+ mManager.onReceive(intent);
+ verifyValues(true, 0, Double.POSITIVE_INFINITY, 1);
}
@SmallTest
@@ -105,62 +116,13 @@ public class BatteryStatusManagerTest extends AndroidTestCase {
Intent intent = new Intent(Intent.ACTION_BATTERY_CHANGED);
intent.putExtra(BatteryManager.EXTRA_PRESENT, true);
- mBatteryStatusManager.onReceive(intent);
-
- mBatteryStatusManager.verifyCalls("gotBatteryStatus");
- mBatteryStatusManager.verifyValues(true, 0, Double.POSITIVE_INFINITY, 1);
+ mManager.onReceive(intent);
+ verifyValues(true, 0, Double.POSITIVE_INFINITY, 1);
}
@SmallTest
public void testStartStopSucceeds() {
- assertTrue(mBatteryStatusManager.start(0));
- mBatteryStatusManager.stop();
- }
-
- // Helper class for testing.
-
- private static class BatteryStatusManagerForTests extends BatteryStatusManager {
-
- private boolean mCharging = false;
- private double mChargingTime = 0;
- private double mDischargingTime = 0;
- private double mLevel = 0;
- private String mCalls = "";
-
- private BatteryStatusManagerForTests(Context context) {
- super(context);
- }
-
- static BatteryStatusManagerForTests getInstance(Context context) {
- return new BatteryStatusManagerForTests(context);
- }
-
- private void verifyValues(boolean charging, double chargingTime,
- double dischargingTime, double level) {
- assertEquals(charging, mCharging);
- 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");
- }
+ assertTrue(mManager.start());
+ mManager.stop();
}
-
}
« no previous file with comments | « device/battery/android/java/src/org/chromium/device/battery/BatteryStatusManager.java ('k') | device/battery/battery.gyp » ('j') | device/battery/battery.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698