Commit 3b149080 authored by nsylvain@chromium.org's avatar nsylvain@chromium.org

AddRemove is failing the same way as TabbedPaneTest.SizeAndLayout on win7.

I'm also disabling it.

BUG:104067
TBR:mnissler
Review URL: http://codereview.chromium.org/8560003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109836 0039d316-1c4b-4281-b951-d872f2087c98
parent 510f08bd
...@@ -67,10 +67,12 @@ class TabbedPaneTest : public testing::Test, ...@@ -67,10 +67,12 @@ class TabbedPaneTest : public testing::Test,
}; };
#if defined(OS_WIN) #if defined(OS_WIN)
// This test is failing and crashes on Win7. See http://crbug.com/104067 // These test are failing and crash on Win7. See http://crbug.com/104067
#define MAYBE_SizeAndLayout DISABLED_SizeAndLayout #define MAYBE_SizeAndLayout DISABLED_SizeAndLayout
#define MAYBE_AddRemove DISBLED_AddRemove
#else #else
#define MAYBE_SizeAndLayout SizeAndLayout #define MAYBE_SizeAndLayout SizeAndLayout
#define MAYBE_AddRemove AddRemove
#endif #endif
// Tests that TabbedPane::GetPreferredSize() and TabbedPane::Layout(). // Tests that TabbedPane::GetPreferredSize() and TabbedPane::Layout().
...@@ -100,7 +102,7 @@ TEST_F(TabbedPaneTest, MAYBE_SizeAndLayout) { ...@@ -100,7 +102,7 @@ TEST_F(TabbedPaneTest, MAYBE_SizeAndLayout) {
EXPECT_EQ(bounds, child2->bounds()); EXPECT_EQ(bounds, child2->bounds());
} }
TEST_F(TabbedPaneTest, AddRemove) { TEST_F(TabbedPaneTest, MAYBE_AddRemove) {
View* tab0 = new View; View* tab0 = new View;
tabbed_pane_->AddTab(ASCIIToUTF16("tab0"), tab0); tabbed_pane_->AddTab(ASCIIToUTF16("tab0"), tab0);
EXPECT_EQ(tab0, tabbed_pane_->GetSelectedTab()); EXPECT_EQ(tab0, tabbed_pane_->GetSelectedTab());
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment