summaryrefslogtreecommitdiffstats
path: root/chrome/test
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/test')
-rw-r--r--chrome/test/accessibility/accessibility_tests.cc24
-rw-r--r--chrome/test/automation/automation_proxy_uitest.cc48
-rw-r--r--chrome/test/plugin/plugin_test.cpp7
-rw-r--r--chrome/test/selenium/selenium_test.cc3
-rw-r--r--chrome/test/tab_switching/tab_switching_test.cc19
-rw-r--r--chrome/test/ui/layout_plugin_uitest.cc4
-rw-r--r--chrome/test/ui/ui_test.cc2
7 files changed, 54 insertions, 53 deletions
diff --git a/chrome/test/accessibility/accessibility_tests.cc b/chrome/test/accessibility/accessibility_tests.cc
index bc42dbc..542ba7f 100644
--- a/chrome/test/accessibility/accessibility_tests.cc
+++ b/chrome/test/accessibility/accessibility_tests.cc
@@ -140,8 +140,8 @@ TEST_F(AccessibilityTest, DISABLED_TestBackBtnStatusOnNewTab) {
// Set URL and check button status.
scoped_ptr<TabProxy> tab1(window->GetTab(0));
ASSERT_TRUE(tab1.get());
- std::wstring test_file1 = test_data_directory_;
- file_util::AppendToPath(&test_file1, L"title1.html");
+ FilePath test_file1(FilePath::FromWStringHack(test_data_directory_));
+ test_file1 = test_file1.AppendASCII("title1.html");
tab1->NavigateToURL(net::FilePathToFileURL(test_file1));
Sleep(sleep_timeout_ms());
EXPECT_EQ(STATE_SYSTEM_HASPOPUP | STATE_SYSTEM_FOCUSABLE,
@@ -167,8 +167,8 @@ TEST_F(AccessibilityTest, DISABLED_TestBackBtnStatusOnNewTab) {
// Add new tab with URL and check status.
ASSERT_TRUE(window->GetTabCount(&tab_count));
- std::wstring test_file2 = test_data_directory_;
- file_util::AppendToPath(&test_file2, L"title1.html");
+ FilePath test_file2(FilePath::FromWStringHack(test_data_directory_));
+ test_file2 = test_file2.AppendASCII("title1.html");
ASSERT_TRUE(window->AppendTab(net::FilePathToFileURL(test_file2)));
ASSERT_TRUE(window->WaitForTabCountToBecome(tab_count + 1,
action_max_timeout_ms()));
@@ -242,8 +242,8 @@ TEST_F(AccessibilityTest, DISABLED_TestForwardBtnStatusOnNewTab) {
// Set URL and check button status.
scoped_ptr<TabProxy> tab1(window->GetTab(0));
ASSERT_TRUE(tab1.get());
- std::wstring test_file1 = test_data_directory_;
- file_util::AppendToPath(&test_file1, L"title1.html");
+ FilePath test_file1(FilePath::FromWStringHack(test_data_directory_));
+ test_file1 = test_file1.AppendASCII("title1.html");
tab1->NavigateToURL(net::FilePathToFileURL(test_file1));
Sleep(sleep_timeout_ms());
EXPECT_EQ(STATE_SYSTEM_HASPOPUP |
@@ -275,8 +275,8 @@ TEST_F(AccessibilityTest, DISABLED_TestForwardBtnStatusOnNewTab) {
// Add new tab with URL and check status.
ASSERT_TRUE(window->GetTabCount(&tab_count));
- std::wstring test_file2 = test_data_directory_;
- file_util::AppendToPath(&test_file2, L"title1.html");
+ FilePath test_file2(FilePath::FromWStringHack(test_data_directory_));
+ test_file2 = test_file2.AppendASCII("title1.html");
ASSERT_TRUE(window->AppendTab(net::FilePathToFileURL(test_file2)));
ASSERT_TRUE(window->WaitForTabCountToBecome(tab_count + 1,
action_max_timeout_ms()));
@@ -328,8 +328,8 @@ TEST_F(AccessibilityTest, DISABLED_TestStarBtnStatusOnNewTab) {
// Set URL and check button status.
scoped_ptr<TabProxy> tab1(window->GetTab(0));
ASSERT_TRUE(tab1.get());
- std::wstring test_file1 = test_data_directory_;
- file_util::AppendToPath(&test_file1, L"title1.html");
+ FilePath test_file1(FilePath::FromWStringHack(test_data_directory_));
+ test_file1 = test_file1.AppendASCII("title1.html");
tab1->NavigateToURL(net::FilePathToFileURL(test_file1));
Sleep(sleep_timeout_ms());
EXPECT_EQ(STATE_SYSTEM_FOCUSABLE, GetState(acc_obj));
@@ -346,8 +346,8 @@ TEST_F(AccessibilityTest, DISABLED_TestStarBtnStatusOnNewTab) {
// Add new tab with URL and check status.
ASSERT_TRUE(window->GetTabCount(&tab_count));
- std::wstring test_file2 = test_data_directory_;
- file_util::AppendToPath(&test_file2, L"title1.html");
+ FilePath test_file2(FilePath::FromWStringHack(test_data_directory_));
+ test_file2 = test_file2.AppendASCII("title1.html");
ASSERT_TRUE(window->AppendTab(net::FilePathToFileURL(test_file2)));
ASSERT_TRUE(window->WaitForTabCountToBecome(tab_count + 1,
action_max_timeout_ms()));
diff --git a/chrome/test/automation/automation_proxy_uitest.cc b/chrome/test/automation/automation_proxy_uitest.cc
index d2d6ac7..464fa81 100644
--- a/chrome/test/automation/automation_proxy_uitest.cc
+++ b/chrome/test/automation/automation_proxy_uitest.cc
@@ -194,8 +194,8 @@ TEST_F(AutomationProxyVisibleTest, AppendTab) {
ASSERT_EQ(tab_count - 1, active_tab_index);
ASSERT_NE(original_active_tab_index, active_tab_index);
- std::wstring filename(test_data_directory_);
- file_util::AppendToPath(&filename, L"title2.html");
+ FilePath filename(FilePath::FromWStringHack(test_data_directory_));
+ filename = filename.AppendASCII("title2.html");
ASSERT_TRUE(window->AppendTab(net::FilePathToFileURL(filename)));
int appended_tab_index;
@@ -262,8 +262,8 @@ TEST_F(AutomationProxyTest, NavigateToURL) {
// BUG [634097] : expected title should be "about:blank"
ASSERT_STREQ(L"", title.c_str());
- std::wstring filename(test_data_directory_);
- file_util::AppendToPath(&filename, L"title2.html");
+ FilePath filename(FilePath::FromWStringHack(test_data_directory_));
+ filename = filename.AppendASCII("title2.html");
tab->NavigateToURL(net::FilePathToFileURL(filename));
ASSERT_TRUE(tab->GetTabTitle(&title));
@@ -279,8 +279,8 @@ TEST_F(AutomationProxyTest, DISABLED_NavigateToURLWithTimeout1) {
scoped_ptr<TabProxy> tab(window->GetTab(0));
ASSERT_TRUE(tab.get());
- std::wstring filename(test_data_directory_);
- file_util::AppendToPath(&filename, L"title2.html");
+ FilePath filename(FilePath::FromWStringHack(test_data_directory_));
+ filename = filename.AppendASCII("title2.html");
bool is_timeout;
tab->NavigateToURLWithTimeout(net::FilePathToFileURL(filename),
@@ -306,16 +306,16 @@ TEST_F(AutomationProxyTest, DISABLED_NavigateToURLWithTimeout2) {
tab.reset(window->GetTab(0));
ASSERT_TRUE(tab.get());
- std::wstring filename1(test_data_directory_);
- file_util::AppendToPath(&filename1, L"title1.html");
+ FilePath filename1(FilePath::FromWStringHack(test_data_directory_));
+ filename1 = filename1.AppendASCII("title1.html");
bool is_timeout;
tab->NavigateToURLWithTimeout(net::FilePathToFileURL(filename1),
1, &is_timeout);
ASSERT_TRUE(is_timeout);
- std::wstring filename2(test_data_directory_);
- file_util::AppendToPath(&filename2, L"title2.html");
+ FilePath filename2(FilePath::FromWStringHack(test_data_directory_));
+ filename2 = filename2.AppendASCII("title1.html");
tab->NavigateToURLWithTimeout(net::FilePathToFileURL(filename2),
10000, &is_timeout);
ASSERT_FALSE(is_timeout);
@@ -338,8 +338,8 @@ TEST_F(AutomationProxyTest, GoBackForward) {
ASSERT_TRUE(tab->GetTabTitle(&title));
ASSERT_STREQ(L"", title.c_str());
- std::wstring filename(test_data_directory_);
- file_util::AppendToPath(&filename, L"title2.html");
+ FilePath filename(FilePath::FromWStringHack(test_data_directory_));
+ filename = filename.AppendASCII("title2.html");
ASSERT_TRUE(tab->NavigateToURL(net::FilePathToFileURL(filename)));
ASSERT_TRUE(tab->GetTabTitle(&title));
ASSERT_STREQ(L"Title Of Awesomeness", title.c_str());
@@ -367,8 +367,8 @@ TEST_F(AutomationProxyTest, GetCurrentURL) {
ASSERT_TRUE(tab->GetCurrentURL(&url));
ASSERT_STREQ("about:blank", url.spec().c_str());
- std::wstring filename(test_data_directory_);
- file_util::AppendToPath(&filename, L"cookie1.html");
+ FilePath filename(FilePath::FromWStringHack(test_data_directory_));
+ filename = filename.AppendASCII("cookie1.html");
GURL newurl = net::FilePathToFileURL(filename);
ASSERT_TRUE(tab->NavigateToURL(newurl));
ASSERT_TRUE(tab->GetCurrentURL(&url));
@@ -474,8 +474,8 @@ TEST_F(AutomationProxyTest, NavigateToURLAsync) {
scoped_ptr<TabProxy> tab(window->GetTab(0));
ASSERT_TRUE(tab.get());
- std::wstring filename(test_data_directory_);
- file_util::AppendToPath(&filename, L"cookie1.html");
+ FilePath filename(FilePath::FromWStringHack(test_data_directory_));
+ filename = filename.AppendASCII("cookie1.html");
GURL newurl = net::FilePathToFileURL(filename);
ASSERT_TRUE(tab->NavigateToURLAsync(newurl));
@@ -657,9 +657,9 @@ TEST_F(AutomationProxyTest, DISABLED_ConstrainedWindowTest) {
tab.reset(window->GetTab(0));
ASSERT_TRUE(tab.get());
- std::wstring filename(test_data_directory_);
- file_util::AppendToPath(&filename, L"constrained_files");
- file_util::AppendToPath(&filename, L"constrained_window.html");
+ FilePath filename(FilePath::FromWStringHack(test_data_directory_));
+ filename = filename.AppendASCII("constrained_files");
+ filename = filename.AppendASCII("constrained_window.html");
ASSERT_TRUE(tab->NavigateToURL(net::FilePathToFileURL(filename)));
@@ -698,9 +698,9 @@ TEST_F(AutomationProxyTest, CantEscapeByOnloadMoveto) {
tab.reset(window->GetTab(0));
ASSERT_TRUE(tab.get());
- std::wstring filename(test_data_directory_);
- file_util::AppendToPath(&filename, L"constrained_files");
- file_util::AppendToPath(&filename, L"constrained_window_onload_moveto.html");
+ FilePath filename(FilePath::FromWStringHack(test_data_directory_));
+ filename = filename.AppendASCII("constrained_files");
+ filename = filename.AppendASCII("constrained_window_onload_moveto.html");
ASSERT_TRUE(tab->NavigateToURL(net::FilePathToFileURL(filename)));
@@ -1101,8 +1101,8 @@ TEST_F(AutomationProxyTest5, TestLifetimeOfDomAutomationController) {
scoped_ptr<TabProxy> tab(window->GetTab(0));
ASSERT_TRUE(tab.get());
- std::wstring filename(test_data_directory_);
- file_util::AppendToPath(&filename, L"dom_automation_test_with_popup.html");
+ FilePath filename(FilePath::FromWStringHack(test_data_directory_));
+ filename = filename.AppendASCII("dom_automation_test_with_popup.html");
tab->NavigateToURL(net::FilePathToFileURL(filename));
diff --git a/chrome/test/plugin/plugin_test.cpp b/chrome/test/plugin/plugin_test.cpp
index 4907a9a..77bc77d 100644
--- a/chrome/test/plugin/plugin_test.cpp
+++ b/chrome/test/plugin/plugin_test.cpp
@@ -47,6 +47,7 @@
#include <string.h>
#include <memory.h>
+#include "base/file_path.h"
#include "base/file_util.h"
#include "base/registry.h"
#include "chrome/common/chrome_switches.h"
@@ -102,10 +103,10 @@ class PluginTest : public UITest {
// Generate the URL for testing a particular test.
// HTML for the tests is all located in test_directory\plugin\<testcase>
GURL GetTestUrl(const std::wstring &test_case) {
- std::wstring path;
+ FilePath path;
PathService::Get(chrome::DIR_TEST_DATA, &path);
- file_util::AppendToPath(&path, L"plugin");
- file_util::AppendToPath(&path, test_case);
+ path = path.AppendASCII("plugin");
+ path = path.Append(FilePath::FromWStringHack(test_case));
return net::FilePathToFileURL(path);
}
diff --git a/chrome/test/selenium/selenium_test.cc b/chrome/test/selenium/selenium_test.cc
index be66b0d..590d996 100644
--- a/chrome/test/selenium/selenium_test.cc
+++ b/chrome/test/selenium/selenium_test.cc
@@ -12,6 +12,7 @@
#include <list>
#include <set>
+#include "base/file_path.h"
#include "base/file_util.h"
#include "base/path_service.h"
#include "base/rand_util.h"
@@ -101,7 +102,7 @@ class SeleniumTest : public UITest {
file_util::AppendToPath(&test_path, L"core");
file_util::AppendToPath(&test_path, L"TestRunner.html");
- GURL test_url(net::FilePathToFileURL(test_path));
+ GURL test_url(net::FilePathToFileURL(FilePath::FromWStringHack(test_path)));
scoped_ptr<TabProxy> tab(GetActiveTab());
tab->NavigateToURL(test_url);
diff --git a/chrome/test/tab_switching/tab_switching_test.cc b/chrome/test/tab_switching/tab_switching_test.cc
index 3cbbfa6..d56be38 100644
--- a/chrome/test/tab_switching/tab_switching_test.cc
+++ b/chrome/test/tab_switching/tab_switching_test.cc
@@ -108,18 +108,17 @@ class TabSwitchingUITest : public UITest {
// Opens new tabs. Returns the number of tabs opened.
int OpenTabs() {
// Add tabs.
- static const wchar_t* files[] = { L"espn.go.com", L"bugzilla.mozilla.org",
- L"news.cnet.com", L"www.amazon.com",
- L"kannada.chakradeo.net", L"allegro.pl",
- L"ml.wikipedia.org", L"www.bbc.co.uk",
- L"126.com", L"www.altavista.com"};
+ static const char* files[] = { "espn.go.com", "bugzilla.mozilla.org",
+ "news.cnet.com", "www.amazon.com",
+ "kannada.chakradeo.net", "allegro.pl",
+ "ml.wikipedia.org", "www.bbc.co.uk",
+ "126.com", "www.altavista.com"};
int number_of_new_tabs_opened = 0;
- std::wstring file_name;
+ FilePath file_name;
for (int i = 0; i < arraysize(files); ++i) {
- file_name = path_prefix_;
- file_name += files[i];
- file_name += FilePath::kSeparators[0];
- file_name += L"index.html";
+ file_name = FilePath::FromWStringHack(path_prefix_);
+ file_name = file_name.AppendASCII(files[i]);
+ file_name = file_name.AppendASCII("index.html");
browser_proxy_->AppendTab(net::FilePathToFileURL(file_name));
number_of_new_tabs_opened++;
}
diff --git a/chrome/test/ui/layout_plugin_uitest.cc b/chrome/test/ui/layout_plugin_uitest.cc
index fa46e2a..f0778ab 100644
--- a/chrome/test/ui/layout_plugin_uitest.cc
+++ b/chrome/test/ui/layout_plugin_uitest.cc
@@ -57,9 +57,9 @@ TEST_F(LayoutPluginTester, UnloadNoCrash) {
CreateDirectory(plugins_directory.c_str(), NULL);
CopyFile(plugin_src.c_str(), plugin_dest.c_str(), true /* overwrite */);
- std::wstring path;
+ FilePath path;
PathService::Get(chrome::DIR_TEST_DATA, &path);
- file_util::AppendToPath(&path, L"npapi/layout_test_plugin.html");
+ path = path.AppendASCII("npapi").AppendASCII("layout_test_plugin.html");
NavigateToURL(net::FilePathToFileURL(path));
std::wstring title;
diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc
index 6b43ae0..5cd8e2a 100644
--- a/chrome/test/ui/ui_test.cc
+++ b/chrome/test/ui/ui_test.cc
@@ -774,7 +774,7 @@ GURL UITest::GetTestUrl(const std::wstring& test_directory,
PathService::Get(chrome::DIR_TEST_DATA, &path);
file_util::AppendToPath(&path, test_directory);
file_util::AppendToPath(&path, test_case);
- return net::FilePathToFileURL(path);
+ return net::FilePathToFileURL(FilePath::FromWStringHack(path));
}
void UITest::WaitForFinish(const std::string &name,
generated by cgit v1.1 at 2025-03-11 03:41:13 +0000