accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vi...@apache.org
Subject git commit: ACCUMULO-2671 adjusting test to make jenkins happy
Date Fri, 18 Apr 2014 14:41:07 GMT
Repository: accumulo
Updated Branches:
  refs/heads/1.6.0-SNAPSHOT 8d6432bec -> 055072064


ACCUMULO-2671 adjusting test to make jenkins happy


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/05507206
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/05507206
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/05507206

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 05507206410bc289da98bfb7931d1cea43cc69a2
Parents: 8d6432b
Author: John Vines <vines@apache.org>
Authored: Fri Apr 18 10:40:34 2014 -0400
Committer: John Vines <vines@apache.org>
Committed: Fri Apr 18 10:40:34 2014 -0400

----------------------------------------------------------------------
 .../security/crypto/BlockedIOStreamTest.java     | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/05507206/core/src/test/java/org/apache/accumulo/core/security/crypto/BlockedIOStreamTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/security/crypto/BlockedIOStreamTest.java
b/core/src/test/java/org/apache/accumulo/core/security/crypto/BlockedIOStreamTest.java
index 17a20da..212aaaf 100644
--- a/core/src/test/java/org/apache/accumulo/core/security/crypto/BlockedIOStreamTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/security/crypto/BlockedIOStreamTest.java
@@ -23,9 +23,11 @@ import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.DataInputStream;
 import java.io.IOException;
+import java.util.Arrays;
 import java.util.Random;
 
 import org.apache.accumulo.core.Constants;
+import org.apache.commons.lang.ArrayUtils;
 import org.junit.Test;
 
 public class BlockedIOStreamTest {
@@ -127,8 +129,13 @@ public class BlockedIOStreamTest {
 
     int size = 1024 * 1024 * 128;
     byte[] giant = new byte[size];
+    byte[] pattern = new byte[1024];
 
-    r.nextBytes(giant);
+    r.nextBytes(pattern);
+
+    for (int i = 0; i < size / 1024; i++) {
+      System.arraycopy(pattern, 0, giant, i * 1024, 1024);
+    }
 
     blockOut.write(giant);
     blockOut.flush();
@@ -142,11 +149,15 @@ public class BlockedIOStreamTest {
     assertEquals(blocks * 16, byteStream.length);
 
     DataInputStream blockIn = new DataInputStream(new BlockedInputStream(new ByteArrayInputStream(byteStream),
blockSize, blockSize));
-    byte[] giantRead = new byte[size];
-    blockIn.readFully(giantRead, 0, size);
+    Arrays.fill(giant, (byte) 0);
+    blockIn.readFully(giant, 0, size);
     blockIn.close();
 
-    assertArrayEquals(giant, giantRead);
+    for (int i = 0; i < size / 1024; i++) {
+      byte[] readChunk = new byte[1024];
+      System.arraycopy(giant, i * 1024, readChunk, 0, 1024);
+      assertArrayEquals(pattern, readChunk);
+    }
   }
 
 }


Mime
View raw message