Enable layout tests: worker-constructor.html and worker-script-error.html....

chrome/worker/worker_uitest.cc

 // Copyright (c) 2009 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/file_util.h"
 #include "base/path_service.h"
 #include "base/platform_thread.h"
 #include "base/string_util.h"
 #include "chrome/browser/worker_host/worker_service.h"
@@ skipping 37 matching lines @@
                           std::string* expected_result_value);
 
   bool initialized_for_layout_test_;
   int test_count_;
   FilePath temp_test_dir_;
   FilePath layout_test_dir_;
   FilePath test_case_dir_;
   FilePath new_http_root_dir_;
   FilePath new_layout_test_dir_;
   FilePath rebase_result_dir_;
+  FilePath rebase_result_win_dir_;
   std::string layout_test_controller_;
 };
 
 WorkerTest::WorkerTest()
     : UITest(), initialized_for_layout_test_(false), test_count_(0) {
 }
 
 WorkerTest::~WorkerTest() {
   // The deletion might fail because HTTP server process might not been
   // completely shut down yet and is still holding certain handle to it.
@@ skipping 42 matching lines @@
   // This is because our build machines do not have WebKit layout tests added.
   layout_test_dir_ = src_dir.AppendASCII("chrome");
   layout_test_dir_ = layout_test_dir_.AppendASCII("test");
   layout_test_dir_ = layout_test_dir_.AppendASCII("data");
   layout_test_dir_ = layout_test_dir_.AppendASCII("workers");
   layout_test_dir_ = layout_test_dir_.Append(test_parent_dir);
   layout_test_dir_ = layout_test_dir_.Append(test_case_dir);
 
   // If not found, try to use the original copy of WebKit layout tests for
   // workers. For testing only in local machine only.
-  //   webkit/data/layout_tests/LayoutTests/.../workers
+  //   third_party/LayoutTests/.../workers
   if (!file_util::DirectoryExists(layout_test_dir_)) {
-    layout_test_dir_ = src_dir.AppendASCII("webkit");
-    layout_test_dir_ = layout_test_dir_.AppendASCII("data");
-    layout_test_dir_ = layout_test_dir_.AppendASCII("layout_tests");
+    layout_test_dir_ = src_dir.AppendASCII("third_party");
     layout_test_dir_ = layout_test_dir_.Append(test_parent_dir);
     layout_test_dir_ = layout_test_dir_.Append(test_case_dir);
     ASSERT_TRUE(file_util::DirectoryExists(layout_test_dir_));
   }
 
-  // Gets the file path to rebased expected result directory for workers.
+  // Gets the file path to rebased expected result directory for workers for
+  // current platform.
   //   webkit/data/layout_tests/platform/chromium_***/LayoutTests/.../workers
   rebase_result_dir_ = src_dir.AppendASCII("webkit");
   rebase_result_dir_ = rebase_result_dir_.AppendASCII("data");
   rebase_result_dir_ = rebase_result_dir_.AppendASCII("layout_tests");
   rebase_result_dir_ = rebase_result_dir_.AppendASCII("platform");
   rebase_result_dir_ = rebase_result_dir_.AppendASCII(kPlatformName);
   rebase_result_dir_ = rebase_result_dir_.Append(test_parent_dir);
   rebase_result_dir_ = rebase_result_dir_.Append(test_case_dir);
 
+  // Gets the file path to rebased expected result directory for workers under
+  // win32 platform. This is used by other non-win32 platform to use the same
+  // rebased expected results.
+#if !defined(OS_WIN)
+  rebase_result_win_dir_ = src_dir.AppendASCII("webkit");
+  rebase_result_win_dir_ = rebase_result_win_dir_.AppendASCII("data");
+  rebase_result_win_dir_ = rebase_result_win_dir_.AppendASCII("layout_tests");
+  rebase_result_win_dir_ = rebase_result_win_dir_.AppendASCII("platform");
+  rebase_result_win_dir_ = rebase_result_win_dir_.AppendASCII("chromium-win");
+  rebase_result_win_dir_ = rebase_result_win_dir_.Append(test_parent_dir);
+  rebase_result_win_dir_ = rebase_result_win_dir_.Append(test_case_dir);
+#endif
+
   // Creates the temporary directory.
   ASSERT_TRUE(file_util::CreateNewTempDirectory(
       FILE_PATH_LITERAL("chrome_worker_test_"), &temp_test_dir_));
 
   // Creates the new layout test subdirectory under the temp directory.
   // Note that we have to mimic the same layout test directory structure,
   // like .../LayoutTests/fast/workers/.... Otherwise those layout tests
   // dealing with location property, like worker-location.html, could fail.
   new_layout_test_dir_ = temp_test_dir_;
   new_layout_test_dir_ = new_layout_test_dir_.Append(test_parent_dir);
@@ skipping 87 matching lines @@
       UnescapeRule::NORMAL | UnescapeRule::SPACES |
           UnescapeRule::URL_SPECIAL_CHARS | UnescapeRule::CONTROL_CHARS);
   value += "\n";
   ReplaceSubstringsAfterOffset(&value, 0, "\r", "");
 
   // Reads the expected result. First try to read from rebase directory.
   // If failed, read from original directory.
   std::string expected_result_value;
   if (!ReadExpectedResult(rebase_result_dir_,
                           test_case_file_name,
-                          &expected_result_value))
-    ReadExpectedResult(layout_test_dir_,
-                       test_case_file_name,
-                       &expected_result_value);
+                          &expected_result_value)) {
+    if (rebase_result_win_dir_.empty() ||
+        !ReadExpectedResult(rebase_result_win_dir_,
+                              test_case_file_name,
+                              &expected_result_value))

[levin, 2009/07/28 00:59:05]

indent off.

+      ReadExpectedResult(layout_test_dir_,
+                         test_case_file_name,
+                         &expected_result_value);
+  }
   ASSERT_TRUE(!expected_result_value.empty());
 
   // Normalizes the expected result.
   ReplaceSubstringsAfterOffset(&expected_result_value, 0, "\r", "");
 
   // Compares the results.
   EXPECT_STREQ(expected_result_value.c_str(), value.c_str());
 }
 
 bool WorkerTest::ReadExpectedResult(const FilePath& result_dir_path,
@@ skipping 15 matching lines @@
 
 TEST_F(WorkerTest, MultipleWorkers) {
   RunTest(L"multi_worker.html");
 }
 
 TEST_F(WorkerTest, WorkerFastLayoutTests) {
   static const char* kLayoutTestFiles[] = {
     "stress-js-execution.html",
     "use-machine-stack.html",
     "worker-close.html",
-    //"worker-constructor.html",
+    "worker-constructor.html",
     "worker-context-gc.html",
     "worker-event-listener.html",
     "worker-gc.html",
     "worker-location.html",
     "worker-navigator.html",
     "worker-replace-global-constructor.html",
     "worker-replace-self.html",
+    "worker-script-error.html",
     "worker-terminate.html",
     "worker-timeout.html"
   };
 
   FilePath fast_test_dir;
   fast_test_dir = fast_test_dir.AppendASCII("LayoutTests");
   fast_test_dir = fast_test_dir.AppendASCII("fast");
 
   FilePath worker_test_dir;
   worker_test_dir = worker_test_dir.AppendASCII("workers");
@@ skipping 82 matching lines @@
   EXPECT_EQ(total_workers + 1 + (UITest::in_process_renderer() ? 0 : tab_count),
             UITest::GetBrowserProcessCount());
 
   // Now close the first tab and check that the queued workers were started.
   tab->Close(true);
   tab->NavigateToURL(GetTestUrl(L"google", L"google.html"));
 
   EXPECT_EQ(total_workers + 1 + (UITest::in_process_renderer() ? 0 : tab_count),
             UITest::GetBrowserProcessCount());
 }