diff options
author | dumi@chromium.org <dumi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-12 03:25:17 +0000 |
---|---|---|
committer | dumi@chromium.org <dumi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-12 03:25:17 +0000 |
commit | aa5ff891c563531aa38fbee52c36f29c66ca3e54 (patch) | |
tree | 00c299c7257ebe76f77497d1058246061e16edc5 | |
parent | 33e926f1a98db0321adfa9bf0276d23c61ab5a6a (diff) | |
download | chromium_src-aa5ff891c563531aa38fbee52c36f29c66ca3e54.zip chromium_src-aa5ff891c563531aa38fbee52c36f29c66ca3e54.tar.gz chromium_src-aa5ff891c563531aa38fbee52c36f29c66ca3e54.tar.bz2 |
Add a worker test for LayoutTests/fast/workers/storage/open-database-sync-inputs.html.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/2045003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47005 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | chrome/worker/worker_uitest.cc | 32 |
1 files changed, 31 insertions, 1 deletions
diff --git a/chrome/worker/worker_uitest.cc b/chrome/worker/worker_uitest.cc index 1abc538..daadb22 100644 --- a/chrome/worker/worker_uitest.cc +++ b/chrome/worker/worker_uitest.cc @@ -7,6 +7,7 @@ #include "chrome/app/chrome_dll_resource.h" #include "chrome/browser/worker_host/worker_service.h" #include "chrome/common/chrome_switches.h" +#include "chrome/common/url_constants.h" #include "chrome/test/automation/browser_proxy.h" #include "chrome/test/automation/tab_proxy.h" #include "chrome/test/ui/ui_layout_test.h" @@ -121,7 +122,32 @@ class WorkerTest : public UILayoutTest { // Navigate to a blank page so that any workers are cleaned up. // This helps leaks trackers do a better job of reporting. scoped_refptr<TabProxy> tab(GetActiveTab()); - GURL about_url(std::string("about:blank")); + GURL about_url(chrome::kAboutBlankURL); + EXPECT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS, tab->NavigateToURL(about_url)); + } + + void RunWorkerStorageLayoutTest(const std::string& test_case_file_name) { + FilePath worker_test_dir; + worker_test_dir = worker_test_dir.AppendASCII("fast"); + worker_test_dir = worker_test_dir.AppendASCII("workers"); + + FilePath storage_test_dir; + storage_test_dir = storage_test_dir.AppendASCII("storage"); + InitializeForLayoutTest(worker_test_dir, storage_test_dir, kNoHttpPort); + + // Storage worker tests also rely on common files in 'resources'. + FilePath resource_dir; + resource_dir = resource_dir.AppendASCII("resources"); + AddResourceForLayoutTest(worker_test_dir.Append(storage_test_dir), + resource_dir); + + printf("Test: %s\n", test_case_file_name.c_str()); + RunLayoutTest(test_case_file_name, kNoHttpPort); + + // Navigate to a blank page so that any workers are cleaned up. + // This helps leaks trackers do a better job of reporting. + scoped_refptr<TabProxy> tab(GetActiveTab()); + GURL about_url(chrome::kAboutBlankURL); EXPECT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS, tab->NavigateToURL(about_url)); } @@ -630,3 +656,7 @@ TEST_F(WorkerTest, DISABLED_QueuedSharedWorkerStartedFromOtherTab) { ASSERT_STREQ(kTestCompleteSuccess, value.c_str()); ASSERT_TRUE(WaitForProcessCountToBe(2, max_workers_per_tab+1)); } + +TEST_F(WorkerTest, OpenDatabaseSyncInputs) { + RunWorkerStorageLayoutTest("open-database-sync-inputs.html"); +} |