Render Ash material design battery image icon without PNGs

ash/common/system/chromeos/power/power_status_unittest.cc

Index: ash/common/system/chromeos/power/power_status_unittest.cc
diff --git a/ash/common/system/chromeos/power/power_status_unittest.cc b/ash/common/system/chromeos/power/power_status_unittest.cc
index 5115828f5156cf034650ee4c7d437210b4800e9f..123ccf13988e55902f4fff1bf8f95e88a416b5d0 100644
--- a/ash/common/system/chromeos/power/power_status_unittest.cc
+++ b/ash/common/system/chromeos/power/power_status_unittest.cc
@@ -6,6 +6,8 @@
 
 #include <memory>
 
+#include "ash/common/material_design/material_design_controller.h"
+#include "ash/test/material_design_controller_test_api.h"
 #include "base/message_loop/message_loop.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -34,7 +36,9 @@ class TestObserver : public PowerStatus::Observer {
 
 }  // namespace
 
-class PowerStatusTest : public testing::Test {
+class PowerStatusTest
+    : public testing::Test,
+      public testing::WithParamInterface<MaterialDesignController::Mode> {
  public:
   PowerStatusTest() : power_status_(NULL) {}
   ~PowerStatusTest() override {}
@@ -45,9 +49,12 @@ class PowerStatusTest : public testing::Test {
     power_status_ = PowerStatus::Get();
     test_observer_.reset(new TestObserver);
     power_status_->AddObserver(test_observer_.get());
+    material_design_state_.reset(
+        new test::MaterialDesignControllerTestAPI(GetParam()));
   }
 
   void TearDown() override {
+    material_design_state_.reset();
     power_status_->RemoveObserver(test_observer_.get());
     test_observer_.reset();
     PowerStatus::Shutdown();
@@ -60,10 +67,19 @@ class PowerStatusTest : public testing::Test {
   std::unique_ptr<TestObserver> test_observer_;
 
  private:
+  std::unique_ptr<test::MaterialDesignControllerTestAPI> material_design_state_;
+
   DISALLOW_COPY_AND_ASSIGN(PowerStatusTest);
 };
 
-TEST_F(PowerStatusTest, InitializeAndUpdate) {
+INSTANTIATE_TEST_CASE_P(
+    ,

[James Cook, 2016/06/21 23:19:00]

nit: comment why this is blank

[tdanderson, 2016/06/22 15:25:00]

Done.

+    PowerStatusTest,
+    testing::Values(MaterialDesignController::NON_MATERIAL,
+                    MaterialDesignController::MATERIAL_NORMAL,
+                    MaterialDesignController::MATERIAL_EXPERIMENTAL));
+
+TEST_P(PowerStatusTest, InitializeAndUpdate) {
   // Test that the initial power supply state should be acquired after
   // PowerStatus is instantiated. This depends on
   // PowerManagerClientStubImpl, which responds to power status update
@@ -79,7 +95,7 @@ TEST_F(PowerStatusTest, InitializeAndUpdate) {
   EXPECT_EQ(2, test_observer_->power_changed_count());
 }
 
-TEST_F(PowerStatusTest, ShouldDisplayBatteryTime) {
+TEST_P(PowerStatusTest, ShouldDisplayBatteryTime) {
   EXPECT_FALSE(PowerStatus::ShouldDisplayBatteryTime(
       base::TimeDelta::FromSeconds(-1)));
   EXPECT_FALSE(PowerStatus::ShouldDisplayBatteryTime(
@@ -100,7 +116,7 @@ TEST_F(PowerStatusTest, ShouldDisplayBatteryTime) {
           PowerStatus::kMaxBatteryTimeToDisplaySec + 1)));
 }
 
-TEST_F(PowerStatusTest, SplitTimeIntoHoursAndMinutes) {
+TEST_P(PowerStatusTest, SplitTimeIntoHoursAndMinutes) {
   int hours = 0, minutes = 0;
   PowerStatus::SplitTimeIntoHoursAndMinutes(
       base::TimeDelta::FromSeconds(0), &hours, &minutes);
@@ -151,7 +167,10 @@ TEST_F(PowerStatusTest, SplitTimeIntoHoursAndMinutes) {
   EXPECT_EQ(0, minutes);
 }
 
-TEST_F(PowerStatusTest, GetBatteryImageInfo) {
+TEST_P(PowerStatusTest, GetBatteryImageInfo) {
+  const bool use_md_icon =
+      ash::MaterialDesignController::UseMaterialDesignSystemIcons();
+
   PowerSupplyProperties prop;
   prop.set_external_power(PowerSupplyProperties::AC);
   prop.set_battery_state(PowerSupplyProperties::CHARGING);
@@ -166,10 +185,16 @@ TEST_F(PowerStatusTest, GetBatteryImageInfo) {
   EXPECT_EQ(info_charging_98,
             power_status_->GetBatteryImageInfo(PowerStatus::ICON_LIGHT));
 
-  // The dark icon set should use a different image.
+  // The dark icon set should use a different image for non-MD, but the
+  // same image for MD.
   prop.set_battery_percent(98.0);
-  EXPECT_NE(info_charging_98,
-            power_status_->GetBatteryImageInfo(PowerStatus::ICON_DARK));
+  if (use_md_icon) {
+    EXPECT_EQ(info_charging_98,
+              power_status_->GetBatteryImageInfo(PowerStatus::ICON_DARK));
+  } else {
+    EXPECT_NE(info_charging_98,
+              power_status_->GetBatteryImageInfo(PowerStatus::ICON_DARK));
+  }
 
   // A different icon should be used when the battery is full, too.
   prop.set_battery_state(PowerSupplyProperties::FULL);
@@ -193,4 +218,120 @@ TEST_F(PowerStatusTest, GetBatteryImageInfo) {
             power_status_->GetBatteryImageInfo(PowerStatus::ICON_LIGHT));
 }
 
+// Tests that the |icon_badge| member of BatteryImageInfo is set correctly
+// with various power supply property values.
+TEST_P(PowerStatusTest, BatteryImageInfoIconBadge) {
+  PowerSupplyProperties prop;
+
+  // A charging battery connected to AC power should have an ICON_BADGE_BOLT.
+  prop.set_external_power(PowerSupplyProperties::AC);
+  prop.set_battery_state(PowerSupplyProperties::CHARGING);
+  prop.set_battery_percent(98.0);
+  power_status_->SetProtoForTesting(prop);
+  EXPECT_EQ(
+      PowerStatus::ICON_BADGE_BOLT,
+      power_status_->GetBatteryImageInfo(PowerStatus::ICON_LIGHT).icon_badge);
+
+  // A discharging battery connected to AC should also have an ICON_BADGE_BOLT.
+  prop.set_battery_state(PowerSupplyProperties::DISCHARGING);
+  power_status_->SetProtoForTesting(prop);
+  EXPECT_EQ(
+      PowerStatus::ICON_BADGE_BOLT,
+      power_status_->GetBatteryImageInfo(PowerStatus::ICON_LIGHT).icon_badge);
+
+  // A charging battery connected to USB power should have an
+  // ICON_BADGE_UNRELIABLE.
+  prop.set_external_power(PowerSupplyProperties::USB);
+  prop.set_battery_state(PowerSupplyProperties::CHARGING);
+  power_status_->SetProtoForTesting(prop);
+  EXPECT_EQ(
+      PowerStatus::ICON_BADGE_UNRELIABLE,
+      power_status_->GetBatteryImageInfo(PowerStatus::ICON_LIGHT).icon_badge);
+
+  // A discharging battery connected to USB power should also have an
+  // ICON_BADGE_UNRELIABLE.
+  prop.set_battery_state(PowerSupplyProperties::DISCHARGING);
+  power_status_->SetProtoForTesting(prop);
+  EXPECT_EQ(
+      PowerStatus::ICON_BADGE_UNRELIABLE,
+      power_status_->GetBatteryImageInfo(PowerStatus::ICON_LIGHT).icon_badge);
+
+  // Show an ICON_BADGE_X when no battery is present.
+  prop.set_external_power(PowerSupplyProperties::DISCONNECTED);
+  prop.set_battery_state(PowerSupplyProperties::NOT_PRESENT);
+  power_status_->SetProtoForTesting(prop);
+  EXPECT_EQ(
+      PowerStatus::ICON_BADGE_X,
+      power_status_->GetBatteryImageInfo(PowerStatus::ICON_LIGHT).icon_badge);
+
+  // Do not show a badge when the battery is discharging.
+  prop.set_battery_state(PowerSupplyProperties::DISCHARGING);
+  power_status_->SetProtoForTesting(prop);
+  EXPECT_EQ(
+      PowerStatus::ICON_BADGE_NONE,
+      power_status_->GetBatteryImageInfo(PowerStatus::ICON_LIGHT).icon_badge);
+
+  // Show ICON_BADGE_ALERT for a discharging battery when it falls below
+  // a charge level of 9%.
+  prop.set_battery_percent(9.0);
+  power_status_->SetProtoForTesting(prop);
+  EXPECT_EQ(
+      PowerStatus::ICON_BADGE_NONE,
+      power_status_->GetBatteryImageInfo(PowerStatus::ICON_LIGHT).icon_badge);
+  prop.set_battery_percent(8.0);
+  power_status_->SetProtoForTesting(prop);
+  EXPECT_EQ(
+      PowerStatus::ICON_BADGE_ALERT,
+      power_status_->GetBatteryImageInfo(PowerStatus::ICON_LIGHT).icon_badge);
+}
+
+// Tests that the |charge_level| member of BatteryImageInfo is set correctly
+// with various power supply property values.
+TEST_P(PowerStatusTest, BatteryImageInfoChargeLevel) {
+  PowerSupplyProperties prop;
+
+  // No charge level is drawn when the battery is not present.
+  prop.set_external_power(PowerSupplyProperties::DISCONNECTED);
+  prop.set_battery_state(PowerSupplyProperties::NOT_PRESENT);
+  power_status_->SetProtoForTesting(prop);
+  EXPECT_EQ(
+      0,
+      power_status_->GetBatteryImageInfo(PowerStatus::ICON_LIGHT).charge_level);
+
+  // A charge level of 1 when the battery is up to 16% full, and a level of 2

[James Cook, 2016/06/21 23:19:00]

optional: maybe also test battery at 0%? I think we can get into that state?

[tdanderson, 2016/06/22 15:25:01]

Done.

+  // for 17% full.
+  prop.set_external_power(PowerSupplyProperties::AC);
+  prop.set_battery_state(PowerSupplyProperties::CHARGING);
+  prop.set_battery_percent(16.0);
+  power_status_->SetProtoForTesting(prop);
+  EXPECT_EQ(
+      1,
+      power_status_->GetBatteryImageInfo(PowerStatus::ICON_LIGHT).charge_level);
+  prop.set_battery_percent(17.0);
+  power_status_->SetProtoForTesting(prop);
+  EXPECT_EQ(
+      2,
+      power_status_->GetBatteryImageInfo(PowerStatus::ICON_LIGHT).charge_level);
+
+  // A charge level of 6 when the battery is 50% full.
+  prop.set_battery_percent(50.0);
+  power_status_->SetProtoForTesting(prop);
+  EXPECT_EQ(
+      6,
+      power_status_->GetBatteryImageInfo(PowerStatus::ICON_LIGHT).charge_level);
+
+  // A charge level of 11 when the battery is 99% full, and a level of 12 when
+  // the battery is 100% full.
+  prop.set_battery_percent(99.0);
+  power_status_->SetProtoForTesting(prop);
+  EXPECT_EQ(
+      11,
+      power_status_->GetBatteryImageInfo(PowerStatus::ICON_LIGHT).charge_level);
+  prop.set_battery_percent(100.0);
+  power_status_->SetProtoForTesting(prop);
+  EXPECT_EQ(
+      12,
+      power_status_->GetBatteryImageInfo(PowerStatus::ICON_LIGHT).charge_level);
+}

[James Cook, 2016/06/21 23:19:00]

Nice test suite, very thorough.

[tdanderson, 2016/06/22 15:25:01]

Thank you

+
 }  // namespace ash