Add transformer tests

Author: patrickfav

src/main/java/at/favre/lib/bytes/Bytes.java

@@ -429,6 +429,16 @@ public Bytes append(byte singleByte) {
         return append(new byte[]{singleByte});
     }
 
+    /**
+     * Creates a new instance with the current array appended with the provided data (ie. append at the end)
+     *
+     * @param char2Bytes to append
+     * @return appended instance
+     */
+    public Bytes append(char char2Bytes) {
+        return append(Bytes.from(char2Bytes));
+    }
+
     /**
      * Creates a new instance with the current array appended with the provided data (ie. append at the end)
      *
@@ -557,7 +567,7 @@ public Bytes negate() {
      * <p>
      * See the considerations about possible in-place operation in {@link #transform(BytesTransformer)}.
      *
-     * @param shiftCount how many bits
+     * @param shiftCount how many bits (not bytes)
      * @return shifted instance
      * @see <a href="https://en.wikipedia.org/wiki/Bitwise_operation#Bit_shifts">Bit shifts</a>
      */
@@ -570,7 +580,7 @@ public Bytes leftShift(int shiftCount) {
      * <p>
      * See the considerations about possible in-place operation in {@link #transform(BytesTransformer)}.
      *
-     * @param shiftCount how many bits
+     * @param shiftCount how many bits (not bytes)
      * @return shifted instance
      * @see <a href="https://en.wikipedia.org/wiki/Bitwise_operation#Bit_shifts">Bit shifts</a>
      */
@@ -690,8 +700,21 @@ public Bytes resize(int newByteLength) {
         if (length() == newByteLength) {
             return this;
         }
+
+        if (newByteLength < 0) {
+            throw new IllegalArgumentException("cannot resize to smaller than 0");
+        }
+
+        if (newByteLength == 0) {
+            return wrap(new byte[0]);
+        }
+
         byte[] newSize = new byte[newByteLength];
-        System.arraycopy(internalArray(), 0, newSize, Math.max(0, Math.abs(newByteLength - length())), Math.min(newByteLength, length()));
+        if (newByteLength > length()) {
+            System.arraycopy(internalArray(), 0, newSize, Math.max(0, Math.abs(newByteLength - length())), Math.min(newByteLength, length()));
+        } else {
+            System.arraycopy(internalArray(), Math.max(0, Math.abs(newByteLength - length())), newSize, Math.min(0, Math.abs(newByteLength - length())), Math.min(newByteLength, length()));
+        }
         return wrap(newSize);
     }
 

src/main/java/at/favre/lib/bytes/BytesTransformer.java

@@ -64,18 +64,18 @@ public Bytes transform(Bytes victim, boolean inPlace) {
                 throw new IllegalArgumentException("all byte array must be of same length doing bit wise operation");
             }
 
-            byte[] out = inPlace ? victim.array() : new byte[victim.length()];
+            byte[] out = inPlace ? victim.internalArray() : new byte[victim.length()];
 
             for (int i = 0; i < victim.length(); i++) {
                 switch (mode) {
                     case OR:
-                        out[i] = (byte) (victim.array()[i] | secondArray[i]);
+                        out[i] = (byte) (victim.internalArray()[i] | secondArray[i]);
                         break;
                     case AND:
-                        out[i] = (byte) (victim.array()[i] & secondArray[i]);
+                        out[i] = (byte) (victim.internalArray()[i] & secondArray[i]);
                         break;
                     case XOR:
-                        out[i] = (byte) (victim.array()[i] ^ secondArray[i]);
+                        out[i] = (byte) (victim.internalArray()[i] ^ secondArray[i]);
                         break;
                     default:
                         throw new IllegalArgumentException("unknown bitwise transform mode " + mode);
@@ -94,10 +94,10 @@ public Bytes transform(Bytes victim, boolean inPlace) {
     final class NegateTransformer implements BytesTransformer {
         @Override
         public Bytes transform(Bytes victim, boolean inPlace) {
-            byte[] out = inPlace ? victim.array() : new byte[victim.length()];
+            byte[] out = inPlace ? victim.internalArray() : victim.copy().internalArray();
 
             for (int i = 0; i < victim.length(); i++) {
-                out[i] = (byte) ~victim.array()[i];
+                out[i] = (byte) ~out[i];
             }
 
             return inPlace ? victim : Bytes.wrap(out);
@@ -129,9 +129,9 @@ public Bytes transform(Bytes victim, boolean inPlace) {
             BigInteger bigInt;
 
             if (inPlace) {
-                bigInt = new BigInteger(victim.array());
+                bigInt = new BigInteger(victim.internalArray());
             } else {
-                bigInt = new BigInteger(victim.copy().array());
+                bigInt = new BigInteger(victim.copy().internalArray());
             }
 
             switch (type) {
@@ -160,7 +160,7 @@ public ConcatTransformer(byte[] secondArrays) {
 
         @Override
         public Bytes transform(Bytes victim, boolean inPlace) {
-            return Bytes.wrap(Util.concat(victim.array(), secondArray));
+            return Bytes.wrap(Util.concat(victim.internalArray(), secondArray));
         }
     }
 
@@ -170,14 +170,13 @@ public Bytes transform(Bytes victim, boolean inPlace) {
     final class ReverseTransformer implements BytesTransformer {
         @Override
         public Bytes transform(Bytes victim, boolean inPlace) {
-            byte[] out = inPlace ? victim.array() : new byte[victim.length()];
+            byte[] out = inPlace ? victim.internalArray() : victim.copy().internalArray();
 
-            for (int k = 0; k < out.length / 2; k++) {
-                byte temp = out[k];
-                out[k] = out[out.length - (1 + k)];
-                out[out.length - (1 + k)] = temp;
+            for (int i = 0; i < out.length / 2; i++) {
+                byte temp = out[i];
+                out[i] = out[out.length - i - 1];
+                out[out.length - i - 1] = temp;
             }
-
             return inPlace ? victim : Bytes.wrap(out);
         }
     }
@@ -200,13 +199,13 @@ public SortTransformer(Comparator<Byte> comparator) {
         public Bytes transform(Bytes victim, boolean inPlace) {
 
             if (comparator == null) {
-                byte[] out = inPlace ? victim.array() : new byte[victim.length()];
+                byte[] out = inPlace ? victim.internalArray() : victim.copy().internalArray();
                 Arrays.sort(out);
                 return inPlace ? victim : Bytes.wrap(out);
             } else {
                 //no in-place implementation with comparator
                 List<Byte> list = victim.toList();
-                Collections.sort(list);
+                Collections.sort(list, comparator);
                 return Bytes.from(list);
             }
         }
@@ -225,7 +224,7 @@ public ShuffleTransformer(Random random) {
 
         @Override
         public Bytes transform(Bytes victim, boolean inPlace) {
-            byte[] out = inPlace ? victim.array() : new byte[victim.length()];
+            byte[] out = inPlace ? victim.internalArray() : victim.copy().internalArray();
             Util.shuffle(out, random);
             return inPlace ? victim : Bytes.wrap(out);
         }

src/test/java/at/favre/lib/bytes/ABytesTest.java

@@ -51,6 +51,8 @@ public abstract class ABytesTest {
     byte[] example_bytes_sixteen;
     String example_hex_sixteen;
 
+    byte[] example_bytes_twentyfour;
+    String example_hex_twentyfour;
     @Before
     public void setUp() throws Exception {
         example_bytes_empty = new byte[0];
@@ -68,6 +70,8 @@ public void setUp() throws Exception {
         example_hex_eight = "eed1fdaa12af7809";
         example_bytes_sixteen = new byte[]{0x7E, (byte) 0xD1, (byte) 0xFD, (byte) 0xAA, 0x12, (byte) 0xAF, (byte) 0x78, 0x09, 0x1E, (byte) 0xD1, (byte) 0xFD, (byte) 0xAA, 0x12, (byte) 0xAF, (byte) 0x00, 0x0A};
         example_hex_sixteen = "7ed1fdaa12af78091ed1fdaa12af000a";
+        example_bytes_twentyfour = new byte[]{(byte) 0x8E, (byte) 0xD1, (byte) 0xFD, (byte) 0xAA, 0x12, (byte) 0xAF, (byte) 0x78, 0x09, 0x1E, (byte) 0xD1, (byte) 0xFD, (byte) 0xAA, 0x12, (byte) 0xAF, (byte) 0x00, 0x0A, (byte) 0xEE, (byte) 0xD1, (byte) 0xFD, (byte) 0xAA, 0x12, (byte) 0xAF, (byte) 0x78, 0x11};
+        example_hex_twentyfour = "8ed1fdaa12af78091ed1fdaa12af000aeed1fdaa12af7811";
     }
 
     Bytes fromAndTest(byte[] bytes) {

…favre/lib/bytes/BytesPrimitivesTest.java …/favre/lib/bytes/BytesByteOrderTest.javasrc/test/java/at/favre/lib/bytes/BytesPrimitivesTest.java renamed to src/test/java/at/favre/lib/bytes/BytesByteOrderTest.java src/test/java/at/favre/lib/bytes/BytesPrimitivesTest.java renamed to src/test/java/at/favre/lib/bytes/BytesByteOrderTest.java

@@ -30,9 +30,7 @@
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 
-public class BytesPrimitivesTest {
-    private final static byte[] example2 = new byte[]{0x4A, (byte) 0x94, (byte) 0xFD, (byte) 0xFF, 0x1E, (byte) 0xAF, (byte) 0xED};
-
+public class BytesByteOrderTest {
     @Before
     public void setUp() throws Exception {
     }

src/test/java/at/favre/lib/bytes/BytesConstructorTests.java

@@ -217,4 +217,10 @@ public void fromVariousBytes() throws Exception {
         assertArrayEquals(new byte[2], Bytes.from((byte) 0, (byte) 0).array());
         assertArrayNotEquals(new byte[2], Bytes.from((byte) 1, (byte) 0).array());
     }
+
+    @Test
+    public void fromPartByte() throws Exception {
+        assertArrayEquals(new byte[]{example_bytes_four[1]}, Bytes.from(example_bytes_four, 1, 1).array());
+        assertArrayEquals(new byte[]{example_bytes_eight[4], example_bytes_eight[5], example_bytes_eight[6]}, Bytes.from(example_bytes_eight, 4, 3).array());
+    }
 }