Fix or() operator using and() internally

refs #2

Author: patrickfav

CHANGELOG

@@ -8,6 +8,7 @@
  * add appendNullSafe and append string with encoding
  * add proguard optimized version (can be used with classifier 'optimized')
  * add constant time equals
+ * fix or() operator using and() internally #2
 
 ## v0.4.6
 
@@ -66,4 +67,4 @@
 
 ## v0.2.0
 
-initial version
+initial version

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

@@ -21,7 +21,11 @@
 
 package at.favre.lib.bytes;
 
-import java.io.*;
+import java.io.ByteArrayInputStream;
+import java.io.DataInput;
+import java.io.File;
+import java.io.InputStream;
+import java.io.Serializable;
 import java.math.BigInteger;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
@@ -31,7 +35,13 @@
 import java.nio.charset.StandardCharsets;
 import java.security.SecureRandom;
 import java.text.Normalizer;
-import java.util.*;
+import java.util.Arrays;
+import java.util.BitSet;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Objects;
+import java.util.Random;
 
 /**
  * Bytes is wrapper class for an byte-array that allows a lot of convenience operations on it:
@@ -744,7 +754,7 @@ public Bytes and(byte[] secondArray) {
      * @see <a href="https://en.wikipedia.org/wiki/Bitwise_operation#OR">Bitwise operators: OR</a>
      */
     public Bytes or(Bytes bytes) {
-        return and(bytes.internalArray());
+        return or(bytes.internalArray());
     }
 
     /**

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

@@ -179,8 +179,13 @@ public void xor() {
     @Test
     public void or() {
         assertArrayEquals(new byte[0], Bytes.from(new byte[0]).or(new byte[0]).array());
+        assertArrayEquals(new byte[]{1}, Bytes.from(new byte[]{1}).or(new byte[]{0}).array());
         assertArrayEquals(new byte[1], Bytes.from(new byte[1]).or(new byte[1]).array());
 
+        assertArrayEquals(new byte[0], Bytes.from(new byte[0]).or(Bytes.wrap(new byte[0])).array());
+        assertArrayEquals(new byte[]{1}, Bytes.from(new byte[]{1}).or(Bytes.wrap(new byte[]{0})).array());
+        assertArrayEquals(new byte[1], Bytes.from(new byte[1]).or(Bytes.wrap(new byte[1])).array());
+
         assertArrayEquals(example_bytes_one, Bytes.from(example_bytes_one).or(new byte[1]).array());
         assertArrayEquals(example_bytes_two, Bytes.from(example_bytes_two).or(new byte[2]).array());
         assertArrayEquals(example_bytes_sixteen, Bytes.from(example_bytes_sixteen).or(new byte[16]).array());
@@ -419,4 +424,4 @@ public int compare(Byte o1, Byte o2) {
         }).supportInPlaceTransformation());
         assertTrue(new BytesTransformers.ShuffleTransformer(new SecureRandom()).supportInPlaceTransformation());
     }
-}
+}