From a76b4e19760398ca33bf2e8f558ade60be528e74 Mon Sep 17 00:00:00 2001 From: Brian Pellin Date: Thu, 6 May 2010 21:13:55 -0500 Subject: [PATCH] Add extra hashed block test. --- .../keepassdroid/stream/HashedBlockInputStream.java | 1 - .../com/keepassdroid/tests/stream/HashedBlock.java | 12 ++++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/com/keepassdroid/stream/HashedBlockInputStream.java b/src/com/keepassdroid/stream/HashedBlockInputStream.java index be5d68582..da2cf9a44 100644 --- a/src/com/keepassdroid/stream/HashedBlockInputStream.java +++ b/src/com/keepassdroid/stream/HashedBlockInputStream.java @@ -27,7 +27,6 @@ import java.util.Arrays; public class HashedBlockInputStream extends InputStream { - // private final static int BUFFER_SIZE = 1024 * 1024; // I think this is only needed in the writer private final static int HASH_SIZE = 32; private BetterDataInputStream baseStream; diff --git a/tests/src/com/keepassdroid/tests/stream/HashedBlock.java b/tests/src/com/keepassdroid/tests/stream/HashedBlock.java index 339494ad5..f65011e01 100644 --- a/tests/src/com/keepassdroid/tests/stream/HashedBlock.java +++ b/tests/src/com/keepassdroid/tests/stream/HashedBlock.java @@ -32,15 +32,23 @@ import com.keepassdroid.stream.HashedBlockInputStream; import com.keepassdroid.stream.HashedBlockOutputStream; public class HashedBlock extends TestCase { + public void testBlockAligned() throws IOException { - final int blockSize = 1024; + testSize(1024, 1024); + } + + public void testOffset() throws IOException { + testSize(1500, 1024); + } + + private void testSize(int blockSize, int bufferSize) throws IOException { byte[] orig = new byte[blockSize]; Random rnd = new Random(); rnd.nextBytes(orig); ByteArrayOutputStream bos = new ByteArrayOutputStream(); - HashedBlockOutputStream output = new HashedBlockOutputStream(bos, blockSize); + HashedBlockOutputStream output = new HashedBlockOutputStream(bos, bufferSize); output.write(orig); output.close();