diff options
Diffstat (limited to 'airlift-zstd')
4 files changed, 27 insertions, 29 deletions
diff --git a/airlift-zstd/pom.xml b/airlift-zstd/pom.xml index 2162d69d722..c7eb8c96f39 100644 --- a/airlift-zstd/pom.xml +++ b/airlift-zstd/pom.xml @@ -40,12 +40,6 @@ </dependency> <dependency> - <groupId>javax.inject</groupId> - <artifactId>javax.inject</artifactId> - <scope>test</scope> - </dependency> - - <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> <scope>test</scope> diff --git a/airlift-zstd/src/test/java/ai/vespa/airlift/compress/AbstractTestCompression.java b/airlift-zstd/src/test/java/ai/vespa/airlift/compress/AbstractTestCompression.java index 851efdb3580..71881325ba4 100644 --- a/airlift-zstd/src/test/java/ai/vespa/airlift/compress/AbstractTestCompression.java +++ b/airlift-zstd/src/test/java/ai/vespa/airlift/compress/AbstractTestCompression.java @@ -20,8 +20,6 @@ import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; -import javax.inject.Inject; - import java.io.IOException; import java.io.UncheckedIOException; import java.nio.Buffer; @@ -61,6 +59,14 @@ public abstract class AbstractTestCompression return true; } + protected byte[] getResourceBytes(String name) { + try { + return getClass().getClassLoader().getResourceAsStream(name).readAllBytes(); + } catch (java.io.IOException ex) { + throw new IllegalArgumentException("Could not load resource: " + name, ex); + } + } + private static List<DataSet> setup() { List<DataSet> testCases = new ArrayList<>(); diff --git a/airlift-zstd/src/test/java/ai/vespa/airlift/zstd/TestZstd.java b/airlift-zstd/src/test/java/ai/vespa/airlift/zstd/TestZstd.java index e39d964a06f..2dc53d32573 100644 --- a/airlift-zstd/src/test/java/ai/vespa/airlift/zstd/TestZstd.java +++ b/airlift-zstd/src/test/java/ai/vespa/airlift/zstd/TestZstd.java @@ -13,7 +13,6 @@ */ package ai.vespa.airlift.zstd; -import com.google.common.io.Resources; import ai.vespa.airlift.compress.AbstractTestCompression; import ai.vespa.airlift.compress.Compressor; import ai.vespa.airlift.compress.Decompressor; @@ -66,8 +65,8 @@ public class TestZstd { int padding = 1021; - byte[] compressed = Resources.toByteArray(getClass().getClassLoader().getResource("data/zstd/with-checksum.zst")); - byte[] uncompressed = Resources.toByteArray(getClass().getClassLoader().getResource("data/zstd/with-checksum")); + byte[] compressed = getResourceBytes("data/zstd/with-checksum.zst"); + byte[] uncompressed = getResourceBytes("data/zstd/with-checksum"); byte[] output = new byte[uncompressed.length + padding * 2]; // pre + post padding int decompressedSize = getDecompressor().decompress(compressed, 0, compressed.length, output, padding, output.length - padding); @@ -79,8 +78,8 @@ public class TestZstd public void testConcatenatedFrames() throws IOException { - byte[] compressed = Resources.toByteArray(getClass().getClassLoader().getResource("data/zstd/multiple-frames.zst")); - byte[] uncompressed = Resources.toByteArray(getClass().getClassLoader().getResource("data/zstd/multiple-frames")); + byte[] compressed = getResourceBytes("data/zstd/multiple-frames.zst"); + byte[] uncompressed = getResourceBytes("data/zstd/multiple-frames"); byte[] output = new byte[uncompressed.length]; getDecompressor().decompress(compressed, 0, compressed.length, output, 0, output.length); @@ -92,7 +91,7 @@ public class TestZstd public void testInvalidSequenceOffset() throws IOException { - byte[] compressed = Resources.toByteArray(getClass().getClassLoader().getResource("data/zstd/offset-before-start.zst")); + byte[] compressed = getResourceBytes("data/zstd/offset-before-start.zst"); byte[] output = new byte[compressed.length * 10]; assertThatThrownBy(() -> getDecompressor().decompress(compressed, 0, compressed.length, output, 0, output.length)) @@ -108,7 +107,7 @@ public class TestZstd // which ended up emitting raw literals due to insufficient gain Compressor compressor = getCompressor(); - byte[] original = Resources.toByteArray(getClass().getClassLoader().getResource("data/zstd/small-literals-after-incompressible-literals")); + byte[] original = getResourceBytes("data/zstd/small-literals-after-incompressible-literals"); int maxCompressLength = compressor.maxCompressedLength(original.length); byte[] compressed = new byte[maxCompressLength]; @@ -128,7 +127,7 @@ public class TestZstd Compressor compressor = getCompressor(); - byte[] original = Resources.toByteArray(getClass().getClassLoader().getResource("data/zstd/large-rle")); + byte[] original = getResourceBytes("data/zstd/large-rle"); int maxCompressLength = compressor.maxCompressedLength(original.length); byte[] compressed = new byte[maxCompressLength]; @@ -148,7 +147,7 @@ public class TestZstd Compressor compressor = getCompressor(); - byte[] original = Resources.toByteArray(getClass().getClassLoader().getResource("data/zstd/incompressible")); + byte[] original = getResourceBytes("data/zstd/incompressible"); int maxCompressLength = compressor.maxCompressedLength(original.length); byte[] compressed = new byte[maxCompressLength]; @@ -194,8 +193,8 @@ public class TestZstd throws IOException { Compressor compressor = getCompressor(); - byte[] compressed = Resources.toByteArray(getClass().getClassLoader().getResource("data/zstd/bad-second-frame.zst")); - byte[] uncompressed = Resources.toByteArray(getClass().getClassLoader().getResource("data/zstd/multiple-frames")); + byte[] compressed = getResourceBytes("data/zstd/bad-second-frame.zst"); + byte[] uncompressed = getResourceBytes("data/zstd/multiple-frames"); byte[] output = new byte[uncompressed.length]; assertThatThrownBy(() -> getDecompressor().decompress(compressed, 0, compressed.length, output, 0, output.length)) .isInstanceOf(MalformedInputException.class) diff --git a/airlift-zstd/src/test/java/ai/vespa/airlift/zstd/TestZstdInputStream.java b/airlift-zstd/src/test/java/ai/vespa/airlift/zstd/TestZstdInputStream.java index fdf521b7d92..f233ff76825 100644 --- a/airlift-zstd/src/test/java/ai/vespa/airlift/zstd/TestZstdInputStream.java +++ b/airlift-zstd/src/test/java/ai/vespa/airlift/zstd/TestZstdInputStream.java @@ -13,7 +13,6 @@ */ package ai.vespa.airlift.zstd; -import com.google.common.io.Resources; import ai.vespa.airlift.compress.AbstractTestCompression; import ai.vespa.airlift.compress.Compressor; import ai.vespa.airlift.compress.Decompressor; @@ -153,8 +152,8 @@ public class TestZstdInputStream { int padding = 1021; - byte[] compressed = Resources.toByteArray(getClass().getClassLoader().getResource("data/zstd/with-checksum.zst")); - byte[] uncompressed = Resources.toByteArray(getClass().getClassLoader().getResource("data/zstd/with-checksum")); + byte[] compressed = getResourceBytes("data/zstd/with-checksum.zst"); + byte[] uncompressed = getResourceBytes("data/zstd/with-checksum"); byte[] output = new byte[uncompressed.length + padding * 2]; // pre + post padding int decompressedSize = getDecompressor().decompress(compressed, 0, compressed.length, output, padding, output.length - padding); @@ -166,8 +165,8 @@ public class TestZstdInputStream public void testConcatenatedFrames() throws IOException { - byte[] compressed = Resources.toByteArray(getClass().getClassLoader().getResource("data/zstd/multiple-frames.zst")); - byte[] uncompressed = Resources.toByteArray(getClass().getClassLoader().getResource("data/zstd/multiple-frames")); + byte[] compressed = getResourceBytes("data/zstd/multiple-frames.zst"); + byte[] uncompressed = getResourceBytes("data/zstd/multiple-frames"); byte[] output = new byte[uncompressed.length]; getDecompressor().decompress(compressed, 0, compressed.length, output, 0, output.length); @@ -179,7 +178,7 @@ public class TestZstdInputStream public void testInvalidSequenceOffset() throws IOException { - byte[] compressed = Resources.toByteArray(getClass().getClassLoader().getResource("data/zstd/offset-before-start.zst")); + byte[] compressed = getResourceBytes("data/zstd/offset-before-start.zst"); byte[] output = new byte[compressed.length * 10]; assertThatThrownBy(() -> getDecompressor().decompress(compressed, 0, compressed.length, output, 0, output.length)) @@ -195,7 +194,7 @@ public class TestZstdInputStream Compressor compressor = getCompressor(); - byte[] original = Resources.toByteArray(getClass().getClassLoader().getResource("data/zstd/large-rle")); + byte[] original = getResourceBytes("data/zstd/large-rle"); int maxCompressLength = compressor.maxCompressedLength(original.length); byte[] compressed = new byte[maxCompressLength]; @@ -215,7 +214,7 @@ public class TestZstdInputStream Compressor compressor = getCompressor(); - byte[] original = Resources.toByteArray(getClass().getClassLoader().getResource("data/zstd/incompressible")); + byte[] original = getResourceBytes("data/zstd/incompressible"); int maxCompressLength = compressor.maxCompressedLength(original.length); byte[] compressed = new byte[maxCompressLength]; @@ -232,8 +231,8 @@ public class TestZstdInputStream throws IOException { Compressor compressor = getCompressor(); - byte[] compressed = Resources.toByteArray(getClass().getClassLoader().getResource("data/zstd/bad-second-frame.zst")); - byte[] uncompressed = Resources.toByteArray(getClass().getClassLoader().getResource("data/zstd/multiple-frames")); + byte[] compressed = getResourceBytes("data/zstd/bad-second-frame.zst"); + byte[] uncompressed = getResourceBytes("data/zstd/multiple-frames"); byte[] output = new byte[uncompressed.length]; assertThatThrownBy(() -> getDecompressor().decompress(compressed, 0, compressed.length, output, 0, output.length)) .isInstanceOf(MalformedInputException.class) |