Rewrite HTML5 workers ui_tests to browser_tests. Compared to ui_tests, browser_tests are faster, le…

content/browser/worker_host/test/worker_browsertest.cc

Index: content/browser/worker_host/test/worker_browsertest.cc
===================================================================
--- content/browser/worker_host/test/worker_browsertest.cc	(revision 0)
+++ content/browser/worker_host/test/worker_browsertest.cc	(revision 0)
@@ -0,0 +1,482 @@
+// Copyright (c) 2012 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/bind.h"
+#include "base/file_path.h"
+#include "base/path_service.h"
+#include "base/stringprintf.h"
+#include "base/string_util.h"
+#include "base/test/test_timeouts.h"
+#include "base/utf_string_conversions.h"
+#include "chrome/browser/ui/browser.h"
+#include "chrome/test/base/ui_test_utils.h"
+#include "content/browser/worker_host/worker_process_host.h"
+#include "content/browser/worker_host/worker_service_impl.h"
+#include "content/public/browser/browser_thread.h"
+#include "content/public/common/content_paths.h"
+#include "content/test/layout_browsertest.h"
+#include "googleurl/src/gurl.h"
+
+using content::BrowserThread;
+using content::WorkerServiceImpl;
+
+class WorkerLayoutTest : public InProcessBrowserLayoutTest {
+ public:
+  WorkerLayoutTest() : InProcessBrowserLayoutTest(
+      FilePath(), FilePath().AppendASCII("fast").AppendASCII("workers")) {
+  }
+  virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
+    InProcessBrowserLayoutTest::SetUpInProcessBrowserTestFixture();
+    AddResourceForLayoutTest(
+        FilePath().AppendASCII("fast").AppendASCII("js"),
+        FilePath().AppendASCII("resources"));
+  }
+};
+
+// Crashy, http://crbug.com/35965.
+// Flaky, http://crbug.com/36555.
+IN_PROC_BROWSER_TEST_F(WorkerLayoutTest, SLOW_WorkerClonePort) {
+  RunLayoutTest("worker-cloneport.html");
+}
+
+// http://crbug.com/101996 (started flaking with WebKit roll 98537:98582).

[Andrew T Wilson (Slow), 2012/03/28 22:44:09]

Are these tests no longer flaky now that we're using browser tests? Should we
modify the comments appropriately/mark bugs fixed? Or do we want to wait to see
what happens in practice when this hits the tree?

[jam, 2012/03/28 23:01:27]

I haven't seen any flakiness in running these tests dozens of times on my
win/linux/mac machines. I hope that by switching them they'll be less flaky on
the bots as well. Of course I have no idea if that'll be the case, and
unfortunately this patch won't apply on the bots. So my plan is to check them in
with these comments so that if tests are flaky, the same bugs are reopened.

The one issue is on windows sometimes the http server won't start, but that's
separate from browser_tests vs ui_tests. I'm investigating that.

