Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(27)

Side by Side Diff: chrome/test/ui/ppapi_uitest.cc

Issue 9227008: WebSocket Pepper API: SRPC proxy implementation (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase and add TODO for performance optimization Created 8 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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
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
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 346 matching lines...) Expand 10 before | Expand all | Expand 10 after
676 TEST_PPAPI_IN_PROCESS(WebSocket_Protocols) 683 TEST_PPAPI_IN_PROCESS(WebSocket_Protocols)
677 TEST_PPAPI_IN_PROCESS(WebSocket_GetURL) 684 TEST_PPAPI_IN_PROCESS(WebSocket_GetURL)
678 TEST_PPAPI_IN_PROCESS_WITH_WS(WebSocket_ValidConnect) 685 TEST_PPAPI_IN_PROCESS_WITH_WS(WebSocket_ValidConnect)
679 TEST_PPAPI_IN_PROCESS_WITH_WS(WebSocket_InvalidClose) 686 TEST_PPAPI_IN_PROCESS_WITH_WS(WebSocket_InvalidClose)
680 TEST_PPAPI_IN_PROCESS_WITH_WS(WebSocket_ValidClose) 687 TEST_PPAPI_IN_PROCESS_WITH_WS(WebSocket_ValidClose)
681 TEST_PPAPI_IN_PROCESS_WITH_WS(WebSocket_GetProtocol) 688 TEST_PPAPI_IN_PROCESS_WITH_WS(WebSocket_GetProtocol)
682 TEST_PPAPI_IN_PROCESS_WITH_WS(WebSocket_TextSendReceive) 689 TEST_PPAPI_IN_PROCESS_WITH_WS(WebSocket_TextSendReceive)
683 TEST_PPAPI_IN_PROCESS_WITH_WS(WebSocket_BinarySendReceive) 690 TEST_PPAPI_IN_PROCESS_WITH_WS(WebSocket_BinarySendReceive)
684 TEST_PPAPI_IN_PROCESS_WITH_WS(WebSocket_BufferedAmount) 691 TEST_PPAPI_IN_PROCESS_WITH_WS(WebSocket_BufferedAmount)
685 TEST_PPAPI_IN_PROCESS_WITH_WS(WebSocket_CcInterfaces) 692 TEST_PPAPI_IN_PROCESS_WITH_WS(WebSocket_CcInterfaces)
693 TEST_PPAPI_NACL_VIA_HTTP(WebSocket_IsWebSocket)
694 TEST_PPAPI_NACL_VIA_HTTP(WebSocket_UninitializedPropertiesAccess)
695 TEST_PPAPI_NACL_VIA_HTTP(WebSocket_InvalidConnect)
696 TEST_PPAPI_NACL_VIA_HTTP(WebSocket_Protocols)
697 TEST_PPAPI_NACL_VIA_HTTP(WebSocket_GetURL)
698 TEST_PPAPI_NACL_VIA_HTTP_WITH_WS(WebSocket_ValidConnect)
699 TEST_PPAPI_NACL_VIA_HTTP_WITH_WS(WebSocket_InvalidClose)
700 TEST_PPAPI_NACL_VIA_HTTP_WITH_WS(WebSocket_ValidClose)
701 TEST_PPAPI_NACL_VIA_HTTP_WITH_WS(WebSocket_GetProtocol)
702 TEST_PPAPI_NACL_VIA_HTTP_WITH_WS(WebSocket_TextSendReceive)
703 TEST_PPAPI_NACL_VIA_HTTP_WITH_WS(WebSocket_BinarySendReceive)
704 TEST_PPAPI_NACL_VIA_HTTP_WITH_WS(WebSocket_BufferedAmount)
705 TEST_PPAPI_NACL_VIA_HTTP_WITH_WS(WebSocket_CcInterfaces)
686 706
687 TEST_PPAPI_IN_PROCESS(AudioConfig_ValidConfigs) 707 TEST_PPAPI_IN_PROCESS(AudioConfig_ValidConfigs)
688 TEST_PPAPI_IN_PROCESS(AudioConfig_InvalidConfigs) 708 TEST_PPAPI_IN_PROCESS(AudioConfig_InvalidConfigs)
689 TEST_PPAPI_OUT_OF_PROCESS(AudioConfig_ValidConfigs) 709 TEST_PPAPI_OUT_OF_PROCESS(AudioConfig_ValidConfigs)
690 TEST_PPAPI_OUT_OF_PROCESS(AudioConfig_InvalidConfigs) 710 TEST_PPAPI_OUT_OF_PROCESS(AudioConfig_InvalidConfigs)
691 711
692 TEST_PPAPI_IN_PROCESS(Audio_Creation) 712 TEST_PPAPI_IN_PROCESS(Audio_Creation)
693 TEST_PPAPI_IN_PROCESS(Audio_DestroyNoStop) 713 TEST_PPAPI_IN_PROCESS(Audio_DestroyNoStop)
694 TEST_PPAPI_IN_PROCESS(Audio_Failures) 714 TEST_PPAPI_IN_PROCESS(Audio_Failures)
695 TEST_PPAPI_OUT_OF_PROCESS(Audio_Creation) 715 TEST_PPAPI_OUT_OF_PROCESS(Audio_Creation)
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
756 TEST_PPAPI_IN_PROCESS(ResourceArray_Basics) 776 TEST_PPAPI_IN_PROCESS(ResourceArray_Basics)
757 TEST_PPAPI_IN_PROCESS(ResourceArray_OutOfRangeAccess) 777 TEST_PPAPI_IN_PROCESS(ResourceArray_OutOfRangeAccess)
758 TEST_PPAPI_IN_PROCESS(ResourceArray_EmptyArray) 778 TEST_PPAPI_IN_PROCESS(ResourceArray_EmptyArray)
759 TEST_PPAPI_IN_PROCESS(ResourceArray_InvalidElement) 779 TEST_PPAPI_IN_PROCESS(ResourceArray_InvalidElement)
760 TEST_PPAPI_OUT_OF_PROCESS(ResourceArray_Basics) 780 TEST_PPAPI_OUT_OF_PROCESS(ResourceArray_Basics)
761 TEST_PPAPI_OUT_OF_PROCESS(ResourceArray_OutOfRangeAccess) 781 TEST_PPAPI_OUT_OF_PROCESS(ResourceArray_OutOfRangeAccess)
762 TEST_PPAPI_OUT_OF_PROCESS(ResourceArray_EmptyArray) 782 TEST_PPAPI_OUT_OF_PROCESS(ResourceArray_EmptyArray)
763 TEST_PPAPI_OUT_OF_PROCESS(ResourceArray_InvalidElement) 783 TEST_PPAPI_OUT_OF_PROCESS(ResourceArray_InvalidElement)
764 784
765 #endif // ADDRESS_SANITIZER 785 #endif // ADDRESS_SANITIZER
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698