Skip to content

GitLab

T
tangled
Commit b89047e6 authored by nkostylev@chromium.org's avatar nkostylev@chromium.org
Browse files
Options

Revert 110861 - Adding more bidichecker tests and doing some minor cleanups. 

These tests are constantly failing on Linux ChromeOS bot (chromium.chromiumos waterfall): TestBugReportPage, TestSettingsLanguageOptionsPage.

BUG=NONE
TEST=NONE

Review URL: http://codereview.chromium.org/8228009

TBR=jeremy@chromium.org
Review URL: http://codereview.chromium.org/8606009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110899 0039d316-1c4b-4281-b951-d872f2087c98
parent 17284478
Show whitespace changes
Inline Side-by-side
Showing with 114 additions and 328 deletions
chrome/browser/ui/webui/bidi_checker_web_ui_test.cc
View file @ b89047e6
...@@ -14,8 +14,6 @@ ...@@ -14,8 +14,6 @@
#include "chrome/browser/autofill/personal_data_manager.h" #include "chrome/browser/autofill/personal_data_manager.h"
#include "chrome/browser/autofill/personal_data_manager_factory.h" #include "chrome/browser/autofill/personal_data_manager_factory.h"
#include "chrome/browser/history/history.h" #include "chrome/browser/history/history.h"
#include "chrome/browser/prefs/pref_service.h"
#include "chrome/browser/prefs/session_startup_pref.h"
#include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser.h"
#include "chrome/common/url_constants.h" #include "chrome/common/url_constants.h"
...@@ -59,17 +57,13 @@ void WebUIBidiCheckerBrowserTest::RunBidiCheckerOnPage(const char pageURL[], ...@@ -59,17 +57,13 @@ void WebUIBidiCheckerBrowserTest::RunBidiCheckerOnPage(const char pageURL[],
Value::CreateBooleanValue(isRTL))); Value::CreateBooleanValue(isRTL)));
} }
void WebUIBidiCheckerBrowserTestLTR::RunBidiCheckerOnPage( // WebUIBidiCheckerBrowserTestFakeBidi
const char pageURL[]) {
WebUIBidiCheckerBrowserTest::RunBidiCheckerOnPage(pageURL, false);
}
void WebUIBidiCheckerBrowserTestRTL::RunBidiCheckerOnPage( WebUIBidiCheckerBrowserTestFakeBidi::~WebUIBidiCheckerBrowserTestFakeBidi() {}
const char pageURL[]) {
WebUIBidiCheckerBrowserTest::RunBidiCheckerOnPage(pageURL, true); WebUIBidiCheckerBrowserTestFakeBidi::WebUIBidiCheckerBrowserTestFakeBidi() {}
}
void WebUIBidiCheckerBrowserTestRTL::SetUpOnMainThread() { void WebUIBidiCheckerBrowserTestFakeBidi::SetUpOnMainThread() {
WebUIBidiCheckerBrowserTest::SetUpOnMainThread(); WebUIBidiCheckerBrowserTest::SetUpOnMainThread();
FilePath pak_path; FilePath pak_path;
app_locale_ = base::i18n::GetConfiguredLocale(); app_locale_ = base::i18n::GetConfiguredLocale();
...@@ -86,7 +80,7 @@ void WebUIBidiCheckerBrowserTestRTL::SetUpOnMainThread() { ...@@ -86,7 +80,7 @@ void WebUIBidiCheckerBrowserTestRTL::SetUpOnMainThread() {
#endif #endif
} }
void WebUIBidiCheckerBrowserTestRTL::CleanUpOnMainThread() { void WebUIBidiCheckerBrowserTestFakeBidi::CleanUpOnMainThread() {
WebUIBidiCheckerBrowserTest::CleanUpOnMainThread(); WebUIBidiCheckerBrowserTest::CleanUpOnMainThread();
#if defined(OS_POSIX) && defined(TOOLKIT_USES_GTK) #if defined(OS_POSIX) && defined(TOOLKIT_USES_GTK)
gtk_widget_set_default_direction(GTK_TEXT_DIR_LTR); gtk_widget_set_default_direction(GTK_TEXT_DIR_LTR);
...@@ -98,196 +92,143 @@ void WebUIBidiCheckerBrowserTestRTL::CleanUpOnMainThread() { ...@@ -98,196 +92,143 @@ void WebUIBidiCheckerBrowserTestRTL::CleanUpOnMainThread() {
// Tests // Tests
//============================== IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTest, TestMainHistoryPageLTR) {
// chrome://history
//==============================
static void SetupHistoryPageTest(Browser* browser,
const std::string page_url,
const std::string page_title) {
HistoryService* history_service = HistoryService* history_service =
browser->profile()->GetHistoryService(Profile::IMPLICIT_ACCESS); browser()->profile()->GetHistoryService(Profile::IMPLICIT_ACCESS);
const GURL history_url = GURL(page_url); GURL history_url = GURL("http://www.ynet.co.il");
history_service->AddPage(history_url, history::SOURCE_BROWSED); history_service->AddPage(history_url, history::SOURCE_BROWSED);
history_service->SetPageTitle(history_url, UTF8ToUTF16(page_title)); string16 title;
ASSERT_TRUE(UTF8ToUTF16("\xD7\x91\xD7\x93\xD7\x99\xD7\xA7\xD7\x94\x21",
12,
&title));
history_service->SetPageTitle(history_url, title);
RunBidiCheckerOnPage(chrome::kChromeUIHistoryURL, false);
} }
IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestLTR, TestHistoryPage) { IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestFakeBidi,
// Test an Israeli news site with a Hebrew title. TestMainHistoryPageRTL) {
SetupHistoryPageTest(browser(), HistoryService* history_service =
"http://www.ynet.co.il", browser()->profile()->GetHistoryService(Profile::IMPLICIT_ACCESS);
"\xD7\x91\xD7\x93\xD7\x99\xD7\xA7\xD7\x94\x21"); GURL history_url = GURL("http://www.google.com");
RunBidiCheckerOnPage(chrome::kChromeUIHistoryURL); history_service->AddPage(history_url, history::SOURCE_BROWSED);
} string16 title = UTF8ToUTF16("Google");
history_service->SetPageTitle(history_url, title);
IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestRTL, TestHistoryPage) { WebUIBidiCheckerBrowserTest::RunBidiCheckerOnPage(chrome::kChromeUIHistoryURL,
SetupHistoryPageTest(browser(), "http://www.google.com", "Google"); true);
RunBidiCheckerOnPage(chrome::kChromeUIHistoryURL);
}
//==============================
// chrome://about
//==============================
// This page isn't localized to an RTL language so we test it only in English.
IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestLTR, TestAboutPage) {
RunBidiCheckerOnPage(chrome::kChromeUIAboutURL);
} }
//============================== IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTest, TestAboutPageLTR) {
// chrome://bugreport RunBidiCheckerOnPage(chrome::kChromeUIAboutURL, false);
//==============================
IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestLTR, TestBugReportPage) {
// The bugreport page receives its contents as GET arguments. Here we provide
// a custom, Hebrew typed, description message.
RunBidiCheckerOnPage(
"chrome://bugreport#0?description=%D7%91%D7%93%D7%99%D7%A7%D7%94"
"&issueType=1");
} }
IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestRTL, IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTest, TestBugReportPageLTR) {
TestBugReportPage) { RunBidiCheckerOnPage(chrome::kChromeUIBugReportURL, false);
RunBidiCheckerOnPage("chrome://bugreport#0?description=test&issueType=1");
} }
//============================== IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTest, TestCrashesPageLTR) {
// chrome://crashes RunBidiCheckerOnPage(chrome::kChromeUICrashesURL, false);
//==============================
IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestLTR, TestCrashesPage) {
RunBidiCheckerOnPage(chrome::kChromeUICrashesURL);
} }
IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestRTL, TestCrashesPage) { IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestFakeBidi,
RunBidiCheckerOnPage(chrome::kChromeUICrashesURL); TestCrashesPageRTL) {
WebUIBidiCheckerBrowserTest::RunBidiCheckerOnPage(chrome::kChromeUICrashesURL,
true);
} }
//==============================
// chrome://downloads
//==============================
#if defined(OS_WIN) || defined(OS_LINUX) #if defined(OS_WIN) || defined(OS_LINUX)
// http://crbug.com/104129 // http://crbug.com/104129
#define TestDownloadsPageLTR FLAKY_TestDownloadsPage #define TestDownloadsPageLTR FLAKY_TestDownloadsPageLTR
#endif #endif
IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestLTR, TestDownloadsPageLTR) { IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTest, TestDownloadsPageLTR) {
RunBidiCheckerOnPage(chrome::kChromeUIDownloadsURL); RunBidiCheckerOnPage(chrome::kChromeUIDownloadsURL, false);
} }
IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestRTL, TestDownloadsPage) { IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestFakeBidi,
RunBidiCheckerOnPage(chrome::kChromeUIDownloadsURL); TestDownloadsPageRTL) {
WebUIBidiCheckerBrowserTest::RunBidiCheckerOnPage(
chrome::kChromeUIDownloadsURL, true);
} }
//============================== IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTest, TestNewTabPageLTR) {
// chrome://newtab RunBidiCheckerOnPage(chrome::kChromeUINewTabURL, false);
//==============================
IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestLTR, TestNewTabPage) {
RunBidiCheckerOnPage(chrome::kChromeUINewTabURL);
} }
// http://crbug.com/97453 // http://crbug.com/97453
IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestRTL, IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestFakeBidi,
DISABLED_TestNewTabPage) { DISABLED_TestNewTabPageRTL) {
RunBidiCheckerOnPage(chrome::kChromeUINewTabURL); WebUIBidiCheckerBrowserTest::RunBidiCheckerOnPage(chrome::kChromeUINewTabURL,
true);
} }
//============================== IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTest, TestPluginsPageLTR) {
// chrome://plugins RunBidiCheckerOnPage(chrome::kChromeUIPluginsURL, false);
//==============================
IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestLTR, TestPluginsPage) {
RunBidiCheckerOnPage(chrome::kChromeUIPluginsURL);
} }
IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestRTL, TestPluginsPage) { IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestFakeBidi,
RunBidiCheckerOnPage(chrome::kChromeUIPluginsURL); TestPluginsPageRTL) {
WebUIBidiCheckerBrowserTest::RunBidiCheckerOnPage(chrome::kChromeUIPluginsURL,
true);
} }
//============================== IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTest, TestSettingsPageLTR) {
// chrome://settings RunBidiCheckerOnPage(chrome::kChromeUISettingsURL, false);
//==============================
IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestLTR, TestSettingsPage) {
RunBidiCheckerOnPage(chrome::kChromeUISettingsURL);
} }
IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestRTL, TestSettingsPage) { IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestFakeBidi,
RunBidiCheckerOnPage(chrome::kChromeUISettingsURL); TestSettingsPageRTL) {
WebUIBidiCheckerBrowserTest::RunBidiCheckerOnPage(
chrome::kChromeUISettingsURL, true);
} }
#if defined(OS_MACOSX) #if defined(OS_MACOSX)
// http://crbug.com/94642 // http://crbug.com/94642
#define MAYBE_TestSettingsAutofillPage FLAKY_TestSettingsAutofillPage #define MAYBE_TestSettingsAutofillPageLTR FLAKY_TestSettingsAutofillPageLTR
#elif defined(OS_WIN) #elif defined(OS_WIN)
// http://crbug.com/95425 // http://crbug.com/95425
#define MAYBE_TestSettingsAutofillPage FAILS_TestSettingsAutofillPage #define MAYBE_TestSettingsAutofillPageLTR FAILS_TestSettingsAutofillPageLTR
#else #else
#define MAYBE_TestSettingsAutofillPage TestSettingsAutofillPage #define MAYBE_TestSettingsAutofillPageLTR TestSettingsAutofillPageLTR
#endif // defined(OS_MACOSX) #endif // defined(OS_MACOSX)
IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTest,
MAYBE_TestSettingsAutofillPageLTR) {
std::string url(chrome::kChromeUISettingsURL);
url += std::string(chrome::kAutofillSubPage);
static void SetupSettingsAutofillPageTest(Profile* profile, autofill_test::DisableSystemServices(browser()->profile());
const char* first_name, AutofillProfile profile;
const char* middle_name, autofill_test::SetProfileInfo(
const char* last_name, &profile,
const char* email,
const char* company,
const char* address1,
const char* address2,
const char* city,
const char* state,
const char* zipcode,
const char* country,
const char* phone) {
autofill_test::DisableSystemServices(profile);
AutofillProfile autofill_profile;
autofill_test::SetProfileInfo(&autofill_profile,
first_name,
middle_name,
last_name,
email,
company,
address1,
address2,
city,
state,
zipcode,
country,
phone);
PersonalDataManager* personal_data_manager =
PersonalDataManagerFactory::GetForProfile(profile);
ASSERT_TRUE(personal_data_manager);
personal_data_manager->AddProfile(autofill_profile);
}
IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestLTR,
TestSettingsAutofillPage) {
SetupSettingsAutofillPageTest(browser()->profile(),
"\xD7\x9E\xD7\xA9\xD7\x94", "\xD7\x9E\xD7\xA9\xD7\x94",
"\xD7\x91", "\xD7\x91",
"\xD7\x9B\xD7\x94\xD7\x9F", "\xD7\x9B\xD7\x94\xD7\x9F",
"moshe.b.cohen@biditest.com", "moshe.b.cohen@biditest.com",
"\xD7\x91\xD7\x93\xD7\x99\xD7\xA7\xD7\x94\x20" "\xD7\x91\xD7\x93\xD7\x99\xD7\xA7\xD7\x94\x20\xD7\x91\xD7\xA2\xD7\x9E",
"\xD7\x91\xD7\xA2\xD7\x9E", "\xD7\x93\xD7\xA8\xD7\x9A\x20\xD7\x9E\xD7\xA0\xD7\x97\xD7\x9D\x20\xD7\x91\xD7\x92\xD7\x99\xD7\x9F\x20\x32\x33",
"\xD7\x93\xD7\xA8\xD7\x9A\x20\xD7\x9E\xD7\xA0"
"\xD7\x97\xD7\x9D\x20\xD7\x91\xD7\x92\xD7"
"\x99\xD7\x9F\x20\x32\x33",
"\xD7\xA7\xD7\x95\xD7\x9E\xD7\x94\x20\x32\x36", "\xD7\xA7\xD7\x95\xD7\x9E\xD7\x94\x20\x32\x36",
"\xD7\xAA\xD7\x9C\x20\xD7\x90\xD7\x91\xD7\x99" "\xD7\xAA\xD7\x9C\x20\xD7\x90\xD7\x91\xD7\x99\xD7\x91",
"\xD7\x91",
"", "",
"66183", "66183",
"\xD7\x99\xD7\xA9\xD7\xA8\xD7\x90\xD7\x9C", "\xD7\x99\xD7\xA9\xD7\xA8\xD7\x90\xD7\x9C",
"0000"); "0000");
PersonalDataManager* personal_data_manager =
PersonalDataManagerFactory::GetForProfile(browser()->profile());
ASSERT_TRUE(personal_data_manager);
personal_data_manager->AddProfile(profile);
RunBidiCheckerOnPage(url.c_str(), false);
}
IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestFakeBidi,
TestSettingsAutofillPageRTL) {
std::string url(chrome::kChromeUISettingsURL); std::string url(chrome::kChromeUISettingsURL);
url += std::string(chrome::kAutofillSubPage); url += std::string(chrome::kAutofillSubPage);
RunBidiCheckerOnPage(url.c_str());
}
IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestRTL, autofill_test::DisableSystemServices(browser()->profile());
TestSettingsAutofillPage) { AutofillProfile profile;
SetupSettingsAutofillPageTest(browser()->profile(), autofill_test::SetProfileInfo(
&profile,
"Milton", "Milton",
"C.", "C.",
"Waddams", "Waddams",
...@@ -300,120 +241,12 @@ IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestRTL, ...@@ -300,120 +241,12 @@ IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestRTL,
"78744", "78744",
"United States", "United States",
"5125551234"); "5125551234");
std::string url(chrome::kChromeUISettingsURL);
url += std::string(chrome::kAutofillSubPage);
RunBidiCheckerOnPage(url.c_str());
}
static void SetupSettingsBrowserOptionsTest(Profile* profile,
const GURL url,
const std::string title) {
// First, add a history entry for the site. This is needed so the site's
// name will appear in the startup sites lists.
HistoryService* history_service =
profile->GetHistoryService(Profile::IMPLICIT_ACCESS);
history_service->AddPage(url, history::SOURCE_BROWSED);
history_service->SetPageTitle(url, UTF8ToUTF16(title));
// Next, add the site to the startup sites
PrefService* prefs = profile->GetPrefs();
SessionStartupPref pref = SessionStartupPref::GetStartupPref(prefs);
pref.urls.push_back(url);
SessionStartupPref::SetStartupPref(prefs, pref);
}
IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestLTR,
TestSettingsBrowserOptionsPage) {
SetupSettingsBrowserOptionsTest(browser()->profile(),
GURL("http://ynet.co.il"),
"\x79\x6E\x65\x74\x20\xD7\x97\xD7\x93\xD7"
"\xA9\xD7\x95\xD7\xAA\x20\xD7\xAA\xD7\x95"
"\xD7\x9B\xD7\x9F\x20\xD7\x95\xD7\xA2\xD7"
"\x93\xD7\x9B\xD7\x95\xD7\xA0\xD7\x99\xD7"
"\x9D\x20\x2D\x20\xD7\x99\xD7\x93\xD7\x99"
"\xD7\xA2\xD7\x95\xD7\xAA\x20\xD7\x90\xD7"
"\x97\xD7\xA8\xD7\x95\xD7\xA0\xD7\x95\xD7"
"\xAA");
std::string url(chrome::kChromeUISettingsURL);
url += std::string(chrome::kBrowserOptionsSubPage);
RunBidiCheckerOnPage(url.c_str());
}
IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestRTL,
TestSettingsBrowserOptionsPage) {
SetupSettingsBrowserOptionsTest(browser()->profile(),
GURL("http://google.com"),
"Google");
std::string url(chrome::kChromeUISettingsURL);
url += std::string(chrome::kBrowserOptionsSubPage);
RunBidiCheckerOnPage(url.c_str());
}
IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestLTR,
TestSettingsClearBrowserDataPage) {
std::string url(chrome::kChromeUISettingsURL);
url += std::string(chrome::kClearBrowserDataSubPage);
RunBidiCheckerOnPage(url.c_str());
}
IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestRTL,
TestSettingsClearBrowserDataPage) {
std::string url(chrome::kChromeUISettingsURL);
url += std::string(chrome::kClearBrowserDataSubPage);
RunBidiCheckerOnPage(url.c_str());
}
IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestLTR,
TestSettingsContentSettingsPage) {
std::string url(chrome::kChromeUISettingsURL);
url += std::string(chrome::kContentSettingsSubPage);
RunBidiCheckerOnPage(url.c_str());
}
IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestRTL,
TestSettingsContentSettingsPage) {
std::string url(chrome::kChromeUISettingsURL);
url += std::string(chrome::kContentSettingsSubPage);
RunBidiCheckerOnPage(url.c_str());
}
IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestLTR,
TestSettingsContentSettingsExceptionsPage) {
std::string url(chrome::kChromeUISettingsURL);
url += std::string(chrome::kContentSettingsExceptionsSubPage);
RunBidiCheckerOnPage(url.c_str());
}
IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestRTL,
TestSettingsContentSettingsExceptionsPage) {
std::string url(chrome::kChromeUISettingsURL);
url += std::string(chrome::kContentSettingsExceptionsSubPage);
RunBidiCheckerOnPage(url.c_str());
}
IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestLTR,
TestSettingsLanguageOptionsPage) {
std::string url(chrome::kChromeUISettingsURL);
url += std::string(chrome::kLanguageOptionsSubPage);
RunBidiCheckerOnPage(url.c_str());
}
IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestRTL, PersonalDataManager* personal_data_manager =
TestSettingsLanguageOptionsPage) { PersonalDataManagerFactory::GetForProfile(browser()->profile());
std::string url(chrome::kChromeUISettingsURL); ASSERT_TRUE(personal_data_manager);
url += std::string(chrome::kLanguageOptionsSubPage);
RunBidiCheckerOnPage(url.c_str());
}
IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestLTR, personal_data_manager->AddProfile(profile);
TestSettingsSearchEnginesOptionsPage) {
std::string url(chrome::kChromeUISettingsURL);
url += std::string(chrome::kSearchEnginesSubPage);
RunBidiCheckerOnPage(url.c_str());
}
IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestRTL, WebUIBidiCheckerBrowserTest::RunBidiCheckerOnPage(url.c_str(), true);
TestSettingsSearchEnginesOptionsPage) {
std::string url(chrome::kChromeUISettingsURL);
url += std::string(chrome::kSearchEnginesSubPage);
RunBidiCheckerOnPage(url.c_str());
} }
chrome/browser/ui/webui/bidi_checker_web_ui_test.h
View file @ b89047e6
...@@ -15,29 +15,27 @@ class WebUIBidiCheckerBrowserTest : public WebUIBrowserTest { ...@@ -15,29 +15,27 @@ class WebUIBidiCheckerBrowserTest : public WebUIBrowserTest {
public: public:
virtual ~WebUIBidiCheckerBrowserTest(); virtual ~WebUIBidiCheckerBrowserTest();
protected:
WebUIBidiCheckerBrowserTest();
// Runs the Bidi Checker on the given page URL. |isRTL| should be true when // Runs the Bidi Checker on the given page URL. |isRTL| should be true when
// the active page locale is RTL. // the active page locale is RTL.
void RunBidiCheckerOnPage(const char pageURL[], bool isRTL); void RunBidiCheckerOnPage(const char pageURL[], bool isRTL);
protected:
WebUIBidiCheckerBrowserTest();
// Setup test path. // Setup test path.
virtual void SetUpInProcessBrowserTestFixture() OVERRIDE; virtual void SetUpInProcessBrowserTestFixture() OVERRIDE;
}; };
// Base class for BidiChecker-based tests that run with an LTR UI.
class WebUIBidiCheckerBrowserTestLTR : public WebUIBidiCheckerBrowserTest {
public:
void RunBidiCheckerOnPage(const char pageURL[]);
};
// Base class for BidiChecker-based tests that run with an RTL UI. // Base class for BidiChecker-based tests that run with an RTL UI.
class WebUIBidiCheckerBrowserTestRTL : public WebUIBidiCheckerBrowserTest { // Preloads the BidiChecker JS library for each test, as well as modifies the
// active language.
class WebUIBidiCheckerBrowserTestFakeBidi : public WebUIBidiCheckerBrowserTest {
public: public:
void RunBidiCheckerOnPage(const char pageURL[]); virtual ~WebUIBidiCheckerBrowserTestFakeBidi();
protected: protected:
WebUIBidiCheckerBrowserTestFakeBidi();
virtual void SetUpOnMainThread() OVERRIDE; virtual void SetUpOnMainThread() OVERRIDE;
virtual void CleanUpOnMainThread() OVERRIDE; virtual void CleanUpOnMainThread() OVERRIDE;
......
chrome/test/data/webui/bidichecker_tests.js
View file @ b89047e6
...@@ -20,12 +20,12 @@ function filtersForPage(pageName, isRTL) { ...@@ -20,12 +20,12 @@ function filtersForPage(pageName, isRTL) {
"chrome://history" : { "chrome://history" : {
// Filters for LTR UI // Filters for LTR UI
"LTR" : [ "LTR" : [
// BUG: http://crbug.com/80791 // BUG: http://code.google.com/p/chromium/issues/detail?id=80791
bidichecker.FilterFactory.atText("בדיקה") bidichecker.FilterFactory.atText("בדיקה")
], ],
// Filters for RTL UI // Filters for RTL UI
"RTL" : [ "RTL" : [
// BUG: http://crbug.com/80791 // BUG: http://code.google.com/p/chromium/issues/detail?id=80791
bidichecker.FilterFactory.atText("Google"), bidichecker.FilterFactory.atText("Google"),
bidichecker.FilterFactory.atText("www.google.com"), bidichecker.FilterFactory.atText("www.google.com"),
// The following two are probably false positives since we can't // The following two are probably false positives since we can't
...@@ -37,11 +37,11 @@ function filtersForPage(pageName, isRTL) { ...@@ -37,11 +37,11 @@ function filtersForPage(pageName, isRTL) {
}, },
"chrome://settings/autofill" : { "chrome://settings/autofill" : {
"LTR" : [ "LTR" : [
// BUG: http://crbug.com/82267 // BUG: http://code.google.com/p/chromium/issues/detail?id=82267
bidichecker.FilterFactory.atText("משה ב כהן, דרך מנחם בגין") bidichecker.FilterFactory.atText("משה ב כהן, דרך מנחם בגין")
], ],
"RTL" : [ "RTL" : [
// BUG: http://crbug.com/90322 // BUG: http://code.google.com/p/chromium/issues/detail?id=90322
bidichecker.FilterFactory.atText( bidichecker.FilterFactory.atText(
"Milton C. Waddams, 4120 Freidrich Lane") "Milton C. Waddams, 4120 Freidrich Lane")
] ]
...@@ -57,55 +57,10 @@ function filtersForPage(pageName, isRTL) { ...@@ -57,55 +57,10 @@ function filtersForPage(pageName, isRTL) {
}, },
"chrome://newtab" : { "chrome://newtab" : {
"RTL" : [ "RTL" : [
// BUG: http://crbug.com/93339 // BUG: http://code.google.com/p/chromium/issues/detail?id=93339
bidichecker.FilterFactory.atText("Chrome Web Store"), bidichecker.FilterFactory.atText("Chrome Web Store"),
bidichecker.FilterFactory.atText("File Manager") bidichecker.FilterFactory.atText("File Manager")
] ]
},
"chrome://bugreport#0?description=%D7%91%D7%93%D7%99%D7%A7%D7%94&issueType=1" : {
"LTR" : [
// BUG: http://crbug.com/90835
bidichecker.FilterFactory.atText("בדיקה")
]
},
"chrome://bugreport#0?description=test&issueType=1" : {
"RTL" : [
// BUG: http://crbug.com/90835
bidichecker.FilterFactory.atText("test")
]
},
"chrome://settings/browser" : {
"LTR" : [
// BUG: http://crbug.com/93702
bidichecker.FilterFactory.atText("חדשות תוכן ועדכונים - ידיעות אחרונות")
]
},
"chrome://settings/clearBrowserData" : {
"RTL" : [
// BUG: http://crbug.com/94070
bidichecker.FilterFactory.atText("Google Cloud Print")
]
},
"chrome://settings/content" : {
"RTL" : [
// BUG: http://crbug.com/94070
bidichecker.FilterFactory.atText("Google Cloud Print")
]
},
"chrome://settings/languages" : {
"RTL" : [
// BUG: http://crbug.com/94070
bidichecker.FilterFactory.atText("Google Cloud Print"),
bidichecker.FilterFactory.atText("Hebrew"),
bidichecker.FilterFactory.atText("English (United States"),
bidichecker.FilterFactory.atText("English")
]
},
"chrome://settings/contentExceptions" : {
"RTL" : [
// BUG: http://crbug.com/94070
bidichecker.FilterFactory.atText("Google Cloud Print")
]
} }
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment