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

Unified Diff: ash/system/tray/tray_details_view_unittest.cc

Issue 968873005: Touch Feedback tests on Valgrind (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 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/tray/tray_details_view_unittest.cc
diff --git a/ash/system/tray/tray_details_view_unittest.cc b/ash/system/tray/tray_details_view_unittest.cc
index 5c7f99adf7ba962a245b2bccbfec5ef298fc1c2e..0d83ae153a2c8fe489a0b430278353cc3c9b1fee 100644
--- a/ash/system/tray/tray_details_view_unittest.cc
+++ b/ash/system/tray/tray_details_view_unittest.cc
@@ -201,11 +201,9 @@ TEST_F(TrayDetailsViewTest, HoverHighlightViewTouchFeedback) {
ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
generator.set_current_location(view->GetBoundsInScreen().CenterPoint());
generator.PressTouch();
- RunAllPendingInMessageLoop();
EXPECT_TRUE(view->hover());
generator.ReleaseTouch();
- RunAllPendingInMessageLoop();
EXPECT_FALSE(view->hover());
}
@@ -218,17 +216,14 @@ TEST_F(TrayDetailsViewTest, HoverHighlightViewTouchFeedbackCancellation) {
ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
generator.set_current_location(view_bounds.CenterPoint());
generator.PressTouch();
- RunAllPendingInMessageLoop();
EXPECT_TRUE(view->hover());
gfx::Point move_point(view_bounds.x(), view_bounds.CenterPoint().y());
generator.MoveTouch(move_point);
- RunAllPendingInMessageLoop();
EXPECT_FALSE(view->hover());
generator.set_current_location(move_point);
generator.ReleaseTouch();
- RunAllPendingInMessageLoop();
EXPECT_FALSE(view->hover());
}
@@ -240,11 +235,9 @@ TEST_F(TrayDetailsViewTest, TrayPopupHeaderButtonTouchFeedback) {
ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
generator.set_current_location(button->GetBoundsInScreen().CenterPoint());
generator.PressTouch();
- RunAllPendingInMessageLoop();
EXPECT_TRUE(button->background());
generator.ReleaseTouch();
- RunAllPendingInMessageLoop();
EXPECT_FALSE(button->background());
}
@@ -258,17 +251,14 @@ TEST_F(TrayDetailsViewTest, TrayPopupHeaderButtonTouchFeedbackCancellation) {
ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
generator.set_current_location(view_bounds.CenterPoint());
generator.PressTouch();
- RunAllPendingInMessageLoop();
EXPECT_TRUE(button->background());
gfx::Point move_point(view_bounds.x(), view_bounds.CenterPoint().y());
generator.MoveTouch(move_point);
- RunAllPendingInMessageLoop();
EXPECT_FALSE(button->background());
generator.set_current_location(move_point);
generator.ReleaseTouch();
- RunAllPendingInMessageLoop();
EXPECT_FALSE(button->background());
}
« no previous file with comments | « ash/system/tray/system_tray_unittest.cc ('k') | ash/system/web_notification/web_notification_tray_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698