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

Unified Diff: ash/display/display_error_dialog_unittest.cc

Issue 16539005: Skip mulitple-dispay tests on win8 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: addressed comment Created 7 years, 6 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
« no previous file with comments | « ash/display/display_controller_unittest.cc ('k') | ash/display/display_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/display_error_dialog_unittest.cc
diff --git a/ash/display/display_error_dialog_unittest.cc b/ash/display/display_error_dialog_unittest.cc
index 9c5a8911488c4df31a481862eae604684e66d2c7..9bd81e4713345d5fcce28e613951ec30f8ad2df9 100644
--- a/ash/display/display_error_dialog_unittest.cc
+++ b/ash/display/display_error_dialog_unittest.cc
@@ -59,6 +59,9 @@ class DisplayErrorDialogTest : public test::AshTestBase {
// The test cases in this file usually check if the showing dialog doesn't
// cause any crashes, and the code doesn't cause any memory leaks.
TEST_F(DisplayErrorDialogTest, Normal) {
+ if (!SupportsMultipleDisplays())
+ return;
+
UpdateDisplay("200x200,300x300");
DisplayErrorDialog* dialog =
DisplayErrorDialog::ShowDialog(chromeos::STATE_DUAL_MIRROR);
@@ -71,6 +74,9 @@ TEST_F(DisplayErrorDialogTest, Normal) {
}
TEST_F(DisplayErrorDialogTest, CallTwice) {
+ if (!SupportsMultipleDisplays())
+ return;
+
UpdateDisplay("200x200,300x300");
observer()->OnDisplayModeChangeFailed(chromeos::STATE_DUAL_MIRROR);
const DisplayErrorDialog* dialog = observer()->dialog();
@@ -81,6 +87,9 @@ TEST_F(DisplayErrorDialogTest, CallTwice) {
}
TEST_F(DisplayErrorDialogTest, CallWithDifferentState) {
+ if (!SupportsMultipleDisplays())
+ return;
+
UpdateDisplay("200x200,300x300");
observer()->OnDisplayModeChangeFailed(chromeos::STATE_DUAL_MIRROR);
const DisplayErrorDialog* dialog = observer()->dialog();
@@ -105,6 +114,9 @@ TEST_F(DisplayErrorDialogTest, SingleDisplay) {
}
TEST_F(DisplayErrorDialogTest, DisplayDisconnected) {
+ if (!SupportsMultipleDisplays())
+ return;
+
UpdateDisplay("200x200,300x300");
observer()->OnDisplayModeChangeFailed(chromeos::STATE_DUAL_MIRROR);
EXPECT_TRUE(observer()->dialog());
« no previous file with comments | « ash/display/display_controller_unittest.cc ('k') | ash/display/display_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698