diff options
Diffstat (limited to 'chrome/test')
-rw-r--r-- | chrome/test/automated_ui_tests/automated_ui_test_base.cc | 6 | ||||
-rw-r--r-- | chrome/test/automated_ui_tests/automated_ui_test_interactive_test.cc | 10 |
2 files changed, 6 insertions, 10 deletions
diff --git a/chrome/test/automated_ui_tests/automated_ui_test_base.cc b/chrome/test/automated_ui_tests/automated_ui_test_base.cc index 81ed10e..9880fd3 100644 --- a/chrome/test/automated_ui_tests/automated_ui_test_base.cc +++ b/chrome/test/automated_ui_tests/automated_ui_test_base.cc @@ -17,12 +17,14 @@ AutomatedUITestBase::AutomatedUITestBase() {} AutomatedUITestBase::~AutomatedUITestBase() {} -void AutomatedUITestBase::LogErrorMessage(const std::string& error) {} +void AutomatedUITestBase::LogErrorMessage(const std::string& error) { +} void AutomatedUITestBase::LogWarningMessage(const std::string& warning) { } -void AutomatedUITestBase::LogInfoMessage(const std::string& info) {} +void AutomatedUITestBase::LogInfoMessage(const std::string& info) { +} void AutomatedUITestBase::SetUp() { UITest::SetUp(); diff --git a/chrome/test/automated_ui_tests/automated_ui_test_interactive_test.cc b/chrome/test/automated_ui_tests/automated_ui_test_interactive_test.cc index f7ac5fc..e1d2e64 100644 --- a/chrome/test/automated_ui_tests/automated_ui_test_interactive_test.cc +++ b/chrome/test/automated_ui_tests/automated_ui_test_interactive_test.cc @@ -7,12 +7,6 @@ #include "chrome/test/automation/tab_proxy.h" #include "chrome/test/ui/ui_test.h" -#if defined(OS_WINDOWS) -#define MAYBE(x) x -#else -#define MAYBE(x) DISABLED_##x -#endif - namespace { bool WaitForURLDisplayedForTab(BrowserProxy* browser, int tab_index, @@ -32,7 +26,7 @@ bool WaitForURLDisplayedForTab(BrowserProxy* browser, int tab_index, } // namespace -TEST_F(AutomatedUITestBase, MAYBE(DragOut)) { +TEST_F(AutomatedUITestBase, DragOut) { int tab_count; active_browser()->GetTabCount(&tab_count); ASSERT_EQ(1, tab_count); @@ -54,7 +48,7 @@ TEST_F(AutomatedUITestBase, MAYBE(DragOut)) { ASSERT_EQ(2, window_count); } -TEST_F(AutomatedUITestBase, MAYBE(DragLeftRight)) { +TEST_F(AutomatedUITestBase, DragLeftRight) { int tab_count; active_browser()->GetTabCount(&tab_count); ASSERT_EQ(1, tab_count); |