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

Side by Side Diff: net/http/http_network_transaction_spdy3_unittest.cc

Issue 10796085: Give MockRead and MockWrite distinct types. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase and fix compile. Created 8 years, 4 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 "net/http/http_network_transaction.h" 5 #include "net/http/http_network_transaction.h"
6 6
7 #include <math.h> // ceil 7 #include <math.h> // ceil
8 #include <stdarg.h> 8 #include <stdarg.h>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 5756 matching lines...) Expand 10 before | Expand all | Expand 10 after
5767 5767
5768 MockWrite data_writes[] = { 5768 MockWrite data_writes[] = {
5769 MockWrite(ASYNC, reinterpret_cast<char*>(write_buffer), 5769 MockWrite(ASYNC, reinterpret_cast<char*>(write_buffer),
5770 arraysize(write_buffer)), 5770 arraysize(write_buffer)),
5771 MockWrite("GET / HTTP/1.1\r\n" 5771 MockWrite("GET / HTTP/1.1\r\n"
5772 "Host: www.google.com\r\n" 5772 "Host: www.google.com\r\n"
5773 "Connection: keep-alive\r\n\r\n") 5773 "Connection: keep-alive\r\n\r\n")
5774 }; 5774 };
5775 5775
5776 MockRead data_reads[] = { 5776 MockRead data_reads[] = {
5777 MockWrite(ASYNC, reinterpret_cast<char*>(read_buffer), 5777 MockRead(ASYNC, reinterpret_cast<char*>(read_buffer),
5778 arraysize(read_buffer)), 5778 arraysize(read_buffer)),
5779 MockRead("HTTP/1.0 200 OK\r\n"), 5779 MockRead("HTTP/1.0 200 OK\r\n"),
5780 MockRead("Content-Type: text/html; charset=iso-8859-1\r\n\r\n"), 5780 MockRead("Content-Type: text/html; charset=iso-8859-1\r\n\r\n"),
5781 MockRead("Payload"), 5781 MockRead("Payload"),
5782 MockRead(SYNCHRONOUS, OK) 5782 MockRead(SYNCHRONOUS, OK)
5783 }; 5783 };
5784 5784
5785 StaticSocketDataProvider data(data_reads, arraysize(data_reads), 5785 StaticSocketDataProvider data(data_reads, arraysize(data_reads),
5786 data_writes, arraysize(data_writes)); 5786 data_writes, arraysize(data_writes));
5787 session_deps.socket_factory.AddSocketDataProvider(&data); 5787 session_deps.socket_factory.AddSocketDataProvider(&data);
5788 5788
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
5835 5835
5836 MockWrite data_writes[] = { 5836 MockWrite data_writes[] = {
5837 MockWrite(ASYNC, kSOCKS5GreetRequest, arraysize(kSOCKS5GreetRequest)), 5837 MockWrite(ASYNC, kSOCKS5GreetRequest, arraysize(kSOCKS5GreetRequest)),
5838 MockWrite(ASYNC, kSOCKS5OkRequest, arraysize(kSOCKS5OkRequest)), 5838 MockWrite(ASYNC, kSOCKS5OkRequest, arraysize(kSOCKS5OkRequest)),
5839 MockWrite("GET / HTTP/1.1\r\n" 5839 MockWrite("GET / HTTP/1.1\r\n"
5840 "Host: www.google.com\r\n" 5840 "Host: www.google.com\r\n"
5841 "Connection: keep-alive\r\n\r\n") 5841 "Connection: keep-alive\r\n\r\n")
5842 }; 5842 };
5843 5843
5844 MockRead data_reads[] = { 5844 MockRead data_reads[] = {
5845 MockWrite(ASYNC, kSOCKS5GreetResponse, arraysize(kSOCKS5GreetResponse)), 5845 MockRead(ASYNC, kSOCKS5GreetResponse, arraysize(kSOCKS5GreetResponse)),
5846 MockWrite(ASYNC, kSOCKS5OkResponse, arraysize(kSOCKS5OkResponse)), 5846 MockRead(ASYNC, kSOCKS5OkResponse, arraysize(kSOCKS5OkResponse)),
5847 MockRead("HTTP/1.0 200 OK\r\n"), 5847 MockRead("HTTP/1.0 200 OK\r\n"),
5848 MockRead("Content-Type: text/html; charset=iso-8859-1\r\n\r\n"), 5848 MockRead("Content-Type: text/html; charset=iso-8859-1\r\n\r\n"),
5849 MockRead("Payload"), 5849 MockRead("Payload"),
5850 MockRead(SYNCHRONOUS, OK) 5850 MockRead(SYNCHRONOUS, OK)
5851 }; 5851 };
5852 5852
5853 StaticSocketDataProvider data(data_reads, arraysize(data_reads), 5853 StaticSocketDataProvider data(data_reads, arraysize(data_reads),
5854 data_writes, arraysize(data_writes)); 5854 data_writes, arraysize(data_writes));
5855 session_deps.socket_factory.AddSocketDataProvider(&data); 5855 session_deps.socket_factory.AddSocketDataProvider(&data);
5856 5856
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
5902 MockWrite data_writes[] = { 5902 MockWrite data_writes[] = {
5903 MockWrite(ASYNC, kSOCKS5GreetRequest, arraysize(kSOCKS5GreetRequest)), 5903 MockWrite(ASYNC, kSOCKS5GreetRequest, arraysize(kSOCKS5GreetRequest)),
5904 MockWrite(ASYNC, reinterpret_cast<const char*>(kSOCKS5OkRequest), 5904 MockWrite(ASYNC, reinterpret_cast<const char*>(kSOCKS5OkRequest),
5905 arraysize(kSOCKS5OkRequest)), 5905 arraysize(kSOCKS5OkRequest)),
5906 MockWrite("GET / HTTP/1.1\r\n" 5906 MockWrite("GET / HTTP/1.1\r\n"
5907 "Host: www.google.com\r\n" 5907 "Host: www.google.com\r\n"
5908 "Connection: keep-alive\r\n\r\n") 5908 "Connection: keep-alive\r\n\r\n")
5909 }; 5909 };
5910 5910
5911 MockRead data_reads[] = { 5911 MockRead data_reads[] = {
5912 MockWrite(ASYNC, kSOCKS5GreetResponse, arraysize(kSOCKS5GreetResponse)), 5912 MockRead(ASYNC, kSOCKS5GreetResponse, arraysize(kSOCKS5GreetResponse)),
5913 MockWrite(ASYNC, kSOCKS5OkResponse, arraysize(kSOCKS5OkResponse)), 5913 MockRead(ASYNC, kSOCKS5OkResponse, arraysize(kSOCKS5OkResponse)),
5914 MockRead("HTTP/1.0 200 OK\r\n"), 5914 MockRead("HTTP/1.0 200 OK\r\n"),
5915 MockRead("Content-Type: text/html; charset=iso-8859-1\r\n\r\n"), 5915 MockRead("Content-Type: text/html; charset=iso-8859-1\r\n\r\n"),
5916 MockRead("Payload"), 5916 MockRead("Payload"),
5917 MockRead(SYNCHRONOUS, OK) 5917 MockRead(SYNCHRONOUS, OK)
5918 }; 5918 };
5919 5919
5920 StaticSocketDataProvider data(data_reads, arraysize(data_reads), 5920 StaticSocketDataProvider data(data_reads, arraysize(data_reads),
5921 data_writes, arraysize(data_writes)); 5921 data_writes, arraysize(data_writes));
5922 session_deps.socket_factory.AddSocketDataProvider(&data); 5922 session_deps.socket_factory.AddSocketDataProvider(&data);
5923 5923
(...skipping 1961 matching lines...) Expand 10 before | Expand all | Expand 10 after
7885 TestRound(const MockWrite& write_arg, const MockRead& read_arg, 7885 TestRound(const MockWrite& write_arg, const MockRead& read_arg,
7886 int expected_rv_arg) 7886 int expected_rv_arg)
7887 : write(write_arg), 7887 : write(write_arg),
7888 read(read_arg), 7888 read(read_arg),
7889 expected_rv(expected_rv_arg), 7889 expected_rv(expected_rv_arg),
7890 extra_write(NULL), 7890 extra_write(NULL),
7891 extra_read(NULL) { 7891 extra_read(NULL) {
7892 } 7892 }
7893 TestRound(const MockWrite& write_arg, const MockRead& read_arg, 7893 TestRound(const MockWrite& write_arg, const MockRead& read_arg,
7894 int expected_rv_arg, const MockWrite* extra_write_arg, 7894 int expected_rv_arg, const MockWrite* extra_write_arg,
7895 const MockWrite* extra_read_arg) 7895 const MockRead* extra_read_arg)
7896 : write(write_arg), 7896 : write(write_arg),
7897 read(read_arg), 7897 read(read_arg),
7898 expected_rv(expected_rv_arg), 7898 expected_rv(expected_rv_arg),
7899 extra_write(extra_write_arg), 7899 extra_write(extra_write_arg),
7900 extra_read(extra_read_arg) { 7900 extra_read(extra_read_arg) {
7901 } 7901 }
7902 MockWrite write; 7902 MockWrite write;
7903 MockRead read; 7903 MockRead read;
7904 int expected_rv; 7904 int expected_rv;
7905 const MockWrite* extra_write; 7905 const MockWrite* extra_write;
(...skipping 2244 matching lines...) Expand 10 before | Expand all | Expand 10 after
10150 trans2.Start(&request2, callback2.callback(), BoundNetLog())); 10150 trans2.Start(&request2, callback2.callback(), BoundNetLog()));
10151 MessageLoop::current()->RunAllPending(); 10151 MessageLoop::current()->RunAllPending();
10152 data2->RunFor(3); 10152 data2->RunFor(3);
10153 10153
10154 ASSERT_TRUE(callback2.have_result()); 10154 ASSERT_TRUE(callback2.have_result());
10155 EXPECT_EQ(OK, callback2.WaitForResult()); 10155 EXPECT_EQ(OK, callback2.WaitForResult());
10156 EXPECT_TRUE(trans2.GetResponseInfo()->was_fetched_via_spdy); 10156 EXPECT_TRUE(trans2.GetResponseInfo()->was_fetched_via_spdy);
10157 } 10157 }
10158 10158
10159 } // namespace net 10159 } // namespace net
OLDNEW
« no previous file with comments | « net/http/http_network_transaction_spdy2_unittest.cc ('k') | net/http/http_proxy_client_socket_pool_spdy2_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698