services/device/battery/android/javatests/src/org/chromium/device/battery/BatteryStatusManagerTest.java - Issue 2818673003: [DeviceService] Expose battery monitoring solely via the Device Service

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2818673003: [DeviceService] Expose battery monitoring solely via the Device Service (Closed)

Patch Set: Java file format change Created 3 years, 8 months 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 | « services/device/battery/android/java/src/org/chromium/device/battery/BatteryStatusManager.java ('k') | services/device/battery/battery_monitor_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: services/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/services/device/battery/android/javatests/src/org/chromium/device/battery/BatteryStatusManagerTest.java

similarity index 95%

rename from device/battery/android/javatests/src/org/chromium/device/battery/BatteryStatusManagerTest.java

rename to services/device/battery/android/javatests/src/org/chromium/device/battery/BatteryStatusManagerTest.java

index 7db86e18fe0927f7949d34221933dc03353d89c8..bd7a4699ed68f33810b73a03afa3b0af53be9aae 100644

--- a/device/battery/android/javatests/src/org/chromium/device/battery/BatteryStatusManagerTest.java

+++ b/services/device/battery/android/javatests/src/org/chromium/device/battery/BatteryStatusManagerTest.java

@@ -24,14 +24,14 @@ public class BatteryStatusManagerTest extends AndroidTestCase {

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;

- }

- };

+ @Override

+ public void onBatteryStatusChanged(BatteryStatus batteryStatus) {

+ mCharging = batteryStatus.charging;

+ mChargingTime = batteryStatus.chargingTime;

+ mDischargingTime = batteryStatus.dischargingTime;

+ mLevel = batteryStatus.level;

+ }

+ };

private BatteryStatusManager mManager;

@@ -55,8 +55,8 @@ public class BatteryStatusManagerTest extends AndroidTestCase {

@Override

public int getIntProperty(int id) {

- switch(id) {

- case BatteryManager.BATTERY_PROPERTY_CHARGE_COUNTER :

+ switch (id) {

+ case BatteryManager.BATTERY_PROPERTY_CHARGE_COUNTER:

return mChargeCounter;

case BatteryManager.BATTERY_PROPERTY_CAPACITY:

return mCapacity;

@@ -68,8 +68,8 @@ public class BatteryStatusManagerTest extends AndroidTestCase {

}

public FakeAndroidBatteryManager setIntProperty(int id, int value) {

- switch(id) {

- case BatteryManager.BATTERY_PROPERTY_CHARGE_COUNTER :

+ switch (id) {

+ case BatteryManager.BATTERY_PROPERTY_CHARGE_COUNTER:

mChargeCounter = value;

return this;

case BatteryManager.BATTERY_PROPERTY_CAPACITY: