small fixes and test improvements

Author: raydac

jbbp/src/main/java/com/igormaznitsa/jbbp/utils/JBBPTextWriter.java

@@ -1896,7 +1896,10 @@ protected void onFieldFloat(final Object obj, final Field field, final Bin annot
     protected void onFieldString(final Object obj, final Field field, final Bin annotation, final String value) {
       try {
         ensureValueMode();
+        final String prefix = prefixValue;
+        prefixValue = "";
         printValueString(value == null ? "<NULL>" : '\"'+value+'\"');
+        prefixValue = prefix;
         if (this.arrayCounter == 0) {
           Comment(makeFieldDescription(field, annotation));
         }

jbbp/src/test/java/com/igormaznitsa/jbbp/compiler/conversion/RandomAutoTest.java

@@ -46,13 +46,15 @@ static class Result {
     final int fieldsNumber;
     final int structNumber;
     final int booleanDataItemCounter;
+    final long typeFlags;
 
-    Result(final String script, final int bitLength, final int fieldsNumber, final int structNumber, final int booleanDtaItemCounter) {
+    Result(final String script, final int bitLength, final int fieldsNumber, final int structNumber, final int booleanDtaItemCounter, final long typeFlags) {
       this.script = script;
       this.bitLength = bitLength;
       this.fieldsNumber = fieldsNumber;
       this.structNumber = structNumber;
       this.booleanDataItemCounter = booleanDtaItemCounter;
+      this.typeFlags = typeFlags;
     }
   }
 
@@ -101,6 +103,8 @@ Result generate(final int items, final boolean generateNames) {
 
     int activeStructCounter = 0;
 
+    long typeFlags = 0;
+
     for (int i = 0; i < items; i++) {
 
       if (RND.nextInt(50) > 48) {
@@ -116,7 +120,9 @@ Result generate(final int items, final boolean generateNames) {
         final StructLen len = counterStack.remove(0);
         counterStack.get(0).add(len.make());
       } else {
-        switch (RND.nextInt(25)) {
+        final int rndType = RND.nextInt(25);
+        typeFlags |= (1 << rndType);
+        switch (rndType) {
           case 0: { // STRUCT
             builder.Struct(generateNames ? makeRndName() : null);
             counterStack.add(0, new StructLen());
@@ -221,7 +227,7 @@ Result generate(final int items, final boolean generateNames) {
             fieldsTotal++;
           }
           break;
-          case 14: { // SHORT_ARRAY
+          case 14: { // USHORT_ARRAY
             final int arrayLen = makeArrayLengthNumber();
             builder.UShortArray(generateNames ? makeRndName() : null, String.valueOf(arrayLen));
             counterStack.get(0).add(16 * arrayLen);
@@ -305,7 +311,7 @@ Result generate(final int items, final boolean generateNames) {
       counterStack.get(0).add(len.make());
     }
 
-    return new Result(builder.End(), counterStack.get(0).make(), fieldsTotal, structsTotal, booleanDataItems);
+    return new Result(builder.End(), counterStack.get(0).make(), fieldsTotal, structsTotal, booleanDataItems, typeFlags);
   }
 
   private byte[] makeRandomDataArray(final int bitLength) {
@@ -320,12 +326,16 @@ private byte[] makeRandomDataArray(final int bitLength) {
   public void testCompileParseAndWriteArray() throws Exception {
     int testIndex = 1;
 
+    long generatedFields = 0L;
+
     for (int i = 5; i < 500; i += 3) {
       Result result;
       do {
         result = generate(i, true);
       } while (result.bitLength > 10000000);
 
+      generatedFields |= result.typeFlags;
+
       System.out.println(String.format("Test %d, data bit length = %d, fields = %d, sructs = %d", testIndex, result.bitLength, result.fieldsNumber, result.structNumber));
 
       final byte[] testData = makeRandomDataArray(result.bitLength);
@@ -335,6 +345,8 @@ public void testCompileParseAndWriteArray() throws Exception {
 
       testIndex++;
     }
+
+    assertEquals(0x1FFFFFFL, generatedFields, "All field types must be presented");
   }
 
 

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

@@ -17,7 +17,6 @@
 package com.igormaznitsa.jbbp.it;
 
 import com.igormaznitsa.jbbp.JBBPParser;
-import com.igormaznitsa.jbbp.io.JBBPByteOrder;
 import com.igormaznitsa.jbbp.io.JBBPOut;
 import com.igormaznitsa.jbbp.mapper.Bin;
 import com.igormaznitsa.jbbp.mapper.BinType;

jbbp/src/test/java/com/igormaznitsa/jbbp/utils/JBBPTextWriterTest.java

@@ -726,6 +726,10 @@ class SomeClass {
       long d;
       @Bin(outOrder = 5, comment = "some array")
       byte[] arr = new byte[128];
+      @Bin(outOrder = 6, comment = "some string")
+      String str = "Hello String";
+      @Bin(outOrder = 7, comment = "some string array")
+      String [] strs = new String[] {"Hello", null, "World"};
     }
 
     final SomeClass cl = new SomeClass();

jbbp/src/test/resources/com/igormaznitsa/jbbp/utils/testwriterbin1.txt

@@ -19,6 +19,14 @@
     ~--------------------------------------------------------------------------------
     ; END ARRAY : arr, some array
     ~--------------------------------------------------------------------------------
+    ."Hello String"; str, some string
+    ~--------------------------------------------------------------------------------
+    ; START ARRAY : strs, some string array OF String [3]
+    ~--------------------------------------------------------------------------------
+        ."Hello",<NULL>,"World"
+    ~--------------------------------------------------------------------------------
+    ; END ARRAY : strs, some string array
+    ~--------------------------------------------------------------------------------
 ~--------------------------------------------------------------------------------
 ; END : some class
 ~--------------------------------------------------------------------------------