Skip to content

Commit faaf6ec

Browse files
JakeWhartonJakeWharton
committed
Use fully-reading helper APIs in tests.
1 parent 1c4d377 commit faaf6ec

File tree

6 files changed

+19
-23
lines changed

6 files changed

+19
-23
lines changed

‎okio/src/test/java/okio/BufferTest.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ private List<Integer> moveBytesBetweenBuffers(String... contents) throws IOExcep
158158
for (String s : contents) {
159159
Buffer source = new Buffer();
160160
source.writeUtf8(s);
161-
buffer.write(source, source.size());
161+
buffer.writeAll(source);
162162
expected.append(s);
163163
}
164164
List<Integer> segmentSizes = buffer.segmentSizes();
@@ -245,7 +245,7 @@ private List<Integer> moveBytesBetweenBuffers(String... contents) throws IOExcep
245245
buffer.copyTo(out);
246246
String outString = new String(out.toByteArray(), UTF_8);
247247
assertEquals("hello, world!", outString);
248-
assertEquals("hello, world!", buffer.readUtf8(buffer.size()));
248+
assertEquals("hello, world!", buffer.readUtf8());
249249
}
250250

251251
@Test public void writeToSpanningSegments() throws Exception {
@@ -275,23 +275,23 @@ private List<Integer> moveBytesBetweenBuffers(String... contents) throws IOExcep
275275
InputStream in = new ByteArrayInputStream("hello, world!".getBytes(UTF_8));
276276
Buffer buffer = new Buffer();
277277
buffer.readFrom(in);
278-
String out = buffer.readUtf8(buffer.size());
278+
String out = buffer.readUtf8();
279279
assertEquals("hello, world!", out);
280280
}
281281

282282
@Test public void readFromSpanningSegments() throws Exception {
283283
InputStream in = new ByteArrayInputStream("hello, world!".getBytes(UTF_8));
284284
Buffer buffer = new Buffer().writeUtf8(repeat('a', Segment.SIZE - 10));
285285
buffer.readFrom(in);
286-
String out = buffer.readUtf8(buffer.size());
286+
String out = buffer.readUtf8();
287287
assertEquals(repeat('a', Segment.SIZE - 10) + "hello, world!", out);
288288
}
289289

290290
@Test public void readFromStreamWithCount() throws Exception {
291291
InputStream in = new ByteArrayInputStream("hello, world!".getBytes(UTF_8));
292292
Buffer buffer = new Buffer();
293293
buffer.readFrom(in, 10);
294-
String out = buffer.readUtf8(buffer.size());
294+
String out = buffer.readUtf8();
295295
assertEquals("hello, wor", out);
296296
}
297297

@@ -450,8 +450,8 @@ private List<Integer> moveBytesBetweenBuffers(String... contents) throws IOExcep
450450
Buffer source = new Buffer().writeUtf8(repeat('a', 10000));
451451
Buffer sink = new Buffer();
452452
source.readFully(sink, 9999);
453-
assertEquals(repeat('a', 9999), sink.readUtf8(sink.size()));
454-
assertEquals("a", source.readUtf8(source.size()));
453+
assertEquals(repeat('a', 9999), sink.readUtf8());
454+
assertEquals("a", source.readUtf8());
455455
}
456456

457457
@Test public void bufferInputStreamByteByByte() throws Exception {
@@ -511,7 +511,7 @@ private List<Integer> moveBytesBetweenBuffers(String... contents) throws IOExcep
511511

512512
assertEquals(Segment.SIZE * 3, sink.writeAll(source));
513513
assertEquals(0, source.size());
514-
assertEquals(TestUtil.repeat('a', Segment.SIZE * 3), sink.readUtf8(sink.size()));
514+
assertEquals(TestUtil.repeat('a', Segment.SIZE * 3), sink.readUtf8());
515515
}
516516