+IN_PROC_BROWSER_TEST_F(WorkerLayoutTest, WorkerContextMultiPort) {
+  RunLayoutTest("worker-context-multi-port.html");
+}
+
+IN_PROC_BROWSER_TEST_F(WorkerLayoutTest, WorkerMessagePort) {
+  RunLayoutTest("worker-messageport.html");
+}
+
+IN_PROC_BROWSER_TEST_F(WorkerLayoutTest, WorkerMessagePortGC) {
+  RunLayoutTest("worker-messageport-gc.html");
+}
+
+// http://crbug.com/101996 (started flaking with WebKit roll 98537:98582).
+IN_PROC_BROWSER_TEST_F(WorkerLayoutTest, WorkerMultiPort) {
+  RunLayoutTest("worker-multi-port.html");
+}
+
+//
+// SharedWorkerFastLayoutTests
+//
+IN_PROC_BROWSER_TEST_F(WorkerLayoutTest, SharedWorkerFastConstructor) {
+  RunLayoutTest("shared-worker-constructor.html");
+}
+
+IN_PROC_BROWSER_TEST_F(WorkerLayoutTest, SharedWorkerFastContextGC) {
+  RunLayoutTest("shared-worker-context-gc.html");
+}
+
+IN_PROC_BROWSER_TEST_F(WorkerLayoutTest, SharedWorkerFastEventListener) {
+  RunLayoutTest("shared-worker-event-listener.html");
+}
+
+IN_PROC_BROWSER_TEST_F(WorkerLayoutTest, SharedWorkerFastException) {
+  RunLayoutTest("shared-worker-exception.html");
+}
+
+IN_PROC_BROWSER_TEST_F(WorkerLayoutTest, SharedWorkerFastGC) {
+  RunLayoutTest("shared-worker-gc.html");
+}
+
+IN_PROC_BROWSER_TEST_F(WorkerLayoutTest, SharedWorkerFastInIframe) {
+  RunLayoutTest("shared-worker-in-iframe.html");
+}
+
+IN_PROC_BROWSER_TEST_F(WorkerLayoutTest, SharedWorkerFastLoadError) {
+  RunLayoutTest("shared-worker-load-error.html");
+}
+
+IN_PROC_BROWSER_TEST_F(WorkerLayoutTest, SharedWorkerFastLocation) {
+  RunLayoutTest("shared-worker-location.html");
+}
+
+IN_PROC_BROWSER_TEST_F(WorkerLayoutTest, SharedWorkerFastName) {
+  RunLayoutTest("shared-worker-name.html");
+}
+
+IN_PROC_BROWSER_TEST_F(WorkerLayoutTest, SharedWorkerFastNavigator) {
+  RunLayoutTest("shared-worker-navigator.html");
+}
+
+IN_PROC_BROWSER_TEST_F(WorkerLayoutTest,
+                       SharedWorkerFastReplaceGlobalConstructor) {
+  RunLayoutTest("shared-worker-replace-global-constructor.html");
+}
+
+IN_PROC_BROWSER_TEST_F(WorkerLayoutTest, SharedWorkerFastReplaceSelf) {
+  RunLayoutTest("shared-worker-replace-self.html");
+}
+
+IN_PROC_BROWSER_TEST_F(WorkerLayoutTest, SharedWorkerFastScriptError) {
+  RunLayoutTest("shared-worker-script-error.html");
+}
+
+IN_PROC_BROWSER_TEST_F(WorkerLayoutTest, SharedWorkerFastShared) {
+  RunLayoutTest("shared-worker-shared.html");
+}
+
+IN_PROC_BROWSER_TEST_F(WorkerLayoutTest, SharedWorkerFastSimple) {
+  RunLayoutTest("shared-worker-simple.html");
+}
+
+class MessagePortTest : public InProcessBrowserLayoutTest {
+ public:
+  MessagePortTest() : InProcessBrowserLayoutTest(
+      FilePath(), FilePath().AppendASCII("fast").AppendASCII("events")) {
+  }
+  virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
+    InProcessBrowserLayoutTest::SetUpInProcessBrowserTestFixture();
+    AddResourceForLayoutTest(
+        FilePath().AppendASCII("fast").AppendASCII("js"),
+        FilePath().AppendASCII("resources"));
+  }
+};
+
+// Flaky, http://crbug.com/34996.
+IN_PROC_BROWSER_TEST_F(MessagePortTest, Tests) {
+  static const char* kLayoutTestFiles[] = {
+    "message-channel-gc.html",
+    "message-channel-gc-2.html",
+    "message-channel-gc-3.html",
+    "message-channel-gc-4.html",
+    "message-port.html",
+    "message-port-clone.html",
+    "message-port-constructor-for-deleted-document.html",
+    "message-port-deleted-document.html",
+    "message-port-deleted-frame.html",
+    "message-port-inactive-document.html",
+    "message-port-multi.html",
+    "message-port-no-wrapper.html",
+    // Only works with run-webkit-tests --leaks.
+    // "message-channel-listener-circular-ownership.html",
+  };
+
+  for (size_t i = 0; i < arraysize(kLayoutTestFiles); ++i)
+    RunLayoutTest(kLayoutTestFiles[i]);
+}
+
+
+class WorkerHttpLayoutTest : public InProcessBrowserLayoutTest {
+ public:
+  // The resources for these tests hardcode 8000, so must use that here. If
+  // multiple tests which use it run in parallel, then the test will fail but
+  // it'll run again at the end in serial and pass.
+  WorkerHttpLayoutTest() : InProcessBrowserLayoutTest(
+      FilePath().AppendASCII("http").AppendASCII("tests"),
+      FilePath().AppendASCII("workers"),
+      8000) {
+  }
+  virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
+    InProcessBrowserLayoutTest::SetUpInProcessBrowserTestFixture();
+    AddResourceForLayoutTest(
+        FilePath().AppendASCII("http").AppendASCII("tests"),
+        FilePath().AppendASCII("resources"));
+  }
+};
+
+IN_PROC_BROWSER_TEST_F(WorkerHttpLayoutTest, Tests) {
+  static const char* kLayoutTestFiles[] = {
+      "shared-worker-importScripts.html",
+      "shared-worker-redirect.html",
+      "text-encoding.html",
+#if defined(OS_WIN)
+      // Fails on the mac (and linux?):
+      // http://code.google.com/p/chromium/issues/detail?id=22599
+      "worker-importScripts.html",
+#endif
+      "worker-redirect.html",
+  };
+
+  for (size_t i = 0; i < arraysize(kLayoutTestFiles); ++i)
+    RunHttpLayoutTest(kLayoutTestFiles[i]);
+}
+
+class WorkerXHRHttpLayoutTest : public InProcessBrowserLayoutTest {
+ public:
+  WorkerXHRHttpLayoutTest() : InProcessBrowserLayoutTest(
+      FilePath().AppendASCII("http").AppendASCII("tests"),
+      FilePath().AppendASCII("xmlhttprequest").AppendASCII("workers"),
+      -1) {
+  }
+  virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
+    InProcessBrowserLayoutTest::SetUpInProcessBrowserTestFixture();
+    AddResourceForLayoutTest(
+        FilePath().AppendASCII("http").AppendASCII("tests"),
+        FilePath().AppendASCII("workers").AppendASCII("resources"));
+  }
+};
+
+IN_PROC_BROWSER_TEST_F(WorkerXHRHttpLayoutTest, Tests) {
+  static const char* kLayoutTestFiles[] = {
+    "abort-exception-assert.html",
+#if defined(OS_WIN)
+    // Fails on the mac (and linux?):
+    // http://code.google.com/p/chromium/issues/detail?id=22599
+    "close.html",
+#endif
+    // These tests (and the shared-worker versions below) are disabled due to
+    // limitations in lighttpd (doesn't handle all of the HTTP methods).
+    // "methods-async.html",
+    // "methods.html",
+
+    "shared-worker-close.html",
+    // Disabled due to limitations in lighttpd (does not handle methods other
+    // than GET/PUT/POST).
+    // "shared-worker-methods-async.html",
+    // "shared-worker-methods.html",
+    "shared-worker-xhr-file-not-found.html",
+
+    "xmlhttprequest-file-not-found.html"
+  };
+
+  for (size_t i = 0; i < arraysize(kLayoutTestFiles); ++i)
+    RunHttpLayoutTest(kLayoutTestFiles[i]);
+}
+
+class WorkerWebSocketHttpLayoutTest : public InProcessBrowserLayoutTest {
+ public:
+  WorkerWebSocketHttpLayoutTest() : InProcessBrowserLayoutTest(
+      FilePath(),
+      FilePath().AppendASCII("http").AppendASCII("tests").
+          AppendASCII("websocket").AppendASCII("tests").AppendASCII("hybi").
+          AppendASCII("workers"),
+      -1) {
+  }
+};
+
+IN_PROC_BROWSER_TEST_F(WorkerWebSocketHttpLayoutTest, Tests) {
+  static const char* kLayoutTestFiles[] = {
+    "close-in-onmessage-crash.html",
+    "close-in-shared-worker.html",
+    "close-in-worker.html",
+    "shared-worker-simple.html",
+    "worker-handshake-challenge-randomness.html",
+    "worker-simple.html"
+  };
+
+  FilePath websocket_test_dir;
+  ASSERT_TRUE(PathService::Get(content::DIR_LAYOUT_TESTS, &websocket_test_dir));
+
+  ui_test_utils::TestWebSocketServer websocket_server;
+  ASSERT_TRUE(websocket_server.Start(websocket_test_dir));
+
+  for (size_t i = 0; i < arraysize(kLayoutTestFiles); ++i)
+    RunHttpLayoutTest(kLayoutTestFiles[i]);
+}
+
+class WorkerTest : public InProcessBrowserTest {
+ public:
+  WorkerTest() {}
+
+  GURL GetTestURL(const std::string& test_case, const std::string& query) {
+    FilePath test_file_path = ui_test_utils::GetTestFilePath(
+        FilePath(FILE_PATH_LITERAL("workers")),
+        FilePath().AppendASCII(test_case));
+    return ui_test_utils::GetFileUrlWithQuery(test_file_path, query);
+  }
+
+  void RunTest(Browser* browser,
+               const std::string& test_case,
+               const std::string& query) {
+    GURL url = GetTestURL(test_case, query);
+    const string16 expected_title = ASCIIToUTF16("OK");
+    ui_test_utils::TitleWatcher title_watcher(
+        browser->GetSelectedWebContents(), expected_title);
+    ui_test_utils::NavigateToURL(browser, url);
+    string16 final_title = title_watcher.WaitAndGetTitle();
+    EXPECT_EQ(expected_title, final_title);
+  }
+
+  void RunTest(const std::string& test_case, const std::string& query) {
+    RunTest(browser(), test_case, query);
+  }
+
+  static void CountWorkerProcesses(int *cur_process_count) {
+    *cur_process_count = 0;
+    for (WorkerProcessHostIterator iter; !iter.Done(); ++iter)
+      (*cur_process_count)++;
+    BrowserThread::PostTask(
+        BrowserThread::UI, FROM_HERE, MessageLoop::QuitClosure());
+  }
+
+  bool WaitForWorkerProcessCount(int count) {
+    int cur_process_count;
+    for (int i = 0; i < 100; ++i) {
+      BrowserThread::PostTask(
+          BrowserThread::IO, FROM_HERE,
+          base::Bind(&CountWorkerProcesses, &cur_process_count));
+      ui_test_utils::RunMessageLoop();
+      if (cur_process_count == count)
+        return true;
+
+      // Sometimes the worker processes can take a while to shut down on the
+      // bots, so use a longer timeout period to avoid spurious failures.
+      base::PlatformThread::Sleep(TestTimeouts::action_max_timeout() / 100);
+    }
+
+    EXPECT_EQ(cur_process_count, count);
+    return false;
+  }
+};
+
+IN_PROC_BROWSER_TEST_F(WorkerTest, SingleWorker) {
+  RunTest("single_worker.html", "");
+}
+
+IN_PROC_BROWSER_TEST_F(WorkerTest, MultipleWorkers) {
+  RunTest("multi_worker.html", "");
+}
+
+IN_PROC_BROWSER_TEST_F(WorkerTest, SingleSharedWorker) {
+  RunTest("single_worker.html", "shared=true");
+}
+
+// http://crbug.com/96435
+IN_PROC_BROWSER_TEST_F(WorkerTest, MultipleSharedWorkers) {
+  RunTest("multi_worker.html", "shared=true");
+}
+
+// http://crbug.com/80446
+IN_PROC_BROWSER_TEST_F(WorkerTest, TerminateQueuedWorkers) {
+  ASSERT_TRUE(WaitForWorkerProcessCount(0));
+  RunTest("terminate_queued_workers.html", "");
+  // Make sure all workers exit.
+  ASSERT_TRUE(WaitForWorkerProcessCount(0));
+}
+
+// Incognito windows should not share workers with non-incognito windows
+// http://crbug.com/30021
+IN_PROC_BROWSER_TEST_F(WorkerTest, IncognitoSharedWorkers) {
+  // Load a non-incognito tab and have it create a shared worker
+  RunTest("incognito_worker.html", "");
+
+  // Incognito worker should not share with non-incognito
+  RunTest(CreateIncognitoBrowser(), "incognito_worker.html", "");
+}
+
+// Make sure that auth dialog is displayed from worker context.
+// http://crbug.com/33344
+IN_PROC_BROWSER_TEST_F(WorkerTest, WorkerHttpAuth) {
+  ASSERT_TRUE(test_server()->Start());
+  GURL url = test_server()->GetURL("files/workers/worker_auth.html");
+
+  ui_test_utils::NavigateToURLWithDisposition(
+      browser(), url, CURRENT_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_AUTH);
+}
+
+// Make sure that auth dialog is displayed from shared worker context.
+// http://crbug.com/33344
+IN_PROC_BROWSER_TEST_F(WorkerTest, SharedWorkerHttpAuth) {
+  ASSERT_TRUE(test_server()->Start());
+  GURL url = test_server()->GetURL("files/workers/shared_worker_auth.html");
+  ui_test_utils::NavigateToURLWithDisposition(
+      browser(), url, CURRENT_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_AUTH);
+}
+
+IN_PROC_BROWSER_TEST_F(WorkerTest, LimitPerPage) {
+  int max_workers_per_tab = WorkerServiceImpl::kMaxWorkersPerTabWhenSeparate;
+  std::string query = StringPrintf("?count=%d", max_workers_per_tab + 1);
+
+  GURL url = GetTestURL("many_shared_workers.html", query);
+  ui_test_utils::NavigateToURL(browser(), url);
+  ASSERT_TRUE(WaitForWorkerProcessCount(max_workers_per_tab));
+}
+
+// http://crbug.com/36800
+IN_PROC_BROWSER_TEST_F(WorkerTest, LimitTotal) {
+  int max_workers_per_tab = WorkerServiceImpl::kMaxWorkersPerTabWhenSeparate;
+  int total_workers = WorkerServiceImpl::kMaxWorkersWhenSeparate;
+
+  std::string query = StringPrintf("?count=%d", max_workers_per_tab);
+  GURL url = GetTestURL("many_shared_workers.html", query);
+  ui_test_utils::NavigateToURL(
+      browser(), GURL(url.spec() + StringPrintf("&client_id=0")));
+
+  // Adding 1 so that we cause some workers to be queued.
+  int tab_count = (total_workers / max_workers_per_tab) + 1;
+  for (int i = 1; i < tab_count; ++i) {
+    ui_test_utils::NavigateToURLWithDisposition(
+        browser(), GURL(url.spec() + StringPrintf("&client_id=%d", i)),
+        NEW_FOREGROUND_TAB,
+        ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
+  }
+
+  // Check that we didn't create more than the max number of workers.
+  ASSERT_TRUE(WaitForWorkerProcessCount(total_workers));
+
+  // Now close a page and check that the queued workers were started.
+  const FilePath kGoogleDir(FILE_PATH_LITERAL("google"));
+  const FilePath kGoogleFile(FILE_PATH_LITERAL("google.html"));
+  url = GURL(ui_test_utils::GetTestUrl(kGoogleDir, kGoogleFile));
+  ui_test_utils::NavigateToURL(browser(), url);
+
+  ASSERT_TRUE(WaitForWorkerProcessCount(total_workers));
+}
+
+// Flaky, http://crbug.com/59786.
+IN_PROC_BROWSER_TEST_F(WorkerTest, WorkerClose) {
+  RunTest("worker_close.html", "");
+  ASSERT_TRUE(WaitForWorkerProcessCount(0));
+}
+
+// Flaky, http://crbug.com/70861.
+IN_PROC_BROWSER_TEST_F(WorkerTest, QueuedSharedWorkerShutdown) {
+  // Tests to make sure that queued shared workers are started up when shared
+  // workers shut down.
+  int max_workers_per_tab = WorkerServiceImpl::kMaxWorkersPerTabWhenSeparate;
+  std::string query = StringPrintf("?count=%d", max_workers_per_tab);
+  RunTest("queued_shared_worker_shutdown.html", query);
+  ASSERT_TRUE(WaitForWorkerProcessCount(max_workers_per_tab));
+}
+
+// Flaky, http://crbug.com/69881.
+IN_PROC_BROWSER_TEST_F(WorkerTest, MultipleTabsQueuedSharedWorker) {
+  // Tests to make sure that only one instance of queued shared workers are
+  // started up even when those instances are on multiple tabs.
+  int max_workers_per_tab = WorkerServiceImpl::kMaxWorkersPerTabWhenSeparate;
+  std::string query = StringPrintf("?count=%d", max_workers_per_tab + 1);
+  GURL url = GetTestURL("many_shared_workers.html", query);
+  ui_test_utils::NavigateToURL(browser(), url);
+  ASSERT_TRUE(WaitForWorkerProcessCount(max_workers_per_tab));
+
+  // Create same set of workers in new tab (leaves one worker queued from this
+  // tab).
+  url = GetTestURL("many_shared_workers.html", query);
+  ui_test_utils::NavigateToURLWithDisposition(
+        browser(), url, NEW_FOREGROUND_TAB,
+        ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
+  ASSERT_TRUE(WaitForWorkerProcessCount(max_workers_per_tab));
+
+  // Now shutdown one of the shared workers - this will fire both queued
+  // workers, but only one instance should be started.
+  url = GetTestURL("shutdown_shared_worker.html", "?id=0");
+  ui_test_utils::NavigateToURLWithDisposition(
+      browser(), url, NEW_FOREGROUND_TAB,
+        ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB);
+  ASSERT_TRUE(WaitForWorkerProcessCount(max_workers_per_tab));
+}
+
+// Flaky: http://crbug.com/48148
+IN_PROC_BROWSER_TEST_F(WorkerTest, QueuedSharedWorkerStartedFromOtherTab) {
+  // Tests to make sure that queued shared workers are started up when
+  // an instance is launched from another tab.
+  int max_workers_per_tab = WorkerServiceImpl::kMaxWorkersPerTabWhenSeparate;
+  std::string query = StringPrintf("?count=%d", max_workers_per_tab + 1);
+  GURL url = GetTestURL("many_shared_workers.html", query);
+  ui_test_utils::NavigateToURL(browser(), url);
+  ASSERT_TRUE(WaitForWorkerProcessCount(max_workers_per_tab));
+
+  // First window has hit its limit. Now launch second window which creates
+  // the same worker that was queued in the first window, to ensure it gets
+  // connected to the first window too.
+  query = StringPrintf("?id=%d", max_workers_per_tab);
+  url = GetTestURL("single_shared_worker.html", query);
+  ui_test_utils::NavigateToURLWithDisposition(
+      browser(), url, NEW_FOREGROUND_TAB,
+        ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB);
+
+  ASSERT_TRUE(WaitForWorkerProcessCount(max_workers_per_tab + 1));
+}
Property changes on: content\browser\worker_host\test\worker_browsertest.cc
___________________________________________________________________
Added: svn:eol-style
   + LF