[Cronet] Make delaying sending request headers explicit in bidirectional stream

components/cronet/android/test/javatests/src/org/chromium/net/BidirectionalStreamTest.java

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.net;
 
 import android.os.ConditionVariable;
 import android.test.suitebuilder.annotation.SmallTest;
 
 import org.chromium.base.test.util.DisabledTest;
@@ skipping 232 matching lines @@
         callback.addWriteData("1234567890".getBytes(), false);
         callback.addWriteData("woot!".getBytes(), true);
         BidirectionalStream stream = new BidirectionalStream
                                              .Builder(url, callback, callback.getExecutor(),
                                                      mTestFramework.mCronetEngine)
                                              .disableAutoFlush(true)
                                              .addHeader("foo", "bar")
                                              .addHeader("empty", "")
                                              .addHeader("Content-Type", "zebra")
                                              .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("Test String1234567890woot!", callback.mResponseAsString);
         assertEquals("bar", callback.mResponseInfo.getAllHeaders().get("echo-foo").get(0));
         assertEquals("", callback.mResponseInfo.getAllHeaders().get("echo-empty").get(0));
         assertEquals(
                 "zebra", callback.mResponseInfo.getAllHeaders().get("echo-content-type").get(0));
     }
 
     @SmallTest
     @Feature({"Cronet"})
     @OnlyRunNativeCronet
+    public void testSimpleGetWithFlush() throws Exception {
+        // TODO(xunjieli): Use ParameterizedTest instead of the loop.
+        for (int i = 0; i < 2; i++) {
+            String url = Http2TestServer.getEchoStreamUrl();
+            TestBidirectionalStreamCallback callback = new TestBidirectionalStreamCallback() {
+                @Override
+                public void onStreamReady(BidirectionalStream stream) {
+                    // If there are delayed headers, this flush should try to send them.
+                    // If nothing to flush, it should not crash.
+                    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("", callback.mResponseAsString);
+            assertEquals("bar", callback.mResponseInfo.getAllHeaders().get("echo-foo").get(0));
+            assertEquals("", callback.mResponseInfo.getAllHeaders().get("echo-empty").get(0));
+        }
+    }
+
+    @SmallTest
+    @Feature({"Cronet"})
+    @OnlyRunNativeCronet
+    public void testSimplePostWithFlushAfterOneWrite() throws Exception {
+        // TODO(xunjieli): Use ParameterizedTest instead of the loop.
+        for (int i = 0; i < 2; i++) {
+            String url = Http2TestServer.getEchoStreamUrl();
+            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("Test String", callback.mResponseAsString);
+            assertEquals("bar", callback.mResponseInfo.getAllHeaders().get("echo-foo").get(0));
+            assertEquals("", callback.mResponseInfo.getAllHeaders().get("echo-empty").get(0));
+            assertEquals("zebra",
+                    callback.mResponseInfo.getAllHeaders().get("echo-content-type").get(0));
+        }
+    }
+
+    @SmallTest
+    @Feature({"Cronet"})
+    @OnlyRunNativeCronet
     public void testSimplePostWithFlushTwice() throws Exception {
-        String url = Http2TestServer.getEchoStreamUrl();
-        TestBidirectionalStreamCallback callback = new TestBidirectionalStreamCallback();
-        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(url, 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(
-                "Test String1234567890woot!Test String1234567890woot!", callback.mResponseAsString);
-        assertEquals("bar", callback.mResponseInfo.getAllHeaders().get("echo-foo").get(0));
-        assertEquals("", callback.mResponseInfo.getAllHeaders().get("echo-empty").get(0));
-        assertEquals(
-                "zebra", callback.mResponseInfo.getAllHeaders().get("echo-content-type").get(0));
+        // TODO(xunjieli): Use ParameterizedTest instead of the loop.
+        for (int i = 0; i < 2; i++) {
+            String url = Http2TestServer.getEchoStreamUrl();
+            TestBidirectionalStreamCallback callback = new TestBidirectionalStreamCallback();
+            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(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("Test String1234567890woot!Test String1234567890woot!",
+                    callback.mResponseAsString);
+            assertEquals("bar", callback.mResponseInfo.getAllHeaders().get("echo-foo").get(0));
+            assertEquals("", callback.mResponseInfo.getAllHeaders().get("echo-empty").get(0));
+            assertEquals("zebra",
+                    callback.mResponseInfo.getAllHeaders().get("echo-content-type").get(0));
+        }
     }
 
     @SmallTest
     @Feature({"Cronet"})
     @OnlyRunNativeCronet
     // Tests that it is legal to call read() in onStreamReady().
     public void testReadDuringOnStreamReady() throws Exception {
         String url = Http2TestServer.getEchoStreamUrl();
         TestBidirectionalStreamCallback callback = new TestBidirectionalStreamCallback() {
             @Override
@@ skipping 880 matching lines @@
     private static String bufferContentsToString(ByteBuffer byteBuffer, int start, int end) {
         // Use a duplicate to avoid modifying byteBuffer.
         ByteBuffer duplicate = byteBuffer.duplicate();
         duplicate.position(start);
         duplicate.limit(end);
         byte[] contents = new byte[duplicate.remaining()];
         duplicate.get(contents);
         return new String(contents);
     }
 }