diff options
| author | rahulk@google.com <rahulk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-28 21:39:31 +0000 |
|---|---|---|
| committer | rahulk@google.com <rahulk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-28 21:39:31 +0000 |
| commit | 7ea9cbb1f61ea1b6990011d076bc09c05b9e72e8 (patch) | |
| tree | 74d3afc03244b779649bee88137656573c41551c /chrome | |
| parent | 6457ac4218710a7bb4c8acc5647a704f2fef884d (diff) | |
| download | chromium_src-7ea9cbb1f61ea1b6990011d076bc09c05b9e72e8.zip chromium_src-7ea9cbb1f61ea1b6990011d076bc09c05b9e72e8.tar.gz chromium_src-7ea9cbb1f61ea1b6990011d076bc09c05b9e72e8.tar.bz2 | |
Fix tests that break with Chromium build.
BUG=1296800
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1505 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/test/accessibility/accessibility_tests.cc | 4 | ||||
| -rw-r--r-- | chrome/test/accessibility/constants.h | 8 | ||||
| -rw-r--r-- | chrome/test/automation/automation_proxy_uitest.cc | 11 |
3 files changed, 20 insertions, 3 deletions
diff --git a/chrome/test/accessibility/accessibility_tests.cc b/chrome/test/accessibility/accessibility_tests.cc index 39e13db..c488986 100644 --- a/chrome/test/accessibility/accessibility_tests.cc +++ b/chrome/test/accessibility/accessibility_tests.cc @@ -51,7 +51,11 @@ TEST_F(AccessibilityTest, TestChromeToolbarAccObject) { ASSERT_TRUE(NULL != p_accobj); // Check Name - "Google Chrome Toolbar". +#if defined(GOOGLE_CHROME_BUILD) EXPECT_EQ(L"Google Chrome Toolbar", GetName(p_accobj)); +#else + EXPECT_EQ(L"Chromium Toolbar", GetName(p_accobj)); +#endif // Check Role - "tool bar". EXPECT_EQ(L"tool bar", GetRole(p_accobj)); // Check State - "focusable" diff --git a/chrome/test/accessibility/constants.h b/chrome/test/accessibility/constants.h index dcbcc19..0d86d68c 100644 --- a/chrome/test/accessibility/constants.h +++ b/chrome/test/accessibility/constants.h @@ -37,11 +37,17 @@ // Chrome Client chidren. #define BROWSER_VIEW_ACC_INDEX (0) #define TABSTRIP_ACC_INDEX (1) +#if defined(GOOGLE_CHROME_BUILD) #define CHROME_MIN_ACC_INDEX (4) #define CHROME_MAX_ACC_INDEX (5) #define CHROME_RESTORE_ACC_INDEX (6) #define CHROME_CLOSE_ACC_INDEX (7) - +#else +#define CHROME_MIN_ACC_INDEX (3) +#define CHROME_MAX_ACC_INDEX (4) +#define CHROME_RESTORE_ACC_INDEX (5) +#define CHROME_CLOSE_ACC_INDEX (6) +#endif // Browser View children. #define TOOLBAR_ACC_INDEX (0) diff --git a/chrome/test/automation/automation_proxy_uitest.cc b/chrome/test/automation/automation_proxy_uitest.cc index 73a16cd..9dd6b9a 100644 --- a/chrome/test/automation/automation_proxy_uitest.cc +++ b/chrome/test/automation/automation_proxy_uitest.cc @@ -652,13 +652,20 @@ TEST_F(AutomationProxyTest, ConstrainedWindowTest) { std::wstring title; ASSERT_TRUE(cwindow->GetTitle(&title)); - ASSERT_STREQ(L"Constrained Window 0 - Google Chrome", title.c_str()); +#if defined(GOOGLE_CHROME_BUILD) + std::wstring app_name = L"Google Chrome"; +#else + std::wstring app_name = L"Chromium"; +#endif + std::wstring window_title = L"Constrained Window 0 - " + app_name; + ASSERT_STREQ(window_title.c_str(), title.c_str()); delete cwindow; cwindow = tab->GetConstrainedWindow(1); ASSERT_TRUE(cwindow); ASSERT_TRUE(cwindow->GetTitle(&title)); - ASSERT_STREQ(L"Constrained Window 1 - Google Chrome", title.c_str()); + window_title = L"Constrained Window 1 - " + app_name; + ASSERT_STREQ(window_title.c_str(), title.c_str()); delete cwindow; } |