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

Unified Diff: chrome/browser/chromeos/status/power_menu_button_browsertest.cc

Issue 8536048: Make power button in status view invisible until we are sure battery is supported on device. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: a Created 9 years, 1 month 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: chrome/browser/chromeos/status/power_menu_button_browsertest.cc
diff --git a/chrome/browser/chromeos/status/power_menu_button_browsertest.cc b/chrome/browser/chromeos/status/power_menu_button_browsertest.cc
index fe476f0d7dc1c8c32ef482a1fb9b7497ad686f96..9b485fae857c7f31a1f6b764ee4e5c9004b73757 100644
--- a/chrome/browser/chromeos/status/power_menu_button_browsertest.cc
+++ b/chrome/browser/chromeos/status/power_menu_button_browsertest.cc
@@ -28,7 +28,10 @@ class PowerMenuButtonTest : public InProcessBrowserTest {
string16 CallPowerChangedAndGetTooltipText(const PowerSupplyStatus& status) {
PowerMenuButton* power = GetPowerMenuButton();
+
power->PowerChanged(status);
+ EXPECT_TRUE(power->IsVisible());
+
string16 tooltip;
// There is static_cast<StatusAreaButton*> because GetTootipText is also
// declared in MenuDelegate
@@ -58,11 +61,30 @@ IN_PROC_BROWSER_TEST_F(PowerMenuButtonTest, BatteryMissingTest) {
status.battery_is_present = false;
status.battery_percentage = 42.0;
status.battery_is_full = false;
+ status.line_power_on = true;
+ status.battery_seconds_to_empty = 42;
+ status.battery_seconds_to_full = 24;
+
+ PowerMenuButton* power = GetPowerMenuButton();
+ power->PowerChanged(status);
+
+ EXPECT_FALSE(power->IsVisible());
+}
+
+IN_PROC_BROWSER_TEST_F(PowerMenuButtonTest, BatteryNotSupportedTest) {
+ PowerSupplyStatus status;
+ // No battery present.
+ status.battery_is_present = false;
+ status.battery_percentage = 42.0;
+ status.battery_is_full = false;
status.line_power_on = false;
status.battery_seconds_to_empty = 42;
status.battery_seconds_to_full = 24;
- EXPECT_NE(tooltip_before, CallPowerChangedAndGetTooltipText(status));
+ PowerMenuButton* power = GetPowerMenuButton();
+ power->PowerChanged(status);
+
+ EXPECT_FALSE(power->IsVisible());
}
IN_PROC_BROWSER_TEST_F(PowerMenuButtonTest, BatteryChargedTest) {

Powered by Google App Engine
This is Rietveld 408576698