refactoring, improved test

Author: raydac

jbbp/src/test/java/com/igormaznitsa/jbbp/io/JBBPBitInputStreamTest.java

@@ -87,7 +87,7 @@ public void testReadMsb0Direct() throws Exception {
   }
 
   @Test
-  public void testReadLsb0Msb0() throws Exception {
+  public void testReadLsb0Msb0Msb0Direct() throws Exception {
     final byte[] data = new byte[] {0b0000_0001};
 
     JBBPBitInputStream in = new JBBPBitInputStream(new ByteArrayInputStream(data));
@@ -106,6 +106,12 @@ public void testReadLsb0Msb0() throws Exception {
     assertEquals(0b1000, in.readBits(BITS_4));
     assertEquals(0b1000_0000,
         new JBBPBitInputStream(new ByteArrayInputStream(data), JBBPBitOrder.MSB0).read());
+
+    in = new JBBPBitInputStream(new ByteArrayInputStream(data), JBBPBitOrder.MSB0_DIRECT);
+    assertEquals(0b0000, in.readBits(BITS_4));
+    assertEquals(0b0001, in.readBits(BITS_4));
+    assertEquals(0b0000_0001,
+        new JBBPBitInputStream(new ByteArrayInputStream(data), JBBPBitOrder.MSB0_DIRECT).read());
   }
 
   @Test

jbbp/src/test/java/com/igormaznitsa/jbbp/io/JBBPBitOutputStreamTest.java

@@ -21,14 +21,14 @@
 import static com.igormaznitsa.jbbp.io.JBBPBitNumber.BITS_4;
 import static com.igormaznitsa.jbbp.io.JBBPBitNumber.BITS_5;
 import static com.igormaznitsa.jbbp.io.JBBPBitNumber.BITS_8;
+import static com.igormaznitsa.jbbp.utils.JBBPUtils.array2bin;
 import static com.igormaznitsa.jbbp.utils.JBBPUtils.array2hex;
 import static com.igormaznitsa.jbbp.utils.JBBPUtils.str2bin;
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import com.igormaznitsa.jbbp.utils.JBBPUtils;
 import com.igormaznitsa.jbbp.utils.SpecialTestUtils;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -252,7 +252,7 @@ public void testWrite_MSB0DIRECT() throws Exception {
     final byte[] result = outBuffer.toByteArray();
 
     assertArrayEquals(str2bin("00000001_101_00001000_00000_01_00_1011_00000"), result,
-        JBBPUtils.array2bin(result));
+        array2bin(result));
   }
 
   @Test
@@ -266,7 +266,7 @@ public void testWriteShort_BigEndian_MSB0DIRECT() throws Exception {
     assertEquals(2, out.getCounter());
     final byte[] result = outBuffer.toByteArray();
     assertArrayEquals(new byte[] {(byte) 0b11010101, (byte) 0b01101110}, result,
-        JBBPUtils.array2bin(result));
+        array2bin(result));
   }
 
   @Test
@@ -280,7 +280,7 @@ public void testWriteShort_LittleEndian_MSB0DIRECT() throws Exception {
     assertEquals(2, out.getCounter());
     final byte[] result = outBuffer.toByteArray();
     assertArrayEquals(new byte[] {(byte) 0b01101110, (byte) 0b11010101}, result,
-        JBBPUtils.array2bin(result));
+        array2bin(result));
   }
 
   @Test