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

Unified Diff: 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
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
deleted file mode 100644
index 7db86e18fe0927f7949d34221933dc03353d89c8..0000000000000000000000000000000000000000
--- a/device/battery/android/javatests/src/org/chromium/device/battery/BatteryStatusManagerTest.java
+++ /dev/null
@@ -1,236 +0,0 @@
-// 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.device.battery;
-
-import android.content.Intent;
-import android.os.BatteryManager;
-import android.os.Build;
-import android.support.test.filters.SmallTest;
-import android.test.AndroidTestCase;
-
-import org.chromium.device.mojom.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 void verifyValues(
- boolean charging, double chargingTime, double dischargingTime, double level) {
- assertEquals(charging, mCharging);
- assertEquals(chargingTime, mChargingTime);
- assertEquals(dischargingTime, mDischargingTime);
- assertEquals(level, mLevel);
- }
-
- 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) {
- case BatteryManager.BATTERY_PROPERTY_CHARGE_COUNTER :
- return mChargeCounter;
- case BatteryManager.BATTERY_PROPERTY_CAPACITY:
- return mCapacity;
- case BatteryManager.BATTERY_PROPERTY_CURRENT_AVERAGE:
- return mAverageCurrent;
- }
- fail();
- return 0;
- }
-
- public FakeAndroidBatteryManager setIntProperty(int id, int value) {
- switch(id) {
- case BatteryManager.BATTERY_PROPERTY_CHARGE_COUNTER :
- mChargeCounter = value;
- return this;
- case BatteryManager.BATTERY_PROPERTY_CAPACITY:
- mCapacity = value;
- return this;
- case BatteryManager.BATTERY_PROPERTY_CURRENT_AVERAGE:
- mAverageCurrent = value;
- return this;
- }
- fail();
- return this;
- }
- }
-
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- initializeBatteryManager(null);
- }
-
- public void initializeBatteryManager(FakeAndroidBatteryManager managerForTesting) {
- mManager = BatteryStatusManager.createBatteryStatusManagerForTesting(
- getContext(), mCallback, managerForTesting);
- }
-
- @SmallTest
- public void testOnReceiveBatteryNotPluggedIn() {
- Intent intent = new Intent(Intent.ACTION_BATTERY_CHANGED);
- intent.putExtra(BatteryManager.EXTRA_PRESENT, true);
- intent.putExtra(BatteryManager.EXTRA_PLUGGED, 0);
- intent.putExtra(BatteryManager.EXTRA_LEVEL, 10);
- intent.putExtra(BatteryManager.EXTRA_SCALE, 100);
- intent.putExtra(BatteryManager.EXTRA_STATUS, BatteryManager.BATTERY_STATUS_NOT_CHARGING);
-
- mManager.onReceive(intent);
- verifyValues(false, Double.POSITIVE_INFINITY, Double.POSITIVE_INFINITY, 0.1);
- }
-
- @SmallTest
- public void testOnReceiveBatteryPluggedInACCharging() {
- Intent intent = new Intent(Intent.ACTION_BATTERY_CHANGED);
- intent.putExtra(BatteryManager.EXTRA_PRESENT, true);
- intent.putExtra(BatteryManager.EXTRA_PLUGGED, BatteryManager.BATTERY_PLUGGED_AC);
- intent.putExtra(BatteryManager.EXTRA_LEVEL, 50);
- intent.putExtra(BatteryManager.EXTRA_SCALE, 100);
- intent.putExtra(BatteryManager.EXTRA_STATUS, BatteryManager.BATTERY_STATUS_CHARGING);
-
- mManager.onReceive(intent);
- verifyValues(true, Double.POSITIVE_INFINITY, Double.POSITIVE_INFINITY, 0.5);
- }
-
- @SmallTest
- public void testOnReceiveBatteryPluggedInACNotCharging() {
- Intent intent = new Intent(Intent.ACTION_BATTERY_CHANGED);
- intent.putExtra(BatteryManager.EXTRA_PRESENT, true);
- intent.putExtra(BatteryManager.EXTRA_PLUGGED, BatteryManager.BATTERY_PLUGGED_AC);
- intent.putExtra(BatteryManager.EXTRA_LEVEL, 50);
- intent.putExtra(BatteryManager.EXTRA_SCALE, 100);
- intent.putExtra(BatteryManager.EXTRA_STATUS, BatteryManager.BATTERY_STATUS_NOT_CHARGING);
-
- mManager.onReceive(intent);
- verifyValues(true, Double.POSITIVE_INFINITY, Double.POSITIVE_INFINITY, 0.5);
- }
-
- @SmallTest
- public void testOnReceiveBatteryPluggedInUSBFull() {
- 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, 100);
- intent.putExtra(BatteryManager.EXTRA_SCALE, 100);
- intent.putExtra(BatteryManager.EXTRA_STATUS, BatteryManager.BATTERY_STATUS_FULL);
-
- mManager.onReceive(intent);
- verifyValues(true, 0, Double.POSITIVE_INFINITY, 1);
- }
-
- @SmallTest
- public void testOnReceiveNoBattery() {
- Intent intent = new Intent(Intent.ACTION_BATTERY_CHANGED);
- intent.putExtra(BatteryManager.EXTRA_PRESENT, false);
- intent.putExtra(BatteryManager.EXTRA_PLUGGED, BatteryManager.BATTERY_PLUGGED_USB);
-
- mManager.onReceive(intent);
- verifyValues(true, 0, Double.POSITIVE_INFINITY, 1);
- }
-
- @SmallTest
- public void testOnReceiveNoPluggedStatus() {
- Intent intent = new Intent(Intent.ACTION_BATTERY_CHANGED);
- intent.putExtra(BatteryManager.EXTRA_PRESENT, true);
-
- mManager.onReceive(intent);
- verifyValues(true, 0, Double.POSITIVE_INFINITY, 1);
- }
-
- @SmallTest
- public void testStartStopSucceeds() {
- assertTrue(mManager.start());
- mManager.stop();
- }
-
- @SmallTest
- public void testLollipopChargingTimeEstimate() {
- if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) return;
-
- 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);
-
- 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);
- }
-
- @SmallTest
- public void testLollipopDischargingTimeEstimate() {
- if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) return;
-
- Intent intent = new Intent(Intent.ACTION_BATTERY_CHANGED);
- intent.putExtra(BatteryManager.EXTRA_PRESENT, true);
- intent.putExtra(BatteryManager.EXTRA_PLUGGED, 0);
- intent.putExtra(BatteryManager.EXTRA_LEVEL, 60);
- intent.putExtra(BatteryManager.EXTRA_SCALE, 100);
- intent.putExtra(BatteryManager.EXTRA_STATUS, BatteryManager.BATTERY_STATUS_NOT_CHARGING);
-
- 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);
- }
-
- @SmallTest
- public void testLollipopDischargingTimeEstimateRounding() {
- if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) return;
-
- Intent intent = new Intent(Intent.ACTION_BATTERY_CHANGED);
- intent.putExtra(BatteryManager.EXTRA_PRESENT, true);
- intent.putExtra(BatteryManager.EXTRA_PLUGGED, 0);
- intent.putExtra(BatteryManager.EXTRA_LEVEL, 90);
- intent.putExtra(BatteryManager.EXTRA_SCALE, 100);
- intent.putExtra(BatteryManager.EXTRA_STATUS, BatteryManager.BATTERY_STATUS_NOT_CHARGING);
-
- 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);
- }
-}
« no previous file with comments | « device/battery/android/java/src/org/chromium/device/battery/BatteryStatusManager.java ('k') | device/battery/battery_export.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698