[Cronet] update test expectations for OutputStream tests

On Lollipop, the default HttpURLConnection implementation sometimes does not trigger
the write-out-of-bound error until reading response. This CL updates the test
expectations.

BUG=398997

Review URL: https://codereview.chromium.org/1094313004

Cr-Commit-Position: refs/heads/master@{#326305}

2 files changed, 13 insertions, 1 deletions

diff --git a/components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/CronetBufferedOutputStreamTest.java b/components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/CronetBufferedOutputStreamTest.java
index d0d1a8c..698be48 100644
--- a/components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/CronetBufferedOutputStreamTest.java
+++ b/components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/CronetBufferedOutputStreamTest.java
@@ -353,6 +353,8 @@ public class CronetBufferedOutputStreamTest extends CronetTestBase {
         try {
             // Write remaining bytes.
             out.write(UPLOAD_DATA, 3, UPLOAD_DATA.length - 3);
+            // On Lollipop, default implementation only triggers the error when reading response.
+            connection.getInputStream();
             fail();
         } catch (ProtocolException e) {
             assertEquals("exceeded content-length limit of "
@@ -381,6 +383,8 @@ public class CronetBufferedOutputStreamTest extends CronetTestBase {
             for (int i = 0; i < UPLOAD_DATA.length; i++) {
                 out.write(UPLOAD_DATA[i]);
             }
+            // On Lollipop, default implementation only triggers the error when reading response.
+            connection.getInputStream();
             fail();
         } catch (java.net.ProtocolException e) {
             assertEquals("exceeded content-length limit of "
diff --git a/components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/CronetFixedModeOutputStreamTest.java b/components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/CronetFixedModeOutputStreamTest.java
index c2b7e45..be00a66 100644
--- a/components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/CronetFixedModeOutputStreamTest.java
+++ b/components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/CronetFixedModeOutputStreamTest.java
@@ -133,6 +133,8 @@ public class CronetFixedModeOutputStreamTest extends CronetTestBase {
         OutputStream out = connection.getOutputStream();
         try {
             out.write(UPLOAD_DATA);
+            // On Lollipop, default implementation only triggers the error when reading response.
+            connection.getInputStream();
             fail();
         } catch (ProtocolException e) {
             // Expected.
@@ -162,10 +164,16 @@ public class CronetFixedModeOutputStreamTest extends CronetTestBase {
         try {
             // Try upload an extra byte.
             out.write(UPLOAD_DATA[UPLOAD_DATA.length - 1]);
+            // On Lollipop, default implementation only triggers the error when reading response.
+            connection.getInputStream();
             fail();
         } catch (ProtocolException e) {
             // Expected.
-            assertEquals("expected 0 bytes but received 1", e.getMessage());
+            String expectedVariant = "expected 0 bytes but received 1";
+            String expectedVariantOnLollipop = "expected " + (UPLOAD_DATA.length - 1)
+                    + " bytes but received " + UPLOAD_DATA.length;
+            assertTrue(expectedVariant.equals(e.getMessage())
+                    || expectedVariantOnLollipop.equals(e.getMessage()));
         }
         connection.disconnect();
     }