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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: components/cronet/android/test/javatests/src/org/chromium/net/BidirectionalStreamQuicTest.java

Issue 1992953004: [Cronet] Make delaying sending request headers explicit in bidirectional stream (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address Andrei's comment and self review Created 4 years, 7 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 side-by-side diff with in-line comments
Download patch
« components/cronet/android/java/src/org/chromium/net/CronetUrlRequestContext.java ('K') | « components/cronet/android/java/src/org/chromium/net/CronetUrlRequestContext.java ('k') | components/cronet/android/test/javatests/src/org/chromium/net/BidirectionalStreamTest.java » ('j') | net/http/bidirectional_stream.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/cronet/android/test/javatests/src/org/chromium/net/BidirectionalStreamQuicTest.java
diff --git a/components/cronet/android/test/javatests/src/org/chromium/net/BidirectionalStreamQuicTest.java b/components/cronet/android/test/javatests/src/org/chromium/net/BidirectionalStreamQuicTest.java
index 21274c8dc497a61cfb21ebbf49f7bec8a06c65ff..5613f6f71265793804da648da86118a36bdbce83 100644
--- a/components/cronet/android/test/javatests/src/org/chromium/net/BidirectionalStreamQuicTest.java
+++ b/components/cronet/android/test/javatests/src/org/chromium/net/BidirectionalStreamQuicTest.java
@@ -107,28 +107,33 @@ public class BidirectionalStreamQuicTest extends CronetTestBase {
@OnlyRunNativeCronet
public void testSimplePostWithFlush() throws Exception {
setUp(QuicBidirectionalStreams.ENABLED);
- String path = "/simple.txt";
- String quicURL = QuicTestServer.getServerURL() + path;
- TestBidirectionalStreamCallback callback = new TestBidirectionalStreamCallback();
- // Although we have no way to verify data sent at this point, this test
- // can make sure that onWriteCompleted is invoked appropriately.
- callback.addWriteData("Test String".getBytes(), false);
- callback.addWriteData("1234567890".getBytes(), false);
- callback.addWriteData("woot!".getBytes(), true);
- BidirectionalStream stream = new BidirectionalStream
- .Builder(quicURL, callback, callback.getExecutor(),
- mTestFramework.mCronetEngine)
- .disableAutoFlush(true)
- .addHeader("foo", "bar")
- .addHeader("empty", "")
- .addHeader("Content-Type", "zebra")
- .build();
- stream.start();
- callback.blockForDone();
- assertTrue(stream.isDone());
- assertEquals(200, callback.mResponseInfo.getHttpStatusCode());
- assertEquals("This is a simple text file served by QUIC.\n", callback.mResponseAsString);
- assertEquals("quic/1+spdy/3", callback.mResponseInfo.getNegotiatedProtocol());
+ // TODO(xunjieli): Use ParameterizedTest instead of the loop.
+ for (int i = 0; i < 2; i++) {
+ String path = "/simple.txt";
+ String quicURL = QuicTestServer.getServerURL() + path;
+ TestBidirectionalStreamCallback callback = new TestBidirectionalStreamCallback();
+ // Although we have no way to verify data sent at this point, this test
+ // can make sure that onWriteCompleted is invoked appropriately.
+ callback.addWriteData("Test String".getBytes(), false);
+ callback.addWriteData("1234567890".getBytes(), false);
+ callback.addWriteData("woot!".getBytes(), true);
+ BidirectionalStream stream = new BidirectionalStream
+ .Builder(quicURL, callback, callback.getExecutor(),
+ mTestFramework.mCronetEngine)
+ .disableAutoFlush(true)
+ .delayRequestHeadersUntilNextFlush(i == 0)
+ .addHeader("foo", "bar")
+ .addHeader("empty", "")
+ .addHeader("Content-Type", "zebra")
+ .build();
+ stream.start();
+ callback.blockForDone();
+ assertTrue(stream.isDone());
+ assertEquals(200, callback.mResponseInfo.getHttpStatusCode());
+ assertEquals(
+ "This is a simple text file served by QUIC.\n", callback.mResponseAsString);
+ assertEquals("quic/1+spdy/3", callback.mResponseInfo.getNegotiatedProtocol());
+ }
}
@SmallTest
@@ -136,31 +141,113 @@ public class BidirectionalStreamQuicTest extends CronetTestBase {
@OnlyRunNativeCronet
public void testSimplePostWithFlushTwice() throws Exception {
setUp(QuicBidirectionalStreams.ENABLED);
- String path = "/simple.txt";
- String quicURL = QuicTestServer.getServerURL() + path;
- TestBidirectionalStreamCallback callback = new TestBidirectionalStreamCallback();
- // Although we have no way to verify data sent at this point, this test
- // can make sure that onWriteCompleted is invoked appropriately.
- callback.addWriteData("Test String".getBytes(), false);
- callback.addWriteData("1234567890".getBytes(), false);
- callback.addWriteData("woot!".getBytes(), true);
- callback.addWriteData("Test String".getBytes(), false);
- callback.addWriteData("1234567890".getBytes(), false);
- callback.addWriteData("woot!".getBytes(), true);
- BidirectionalStream stream = new BidirectionalStream
- .Builder(quicURL, callback, callback.getExecutor(),
- mTestFramework.mCronetEngine)
- .disableAutoFlush(true)
- .addHeader("foo", "bar")
- .addHeader("empty", "")
- .addHeader("Content-Type", "zebra")
- .build();
- stream.start();
- callback.blockForDone();
- assertTrue(stream.isDone());
- assertEquals(200, callback.mResponseInfo.getHttpStatusCode());
- assertEquals("This is a simple text file served by QUIC.\n", callback.mResponseAsString);
- assertEquals("quic/1+spdy/3", callback.mResponseInfo.getNegotiatedProtocol());
+ // TODO(xunjieli): Use ParameterizedTest instead of the loop.
+ for (int i = 0; i < 2; i++) {
mef 2016/06/01 21:33:21 FTR: Yeah, this is ugly hack.
xunjieli 2016/06/01 22:27:16 Acknowledged. But luckily there is a solution. I t
+ String path = "/simple.txt";
+ String quicURL = QuicTestServer.getServerURL() + path;
+ TestBidirectionalStreamCallback callback = new TestBidirectionalStreamCallback();
+ // Although we have no way to verify data sent at this point, this test
+ // can make sure that onWriteCompleted is invoked appropriately.
+ callback.addWriteData("Test String".getBytes(), false);
+ callback.addWriteData("1234567890".getBytes(), false);
+ callback.addWriteData("woot!".getBytes(), true);
+ callback.addWriteData("Test String".getBytes(), false);
+ callback.addWriteData("1234567890".getBytes(), false);
+ callback.addWriteData("woot!".getBytes(), true);
+ BidirectionalStream stream = new BidirectionalStream
+ .Builder(quicURL, callback, callback.getExecutor(),
+ mTestFramework.mCronetEngine)
+ .disableAutoFlush(true)
+ .delayRequestHeadersUntilNextFlush(i == 0)
+ .addHeader("foo", "bar")
+ .addHeader("empty", "")
+ .addHeader("Content-Type", "zebra")
+ .build();
+ stream.start();
+ callback.blockForDone();
+ assertTrue(stream.isDone());
+ assertEquals(200, callback.mResponseInfo.getHttpStatusCode());
+ assertEquals(
+ "This is a simple text file served by QUIC.\n", callback.mResponseAsString);
+ assertEquals("quic/1+spdy/3", callback.mResponseInfo.getNegotiatedProtocol());
+ }
+ }
+
+ @SmallTest
+ @Feature({"Cronet"})
+ @OnlyRunNativeCronet
+ public void testSimpleGetWithFlush() throws Exception {
+ setUp(QuicBidirectionalStreams.ENABLED);
+ // TODO(xunjieli): Use ParameterizedTest instead of the loop.
+ for (int i = 0; i < 2; i++) {
+ String path = "/simple.txt";
+ String url = QuicTestServer.getServerURL() + path;
+
+ TestBidirectionalStreamCallback callback = new TestBidirectionalStreamCallback() {
+ @Override
+ public void onStreamReady(BidirectionalStream stream) {
+ // This flush should send the delayed headers.
+ stream.flush();
+ super.onStreamReady(stream);
+ }
+ };
+ BidirectionalStream stream = new BidirectionalStream
+ .Builder(url, callback, callback.getExecutor(),
+ mTestFramework.mCronetEngine)
+ .setHttpMethod("GET")
+ .disableAutoFlush(true)
+ .delayRequestHeadersUntilNextFlush(i == 0)
+ .addHeader("foo", "bar")
+ .addHeader("empty", "")
+ .build();
+ // Flush before stream is started should not crash.
+ stream.flush();
+
+ stream.start();
+ callback.blockForDone();
+ assertTrue(stream.isDone());
+
+ // Flush after stream is completed is no-op. It shouldn't call into the destroyed
+ // adapter.
+ stream.flush();
+
+ assertEquals(200, callback.mResponseInfo.getHttpStatusCode());
+ assertEquals(
+ "This is a simple text file served by QUIC.\n", callback.mResponseAsString);
+ assertEquals("quic/1+spdy/3", callback.mResponseInfo.getNegotiatedProtocol());
+ }
+ }
+
+ @SmallTest
+ @Feature({"Cronet"})
+ @OnlyRunNativeCronet
+ public void testSimplePostWithFlushAfterOneWrite() throws Exception {
+ setUp(QuicBidirectionalStreams.ENABLED);
+ // TODO(xunjieli): Use ParameterizedTest instead of the loop.
+ for (int i = 0; i < 2; i++) {
+ String path = "/simple.txt";
+ String url = QuicTestServer.getServerURL() + path;
+
+ TestBidirectionalStreamCallback callback = new TestBidirectionalStreamCallback();
+ callback.addWriteData("Test String".getBytes(), true);
+ BidirectionalStream stream = new BidirectionalStream
+ .Builder(url, callback, callback.getExecutor(),
+ mTestFramework.mCronetEngine)
+ .disableAutoFlush(true)
+ .delayRequestHeadersUntilNextFlush(i == 0)
+ .addHeader("foo", "bar")
+ .addHeader("empty", "")
+ .addHeader("Content-Type", "zebra")
+ .build();
+ stream.start();
+ callback.blockForDone();
+ assertTrue(stream.isDone());
+
+ assertEquals(200, callback.mResponseInfo.getHttpStatusCode());
+ assertEquals(
+ "This is a simple text file served by QUIC.\n", callback.mResponseAsString);
+ assertEquals("quic/1+spdy/3", callback.mResponseInfo.getNegotiatedProtocol());
+ }
}
@SmallTest
« components/cronet/android/java/src/org/chromium/net/CronetUrlRequestContext.java ('K') | « components/cronet/android/java/src/org/chromium/net/CronetUrlRequestContext.java ('k') | components/cronet/android/test/javatests/src/org/chromium/net/BidirectionalStreamTest.java » ('j') | net/http/bidirectional_stream.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698