commit d7692cd1d83bd6f7fb61c7daf5c82d022804a69f
author vasilvv <vasilvv@google.com> Fri Dec 06 08:06:31 2019 -0800
committer Copybara-Service <copybara-worker@google.com> Fri Dec 06 08:07:06 2019 -0800
tree 62c8fedb325bc2f8f8ed9b36eed9dd8cb3e40471
parent 78571896c4dcfd040b3aed4680fd9fc8df2fedda

Use client-supplied path instead of external configuration to switch between ECHO and DISCARD mode in QuicTransportSimpleServer

gfe-relnote: n/a (not used in production)
PiperOrigin-RevId: 284186862
Change-Id: Iaed82071af43f509c3d8104b143f2ff9f76efdb1

quic/quic_transport/quic_transport_integration_test.cc

diff --git a/quic/quic_transport/quic_transport_integration_test.cc b/quic/quic_transport/quic_transport_integration_test.cc
index 57f5380..b8d8eae 100644
--- a/quic/quic_transport/quic_transport_integration_test.cc
+++ b/quic/quic_transport/quic_transport_integration_test.cc
@@ -70,7 +70,8 @@
   QuicTransportClientEndpoint(Simulator* simulator,
                               const std::string& name,
                               const std::string& peer_name,
-                              url::Origin origin)
+                              url::Origin origin,
+                              const std::string& path)
       : QuicTransportEndpointBase(simulator,
                                   name,
                                   peer_name,
@@ -80,7 +81,7 @@
                  nullptr,
                  DefaultQuicConfig(),
                  GetVersions(),
-                 GURL("quic-transport://test.example.com:50000"),
+                 GURL("quic-transport://test.example.com:50000" + path),
                  &crypto_config_,
                  origin,
                  &visitor_) {
@@ -101,7 +102,6 @@
   QuicTransportServerEndpoint(Simulator* simulator,
                               const std::string& name,
                               const std::string& peer_name,
-                              QuicTransportSimpleServerSession::Mode mode,
                               std::vector<url::Origin> accepted_origins)
       : QuicTransportEndpointBase(simulator,
                                   name,
@@ -120,7 +120,6 @@
                  GetVersions(),
                  &crypto_config_,
                  &compressed_certs_cache_,
-                 mode,
                  accepted_origins) {
     session_.Initialize();
   }
@@ -161,11 +160,11 @@
   QuicTransportIntegrationTest()
       : switch_(&simulator_, "Switch", 8, 2 * kBdp) {}
 
-  void CreateDefaultEndpoints(QuicTransportSimpleServerSession::Mode mode) {
+  void CreateDefaultEndpoints(const std::string& path) {
     client_ = std::make_unique<QuicTransportClientEndpoint>(
-        &simulator_, "Client", "Server", GetTestOrigin());
+        &simulator_, "Client", "Server", GetTestOrigin(), path);
     server_ = std::make_unique<QuicTransportServerEndpoint>(
-        &simulator_, "Server", "Client", mode, accepted_origins_);
+        &simulator_, "Server", "Client", accepted_origins_);
   }
 
   void WireUpEndpoints() {
@@ -206,7 +205,7 @@
 };
 
 TEST_F(QuicTransportIntegrationTest, SuccessfulHandshake) {
-  CreateDefaultEndpoints(QuicTransportSimpleServerSession::DISCARD);
+  CreateDefaultEndpoints("/discard");
   WireUpEndpoints();
   RunHandshake();
   EXPECT_TRUE(client_->session()->IsSessionReady());
@@ -215,7 +214,7 @@
 
 TEST_F(QuicTransportIntegrationTest, OriginMismatch) {
   accepted_origins_ = {url::Origin::Create(GURL{"https://wrong-origin.test"})};
-  CreateDefaultEndpoints(QuicTransportSimpleServerSession::DISCARD);
+  CreateDefaultEndpoints("/discard");
   WireUpEndpoints();
   RunHandshake();
   // Wait until the client receives CONNECTION_CLOSE.
@@ -233,7 +232,7 @@
 }
 
 TEST_F(QuicTransportIntegrationTest, SendOutgoingStreams) {
-  CreateDefaultEndpoints(QuicTransportSimpleServerSession::DISCARD);
+  CreateDefaultEndpoints("/discard");
   WireUpEndpoints();
   RunHandshake();
 
@@ -259,7 +258,7 @@
 }
 
 TEST_F(QuicTransportIntegrationTest, EchoBidirectionalStreams) {
-  CreateDefaultEndpoints(QuicTransportSimpleServerSession::ECHO);
+  CreateDefaultEndpoints("/echo");
   WireUpEndpoints();
   RunHandshake();
 
@@ -281,7 +280,7 @@
 }
 
 TEST_F(QuicTransportIntegrationTest, EchoUnidirectionalStreams) {
-  CreateDefaultEndpoints(QuicTransportSimpleServerSession::ECHO);
+  CreateDefaultEndpoints("/echo");
   WireUpEndpoints();
   RunHandshake();