Chromium Code Reviews| Index: components/cronet/android/test/javatests/src/org/chromium/net/BidirectionalStreamTest.java |
| diff --git a/components/cronet/android/test/javatests/src/org/chromium/net/BidirectionalStreamTest.java b/components/cronet/android/test/javatests/src/org/chromium/net/BidirectionalStreamTest.java |
| index 96f61ac0bc574c32e7fe6aec6e1422fc502528d0..3f78176f92f7876862e09011df2f20d6c34a28bd 100644 |
| --- a/components/cronet/android/test/javatests/src/org/chromium/net/BidirectionalStreamTest.java |
| +++ b/components/cronet/android/test/javatests/src/org/chromium/net/BidirectionalStreamTest.java |
| @@ -84,6 +84,28 @@ public class BidirectionalStreamTest extends CronetTestBase { |
| return urlResponseInfo; |
| } |
| + private void runSimpleGetWithExpectedReceivedBytesCount(int expectedReceivedBytes) |
| + throws Exception { |
| + String url = Http2TestServer.getEchoMethodUrl(); |
| + TestBidirectionalStreamCallback callback = new TestBidirectionalStreamCallback(); |
| + // Create stream. |
| + BidirectionalStream stream = new BidirectionalStream |
| + .Builder(url, callback, callback.getExecutor(), |
| + mTestFramework.mCronetEngine) |
| + .setHttpMethod("GET") |
| + .build(); |
| + stream.start(); |
| + callback.blockForDone(); |
| + assertTrue(stream.isDone()); |
| + assertEquals(200, callback.mResponseInfo.getHttpStatusCode()); |
| + // Default method is 'GET'. |
| + assertEquals("GET", callback.mResponseAsString); |
| + UrlResponseInfo urlResponseInfo = createUrlResponseInfo( |
| + new String[] {url}, "", 200, expectedReceivedBytes, ":status", "200"); |
| + assertResponseEquals(urlResponseInfo, callback.mResponseInfo); |
| + checkResponseInfo(callback.mResponseInfo, Http2TestServer.getEchoMethodUrl(), 200, ""); |
| + } |
| + |
| @SmallTest |
| @Feature({"Cronet"}) |
| public void testBuilderChecks() throws Exception { |
| @@ -163,24 +185,7 @@ public class BidirectionalStreamTest extends CronetTestBase { |
| @Feature({"Cronet"}) |
| @OnlyRunNativeCronet |
| public void testSimpleGet() throws Exception { |
| - String url = Http2TestServer.getEchoMethodUrl(); |
| - TestBidirectionalStreamCallback callback = new TestBidirectionalStreamCallback(); |
| - // Create stream. |
| - BidirectionalStream stream = new BidirectionalStream |
| - .Builder(url, callback, callback.getExecutor(), |
| - mTestFramework.mCronetEngine) |
| - .setHttpMethod("GET") |
| - .build(); |
| - stream.start(); |
| - callback.blockForDone(); |
| - assertTrue(stream.isDone()); |
| - assertEquals(200, callback.mResponseInfo.getHttpStatusCode()); |
| - // Default method is 'GET'. |
| - assertEquals("GET", callback.mResponseAsString); |
| - UrlResponseInfo urlResponseInfo = |
| - createUrlResponseInfo(new String[] {url}, "", 200, 27, ":status", "200"); |
| - assertResponseEquals(urlResponseInfo, callback.mResponseInfo); |
| - checkResponseInfo(callback.mResponseInfo, Http2TestServer.getEchoMethodUrl(), 200, ""); |
| + runSimpleGetWithExpectedReceivedBytesCount(31); |
| } |
| @SmallTest |
| @@ -201,7 +206,7 @@ public class BidirectionalStreamTest extends CronetTestBase { |
| assertEquals(200, callback.mResponseInfo.getHttpStatusCode()); |
| assertEquals("HEAD", callback.mResponseAsString); |
| UrlResponseInfo urlResponseInfo = |
| - createUrlResponseInfo(new String[] {url}, "", 200, 28, ":status", "200"); |
| + createUrlResponseInfo(new String[] {url}, "", 200, 32, ":status", "200"); |
| assertResponseEquals(urlResponseInfo, callback.mResponseInfo); |
| checkResponseInfo(callback.mResponseInfo, Http2TestServer.getEchoMethodUrl(), 200, ""); |
| } |
| @@ -1073,7 +1078,7 @@ public class BidirectionalStreamTest extends CronetTestBase { |
| // Make sure there are no other pending messages, which would trigger |
| // asserts in TestBidirectionalCallback. |
|
xunjieli
2016/09/01 19:55:23
Could you add a brief comment here on why we use 2
|
| - testSimpleGet(); |
| + runSimpleGetWithExpectedReceivedBytesCount(27); |
| } |
| @SmallTest |