[Android] Check for AC and wireless charging when determining charging state.

build/android/pylib/device/device_utils_test.py

 #!/usr/bin/env python
 # 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.
 
 """
 Unit tests for the contents of device_utils.py (mostly DeviceUtils).
 """
 
 # pylint: disable=C0321
@@ skipping 1393 matching lines @@
           self.device.GetBatteryInfo())
 
 
   def testGetBatteryInfo_nothing(self):
     with self.assertCall(
         self.call.device.RunShellCommand(
             ['dumpsys', 'battery'], check_return=True), []):
       self.assertEquals({}, self.device.GetBatteryInfo())
 
 
-class DeviceUtilsGetUsbChargingTest(DeviceUtilsTest):
-  def testGetUsbCharging_true(self):
+class DeviceUtilsGetChargingTest(DeviceUtilsTest):
+  def testGetCharging_usb(self):
     with self.assertCall(
         self.call.device.GetBatteryInfo(), {'USB powered': 'true'}):
-      self.assertTrue(self.device.GetUsbCharging())
+      self.assertTrue(self.device.GetCharging())
 
-  def testGetUsbCharging_false(self):
+  def testGetCharging_usbFalse(self):
     with self.assertCall(
         self.call.device.GetBatteryInfo(), {'USB powered': 'false'}):
-      self.assertFalse(self.device.GetUsbCharging())
+      self.assertFalse(self.device.GetCharging())
 
-  def testGetUsbCharging_unknown(self):
+  def testGetCharging_ac(self):
     with self.assertCall(
         self.call.device.GetBatteryInfo(), {'AC powered': 'true'}):
-      self.assertFalse(self.device.GetUsbCharging())
+      self.assertTrue(self.device.GetCharging())
+
+  def testGetCharging_wireless(self):
+    with self.assertCall(
+        self.call.device.GetBatteryInfo(), {'Wireless powered': 'true'}):
+      self.assertTrue(self.device.GetCharging())
+
+  def testGetCharging_unknown(self):
+    with self.assertCall(
+        self.call.device.GetBatteryInfo(), {'level': '42'}):
+      self.assertFalse(self.device.GetCharging())
 
 
-class DeviceUtilsSetUsbChargingTest(DeviceUtilsTest):
+class DeviceUtilsSetChargingTest(DeviceUtilsTest):
 
   @mock.patch('time.sleep', mock.Mock())
-  def testSetUsbCharging_enabled(self):
+  def testSetCharging_enabled(self):
     with self.assertCalls(
         (self.call.device.FileExists(mock.ANY), True),
-        (self.call.device.RunShellCommand(mock.ANY), []),
-        (self.call.device.GetUsbCharging(), False),
-        (self.call.device.RunShellCommand(mock.ANY), []),
-        (self.call.device.GetUsbCharging(), True)):
-      self.device.SetUsbCharging(True)
+        (self.call.device.RunShellCommand(mock.ANY, check_return=True), []),
+        (self.call.device.GetCharging(), False),
+        (self.call.device.RunShellCommand(mock.ANY, check_return=True), []),
+        (self.call.device.GetCharging(), True)):
+      self.device.SetCharging(True)
 
-  def testSetUsbCharging_alreadyEnabled(self):
+  def testSetCharging_alreadyEnabled(self):
     with self.assertCalls(
         (self.call.device.FileExists(mock.ANY), True),
-        (self.call.device.RunShellCommand(mock.ANY), []),
-        (self.call.device.GetUsbCharging(), True)):
-      self.device.SetUsbCharging(True)
+        (self.call.device.RunShellCommand(mock.ANY, check_return=True), []),
+        (self.call.device.GetCharging(), True)):
+      self.device.SetCharging(True)
 
   @mock.patch('time.sleep', mock.Mock())
-  def testSetUsbCharging_disabled(self):
+  def testSetCharging_disabled(self):
     with self.assertCalls(
         (self.call.device.FileExists(mock.ANY), True),
-        (self.call.device.RunShellCommand(mock.ANY), []),
-        (self.call.device.GetUsbCharging(), True),
-        (self.call.device.RunShellCommand(mock.ANY), []),
-        (self.call.device.GetUsbCharging(), False)):
-      self.device.SetUsbCharging(False)
+        (self.call.device.RunShellCommand(mock.ANY, check_return=True), []),
+        (self.call.device.GetCharging(), True),
+        (self.call.device.RunShellCommand(mock.ANY, check_return=True), []),
+        (self.call.device.GetCharging(), False)):
+      self.device.SetCharging(False)
 
 
 
 class DeviceUtilsStrTest(DeviceUtilsTest):
 
   def testStr_returnsSerial(self):
     with self.assertCalls(
         (self.call.adb.GetDeviceSerial(), '0123456789abcdef')):
       self.assertEqual('0123456789abcdef', str(self.device))
 
@@ skipping 16 matching lines @@
     with self.assertCall(
         mock.call.pylib.device.adb_wrapper.AdbWrapper.GetDevices(), []):
       with self.assertRaises(device_errors.NoDevicesError):
         device_utils.DeviceUtils.parallel()
 
 
 if __name__ == '__main__':
   logging.getLogger().setLevel(logging.DEBUG)
   unittest.main(verbosity=2)