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

Side by Side Diff: net/quic/quic_end_to_end_unittest.cc

Issue 2109503009: Refactor net tests to use GMock matchers for checking net::Error results (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Revert changes to contents.txt files Created 4 years, 5 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
« no previous file with comments | « net/quic/quic_chromium_client_stream_test.cc ('k') | net/quic/quic_http_stream_test.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 <memory> 5 #include <memory>
6 #include <ostream> 6 #include <ostream>
7 #include <utility> 7 #include <utility>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 15 matching lines...) Expand all
26 #include "net/http/http_network_transaction.h" 26 #include "net/http/http_network_transaction.h"
27 #include "net/http/http_server_properties_impl.h" 27 #include "net/http/http_server_properties_impl.h"
28 #include "net/http/http_transaction_test_util.h" 28 #include "net/http/http_transaction_test_util.h"
29 #include "net/http/transport_security_state.h" 29 #include "net/http/transport_security_state.h"
30 #include "net/proxy/proxy_service.h" 30 #include "net/proxy/proxy_service.h"
31 #include "net/quic/test_tools/crypto_test_utils.h" 31 #include "net/quic/test_tools/crypto_test_utils.h"
32 #include "net/quic/test_tools/quic_test_utils.h" 32 #include "net/quic/test_tools/quic_test_utils.h"
33 #include "net/ssl/default_channel_id_store.h" 33 #include "net/ssl/default_channel_id_store.h"
34 #include "net/ssl/ssl_config_service_defaults.h" 34 #include "net/ssl/ssl_config_service_defaults.h"
35 #include "net/test/cert_test_util.h" 35 #include "net/test/cert_test_util.h"
36 #include "net/test/gtest_util.h"
36 #include "net/test/test_data_directory.h" 37 #include "net/test/test_data_directory.h"
37 #include "net/tools/quic/quic_in_memory_cache.h" 38 #include "net/tools/quic/quic_in_memory_cache.h"
38 #include "net/tools/quic/quic_server.h" 39 #include "net/tools/quic/quic_server.h"
39 #include "net/tools/quic/test_tools/quic_in_memory_cache_peer.h" 40 #include "net/tools/quic/test_tools/quic_in_memory_cache_peer.h"
40 #include "net/tools/quic/test_tools/server_thread.h" 41 #include "net/tools/quic/test_tools/server_thread.h"
42 #include "testing/gmock/include/gmock/gmock.h"
41 #include "testing/gtest/include/gtest/gtest.h" 43 #include "testing/gtest/include/gtest/gtest.h"
42 #include "testing/platform_test.h" 44 #include "testing/platform_test.h"
43 45
44 using base::StringPiece; 46 using base::StringPiece;
45 47
46 namespace net { 48 namespace net {
47 49
50 using test::IsOk;
48 using test::QuicInMemoryCachePeer; 51 using test::QuicInMemoryCachePeer;
49 using test::ServerThread; 52 using test::ServerThread;
50 53
51 namespace test { 54 namespace test {
52 55
53 namespace { 56 namespace {
54 57
55 const char kResponseBody[] = "some arbitrary response body"; 58 const char kResponseBody[] = "some arbitrary response body";
56 59
57 // Factory for creating HttpTransactions, used by TestTransactionConsumer. 60 // Factory for creating HttpTransactions, used by TestTransactionConsumer.
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
227 void InitializePostRequest(size_t length) { 230 void InitializePostRequest(size_t length) {
228 GenerateBody(length); 231 GenerateBody(length);
229 std::vector<std::unique_ptr<UploadElementReader>> element_readers; 232 std::vector<std::unique_ptr<UploadElementReader>> element_readers;
230 element_readers.push_back(base::WrapUnique(new UploadBytesElementReader( 233 element_readers.push_back(base::WrapUnique(new UploadBytesElementReader(
231 request_body_.data(), request_body_.length()))); 234 request_body_.data(), request_body_.length())));
232 upload_data_stream_.reset( 235 upload_data_stream_.reset(
233 new ElementsUploadDataStream(std::move(element_readers), 0)); 236 new ElementsUploadDataStream(std::move(element_readers), 0));
234 request_.method = "POST"; 237 request_.method = "POST";
235 request_.url = GURL("https://test.example.com/"); 238 request_.url = GURL("https://test.example.com/");
236 request_.upload_data_stream = upload_data_stream_.get(); 239 request_.upload_data_stream = upload_data_stream_.get();
237 ASSERT_EQ(OK, request_.upload_data_stream->Init(CompletionCallback())); 240 ASSERT_THAT(request_.upload_data_stream->Init(CompletionCallback()),
241 IsOk());
238 } 242 }
239 243
240 // Checks that |consumer| completed and received |status_line| and |body|. 244 // Checks that |consumer| completed and received |status_line| and |body|.
241 void CheckResponse(const TestTransactionConsumer& consumer, 245 void CheckResponse(const TestTransactionConsumer& consumer,
242 const std::string& status_line, 246 const std::string& status_line,
243 const std::string& body) { 247 const std::string& body) {
244 ASSERT_TRUE(consumer.is_done()); 248 ASSERT_TRUE(consumer.is_done());
245 ASSERT_EQ(OK, consumer.error()); 249 ASSERT_THAT(consumer.error(), IsOk());
246 EXPECT_EQ(status_line, consumer.response_info()->headers->GetStatusLine()); 250 EXPECT_EQ(status_line, consumer.response_info()->headers->GetStatusLine());
247 EXPECT_EQ(body, consumer.content()); 251 EXPECT_EQ(body, consumer.content());
248 } 252 }
249 253
250 std::unique_ptr<MockHostResolver> host_resolver_impl_; 254 std::unique_ptr<MockHostResolver> host_resolver_impl_;
251 MappedHostResolver host_resolver_; 255 MappedHostResolver host_resolver_;
252 MockCertVerifier cert_verifier_; 256 MockCertVerifier cert_verifier_;
253 std::unique_ptr<ChannelIDService> channel_id_service_; 257 std::unique_ptr<ChannelIDService> channel_id_service_;
254 TransportSecurityState transport_security_state_; 258 TransportSecurityState transport_security_state_;
255 std::unique_ptr<CTVerifier> cert_transparency_verifier_; 259 std::unique_ptr<CTVerifier> cert_transparency_verifier_;
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
377 base::MessageLoop::current()->Run(); 381 base::MessageLoop::current()->Run();
378 382
379 for (size_t i = 0; i < num_requests; ++i) { 383 for (size_t i = 0; i < num_requests; ++i) {
380 CheckResponse(*consumers[i], "HTTP/1.1 200", kResponseBody); 384 CheckResponse(*consumers[i], "HTTP/1.1 200", kResponseBody);
381 } 385 }
382 STLDeleteElements(&consumers); 386 STLDeleteElements(&consumers);
383 } 387 }
384 388
385 } // namespace test 389 } // namespace test
386 } // namespace net 390 } // namespace net
OLDNEW
« no previous file with comments | « net/quic/quic_chromium_client_stream_test.cc ('k') | net/quic/quic_http_stream_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698