diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-30 15:22:45 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-30 15:22:45 +0000 |
| commit | 076bf500c06a2ec9ce9f5accc0eaad7c0b0b2666 (patch) | |
| tree | 90c75e38f905641cda5eff21273c76e9f80b4ca5 /chrome/test/tab_switching | |
| parent | 09247ce046ae7fa18a868d7f07ad292899b3798c (diff) | |
| download | chromium_src-076bf500c06a2ec9ce9f5accc0eaad7c0b0b2666.zip chromium_src-076bf500c06a2ec9ce9f5accc0eaad7c0b0b2666.tar.gz chromium_src-076bf500c06a2ec9ce9f5accc0eaad7c0b0b2666.tar.bz2 | |
Cleanup in automation. Remove WaitForTabCountToChange.
WaitForTabCountToBecome is easier to use and more reliable.
Also removed Windows2000-specific code from accessibility unit tests.
Review URL: http://codereview.chromium.org/45070
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12774 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/tab_switching')
| -rw-r--r-- | chrome/test/tab_switching/tab_switching_test.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/chrome/test/tab_switching/tab_switching_test.cc b/chrome/test/tab_switching/tab_switching_test.cc index 5fbbae5..3cbbfa6 100644 --- a/chrome/test/tab_switching/tab_switching_test.cc +++ b/chrome/test/tab_switching/tab_switching_test.cc @@ -45,14 +45,13 @@ class TabSwitchingUITest : public UITest { int initial_tab_count = 0; ASSERT_TRUE(browser_proxy_->GetTabCount(&initial_tab_count)); int new_tab_count = OpenTabs(); - int final_tab_count = 0; - ASSERT_TRUE(browser_proxy_->WaitForTabCountToChange(initial_tab_count, - &final_tab_count, - 10000)); - ASSERT_TRUE(final_tab_count == initial_tab_count + new_tab_count); + ASSERT_TRUE(browser_proxy_->WaitForTabCountToBecome( + initial_tab_count + new_tab_count, 10000)); // Switch linearly between tabs. browser_proxy_->ActivateTab(0); + int final_tab_count = 0; + ASSERT_TRUE(browser_proxy_->GetTabCount(&final_tab_count)); for (int i = initial_tab_count; i < final_tab_count; ++i) { browser_proxy_->ActivateTab(i); ASSERT_TRUE(browser_proxy_->WaitForTabToBecomeActive(i, 10000)); |