OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "base/file_util.h" | 5 #include "base/file_util.h" |
6 #include "base/logging.h" | 6 #include "base/logging.h" |
7 #include "base/path_service.h" | 7 #include "base/path_service.h" |
8 #include "base/test/test_timeouts.h" | 8 #include "base/test/test_timeouts.h" |
9 #include "build/build_config.h" | 9 #include "build/build_config.h" |
10 #include "content/public/common/content_switches.h" | 10 #include "content/public/common/content_switches.h" |
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
127 void RunTestWithWebSocketServer(const std::string& test_case) { | 127 void RunTestWithWebSocketServer(const std::string& test_case) { |
128 FilePath websocket_root_dir; | 128 FilePath websocket_root_dir; |
129 ASSERT_TRUE( | 129 ASSERT_TRUE( |
130 PathService::Get(chrome::DIR_LAYOUT_TESTS, &websocket_root_dir)); | 130 PathService::Get(chrome::DIR_LAYOUT_TESTS, &websocket_root_dir)); |
131 // TODO(toyoshim): Remove following logging after a bug investigation. | 131 // TODO(toyoshim): Remove following logging after a bug investigation. |
132 // http://crbug.com/107836 . | 132 // http://crbug.com/107836 . |
133 LOG(INFO) << "Assume LayoutTests in " << websocket_root_dir.MaybeAsASCII(); | 133 LOG(INFO) << "Assume LayoutTests in " << websocket_root_dir.MaybeAsASCII(); |
134 | 134 |
135 ui_test_utils::TestWebSocketServer server; | 135 ui_test_utils::TestWebSocketServer server; |
136 ASSERT_TRUE(server.Start(websocket_root_dir)); | 136 ASSERT_TRUE(server.Start(websocket_root_dir)); |
137 RunTest(test_case); | 137 RunTestViaHTTP(test_case); |
138 } | 138 } |
139 | 139 |
140 std::string StripPrefixes(const std::string& test_name) { | 140 std::string StripPrefixes(const std::string& test_name) { |
141 const char* const prefixes[] = { "FAILS_", "FLAKY_", "DISABLED_" }; | 141 const char* const prefixes[] = { "FAILS_", "FLAKY_", "DISABLED_" }; |
142 for (size_t i = 0; i < sizeof(prefixes)/sizeof(prefixes[0]); ++i) | 142 for (size_t i = 0; i < sizeof(prefixes)/sizeof(prefixes[0]); ++i) |
143 if (test_name.find(prefixes[i]) == 0) | 143 if (test_name.find(prefixes[i]) == 0) |
144 return test_name.substr(strlen(prefixes[i])); | 144 return test_name.substr(strlen(prefixes[i])); |
145 return test_name; | 145 return test_name; |
146 } | 146 } |
147 | 147 |
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
297 } | 297 } |
298 #define TEST_PPAPI_OUT_OF_PROCESS_WITH_WS(test_name) \ | 298 #define TEST_PPAPI_OUT_OF_PROCESS_WITH_WS(test_name) \ |
299 TEST_F(OutOfProcessPPAPITest, test_name) { \ | 299 TEST_F(OutOfProcessPPAPITest, test_name) { \ |
300 RunTestWithWebSocketServer(STRIP_PREFIXES(test_name)); \ | 300 RunTestWithWebSocketServer(STRIP_PREFIXES(test_name)); \ |
301 } | 301 } |
302 | 302 |
303 | 303 |
304 #if defined(DISABLE_NACL) | 304 #if defined(DISABLE_NACL) |
305 #define TEST_PPAPI_NACL_VIA_HTTP(test_name) | 305 #define TEST_PPAPI_NACL_VIA_HTTP(test_name) |
306 #define TEST_PPAPI_NACL_VIA_HTTP_DISALLOWED_SOCKETS(test_name) | 306 #define TEST_PPAPI_NACL_VIA_HTTP_DISALLOWED_SOCKETS(test_name) |
| 307 #define TEST_PPAPI_NACL_VIA_HTTP_WITH_WS(test_name) |
307 #else | 308 #else |
308 | 309 |
309 // NaCl based PPAPI tests | 310 // NaCl based PPAPI tests |
310 #define TEST_PPAPI_NACL_VIA_HTTP(test_name) \ | 311 #define TEST_PPAPI_NACL_VIA_HTTP(test_name) \ |
311 TEST_F(PPAPINaClTest, test_name) { \ | 312 TEST_F(PPAPINaClTest, test_name) { \ |
312 RunTestViaHTTP(STRIP_PREFIXES(test_name)); \ | 313 RunTestViaHTTP(STRIP_PREFIXES(test_name)); \ |
313 } | 314 } |
314 | 315 |
315 // NaCl based PPAPI tests with disallowed socket API | 316 // NaCl based PPAPI tests with disallowed socket API |
316 #define TEST_PPAPI_NACL_VIA_HTTP_DISALLOWED_SOCKETS(test_name) \ | 317 #define TEST_PPAPI_NACL_VIA_HTTP_DISALLOWED_SOCKETS(test_name) \ |
317 TEST_F(PPAPINaClTestDisallowedSockets, test_name) { \ | 318 TEST_F(PPAPINaClTestDisallowedSockets, test_name) { \ |
318 RunTestViaHTTP(STRIP_PREFIXES(test_name)); \ | 319 RunTestViaHTTP(STRIP_PREFIXES(test_name)); \ |
319 } | 320 } |
| 321 |
| 322 // NaCl based PPAPI tests with WebSocket server |
| 323 #define TEST_PPAPI_NACL_VIA_HTTP_WITH_WS(test_name) \ |
| 324 TEST_F(PPAPINaClTest, test_name) { \ |
| 325 RunTestWithWebSocketServer(STRIP_PREFIXES(test_name)); \ |
| 326 } |
320 #endif | 327 #endif |
321 | 328 |
322 | 329 |
323 // | 330 // |
324 // Interface tests. | 331 // Interface tests. |
325 // | 332 // |
326 | 333 |
327 // Disable tests under ASAN. http://crbug.com/104832. | 334 // Disable tests under ASAN. http://crbug.com/104832. |
328 // This is a bit heavy handed, but the majority of these tests fail under ASAN. | 335 // This is a bit heavy handed, but the majority of these tests fail under ASAN. |
329 // See bug for history. | 336 // See bug for history. |
(...skipping 352 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
682 TEST_PPAPI_IN_PROCESS(WebSocket_Protocols) | 689 TEST_PPAPI_IN_PROCESS(WebSocket_Protocols) |
683 TEST_PPAPI_IN_PROCESS(WebSocket_GetURL) | 690 TEST_PPAPI_IN_PROCESS(WebSocket_GetURL) |
684 TEST_PPAPI_IN_PROCESS_WITH_WS(WebSocket_ValidConnect) | 691 TEST_PPAPI_IN_PROCESS_WITH_WS(WebSocket_ValidConnect) |
685 TEST_PPAPI_IN_PROCESS_WITH_WS(WebSocket_InvalidClose) | 692 TEST_PPAPI_IN_PROCESS_WITH_WS(WebSocket_InvalidClose) |
686 TEST_PPAPI_IN_PROCESS_WITH_WS(WebSocket_ValidClose) | 693 TEST_PPAPI_IN_PROCESS_WITH_WS(WebSocket_ValidClose) |
687 TEST_PPAPI_IN_PROCESS_WITH_WS(WebSocket_GetProtocol) | 694 TEST_PPAPI_IN_PROCESS_WITH_WS(WebSocket_GetProtocol) |
688 TEST_PPAPI_IN_PROCESS_WITH_WS(WebSocket_TextSendReceive) | 695 TEST_PPAPI_IN_PROCESS_WITH_WS(WebSocket_TextSendReceive) |
689 TEST_PPAPI_IN_PROCESS_WITH_WS(WebSocket_BinarySendReceive) | 696 TEST_PPAPI_IN_PROCESS_WITH_WS(WebSocket_BinarySendReceive) |
690 TEST_PPAPI_IN_PROCESS_WITH_WS(WebSocket_BufferedAmount) | 697 TEST_PPAPI_IN_PROCESS_WITH_WS(WebSocket_BufferedAmount) |
691 TEST_PPAPI_IN_PROCESS_WITH_WS(WebSocket_CcInterfaces) | 698 TEST_PPAPI_IN_PROCESS_WITH_WS(WebSocket_CcInterfaces) |
| 699 TEST_PPAPI_NACL_VIA_HTTP(WebSocket_IsWebSocket) |
| 700 TEST_PPAPI_NACL_VIA_HTTP(WebSocket_UninitializedPropertiesAccess) |
| 701 TEST_PPAPI_NACL_VIA_HTTP(WebSocket_InvalidConnect) |
| 702 TEST_PPAPI_NACL_VIA_HTTP(WebSocket_Protocols) |
| 703 TEST_PPAPI_NACL_VIA_HTTP(WebSocket_GetURL) |
| 704 TEST_PPAPI_NACL_VIA_HTTP_WITH_WS(WebSocket_ValidConnect) |
| 705 TEST_PPAPI_NACL_VIA_HTTP_WITH_WS(WebSocket_InvalidClose) |
| 706 TEST_PPAPI_NACL_VIA_HTTP_WITH_WS(WebSocket_ValidClose) |
| 707 TEST_PPAPI_NACL_VIA_HTTP_WITH_WS(WebSocket_GetProtocol) |
| 708 TEST_PPAPI_NACL_VIA_HTTP_WITH_WS(WebSocket_TextSendReceive) |
| 709 TEST_PPAPI_NACL_VIA_HTTP_WITH_WS(WebSocket_BinarySendReceive) |
| 710 TEST_PPAPI_NACL_VIA_HTTP_WITH_WS(WebSocket_BufferedAmount) |
| 711 TEST_PPAPI_NACL_VIA_HTTP_WITH_WS(WebSocket_CcInterfaces) |
692 | 712 |
693 TEST_PPAPI_IN_PROCESS(AudioConfig_ValidConfigs) | 713 TEST_PPAPI_IN_PROCESS(AudioConfig_ValidConfigs) |
694 TEST_PPAPI_IN_PROCESS(AudioConfig_InvalidConfigs) | 714 TEST_PPAPI_IN_PROCESS(AudioConfig_InvalidConfigs) |
695 TEST_PPAPI_OUT_OF_PROCESS(AudioConfig_ValidConfigs) | 715 TEST_PPAPI_OUT_OF_PROCESS(AudioConfig_ValidConfigs) |
696 TEST_PPAPI_OUT_OF_PROCESS(AudioConfig_InvalidConfigs) | 716 TEST_PPAPI_OUT_OF_PROCESS(AudioConfig_InvalidConfigs) |
697 | 717 |
698 TEST_PPAPI_IN_PROCESS(Audio_Creation) | 718 TEST_PPAPI_IN_PROCESS(Audio_Creation) |
699 TEST_PPAPI_IN_PROCESS(Audio_DestroyNoStop) | 719 TEST_PPAPI_IN_PROCESS(Audio_DestroyNoStop) |
700 TEST_PPAPI_IN_PROCESS(Audio_Failures) | 720 TEST_PPAPI_IN_PROCESS(Audio_Failures) |
701 TEST_PPAPI_OUT_OF_PROCESS(Audio_Creation) | 721 TEST_PPAPI_OUT_OF_PROCESS(Audio_Creation) |
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
762 TEST_PPAPI_IN_PROCESS(ResourceArray_Basics) | 782 TEST_PPAPI_IN_PROCESS(ResourceArray_Basics) |
763 TEST_PPAPI_IN_PROCESS(ResourceArray_OutOfRangeAccess) | 783 TEST_PPAPI_IN_PROCESS(ResourceArray_OutOfRangeAccess) |
764 TEST_PPAPI_IN_PROCESS(ResourceArray_EmptyArray) | 784 TEST_PPAPI_IN_PROCESS(ResourceArray_EmptyArray) |
765 TEST_PPAPI_IN_PROCESS(ResourceArray_InvalidElement) | 785 TEST_PPAPI_IN_PROCESS(ResourceArray_InvalidElement) |
766 TEST_PPAPI_OUT_OF_PROCESS(ResourceArray_Basics) | 786 TEST_PPAPI_OUT_OF_PROCESS(ResourceArray_Basics) |
767 TEST_PPAPI_OUT_OF_PROCESS(ResourceArray_OutOfRangeAccess) | 787 TEST_PPAPI_OUT_OF_PROCESS(ResourceArray_OutOfRangeAccess) |
768 TEST_PPAPI_OUT_OF_PROCESS(ResourceArray_EmptyArray) | 788 TEST_PPAPI_OUT_OF_PROCESS(ResourceArray_EmptyArray) |
769 TEST_PPAPI_OUT_OF_PROCESS(ResourceArray_InvalidElement) | 789 TEST_PPAPI_OUT_OF_PROCESS(ResourceArray_InvalidElement) |
770 | 790 |
771 #endif // ADDRESS_SANITIZER | 791 #endif // ADDRESS_SANITIZER |
OLD | NEW |