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

Unified Diff: ash/system/tiles/tray_tiles_unittest.cc

Issue 2857103007: [Night Light] CL2: Ash and system tray work (Closed)
Patch Set: James' comments Created 3 years, 7 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: ash/system/tiles/tray_tiles_unittest.cc
diff --git a/ash/system/tiles/tray_tiles_unittest.cc b/ash/system/tiles/tray_tiles_unittest.cc
index 30fa09497afdea6b6507eb5e1df5e4250fdfd376..48d5d1c633a542c050744d00cc49f199b8bf488a 100644
--- a/ash/system/tiles/tray_tiles_unittest.cc
+++ b/ash/system/tiles/tray_tiles_unittest.cc
@@ -39,6 +39,10 @@ class TrayTilesTest : public test::NoSessionAshTestBase {
return tray_tiles()->default_view_->help_button_;
}
+ views::CustomButton* GetNightLightButton() {
+ return tray_tiles()->default_view_->night_light_button_;
+ }
+
views::CustomButton* GetLockButton() {
return tray_tiles()->default_view_->lock_button_;
}
@@ -61,6 +65,7 @@ TEST_F(TrayTilesTest, ButtonStatesNotLoggedIn) {
tray_tiles()->CreateDefaultViewForTesting());
EXPECT_EQ(Button::STATE_DISABLED, GetSettingsButton()->state());
EXPECT_EQ(Button::STATE_DISABLED, GetHelpButton()->state());
+ EXPECT_EQ(Button::STATE_DISABLED, GetNightLightButton()->state());
EXPECT_EQ(Button::STATE_DISABLED, GetLockButton()->state());
EXPECT_EQ(Button::STATE_NORMAL, GetPowerButton()->state());
}
@@ -72,6 +77,7 @@ TEST_F(TrayTilesTest, ButtonStatesLoggedIn) {
tray_tiles()->CreateDefaultViewForTesting());
EXPECT_EQ(Button::STATE_NORMAL, GetSettingsButton()->state());
EXPECT_EQ(Button::STATE_NORMAL, GetHelpButton()->state());
+ EXPECT_EQ(Button::STATE_NORMAL, GetNightLightButton()->state());
EXPECT_EQ(Button::STATE_NORMAL, GetLockButton()->state());
EXPECT_EQ(Button::STATE_NORMAL, GetPowerButton()->state());
}
@@ -83,6 +89,7 @@ TEST_F(TrayTilesTest, ButtonStatesLockScreen) {
tray_tiles()->CreateDefaultViewForTesting());
EXPECT_EQ(Button::STATE_DISABLED, GetSettingsButton()->state());
EXPECT_EQ(Button::STATE_DISABLED, GetHelpButton()->state());
+ EXPECT_EQ(Button::STATE_DISABLED, GetNightLightButton()->state());
James Cook 2017/05/05 20:47:43 Any particular reason this feature is disabled at
afakhry 2017/05/06 00:49:35 I guess so. I think I'll have to check again with
James Cook 2017/05/08 16:09:07 Ah. It wasn't clear to me from the videos / mocks
afakhry 2017/05/08 17:36:26 Oh, sorry, I think I confused even more! You are r
EXPECT_EQ(Button::STATE_DISABLED, GetLockButton()->state());
EXPECT_EQ(Button::STATE_NORMAL, GetPowerButton()->state());
}
@@ -94,6 +101,7 @@ TEST_F(TrayTilesTest, ButtonStatesAddingUser) {
tray_tiles()->CreateDefaultViewForTesting());
EXPECT_EQ(Button::STATE_DISABLED, GetSettingsButton()->state());
EXPECT_EQ(Button::STATE_DISABLED, GetHelpButton()->state());
+ EXPECT_EQ(Button::STATE_DISABLED, GetNightLightButton()->state());
EXPECT_EQ(Button::STATE_DISABLED, GetLockButton()->state());
EXPECT_EQ(Button::STATE_NORMAL, GetPowerButton()->state());
}
@@ -109,6 +117,7 @@ TEST_F(TrayTilesTest, ButtonStatesSupervisedUserFlow) {
tray_tiles()->CreateDefaultViewForTesting());
EXPECT_EQ(Button::STATE_DISABLED, GetSettingsButton()->state());
EXPECT_EQ(Button::STATE_DISABLED, GetHelpButton()->state());
+ EXPECT_EQ(Button::STATE_DISABLED, GetNightLightButton()->state());
EXPECT_EQ(Button::STATE_DISABLED, GetLockButton()->state());
EXPECT_EQ(Button::STATE_NORMAL, GetPowerButton()->state());
}

Powered by Google App Engine
This is Rietveld 408576698