You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by bo...@apache.org on 2017/05/03 11:46:21 UTC
[1/2] commons-compress git commit: COMPRESS-392 the semi-mandatory
bla.tar test
Repository: commons-compress
Updated Branches:
refs/heads/master 886e92401 -> 037209cb3
COMPRESS-392 the semi-mandatory bla.tar test
Project: http://git-wip-us.apache.org/repos/asf/commons-compress/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-compress/commit/4e619852
Tree: http://git-wip-us.apache.org/repos/asf/commons-compress/tree/4e619852
Diff: http://git-wip-us.apache.org/repos/asf/commons-compress/diff/4e619852
Branch: refs/heads/master
Commit: 4e619852cad8b9b056d4239aff597124e901fe8a
Parents: 886e924
Author: Stefan Bodewig <bo...@apache.org>
Authored: Wed May 3 13:44:51 2017 +0200
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Wed May 3 13:44:51 2017 +0200
----------------------------------------------------------------------
.../brotli/BrotliCompressorInputStreamTest.java | 26 ++++++++++++++++++-
src/test/resources/bla.tar.br | Bin 0 -> 401 bytes
2 files changed, 25 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/4e619852/src/test/java/org/apache/commons/compress/compressors/brotli/BrotliCompressorInputStreamTest.java
----------------------------------------------------------------------
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 ef4294b..da44ea5 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
@@ -23,15 +23,18 @@ import static org.junit.Assert.assertTrue;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileInputStream;
+import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import org.apache.commons.compress.AbstractTestCase;
+import org.apache.commons.compress.compressors.CompressorInputStream;
+import org.apache.commons.compress.compressors.CompressorStreamFactory;
import org.apache.commons.compress.utils.IOUtils;
import org.junit.Assert;
import org.junit.Test;
-public class BrotliCompressorInputStreamTest {
+public class BrotliCompressorInputStreamTest extends AbstractTestCase {
/**
* Test bridge works fine
@@ -130,4 +133,25 @@ public class BrotliCompressorInputStreamTest {
in.close();
}
}
+
+ @Test
+ public void testBrotliUnarchive() throws Exception {
+ final File input = getFile("bla.tar.br");
+ final File output = new File(dir, "bla.tar");
+ try (InputStream is = new FileInputStream(input)) {
+ final CompressorInputStream in = new CompressorStreamFactory()
+ .createCompressorInputStream("br", is);
+ FileOutputStream out = null;
+ try {
+ out = new FileOutputStream(output);
+ IOUtils.copy(in, out);
+ } finally {
+ if (out != null) {
+ out.close();
+ }
+ in.close();
+ }
+ }
+ }
+
}
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/4e619852/src/test/resources/bla.tar.br
----------------------------------------------------------------------
diff --git a/src/test/resources/bla.tar.br b/src/test/resources/bla.tar.br
new file mode 100644
index 0000000..35b1f99
Binary files /dev/null and b/src/test/resources/bla.tar.br differ
[2/2] commons-compress git commit: COMPRESS-392 tweaks
Posted by bo...@apache.org.
COMPRESS-392 tweaks
Project: http://git-wip-us.apache.org/repos/asf/commons-compress/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-compress/commit/037209cb
Tree: http://git-wip-us.apache.org/repos/asf/commons-compress/tree/037209cb
Diff: http://git-wip-us.apache.org/repos/asf/commons-compress/diff/037209cb
Branch: refs/heads/master
Commit: 037209cb3e585e59ead364b36d1f1b82a2fc8d54
Parents: 4e61985
Author: Stefan Bodewig <bo...@apache.org>
Authored: Wed May 3 13:46:03 2017 +0200
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Wed May 3 13:46:03 2017 +0200
----------------------------------------------------------------------
.../brotli/BrotliCompressorInputStreamTest.java | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/037209cb/src/test/java/org/apache/commons/compress/compressors/brotli/BrotliCompressorInputStreamTest.java
----------------------------------------------------------------------
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 da44ea5..208224f 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
@@ -42,8 +42,8 @@ public class BrotliCompressorInputStreamTest extends AbstractTestCase {
*/
@Test
public void testBrotliDecode() throws IOException {
- final File input = AbstractTestCase.getFile("brotli.testdata.compressed");
- final File expected = AbstractTestCase.getFile("brotli.testdata.uncompressed");
+ final File input = getFile("brotli.testdata.compressed");
+ final File expected = getFile("brotli.testdata.uncompressed");
try (InputStream inputStream = new FileInputStream(input);
InputStream expectedStream = new FileInputStream(expected);
BrotliCompressorInputStream brotliInputStream = new BrotliCompressorInputStream(inputStream)) {
@@ -59,7 +59,7 @@ public class BrotliCompressorInputStreamTest extends AbstractTestCase {
}
@Test
- public void testCachingIsEnabledByDefaultAndXZIsPresent() {
+ public void testCachingIsEnabledByDefaultAndBrotliIsPresent() {
assertEquals(BrotliUtils.CachedAvailability.CACHED_AVAILABLE, BrotliUtils.getCachedBrotliAvailability());
assertTrue(BrotliUtils.isBrotliCompressionAvailable());
}
@@ -90,7 +90,7 @@ public class BrotliCompressorInputStreamTest extends AbstractTestCase {
@Test
public void availableShouldReturnZero() throws IOException {
- final File input = AbstractTestCase.getFile("brotli.testdata.compressed");
+ final File input = getFile("brotli.testdata.compressed");
try (InputStream is = new FileInputStream(input)) {
final BrotliCompressorInputStream in =
new BrotliCompressorInputStream(is);
@@ -101,7 +101,7 @@ public class BrotliCompressorInputStreamTest extends AbstractTestCase {
@Test
public void shouldBeAbleToSkipAByte() throws IOException {
- final File input = AbstractTestCase.getFile("brotli.testdata.compressed");
+ final File input = getFile("brotli.testdata.compressed");
try (InputStream is = new FileInputStream(input)) {
final BrotliCompressorInputStream in =
new BrotliCompressorInputStream(is);
@@ -112,7 +112,7 @@ public class BrotliCompressorInputStreamTest extends AbstractTestCase {
@Test
public void singleByteReadWorksAsExpected() throws IOException {
- final File input = AbstractTestCase.getFile("brotli.testdata.compressed");
+ final File input = getFile("brotli.testdata.compressed");
try (InputStream is = new FileInputStream(input)) {
final BrotliCompressorInputStream in =
new BrotliCompressorInputStream(is);
@@ -124,7 +124,7 @@ public class BrotliCompressorInputStreamTest extends AbstractTestCase {
@Test
public void singleByteReadReturnsMinusOneAtEof() throws IOException {
- final File input = AbstractTestCase.getFile("brotli.testdata.compressed");
+ final File input = getFile("brotli.testdata.compressed");
try (InputStream is = new FileInputStream(input)) {
final BrotliCompressorInputStream in =
new BrotliCompressorInputStream(is);