517517
/**

‎okio/src/test/java/okio/DeflaterSinkTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public final class DeflaterSinkTest {
3737
deflaterSink.write(data, data.size());
3838
deflaterSink.close();
3939
Buffer inflated = inflate(sink);
40-
assertEquals(original, inflated.readUtf8(inflated.size()));
40+
assertEquals(original, inflated.readUtf8());
4141
}
4242

4343
@Test public void deflateWithSyncFlush() throws Exception {
@@ -49,7 +49,7 @@ public final class DeflaterSinkTest {
4949
deflaterSink.write(data, data.size());
5050
deflaterSink.flush();
5151
Buffer inflated = inflate(sink);
52-
assertEquals(original, inflated.readUtf8(inflated.size()));
52+
assertEquals(original, inflated.readUtf8());
5353
}
5454

5555
@Test public void deflateWellCompressed() throws IOException {
@@ -61,7 +61,7 @@ public final class DeflaterSinkTest {
6161
deflaterSink.write(data, data.size());
6262
deflaterSink.close();
6363
Buffer inflated = inflate(sink);
64-
assertEquals(original, inflated.readUtf8(inflated.size()));
64+
assertEquals(original, inflated.readUtf8());
6565
}
6666

6767
@Test public void deflatePoorlyCompressed() throws IOException {
@@ -73,7 +73,7 @@ public final class DeflaterSinkTest {
7373
deflaterSink.write(data, data.size());
7474
deflaterSink.close();
7575
Buffer inflated = inflate(sink);
76-
assertEquals(original, inflated.readByteString(inflated.size()));
76+
assertEquals(original, inflated.readByteString());
7777
}
7878

7979
@Test public void multipleSegmentsWithoutCompression() throws IOException {

‎okio/src/test/java/okio/GzipSinkTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public class GzipSinkTest {
1717
gzipSink.write(data, data.size());
1818
gzipSink.close();
1919
Buffer inflated = gunzip(sink);
20-
assertEquals(original, inflated.readUtf8(inflated.size()));
20+
assertEquals(original, inflated.readUtf8());
2121
}
2222

2323
@Test public void closeWithExceptionWhenWritingAndClosing() throws IOException {

‎okio/src/test/java/okio/GzipSourceTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ public class GzipSourceTest {
9898

9999
private void assertGzipped(Buffer gzipped) throws IOException {
100100
Buffer gunzipped = gunzip(gzipped);
101-
assertEquals("It's a UNIX system! I know this!", gunzipped.readUtf8(gunzipped.size()));
101+
assertEquals("It's a UNIX system! I know this!", gunzipped.readUtf8());
102102
}
103103

104104
/**

‎okio/src/test/java/okio/InflaterSourceTest.java

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public final class InflaterSourceTest {
3131
Buffer deflated = decodeBase64("eJxzz09RyEjNKVAoLdZRKE9VL0pVyMxTKMlIVchIzEspVshPU0jNS8/MS00tK"
3232
+ "tYDAF6CD5s=");
3333
Buffer inflated = inflate(deflated);
34-
assertEquals("God help us, we're in the hands of engineers.", readUtf8(inflated));
34+
assertEquals("God help us, we're in the hands of engineers.", inflated.readUtf8());
3535
}
3636

3737
@Test public void inflateTruncated() throws Exception {
@@ -64,24 +64,20 @@ public final class InflaterSourceTest {
6464
+ "tFeWvE=\n");
6565
String original = repeat('a', 1024 * 1024);
6666
Buffer inflated = inflate(deflated);
67-
assertEquals(original, readUtf8(inflated));
67+
assertEquals(original, inflated.readUtf8());
6868
}
6969

7070
@Test public void inflatePoorlyCompressed() throws Exception {
7171
ByteString original = randomBytes(1024 * 1024);
7272
Buffer deflated = deflate(original);
7373
Buffer inflated = inflate(deflated);
74-
assertEquals(original, inflated.readByteString(inflated.size()));
74+
assertEquals(original, inflated.readByteString());
7575
}
7676

7777
private Buffer decodeBase64(String s) {
7878
return new Buffer().write(ByteString.decodeBase64(s));
7979
}
8080

81-
private String readUtf8(Buffer buffer) throws IOException {
82-
return buffer.readUtf8(buffer.size());
83-
}
84-
8581
/** Use DeflaterOutputStream to deflate source. */
8682
private Buffer deflate(ByteString source) throws IOException {
8783
Buffer result = new Buffer();

‎okio/src/test/java/okio/OkioTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,11 +109,11 @@ public final class OkioTest {
109109

110110
// Source: b...bc. Sink: b...b.
111111
assertEquals(Segment.SIZE, source.read(sink, 20000));
112-
assertEquals(repeat('b', Segment.SIZE), sink.readUtf8(sink.size()));
112+
assertEquals(repeat('b', Segment.SIZE), sink.readUtf8());
113113

114114
// Source: b...bc. Sink: b...bc.
115115
assertEquals(Segment.SIZE - 1, source.read(sink, 20000));
116-
assertEquals(repeat('b', Segment.SIZE - 2) + "c", sink.readUtf8(sink.size()));
116+
assertEquals(repeat('b', Segment.SIZE - 2) + "c", sink.readUtf8());
117117

118118
// Source and sink are empty.
119119
assertEquals(-1, source.read(sink, 1));

0 commit comments

Comments
 (0)