Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3591)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/translate/translate_browsertest.cc

Issue 14180010: Translate: browser test for Chrome Translate in an isolated world (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: factor out infobar check Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chrome_content_browser_client.cc ('k') | chrome/browser/ui/startup/bad_flags_prompt.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/translate/translate_browsertest.cc
diff --git a/chrome/browser/translate/translate_browsertest.cc b/chrome/browser/translate/translate_browsertest.cc
index 93fe9b63f1a1d2453d54ab09cde9cfd3ca7a65c5..3d41b2a65c52730a62a41ab0a1d85f588c6db06a 100644
--- a/chrome/browser/translate/translate_browsertest.cc
+++ b/chrome/browser/translate/translate_browsertest.cc
@@ -49,8 +49,13 @@ class TranslateBrowserTest : public InProcessBrowserTest {
SSLOptions(SSLOptions::CERT_OK),
base::FilePath(kTranslateRoot)) {}
- virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
+ virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
ASSERT_TRUE(https_server_.Start());
+ // Setup altenate security-origin for testing in order to allow XHR against
palmer 2013/08/01 21:22:38 Typos: "alternate", "security origin" (or just "or
Takashi Toyoshima 2013/08/02 04:40:19 Done.
Takashi Toyoshima 2013/08/02 04:40:19 Done.
+ // local test server. Note that this flag shows a confirm infobar in tests.
+ GURL origin = GetSecureURL("");
+ command_line->AppendSwitchASCII(switches::kTranslateSecurityOrigin,
+ origin.spec());
}
protected:
@@ -64,41 +69,75 @@ class TranslateBrowserTest : public InProcessBrowserTest {
return https_server_.GetURL(prefix + path);
}
+ TranslateInfoBarDelegate* GetExistingTranslateInfoBarDelegate() {
+ if (!infobar_service_) {
+ content::WebContents* web_contents =
+ browser()->tab_strip_model()->GetActiveWebContents();
+ if (web_contents)
+ infobar_service_ = InfoBarService::FromWebContents(web_contents);
+ }
+ if (!infobar_service_) {
+ EXPECT_TRUE(false) << "infobar service is not available";
+ return NULL;
+ }
+
+ TranslateInfoBarDelegate* delegate = NULL;
+ for (size_t i = 0; i < infobar_service_->infobar_count(); ++i) {
+ // Check if the shown infobar is a confirm infobar coming from the
+ // |kTranslateSecurityOrigin| flag specified in SetUpCommandLine().
+ // This infobar appears in all tests of TranslateBrowserTest and can be
+ // ignored here.
+ ConfirmInfoBarDelegate* confirm =
+ infobar_service_->infobar_at(i)->AsConfirmInfoBarDelegate();
+ if (confirm)
+ continue;
+
+ TranslateInfoBarDelegate* translate =
+ infobar_service_->infobar_at(i)->AsTranslateInfoBarDelegate();
+ if (translate) {
+ EXPECT_FALSE(delegate) << "multiple infobars are shown unexpectedly";
+ delegate = translate;
+ continue;
+ }
+
+ // Other infobar should not be shown.
+ EXPECT_TRUE(delegate);
+ }
+ return delegate;
+ }
+
private:
net::SpawnedTestServer https_server_;
+ InfoBarService* infobar_service_;
typedef net::SpawnedTestServer::SSLOptions SSLOptions;
DISALLOW_COPY_AND_ASSIGN(TranslateBrowserTest);
};
-// TODO(toyoshim): This test should be changed to work in an isolated world.
-// See also http://crbug.com/164547 .
-IN_PROC_BROWSER_TEST_F(TranslateBrowserTest, DISABLED_Translate) {
+IN_PROC_BROWSER_TEST_F(TranslateBrowserTest, TranslateInIsolatedWorld) {
#if defined(OS_WIN) && defined(USE_ASH)
// Disable this test in Metro+Ash for now (http://crbug.com/262796).
if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
return;
#endif
+ net::TestURLFetcherFactory factory;
ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
- content::WebContents* web_contents =
- browser()->tab_strip_model()->GetActiveWebContents();
- ASSERT_TRUE(web_contents);
-
- net::TestURLFetcherFactory factory;
+ // Check if there is no Translate infobar.
+ TranslateInfoBarDelegate* translate = GetExistingTranslateInfoBarDelegate();
+ EXPECT_FALSE(translate);
// Setup infobar observer.
- InfoBarService* infobar_service =
- InfoBarService::FromWebContents(web_contents);
- ASSERT_TRUE(infobar_service);
- EXPECT_EQ(0U, infobar_service->infobar_count());
content::WindowedNotificationObserver infobar(
chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_ADDED,
content::NotificationService::AllSources());
// Setup page title observer.
+ content::WebContents* web_contents =
+ browser()->tab_strip_model()->GetActiveWebContents();
+ ASSERT_TRUE(web_contents);
content::TitleWatcher watcher(web_contents, ASCIIToUTF16("PASS"));
watcher.AlsoWaitForTitle(ASCIIToUTF16("FAIL"));
@@ -109,9 +148,7 @@ IN_PROC_BROWSER_TEST_F(TranslateBrowserTest, DISABLED_Translate) {
infobar.Wait();
// Perform Chrome Translate.
- ASSERT_EQ(1U, infobar_service->infobar_count());
- TranslateInfoBarDelegate* translate =
- infobar_service->infobar_at(0)->AsTranslateInfoBarDelegate();
+ translate = GetExistingTranslateInfoBarDelegate();
ASSERT_TRUE(translate);
translate->Translate();
@@ -157,17 +194,14 @@ IN_PROC_BROWSER_TEST_F(TranslateBrowserTest, IgnoreRefreshMetaTag) {
ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
+ // Check if there is no Translate infobar.
+ TranslateInfoBarDelegate* translate = GetExistingTranslateInfoBarDelegate();
+ EXPECT_FALSE(translate);
+
+ // Setup page title observer.
content::WebContents* web_contents =
browser()->tab_strip_model()->GetActiveWebContents();
ASSERT_TRUE(web_contents);
-
- // Check infobar count.
- InfoBarService* infobar_service =
- InfoBarService::FromWebContents(web_contents);
- ASSERT_TRUE(infobar_service);
- EXPECT_EQ(0U, infobar_service->infobar_count());
-
- // Setup page title observer.
content::TitleWatcher watcher(web_contents, ASCIIToUTF16("PASS"));
watcher.AlsoWaitForTitle(ASCIIToUTF16("FAIL"));
@@ -180,8 +214,9 @@ IN_PROC_BROWSER_TEST_F(TranslateBrowserTest, IgnoreRefreshMetaTag) {
const string16 result = watcher.WaitAndGetTitle();
EXPECT_EQ("PASS", UTF16ToASCII(result));
- // Check there is not infobar.
- EXPECT_EQ(0U, infobar_service->infobar_count());
+ // Check if there is no Translate infobar.
+ translate = GetExistingTranslateInfoBarDelegate();
+ EXPECT_FALSE(translate);
}
IN_PROC_BROWSER_TEST_F(TranslateBrowserTest,
@@ -194,17 +229,14 @@ IN_PROC_BROWSER_TEST_F(TranslateBrowserTest,
ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
+ // Check if there is no Translate infobar.
+ TranslateInfoBarDelegate* translate = GetExistingTranslateInfoBarDelegate();
+ EXPECT_FALSE(translate);
+
+ // Setup page title observer.
content::WebContents* web_contents =
browser()->tab_strip_model()->GetActiveWebContents();
ASSERT_TRUE(web_contents);
-
- // Check infobar count.
- InfoBarService* infobar_service =
- InfoBarService::FromWebContents(web_contents);
- ASSERT_TRUE(infobar_service);
- EXPECT_EQ(0U, infobar_service->infobar_count());
-
- // Setup page title observer.
content::TitleWatcher watcher(web_contents, ASCIIToUTF16("PASS"));
watcher.AlsoWaitForTitle(ASCIIToUTF16("FAIL"));
@@ -217,10 +249,12 @@ IN_PROC_BROWSER_TEST_F(TranslateBrowserTest,
const string16 result = watcher.WaitAndGetTitle();
EXPECT_EQ("PASS", UTF16ToASCII(result));
- // Check there is not infobar.
- EXPECT_EQ(0U, infobar_service->infobar_count());
+ // Check if there is no Translate infobar.
+ translate = GetExistingTranslateInfoBarDelegate();
+ EXPECT_FALSE(translate);
}
+// TODO(toyoshim): Refactoring this test, too.
palmer 2013/08/01 21:22:38 Typo: "Refactor" (it's a command to yourself)
Takashi Toyoshima 2013/08/02 04:40:19 Oops. This was a memo when I'm doing this change.
IN_PROC_BROWSER_TEST_F(TranslateBrowserTest, IgnoreRefreshMetaTagAtOnload) {
#if defined(OS_WIN) && defined(USE_ASH)
// Disable this test in Metro+Ash for now (http://crbug.com/262796).
@@ -230,17 +264,14 @@ IN_PROC_BROWSER_TEST_F(TranslateBrowserTest, IgnoreRefreshMetaTagAtOnload) {
ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
+ // Check if there is no Translate infobar.
+ TranslateInfoBarDelegate* translate = GetExistingTranslateInfoBarDelegate();
+ EXPECT_FALSE(translate);
+
+ // Setup page title observer.
content::WebContents* web_contents =
browser()->tab_strip_model()->GetActiveWebContents();
ASSERT_TRUE(web_contents);
-
- // Check infobar count.
- InfoBarService* infobar_service =
- InfoBarService::FromWebContents(web_contents);
- ASSERT_TRUE(infobar_service);
- EXPECT_EQ(0U, infobar_service->infobar_count());
-
- // Setup page title observer.
content::TitleWatcher watcher(web_contents, ASCIIToUTF16("PASS"));
watcher.AlsoWaitForTitle(ASCIIToUTF16("FAIL"));
@@ -253,8 +284,9 @@ IN_PROC_BROWSER_TEST_F(TranslateBrowserTest, IgnoreRefreshMetaTagAtOnload) {
const string16 result = watcher.WaitAndGetTitle();
EXPECT_EQ("PASS", UTF16ToASCII(result));
- // Check there is not infobar.
- EXPECT_EQ(0U, infobar_service->infobar_count());
+ // Check if there is no Translate infobar.
+ translate = GetExistingTranslateInfoBarDelegate();
+ EXPECT_FALSE(translate);
}
IN_PROC_BROWSER_TEST_F(TranslateBrowserTest, UpdateLocation) {
@@ -266,17 +298,14 @@ IN_PROC_BROWSER_TEST_F(TranslateBrowserTest, UpdateLocation) {
ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
+ // Check if there is no Translate infobar.
+ TranslateInfoBarDelegate* translate = GetExistingTranslateInfoBarDelegate();
+ EXPECT_FALSE(translate);
+
+ // Setup page title observer.
content::WebContents* web_contents =
browser()->tab_strip_model()->GetActiveWebContents();
ASSERT_TRUE(web_contents);
-
- // Check infobar count.
- InfoBarService* infobar_service =
- InfoBarService::FromWebContents(web_contents);
- ASSERT_TRUE(infobar_service);
- EXPECT_EQ(0U, infobar_service->infobar_count());
-
- // Setup page title observer.
content::TitleWatcher watcher(web_contents, ASCIIToUTF16("PASS"));
watcher.AlsoWaitForTitle(ASCIIToUTF16("FAIL"));
@@ -289,8 +318,9 @@ IN_PROC_BROWSER_TEST_F(TranslateBrowserTest, UpdateLocation) {
const string16 result = watcher.WaitAndGetTitle();
EXPECT_EQ("PASS", UTF16ToASCII(result));
- // Check there is not infobar.
- EXPECT_EQ(0U, infobar_service->infobar_count());
+ // Check if there is no Translate infobar.
+ translate = GetExistingTranslateInfoBarDelegate();
+ EXPECT_FALSE(translate);
}
IN_PROC_BROWSER_TEST_F(TranslateBrowserTest, UpdateLocationAtOnload) {
@@ -302,17 +332,14 @@ IN_PROC_BROWSER_TEST_F(TranslateBrowserTest, UpdateLocationAtOnload) {
ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
+ // Check if there is no Translate infobar.
+ TranslateInfoBarDelegate* translate = GetExistingTranslateInfoBarDelegate();
+ EXPECT_FALSE(translate);
+
+ // Setup page title observer.
content::WebContents* web_contents =
browser()->tab_strip_model()->GetActiveWebContents();
ASSERT_TRUE(web_contents);
-
- // Check infobar count.
- InfoBarService* infobar_service =
- InfoBarService::FromWebContents(web_contents);
- ASSERT_TRUE(infobar_service);
- EXPECT_EQ(0U, infobar_service->infobar_count());
-
- // Setup page title observer.
content::TitleWatcher watcher(web_contents, ASCIIToUTF16("PASS"));
watcher.AlsoWaitForTitle(ASCIIToUTF16("FAIL"));
@@ -325,6 +352,7 @@ IN_PROC_BROWSER_TEST_F(TranslateBrowserTest, UpdateLocationAtOnload) {
const string16 result = watcher.WaitAndGetTitle();
EXPECT_EQ("PASS", UTF16ToASCII(result));
- // Check there is not infobar.
- EXPECT_EQ(0U, infobar_service->infobar_count());
+ // Check if there is no Translate infobar.
+ translate = GetExistingTranslateInfoBarDelegate();
+ EXPECT_FALSE(translate);
}
« no previous file with comments | « chrome/browser/chrome_content_browser_client.cc ('k') | chrome/browser/ui/startup/bad_flags_prompt.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698