OLD | NEW |
---|---|
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/worker_host/worker_service.h" | 5 #include "chrome/browser/worker_host/worker_service.h" |
6 #include "chrome/test/automation/browser_proxy.h" | 6 #include "chrome/test/automation/browser_proxy.h" |
7 #include "chrome/test/automation/tab_proxy.h" | 7 #include "chrome/test/automation/tab_proxy.h" |
8 #include "chrome/test/ui/ui_layout_test.h" | 8 #include "chrome/test/ui/ui_layout_test.h" |
9 | 9 |
10 static const char kTestCompleteCookie[] = "status"; | 10 static const char kTestCompleteCookie[] = "status"; |
(...skipping 17 matching lines...) Expand all Loading... | |
28 }; | 28 }; |
29 | 29 |
30 TEST_F(WorkerTest, SingleWorker) { | 30 TEST_F(WorkerTest, SingleWorker) { |
31 RunTest(L"single_worker.html"); | 31 RunTest(L"single_worker.html"); |
32 } | 32 } |
33 | 33 |
34 TEST_F(WorkerTest, MultipleWorkers) { | 34 TEST_F(WorkerTest, MultipleWorkers) { |
35 RunTest(L"multi_worker.html"); | 35 RunTest(L"multi_worker.html"); |
36 } | 36 } |
37 | 37 |
38 // This fails on all platforms. Disable it for now. See http://crbug.com/22942 | 38 // This fails on all platforms. Disable it for now. See http://crbug.com/22942 |
dglazkov
2009/09/24 20:10:20
Probably need to remove this comment?
| |
39 TEST_F(WorkerTest, DISABLED_WorkerFastLayoutTests) { | 39 TEST_F(WorkerTest, WorkerFastLayoutTests) { |
40 static const char* kLayoutTestFiles[] = { | 40 static const char* kLayoutTestFiles[] = { |
41 "stress-js-execution.html", | 41 "stress-js-execution.html", |
42 #if defined(OS_WIN) | 42 #if defined(OS_WIN) |
43 // Workers don't properly initialize the V8 stack guard. | 43 // Workers don't properly initialize the V8 stack guard. |
44 // (http://code.google.com/p/chromium/issues/detail?id=21653). | 44 // (http://code.google.com/p/chromium/issues/detail?id=21653). |
45 "use-machine-stack.html", | 45 "use-machine-stack.html", |
46 #endif | 46 #endif |
47 "worker-call.html", | 47 "worker-call.html", |
48 // Disabled because cloning ports are too slow in Chromium to meet the | 48 // Disabled because cloning ports are too slow in Chromium to meet the |
49 // thresholds in this test. | 49 // thresholds in this test. |
50 // http://code.google.com/p/chromium/issues/detail?id=22780 | 50 // http://code.google.com/p/chromium/issues/detail?id=22780 |
51 // "worker-cloneport.html", | 51 // "worker-cloneport.html", |
52 | 52 |
53 "worker-close.html", | 53 "worker-close.html", |
54 "worker-constructor.html", | 54 "worker-constructor.html", |
55 "worker-context-gc.html", | 55 "worker-context-gc.html", |
56 "worker-context-multi-port.html", | 56 "worker-context-multi-port.html", |
57 "worker-event-listener.html", | 57 "worker-event-listener.html", |
58 "worker-gc.html", | 58 "worker-gc.html", |
59 // worker-lifecycle.html relies on layoutTestController.workerThreadCount | 59 // worker-lifecycle.html relies on layoutTestController.workerThreadCount |
60 // which is not currently implemented. | 60 // which is not currently implemented. |
61 // "worker-lifecycle.html", | 61 // "worker-lifecycle.html", |
62 "worker-location.html", | 62 "worker-location.html", |
63 "worker-messageport.html", | 63 "worker-messageport.html", |
64 "worker-messageport-gc.html", | 64 // Disabled after r27089 (WebKit merge), http://crbug.com/22947 |
65 // "worker-messageport-gc.html", | |
65 "worker-multi-port.html", | 66 "worker-multi-port.html", |
66 "worker-navigator.html", | 67 "worker-navigator.html", |
67 "worker-replace-global-constructor.html", | 68 "worker-replace-global-constructor.html", |
68 "worker-replace-self.html", | 69 "worker-replace-self.html", |
69 "worker-script-error.html", | 70 "worker-script-error.html", |
70 "worker-terminate.html", | 71 "worker-terminate.html", |
71 "worker-timeout.html" | 72 "worker-timeout.html" |
72 }; | 73 }; |
73 | 74 |
74 FilePath fast_test_dir; | 75 FilePath fast_test_dir; |
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
220 UITest::GetBrowserProcessCount()); | 221 UITest::GetBrowserProcessCount()); |
221 | 222 |
222 // Now close the first tab and check that the queued workers were started. | 223 // Now close the first tab and check that the queued workers were started. |
223 tab->Close(true); | 224 tab->Close(true); |
224 tab->NavigateToURL(GetTestUrl(L"google", L"google.html")); | 225 tab->NavigateToURL(GetTestUrl(L"google", L"google.html")); |
225 | 226 |
226 EXPECT_EQ(total_workers + 1 + (UITest::in_process_renderer() ? 0 : tab_count), | 227 EXPECT_EQ(total_workers + 1 + (UITest::in_process_renderer() ? 0 : tab_count), |
227 UITest::GetBrowserProcessCount()); | 228 UITest::GetBrowserProcessCount()); |
228 } | 229 } |
229 #endif | 230 #endif |
OLD | NEW |