From 66f8f80023f742a206e6a8cb064d1ea29bca4fcc Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Thu, 31 Jan 2013 10:23:15 +0100 Subject: [PATCH] Add test case for previous commit Add test case for a battery which reports the current energy, but only the full charge (no energy_full). This reproduces https://bugs.freedesktop.org/show_bug.cgi?id=60104 --- src/linux/integration-test | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/src/linux/integration-test b/src/linux/integration-test index 986d98d..e48d226 100755 --- a/src/linux/integration-test +++ b/src/linux/integration-test @@ -428,6 +428,35 @@ class Tests(unittest.TestCase): self.assertEqual(self.get_dbus_dev_property(bat0_up, 'NativePath'), bat0) self.stop_daemon() + def test_battery_energy_charge_mixed(self): + '''battery which reports current energy, but full charge''' + + bat0 = self.add_device('power_supply', 'BAT0', + {'type': 'Battery', + 'present': '1', + 'status': 'Discharging', + 'charge_full': '10500000', + 'charge_full_design': '11000000', + 'energy_now': '50400000', + 'voltage_now': '12000000'}) + + self.start_daemon() + devs = self.proxy.EnumerateDevices() + self.assertEqual(len(devs), 1) + bat0_up = devs[0] + + self.assertEqual(self.get_dbus_property('OnBattery'), True) + self.assertEqual(self.get_dbus_property('OnLowBattery'), False) + self.assertEqual(self.get_dbus_dev_property(bat0_up, 'IsPresent'), True) + self.assertEqual(self.get_dbus_dev_property(bat0_up, 'State'), UP_DEVICE_STATE_DISCHARGING) + self.assertEqual(self.get_dbus_dev_property(bat0_up, 'Energy'), 50.4) + self.assertEqual(self.get_dbus_dev_property(bat0_up, 'EnergyFull'), 126.0) + self.assertEqual(self.get_dbus_dev_property(bat0_up, 'EnergyFullDesign'), 132.0) + self.assertEqual(self.get_dbus_dev_property(bat0_up, 'Voltage'), 12.0) + self.assertEqual(self.get_dbus_dev_property(bat0_up, 'NativePath'), bat0) + self.assertEqual(self.get_dbus_dev_property(bat0_up, 'Percentage'), 40.0) + self.stop_daemon() + def test_ups_ac(self): '''UPS properties with and without AC'''