From 52e631b74edb5993c8781190bc3cc56d14acb7ce Mon Sep 17 00:00:00 2001 From: Adam Date: Sat, 17 Oct 2015 14:23:54 -0400 Subject: [PATCH] gzip compressoin test --- src/main/java/net/runelite/cache/fs/DataFile.java | 14 ++++++-------- .../java/net/runelite/cache/fs/DataFileTest.java | 14 ++++++++++++++ 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/src/main/java/net/runelite/cache/fs/DataFile.java b/src/main/java/net/runelite/cache/fs/DataFile.java index 0480e6739d..9c11dd9046 100644 --- a/src/main/java/net/runelite/cache/fs/DataFile.java +++ b/src/main/java/net/runelite/cache/fs/DataFile.java @@ -323,15 +323,13 @@ public class DataFile implements Closeable compressedData = data; stream.writeInt(data.length); break; + case 1: + compressedData = (byte[]) null; + break; default: - throw new RuntimeException(); -// case 1: -// compressedData = (byte[]) null; -// break; -// default: -// compressedData = GZipCompressor.compress(data); -// stream.writeInt(compressedData.length); -// stream.writeInt(data.length); + compressedData = GZip.compress(data); + stream.writeInt(compressedData.length); + stream.writeInt(data.length); } stream.writeBytes(compressedData); diff --git a/src/test/java/net/runelite/cache/fs/DataFileTest.java b/src/test/java/net/runelite/cache/fs/DataFileTest.java index 7fca5fb158..7b99953428 100644 --- a/src/test/java/net/runelite/cache/fs/DataFileTest.java +++ b/src/test/java/net/runelite/cache/fs/DataFileTest.java @@ -50,4 +50,18 @@ public class DataFileTest Assert.assertArrayEquals(b, buf); file.delete(); } + + @Test + public void testGZipCompression() throws IOException + { + try (Store store = new Store(folder.getRoot())) + { + DataFile df = new DataFile(store, folder.newFile()); + DataFileWriteResult res = df.write(41, 4, ByteBuffer.wrap("test".getBytes()), 2, 0); + DataFileReadResult res2 = df.read(41, 4, res.sector, res.compressedLength); + byte[] buf = res2.data; + String str = new String(buf); + Assert.assertEquals("test", str); + } + } }