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

Unified Diff: ui/views/widget/widget_unittest.cc

Issue 1925943002: Add views_unittests to Mac10.{9,9(dbg),10,11} and asan bots (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: update StyledRangeBold Created 4 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
Index: ui/views/widget/widget_unittest.cc
diff --git a/ui/views/widget/widget_unittest.cc b/ui/views/widget/widget_unittest.cc
index 8761f7f5cc83857e0164d4f81eb654e02b4c555d..4f5cceeb9c3b5b212e063ef4a02793f54b6642f7 100644
--- a/ui/views/widget/widget_unittest.cc
+++ b/ui/views/widget/widget_unittest.cc
@@ -1744,7 +1744,14 @@ TEST_F(WidgetTest, MouseEventDispatchWhileTouchIsDown) {
// Tests that when there is no active capture, that a mouse press causes capture
// to be set.
-TEST_F(WidgetTest, MousePressCausesCapture) {
+// Disabled on Mac (GetGlobalCapture() not yet implemented).
+// http://crbug.com//622979.
+#if defined(OS_MACOSX)
+#define MAYBE_MousePressCausesCapture DISABLED_MousePressCausesCapture
+#else
+#define MAYBE_MousePressCausesCapture MousePressCausesCapture
+#endif
+TEST_F(WidgetTest, MAYBE_MousePressCausesCapture) {
Widget* widget = CreateTopLevelNativeWidget();
widget->Show();
widget->SetSize(gfx::Size(300, 300));
@@ -1807,7 +1814,16 @@ class CaptureEventConsumer : public ui::EventHandler {
// Tests that if explicit capture occurs during a mouse press, that implicit
// capture is not applied.
-TEST_F(WidgetTest, CaptureDuringMousePressNotOverridden) {
+// Disabled on Mac (GetGlobalCapture() not yet implemented).
+// http://crbug.com//622979.
+#if defined(OS_MACOSX)
+#define MAYBE_CaptureDuringMousePressNotOverridden \
+ DISABLED_CaptureDuringMousePressNotOverridden
+#else
+#define MAYBE_CaptureDuringMousePressNotOverridden \
+ CaptureDuringMousePressNotOverridden
+#endif
+TEST_F(WidgetTest, MAYBE_CaptureDuringMousePressNotOverridden) {
Widget* widget = CreateTopLevelNativeWidget();
widget->Show();
widget->SetSize(gfx::Size(300, 300));
@@ -3143,7 +3159,13 @@ class FullscreenAwareFrame : public views::NonClientFrameView {
// Tests that frame Layout is called when a widget goes fullscreen without
// changing its size or title.
-TEST_F(WidgetTest, FullscreenFrameLayout) {
+// Fails on Mac, but only on bots. http://crbug.com/607403.
+#if defined(OS_MACOSX)
+#define MAYBE_FullscreenFrameLayout DISABLED_FullscreenFrameLayout
+#else
+#define MAYBE_FullscreenFrameLayout FullscreenFrameLayout
+#endif
+TEST_F(WidgetTest, MAYBE_FullscreenFrameLayout) {
WidgetAutoclosePtr widget(CreateTopLevelPlatformWidget());
FullscreenAwareFrame* frame = new FullscreenAwareFrame(widget.get());
widget->non_client_view()->SetFrameView(frame); // Owns |frame|.
« testing/buildbot/chromium.fyi.json ('K') | « ui/views/controls/styled_label_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698