You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2024/12/12 12:07:49 UTC
(commons-compress) branch master updated: Reduce boilerplate in tests
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-compress.git
The following commit(s) were added to refs/heads/master by this push:
new b743130a1 Reduce boilerplate in tests
b743130a1 is described below
commit b743130a1cece31f99c5d75e1aa1bddc35789abf
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu Dec 12 07:07:43 2024 -0500
Reduce boilerplate in tests
---
.../org/apache/commons/compress/archivers/ZipTest.java | 7 +------
.../brotli/BrotliCompressorInputStreamTest.java | 5 +----
.../zstandard/ZstdCompressorInputStreamTest.java | 15 +++------------
3 files changed, 5 insertions(+), 22 deletions(-)
diff --git a/src/test/java/org/apache/commons/compress/archivers/ZipTest.java b/src/test/java/org/apache/commons/compress/archivers/ZipTest.java
index c44f5cb40..31bf4ee34 100644
--- a/src/test/java/org/apache/commons/compress/archivers/ZipTest.java
+++ b/src/test/java/org/apache/commons/compress/archivers/ZipTest.java
@@ -219,15 +219,10 @@ public final class ZipTest extends AbstractTest {
}
private void readStream(final InputStream in, final ArchiveEntry entry, final Map<String, List<List<Long>>> map) throws IOException {
- final byte[] buf = new byte[4096];
final InputStreamStatistics stats = (InputStreamStatistics) in;
- while (in.read(buf) != -1) {
- // consume all.
- }
-
+ IOUtils.consume(in);
final String name = entry.getName();
final List<List<Long>> list = map.computeIfAbsent(name, k -> new ArrayList<>());
-
final long t = stats.getUncompressedCount();
final long b = stats.getCompressedCount();
list.add(Arrays.asList(t, b));
diff --git a/src/test/java/org/apache/commons/compress/compressors/brotli/BrotliCompressorInputStreamTest.java b/src/test/java/org/apache/commons/compress/compressors/brotli/BrotliCompressorInputStreamTest.java
index 3b854993e..dd974cbb4 100644
--- a/src/test/java/org/apache/commons/compress/compressors/brotli/BrotliCompressorInputStreamTest.java
+++ b/src/test/java/org/apache/commons/compress/compressors/brotli/BrotliCompressorInputStreamTest.java
@@ -54,10 +54,7 @@ public class BrotliCompressorInputStreamTest extends AbstractTest {
BrotliCompressorInputStream brotliInputStream = new BrotliCompressorInputStream(inputStream)) {
final byte[] expected = readAllBytes("brotli.testdata.uncompressed");
final ByteArrayOutputStream bos = new ByteArrayOutputStream();
- int readByte = -1;
- while ((readByte = brotliInputStream.read()) != -1) {
- bos.write(readByte);
- }
+ IOUtils.copy(brotliInputStream, bos);
assertArrayEquals(expected, bos.toByteArray());
}
}
diff --git a/src/test/java/org/apache/commons/compress/compressors/zstandard/ZstdCompressorInputStreamTest.java b/src/test/java/org/apache/commons/compress/compressors/zstandard/ZstdCompressorInputStreamTest.java
index f07fda383..c88010970 100644
--- a/src/test/java/org/apache/commons/compress/compressors/zstandard/ZstdCompressorInputStreamTest.java
+++ b/src/test/java/org/apache/commons/compress/compressors/zstandard/ZstdCompressorInputStreamTest.java
@@ -142,10 +142,7 @@ public class ZstdCompressorInputStreamTest extends AbstractTest {
ZstdCompressorInputStream zstdInputStream = new ZstdCompressorInputStream(inputStream)) {
final byte[] expected = readAllBytes("zstandard.testdata");
final ByteArrayOutputStream bos = new ByteArrayOutputStream();
- int readByte = -1;
- while ((readByte = zstdInputStream.read()) != -1) {
- bos.write(readByte);
- }
+ IOUtils.copy(zstdInputStream, bos);
assertArrayEquals(expected, bos.toByteArray());
}
}
@@ -157,10 +154,7 @@ public class ZstdCompressorInputStreamTest extends AbstractTest {
ZstdCompressorInputStream zstdInputStream = new ZstdCompressorInputStream(inputStream, NoPool.INSTANCE)) {
final byte[] expected = readAllBytes("zstandard.testdata");
final ByteArrayOutputStream bos = new ByteArrayOutputStream();
- int readByte = -1;
- while ((readByte = zstdInputStream.read()) != -1) {
- bos.write(readByte);
- }
+ IOUtils.copy(zstdInputStream, bos);
assertArrayEquals(expected, bos.toByteArray());
}
}
@@ -172,10 +166,7 @@ public class ZstdCompressorInputStreamTest extends AbstractTest {
ZstdCompressorInputStream zstdInputStream = new ZstdCompressorInputStream(inputStream, RecyclingBufferPool.INSTANCE)) {
final byte[] expected = readAllBytes("zstandard.testdata");
final ByteArrayOutputStream bos = new ByteArrayOutputStream();
- int readByte = -1;
- while ((readByte = zstdInputStream.read()) != -1) {
- bos.write(readByte);
- }
+ IOUtils.copy(zstdInputStream, bos);
assertArrayEquals(expected, bos.toByteArray());
}
}