#26 fixed saving of MSB0 array bytes if byte aligned

Author: raydac

jbbp/src/main/java/com/igormaznitsa/jbbp/io/JBBPBitOutputStream.java

@@ -229,16 +229,16 @@ public void flush() throws IOException {
   @SuppressWarnings("NullableProblems")
   @Override
   public void write(final byte[] b, final int off, final int len) throws IOException {
-    if (this.bitBufferCount == 0) {
-      out.write(b, off, len);
-      this.byteCounter += len;
-    } else {
+    if (this.msb0 || this.bitBufferCount != 0) {
       int i = off;
       int cnt = len;
       while (cnt > 0) {
         this.write(b[i++]);
         cnt--;
       }
+    } else {
+      out.write(b, off, len);
+      this.byteCounter += len;
     }
   }
 

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

@@ -16,17 +16,20 @@
 
 package com.igormaznitsa.jbbp.io;
 
+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 static org.junit.jupiter.api.Assertions.fail;
+
+
 import com.igormaznitsa.jbbp.TestUtils;
 import com.igormaznitsa.jbbp.utils.JBBPUtils;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.function.Executable;
-
 import java.io.ByteArrayInputStream;
 import java.io.EOFException;
 import java.io.IOException;
 import java.util.Random;
-
-import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class JBBPBitInputStreamTest {
 
@@ -162,6 +165,11 @@ public void testReadString_BigEndan_ShortString() throws Exception {
     assertEquals("ABC", asInputStream(0x03, 65, 66, 67).readString(JBBPByteOrder.BIG_ENDIAN));
   }
 
+  @Test
+  public void testReadString_BigEndan_Msb0_ShortString() throws Exception {
+    assertEquals("zzzz", asInputStreamMSB0(0x20, '^', '^', '^', '^').readString(JBBPByteOrder.BIG_ENDIAN));
+  }
+
   @Test
   public void testReadString_LittleEndan_Null() throws Exception {
     assertEquals(null, asInputStream(0xFF).readString(JBBPByteOrder.LITTLE_ENDIAN));

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

@@ -51,7 +51,7 @@ public void testString() throws Exception {
 
     assertArrayEquals(new byte[] {(byte) 0xFF}, BeginBin(JBBPBitOrder.MSB0).String(null).End().toByteArray());
     assertArrayEquals(new byte[] {0}, BeginBin(JBBPBitOrder.MSB0).String("").End().toByteArray());
-    assertArrayEquals(new byte[] {(byte) 0xc0, (byte) 0x41, (byte) 0x42, (byte) 0x43}, BeginBin(JBBPBitOrder.MSB0).String("ABC").End().toByteArray());
+    assertArrayEquals(new byte[] {(byte) 0xc0, (byte) 0x82, (byte) 0x42, (byte) 0xC2}, BeginBin(JBBPBitOrder.MSB0).String("ABC").End().toByteArray());
 
     assertArrayEquals(new byte[] {(byte) 0xFF}, BeginBin().ByteOrder(JBBPByteOrder.LITTLE_ENDIAN).String(null).End().toByteArray());
     assertArrayEquals(new byte[] {0}, BeginBin().ByteOrder(JBBPByteOrder.LITTLE_ENDIAN).String("").End().toByteArray());

jbbp/src/test/java/com/igormaznitsa/jbbp/it/BasedOnQuestionsAndCasesTest.java

@@ -35,6 +35,7 @@
 import com.igormaznitsa.jbbp.model.JBBPFieldArrayByte;
 import com.igormaznitsa.jbbp.model.JBBPFieldArrayLong;
 import com.igormaznitsa.jbbp.model.JBBPFieldLong;
+import com.igormaznitsa.jbbp.model.JBBPFieldString;
 import com.igormaznitsa.jbbp.model.JBBPFieldStruct;
 import com.igormaznitsa.jbbp.model.JBBPNumericField;
 import com.igormaznitsa.jbbp.utils.JBBPDslBuilder;
@@ -234,6 +235,19 @@ class Bits {
     assertArrayEquals(new byte[] {1, 0, 0, 1, 0, 0, 1, 0}, parsed.bit);
   }
 
+  /**
+   * Case 03-feb-2020
+   * <a href="https://github.com/raydac/java-binary-block-parser/issues/26">Issue #26, Bug in parsing of stringj written in MSB0</a>
+   *
+   * @throws Exception for any error
+   */
+  @Test
+  public void testStringMsb0() throws Exception {
+    JBBPOut joparam = JBBPOut.BeginBin(JBBPByteOrder.BIG_ENDIAN, JBBPBitOrder.MSB0).String("zzzz");
+    final JBBPFieldStruct bitflds = JBBPParser.prepare("stringj fin;", JBBPBitOrder.MSB0).parse(joparam.End().toByteArray());
+    assertEquals("zzzz", bitflds.findFieldForNameAndType("fin", JBBPFieldString.class).getAsString());
+  }
+
   /**
    * Case 10-aug-2017
    * NullPointer exception when referencing a JBBPCustomFieldTypeProcessor parsed field.