Merge pull request square#104 from square/jwilson_1227_eof

JakeWharton · JakeWharton · commit 10c22c8970e2 · 2014-12-27T17:44:10.000-08:00
Provide context when readUtf8LineStrict throws.
diff --git a/okio/src/main/java/okio/Buffer.java b/okio/src/main/java/okio/Buffer.java
@@ -489,7 +489,12 @@ public byte getByte(long pos) {
 
   @Override public String readUtf8LineStrict() throws EOFException {
     long newline = indexOf((byte) '\n');
-    if (newline == -1) throw new EOFException();
+    if (newline == -1) {
+      Buffer data = new Buffer();
+      copyTo(data, 0, Math.min(32, size));
+      throw new EOFException("\\n not found: size=" + size()
+          + " content=" + data.readByteString().hex() + "...");
+    }
     return readUtf8Line(newline);
   }
 
diff --git a/okio/src/main/java/okio/RealBufferedSource.java b/okio/src/main/java/okio/RealBufferedSource.java
@@ -194,7 +194,12 @@ public RealBufferedSource(Source source) {
 
   @Override public String readUtf8LineStrict() throws IOException {
     long newline = indexOf((byte) '\n');
-    if (newline == -1L) throw new EOFException();
+    if (newline == -1L) {
+      Buffer data = new Buffer();
+      buffer.copyTo(data, 0, Math.min(32, buffer.size()));
+      throw new EOFException("\\n not found: size=" + buffer.size()
+          + " content=" + data.readByteString().hex() + "...");
+    }
     return buffer.readUtf8Line(newline);
   }
 
diff --git a/okio/src/test/java/okio/ReadUtf8LineTest.java b/okio/src/test/java/okio/ReadUtf8LineTest.java
@@ -90,6 +90,18 @@ public static List<Object[]> parameters() {
       source.readUtf8LineStrict();
       fail();
     } catch (EOFException expected) {
+      assertEquals("\\n not found: size=0 content=...", expected.getMessage());
+    }
+  }
+
+  @Test public void eofExceptionProvidesLimitedContent() throws IOException {
+    data.writeUtf8("aaaaaaaabbbbbbbbccccccccdddddddde");
+    try {
+      source.readUtf8LineStrict();
+      fail();
+    } catch (EOFException expected) {
+      assertEquals("\\n not found: size=33 content=616161616161616162626262626262626363636363636363"
+          + "6464646464646464...", expected.getMessage());
     }
   }
 
