diff options
author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-20 22:55:19 +0000 |
---|---|---|
committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-20 22:55:19 +0000 |
commit | 1db416e9f847c25d8a610df4b4e3570f2a480b3d (patch) | |
tree | c2d670d448b41a265fddebc19eeb17b994b07fdb /chrome/browser/errorpage_uitest.cc | |
parent | 9ed3c390013b9398ef258564ea73e1c306fdb907 (diff) | |
download | chromium_src-1db416e9f847c25d8a610df4b4e3570f2a480b3d.zip chromium_src-1db416e9f847c25d8a610df4b4e3570f2a480b3d.tar.gz chromium_src-1db416e9f847c25d8a610df4b4e3570f2a480b3d.tar.bz2 |
Mock the LinkDoctor for tests. Should greatly decrease ErrorPage test flakiness.
Not getting rid of WaitForTitleMatching because I have to add few more calls to the automation framework (http://crbug.com/19395) to wait properly after navigating back and forward.
TEST=Covered by ui_tests and browser_tests.
http://crbug.com/18365, http://crbug.com/19361
Review URL: http://codereview.chromium.org/174179
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23906 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/errorpage_uitest.cc')
-rw-r--r-- | chrome/browser/errorpage_uitest.cc | 33 |
1 files changed, 12 insertions, 21 deletions
diff --git a/chrome/browser/errorpage_uitest.cc b/chrome/browser/errorpage_uitest.cc index 8a4c3a0..7480157 100644 --- a/chrome/browser/errorpage_uitest.cc +++ b/chrome/browser/errorpage_uitest.cc @@ -19,15 +19,6 @@ class ErrorPageTest : public UITest { } return false; } - bool WaitForTitleContaining(const std::string& title_substring) { - for (int i = 0; i < 100; ++i) { - std::wstring title = GetActiveTabTitle(); - if (title.find(UTF8ToWide(title_substring)) != std::wstring::npos) - return true; - PlatformThread::Sleep(sleep_timeout_ms() / 10); - } - return false; - } }; TEST_F(ErrorPageTest, DNSError_Basic) { @@ -35,7 +26,7 @@ TEST_F(ErrorPageTest, DNSError_Basic) { NavigateToURLBlockUntilNavigationsComplete(test_url, 2); - EXPECT_TRUE(WaitForTitleContaining(test_url.host())); + EXPECT_TRUE(WaitForTitleMatching(L"Mock Link Doctor")); } // Flaky, see http://crbug.com/19361 and http://crbug.com/19395. @@ -46,7 +37,7 @@ TEST_F(ErrorPageTest, DISABLED_DNSError_GoBack1) { NavigateToURL(URLRequestMockHTTPJob::GetMockUrl(L"title2.html")); NavigateToURL(test_url); - EXPECT_TRUE(WaitForTitleContaining(test_url.host())); + EXPECT_TRUE(WaitForTitleMatching(L"Mock Link Doctor")); GetActiveTab()->GoBack(); @@ -61,11 +52,11 @@ TEST_F(ErrorPageTest, DISABLED_DNSError_GoBack2) { NavigateToURL(URLRequestMockHTTPJob::GetMockUrl(L"title2.html")); NavigateToURL(test_url); - EXPECT_TRUE(WaitForTitleContaining(test_url.host())); + EXPECT_TRUE(WaitForTitleMatching(L"Mock Link Doctor")); NavigateToURL(URLRequestMockHTTPJob::GetMockUrl(L"title3.html")); GetActiveTab()->GoBack(); - EXPECT_TRUE(WaitForTitleContaining(test_url.host())); + EXPECT_TRUE(WaitForTitleMatching(L"Mock Link Doctor")); GetActiveTab()->GoBack(); EXPECT_TRUE(WaitForTitleMatching(L"Title Of Awesomeness")); @@ -80,15 +71,15 @@ TEST_F(ErrorPageTest, DISABLED_DNSError_GoBack2AndForward) { NavigateToURL(URLRequestMockHTTPJob::GetMockUrl(L"title2.html")); NavigateToURL(test_url); - EXPECT_TRUE(WaitForTitleContaining(test_url.host())); + EXPECT_TRUE(WaitForTitleMatching(L"Mock Link Doctor")); NavigateToURL(URLRequestMockHTTPJob::GetMockUrl(L"title3.html")); GetActiveTab()->GoBack(); - EXPECT_TRUE(WaitForTitleContaining(test_url.host())); + EXPECT_TRUE(WaitForTitleMatching(L"Mock Link Doctor")); GetActiveTab()->GoBack(); GetActiveTab()->GoForward(); - EXPECT_TRUE(WaitForTitleContaining(test_url.host())); + EXPECT_TRUE(WaitForTitleMatching(L"Mock Link Doctor")); } // Flaky, see http://crbug.com/19361 and http://crbug.com/19395. @@ -100,14 +91,14 @@ TEST_F(ErrorPageTest, DISABLED_DNSError_GoBack2Forward2) { NavigateToURL(URLRequestMockHTTPJob::GetMockUrl(L"title3.html")); NavigateToURL(test_url); - EXPECT_TRUE(WaitForTitleContaining(test_url.host())); + EXPECT_TRUE(WaitForTitleMatching(L"Mock Link Doctor")); NavigateToURL(URLRequestMockHTTPJob::GetMockUrl(L"title2.html")); GetActiveTab()->GoBack(); - EXPECT_TRUE(WaitForTitleContaining(test_url.host())); + EXPECT_TRUE(WaitForTitleMatching(L"Mock Link Doctor")); GetActiveTab()->GoBack(); GetActiveTab()->GoForward(); - EXPECT_TRUE(WaitForTitleContaining(test_url.host())); + EXPECT_TRUE(WaitForTitleMatching(L"Mock Link Doctor")); GetActiveTab()->GoForward(); EXPECT_TRUE(WaitForTitleMatching(L"Title Of Awesomeness")); @@ -161,13 +152,13 @@ TEST_F(ErrorPageTest, Page404) { NavigateToURL(URLRequestMockHTTPJob::GetMockUrl(L"title2.html")); NavigateToURL(URLRequestMockHTTPJob::GetMockUrl(L"page404.html")); - EXPECT_TRUE(WaitForTitleContaining("page404.html")); + EXPECT_TRUE(WaitForTitleMatching(L"Mock Link Doctor")); } TEST_F(ErrorPageTest, Page404_GoBack) { NavigateToURL(URLRequestMockHTTPJob::GetMockUrl(L"title2.html")); NavigateToURL(URLRequestMockHTTPJob::GetMockUrl(L"page404.html")); - EXPECT_TRUE(WaitForTitleContaining("page404.html")); + EXPECT_TRUE(WaitForTitleMatching(L"Mock Link Doctor")); GetActiveTab()->GoBack(); |