Run the Worker tests for resolveLocalFileSystemURL that were added

content/worker/worker_uitest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/file_path.h"
 #include "base/string_util.h"
 #include "base/test/test_timeouts.h"
 #include "base/threading/platform_thread.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/common/url_constants.h"
@@ skipping 695 matching lines @@
 
     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());
     ASSERT_TRUE(tab.get());
     GURL about_url(chrome::kAboutBlankURL);
     EXPECT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS, tab->NavigateToURL(about_url));
   }
+
+  void RunWorkerFileSystemLayoutHttpTests(const char* tests[], int num_tests) {
+    FilePath worker_test_dir = FilePath().AppendASCII("http")
+                                         .AppendASCII("tests");
+
+    FilePath filesystem_test_dir = FilePath().AppendASCII("filesystem")
+                                             .AppendASCII("workers");
+    InitializeForLayoutTest(worker_test_dir, filesystem_test_dir, kHttpPort);
+
+    AddResourceForLayoutTest(worker_test_dir.AppendASCII("filesystem"),
+                             FilePath().AppendASCII("resources"));
+
+    AddResourceForLayoutTest(worker_test_dir.AppendASCII("filesystem"),
+                             FilePath().AppendASCII("script-tests"));
+
+    AddResourceForLayoutTest(worker_test_dir.AppendASCII("filesystem"),
+                             FilePath().AppendASCII("workers")
+                                       .AppendASCII("script-tests"));
+
+    StartHttpServer(new_http_root_dir_);
+    for (int i = 0; i < num_tests; ++i)
+      RunLayoutTest(tests[i], 8000);

[michaeln, 2011/03/22 21:32:50]

should 8000 by UILayoutTest::kHttpPort?

[adamk, 2011/03/22 21:41:00]

I don't think so, because 8000 seems to be NRWT's default.  Since the port is
referenced explicitly in the tests, this is needed to make sure the same JS can
run in DRT or here.

+    StopHttpServer();
+
+    // 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());
+    ASSERT_TRUE(tab.get());
+    GURL about_url(chrome::kAboutBlankURL);
+    EXPECT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS, tab->NavigateToURL(about_url));
+  }
 };
 
 TEST_F(WorkerFileSystemTest, Temporary) {
   RunWorkerFileSystemLayoutTest("simple-temporary.html");
 }
 
 TEST_F(WorkerFileSystemTest, Persistent) {
   RunWorkerFileSystemLayoutTest("simple-persistent.html");
 }
 
@@ skipping 10 matching lines @@
 }
 
 TEST_F(WorkerFileSystemTest, SyncOperations) {
   RunWorkerFileSystemLayoutTest("sync-operations.html");
 }
 
 TEST_F(WorkerFileSystemTest, FileEntryToURISync) {
   RunWorkerFileSystemLayoutTest("file-entry-to-uri-sync.html");
 }
 
+TEST_F(WorkerFileSystemTest, ResolveURLHttpTests) {
+  static const char* kLayoutTests[] = {
+    "resolve-url.html",
+    "resolve-url-sync.html"
+  };
+  RunWorkerFileSystemLayoutHttpTests(kLayoutTests, arraysize(kLayoutTests));
+}
+
 #if defined(OS_LINUX)
 // These tests fail on Linux due to an assert in WebKit's RNG.
 // See http://webkit.org/b/55728.
 #define FileFromFileEntry DISABLED_FileFromFileEntry
 #define FileFromFileEntrySync DISABLED_FileFromFileEntrySync
 #define FileWriterTruncateExtend DISABLED_FileWriterTruncateExtend
 #define FileWriterSyncTruncateExtend DISABLED_FileWriterSyncTruncateExtend
 #define FileWriterSyncWriteOverlapped DISABLED_FileWriterSyncWriteOverlapped
 #endif
 TEST_F(WorkerFileSystemTest, FileFromFileEntry) {
   RunWorkerFileSystemLayoutTest("file-from-file-entry.html");
 }
 
 TEST_F(WorkerFileSystemTest, FileFromFileEntrySync) {
   RunWorkerFileSystemLayoutTest("file-from-file-entry-sync.html");
 }
 
 TEST_F(WorkerFileSystemTest, FileWriterTruncateExtend) {
   RunWorkerFileSystemLayoutTest("file-writer-truncate-extend.html");
 }
 
 TEST_F(WorkerFileSystemTest, FileWriterSyncTruncateExtend) {
   RunWorkerFileSystemLayoutTest("file-writer-sync-truncate-extend.html");
 }
 
 TEST_F(WorkerFileSystemTest, FileWriterSyncWriteOverlapped) {
   RunWorkerFileSystemLayoutTest("file-writer-sync-write-overlapped.html");
 }