Rearrange tests; improve RandomBigInteger to also generate from hex strings; fix a potential bug in fromRadixSubstring

Author: peteroupc

src/main/java/com/upokecenter/cbor/CBORJson.java

@@ -80,15 +80,17 @@ static String NextJSONString(CharacterReader reader, int quote) {
                       c <<= 4;
                       c |= ch + 10 - 'a';
                     } else {
-                throw reader.NewError("Invalid Unicode escaped character");
+                    throw
+                        reader.NewError("Invalid Unicode escaped character"
+);
                     }
                   }
                   break;
                 }
-              default: throw reader.NewError("Invalid escaped character");
+                default: throw reader.NewError("Invalid escaped character");
             }
             break;
-          default: escaped = false;
+            default: escaped = false;
             break;
         }
         if (surrogate) {
@@ -278,18 +280,18 @@ static CBORObject ParseJSONObject(
         }
         // NOTE: Will overwrite existing value
         myHashMap.put(key, NextJSONValue(
-reader,
+          reader,
           SkipWhitespaceJSON(reader),
- noDuplicates,
- nextchar,
- depth));
+          noDuplicates,
+          nextchar,
+          depth));
         switch (nextchar[0]) {
           case ',':
             seenComma = true;
             break;
           case '}':
             return CBORObject.FromRaw(myHashMap);
-          default: throw reader.NewError("Expected a ',' or '}'");
+            default: throw reader.NewError("Expected a ',' or '}'");
         }
       }
     }
@@ -320,11 +322,11 @@ static CBORObject ParseJSONArray(
         }
         myArrayList.add(
           NextJSONValue(
-reader,
-c,
-noDuplicates,
-nextchar,
-depth));
+            reader,
+            c,
+            noDuplicates,
+            nextchar,
+            depth));
         c = nextchar[0];
         switch (c) {
           case ',':
@@ -357,8 +359,8 @@ static void WriteJSONStringUnquoted(
           sb.WriteChar('\\');
           sb.WriteChar(c);
         } else if (c < 0x20 || (c >= 0x85 && (c == 0x2028 || c == 0x2029 ||
-                c == 0x85 || c == 0xfeff || c == 0xfffe ||
-                                              c == 0xffff))) {
+                              c == 0x85 || c == 0xfeff || c == 0xfffe ||
+                              c == 0xffff))) {
           // Control characters, and also the line and paragraph separators
           // which apparently can't appear in JavaScript (as opposed to
           // JSON) strings
@@ -430,7 +432,7 @@ static void WriteJSONToInternal(
             }
             writer.WriteString(
               CBORObject.TrimDotZero(
-Float.toString((float)f)));
+                Float.toString((float)f)));
             return;
           }
           case CBORObject.CBORObjectTypeDouble: {
@@ -441,7 +443,7 @@ static void WriteJSONToInternal(
               return;
             }
             writer.WriteString(CBORObject.TrimDotZero(
-                Double.toString((double)f)));
+              Double.toString((double)f)));
             return;
           }
           case CBORObject.CBORObjectTypeInteger: {
@@ -450,7 +452,8 @@ static void WriteJSONToInternal(
             return;
           }
           case CBORObject.CBORObjectTypeBigInteger: {
-       writer.WriteString(CBORUtilities.BigIntToString((BigInteger)thisItem));
+            writer.WriteString(
+              CBORUtilities.BigIntToString((BigInteger)thisItem));
             return;
           }
           case CBORObject.CBORObjectTypeExtendedDecimal: {
@@ -475,13 +478,13 @@ static void WriteJSONToInternal(
               // so convert to double instead
               double f = flo.ToDouble();
               if (((f) == Double.NEGATIVE_INFINITY) ||
-                ((f) == Double.POSITIVE_INFINITY) || Double.isNaN(f)) {
+                  ((f) == Double.POSITIVE_INFINITY) || Double.isNaN(f)) {
                 writer.WriteString("null");
                 return;
               }
               writer.WriteString(
                 CBORObject.TrimDotZero(
-Double.toString((double)f)));
+                  Double.toString((double)f)));
               return;
             }
             writer.WriteString(flo.toString());
@@ -497,11 +500,11 @@ static void WriteJSONToInternal(
             writer.WriteChar('\"');
             if (obj.HasTag(22)) {
               Base64.WriteBase64(
-writer,
-byteArray,
-0,
-byteArray.length,
-false);
+                writer,
+                byteArray,
+                0,
+                byteArray.length,
+                false);
             } else if (obj.HasTag(23)) {
               // Write as base16
               for (int i = 0; i < byteArray.length; ++i) {
@@ -510,11 +513,11 @@ static void WriteJSONToInternal(
               }
             } else {
               Base64.WriteBase64URL(
-writer,
-byteArray,
-0,
-byteArray.length,
-false);
+                writer,
+                byteArray,
+                0,
+                byteArray.length,
+                false);
             }
             writer.WriteChar('\"');
             break;
@@ -591,7 +594,8 @@ static void WriteJSONToInternal(
               for (Map.Entry<CBORObject, CBORObject> entry : objMap.entrySet()) {
                 CBORObject key = entry.getKey();
                 CBORObject value = entry.getValue();
-           String str = (key.getItemType() == CBORObject.CBORObjectTypeTextString) ?
+           String str = (key.getItemType() ==
+                  CBORObject.CBORObjectTypeTextString) ?
                   ((String)key.getThisItem()) : key.ToJSONString();
                 stringMap.put(str, value);
               }