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

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

Issue 8566037: aura: Fix unit_tests on linux (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge 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
« no previous file with comments | « ui/aura/desktop_host_linux.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/widget/widget_unittest.cc
diff --git a/ui/views/widget/widget_unittest.cc b/ui/views/widget/widget_unittest.cc
index 90632c63f9a30098ab25cb28c1f3e6290863da6e..e7d395ec8977760bbe178063e41de134df7fd10b 100644
--- a/ui/views/widget/widget_unittest.cc
+++ b/ui/views/widget/widget_unittest.cc
@@ -172,39 +172,6 @@ TEST_F(WidgetTest, GetTopLevelWidget_Native) {
// |child| should be automatically destroyed with |toplevel|.
}
-TEST_F(WidgetTest, GetTopLevelWidget_Synthetic) {
- // Create a hierarchy consisting of a top level platform native widget and a
- // child NativeWidget.
- Widget* toplevel = CreateTopLevelPlatformWidget();
- Widget* child = CreateTopLevelNativeWidget();
-
- EXPECT_EQ(toplevel, toplevel->GetTopLevelWidget());
- EXPECT_EQ(child, child->GetTopLevelWidget());
-
- toplevel->CloseNow();
- // |child| should be automatically destroyed with |toplevel|.
-}
-
-// Creates a hierarchy consisting of a desktop platform native widget, a
-// toplevel NativeWidget, and a child of that toplevel, another NativeWidget.
-TEST_F(WidgetTest, GetTopLevelWidget_SyntheticDesktop) {
- // Create a hierarchy consisting of a desktop platform native widget,
- // a toplevel NativeWidget and a chlid NativeWidget.
- Widget* desktop = CreateTopLevelPlatformWidget();
- Widget* toplevel = CreateTopLevelNativeWidget(); // Will be parented
- // automatically to
- // |toplevel|.
-
- Widget* child = CreateChildNativeWidgetWithParent(toplevel);
-
- EXPECT_EQ(desktop, desktop->GetTopLevelWidget());
- EXPECT_EQ(toplevel, toplevel->GetTopLevelWidget());
- EXPECT_EQ(toplevel, child->GetTopLevelWidget());
-
- desktop->CloseNow();
- // |toplevel|, |child| should be automatically destroyed with |toplevel|.
-}
-
// Tests some grab/ungrab events.
TEST_F(WidgetTest, DISABLED_GrabUngrab) {
Widget* toplevel = CreateTopLevelPlatformWidget();
@@ -342,35 +309,6 @@ TEST_F(WidgetTest, Visibility_ChildPopup) {
}
#endif
-// Tests visibility of synthetic child widgets.
-TEST_F(WidgetTest, Visibility_Synthetic) {
- // Create a hierarchy consisting of a desktop platform native widget,
- // a toplevel NativeWidget and a chlid NativeWidget.
- Widget* desktop = CreateTopLevelPlatformWidget();
- desktop->Show();
-
- Widget* toplevel = CreateTopLevelNativeWidget(); // Will be parented
- // automatically to
- // |toplevel|.
-
- Widget* child = CreateChildNativeWidgetWithParent(toplevel);
-
- EXPECT_FALSE(toplevel->IsVisible());
- EXPECT_FALSE(child->IsVisible());
-
- child->Show();
-
- EXPECT_FALSE(toplevel->IsVisible());
- EXPECT_FALSE(child->IsVisible());
-
- toplevel->Show();
-
- EXPECT_TRUE(toplevel->IsVisible());
- EXPECT_TRUE(child->IsVisible());
-
- desktop->CloseNow();
-}
-
////////////////////////////////////////////////////////////////////////////////
// Widget ownership tests.
//
« no previous file with comments | « ui/aura/desktop_host_linux.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698