update Java version

Author: peteroupc

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

@@ -1128,6 +1128,10 @@ public static long IntegerToDoubleBits(int i) {
       }
       long longmant = Math.abs(i);
       int expo = 0;
+      while (longmant < (1L << 10)) {
+        longmant <<= 42;
+        expo -= 42;
+      }
       while (longmant < (1L << 52)) {
         longmant <<= 1;
         --expo;

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

@@ -214,6 +214,7 @@ public JSONOptions(String paramString) {
         .append("base64padding=").append(this.getBase64Padding() ? "true" : "false")
         .append(";replacesurrogates=")
         .append(this.getReplaceSurrogates() ? "true" : "false")
+        .append(";preservenegativezero=")
         .append(this.getPreserveNegativeZero() ? "true" : "false")
         .append(";numberconversion=").append(this.FromNumberConversion())
         .append(";allowduplicatekeys=")

src/test/java/com/upokecenter/test/CBORObjectTest.java

@@ -9490,24 +9490,35 @@ public void TestFromJsonStringFastCases() {
     @Test(timeout = 10000)
     public void TestFromJsonStringSmallDouble() {
        CBORObject cbor;
-       AssertJSONDouble("0","double",0.0);
-       cbor=FromJSON("[0, 1, 2, 3]", "double");
+       AssertJSONDouble("0", "double", 0.0);
+       cbor = FromJSON("[0, 1, 2, 3]", "double");
        Assert.assertEquals(4, cbor.size());
        Assert.assertEquals(0.0, cbor.get(0).AsDouble());
        Assert.assertEquals(1.0, cbor.get(1).AsDouble());
        Assert.assertEquals(2.0, cbor.get(2).AsDouble());
        Assert.assertEquals(3.0, cbor.get(3).AsDouble());
-       cbor=FromJSON("[0]", "double");
+       cbor = FromJSON("[0]", "double");
        Assert.assertEquals(1, cbor.size());
        Assert.assertEquals(0.0, cbor.get(0).AsDouble());
-       cbor=FromJSON("[-0]", "double");
+       cbor = FromJSON("[-0]", "double");
        Assert.assertEquals(1, cbor.size());
-       cbor=FromJSON("[1]", "double");
+       cbor = FromJSON("[1]", "double");
        Assert.assertEquals(1, cbor.size());
        Assert.assertEquals(1.0, cbor.get(0).AsDouble());
-       cbor=FromJSON("[-1]", "double");
+       cbor = FromJSON("[-1]", "double");
        Assert.assertEquals(1, cbor.size());
        Assert.assertEquals(-1.0, cbor.get(0).AsDouble());
+       cbor = FromJSON("[-1022,-1023,-1024,-1025,1022,1023,1024,1025]",
+  "double");
+       Assert.assertEquals(8, cbor.size());
+       Assert.assertEquals(-1022.0, cbor.get(0).AsDouble());
+       Assert.assertEquals(-1023.0, cbor.get(1).AsDouble());
+       Assert.assertEquals(-1024.0, cbor.get(2).AsDouble());
+       Assert.assertEquals(-1025.0, cbor.get(3).AsDouble());
+       Assert.assertEquals(1022.0, cbor.get(0).AsDouble());
+       Assert.assertEquals(1023.0, cbor.get(1).AsDouble());
+       Assert.assertEquals(1024.0, cbor.get(2).AsDouble());
+       Assert.assertEquals(1025.0, cbor.get(3).AsDouble());
     }
 
     @Test(timeout = 10000)

src/test/java/com/upokecenter/test/CBORTest.java

@@ -5199,6 +5199,89 @@ public static boolean CheckUtf16(String str) {
       return true;
     }
 
+    @Test
+    public void TestJSONOptions() {
+       JSONOptions jsonop1 = new JSONOptions("numberconversion=intorfloat");
+       {
+         Object objectTemp = jsonop1.toString();
+         Object objectTemp2 = new
+JSONOptions(jsonop1.toString()).toString();
+         Assert.assertEquals(objectTemp, objectTemp2);
+       }
+       JSONOptions jsonop2 = new JSONOptions("numberconversion=decimal128");
+       {
+         Object objectTemp = jsonop2.toString();
+         Object objectTemp2 = new
+JSONOptions(jsonop2.toString()).toString();
+         Assert.assertEquals(objectTemp, objectTemp2);
+       }
+       JSONOptions jsonop3 = new JSONOptions("numberconversion=intorfloatfromdouble");
+       {
+         Object objectTemp = jsonop3.toString();
+         Object objectTemp2 = new
+JSONOptions(jsonop3.toString()).toString();
+         Assert.assertEquals(objectTemp, objectTemp2);
+       }
+       JSONOptions jsonop4 = new JSONOptions("numberconversion=double");
+       {
+         Object objectTemp = jsonop4.toString();
+         Object objectTemp2 = new
+JSONOptions(jsonop4.toString()).toString();
+         Assert.assertEquals(objectTemp, objectTemp2);
+       }
+    }
+
+    @Test
+    public void TestPODOptions() {
+       PODOptions podop = PODOptions.Default;
+       {
+         Object objectTemp = podop.toString();
+         Object objectTemp2 = new
+PODOptions(podop.toString()).toString();
+         Assert.assertEquals(objectTemp, objectTemp2);
+       }
+    }
+
+    @Test
+    public void TestCBOREncodeOptions() {
+       CBOREncodeOptions encodeop = CBOREncodeOptions.Default;
+       {
+         Object objectTemp = encodeop.toString();
+         Object objectTemp2 = new
+CBOREncodeOptions(encodeop.toString()).toString();
+         Assert.assertEquals(objectTemp, objectTemp2);
+       }
+    }
+
+    @Test
+    public void TestRandomJSON() {
+       JSONGenerator jsongen = new JSONGenerator();
+       RandomGenerator rg = new RandomGenerator();
+       JSONOptions jsonop1 = new JSONOptions("numberconversion=intorfloat");
+       JSONOptions jsonop2 = new JSONOptions("numberconversion=decimal128");
+       JSONOptions jsonop3 = new JSONOptions("numberconversion=intorfloatfromdouble");
+       JSONOptions jsonop4 = new JSONOptions("numberconversion=double");
+       for (int i = 0; i < 1000; ++i) {
+          byte[] json = jsongen.Generate(rg);
+          System.out.println("" + i + " len=" + json.length);
+          JSONOptions currop = null;
+          try {
+             currop = jsonop1;
+             CBORObject.FromJSONBytes(json, jsonop1);
+             currop = jsonop2;
+             CBORObject.FromJSONBytes(json, jsonop2);
+             currop = jsonop3;
+             CBORObject.FromJSONBytes(json, jsonop3);
+             currop = jsonop4;
+             CBORObject.FromJSONBytes(json, jsonop4);
+           } catch (CBORException ex) {
+              String msg = ex.getMessage() + "\n" +
+                 DataUtilities.GetUtf8String(json, true) + "\n" + currop;
+              throw new IllegalStateException(msg, ex);
+           }
+       }
+    }
+
     public static boolean TestTextStringStreamOne(String longString) {
       if (!CheckUtf16(longString)) {
         return false;