update Java version

Author: peteroupc

api/com.upokecenter.cbor.CBORObject.md

@@ -2372,7 +2372,17 @@ Generates a CBOR object from a byte (0 to 255).
 
 ### FromObject
     public static CBORObject FromObject​(float value)
-Generates a CBOR object from a 32-bit floating-point number.
+Generates a CBOR object from a 32-bit floating-point number. The input value
+ can be a not-a-number (NaN) value (such as <code>Float.NaN</code> in
+ DotNet or Float.NaN in Java); however, NaN values have multiple
+ forms that are equivalent for many applications' purposes, and
+ <code>Float.NaN</code> / <code>Float.NaN</code> is only one of these equivalent
+ forms. In fact, <code>CBORObject.FromObject(Float.NaN)</code> or
+ <code>CBORObject.FromObject(Float.NaN)</code> could produce a CBOR-encoded
+ object that differs between DotNet and Java, because
+ <code>Float.NaN</code> / <code>Float.NaN</code> may have a different form in
+ DotNet and Java (for example, the NaN value's sign may be negative
+ in DotNet, but positive in Java).
 
 **Parameters:**
 
@@ -2384,7 +2394,15 @@ Generates a CBOR object from a 32-bit floating-point number.
 
 ### FromObject
     public static CBORObject FromObject​(double value)
-Generates a CBOR object from a 64-bit floating-point number.
+Generates a CBOR object from a 64-bit floating-point number. The input value
+ can be a not-a-number (NaN) value (such as <code>Double.NaN</code>);
+ however, NaN values have multiple forms that are equivalent for many
+ applications' purposes, and <code>Double.NaN</code> is only one of these
+ equivalent forms. In fact, <code>CBORObject.FromObject(Double.NaN)</code>
+ could produce a CBOR-encoded object that differs between DotNet and
+ Java, because <code>Double.NaN</code> may have a different form in DotNet
+ and Java (for example, the NaN value's sign may be negative in
+ DotNet, but positive in Java).
 
 **Parameters:**
 

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

@@ -2262,7 +2262,17 @@ public static CBORObject FromObject(byte value) {
     }
 
     /**
-     * Generates a CBOR object from a 32-bit floating-point number.
+     * Generates a CBOR object from a 32-bit floating-point number. The input value
+     * can be a not-a-number (NaN) value (such as <code>Float.NaN</code> in
+     * DotNet or Float.NaN in Java); however, NaN values have multiple
+     * forms that are equivalent for many applications' purposes, and
+     * <code>Float.NaN</code> / <code>Float.NaN</code> is only one of these equivalent
+     * forms. In fact, <code>CBORObject.FromObject(Float.NaN)</code> or
+     * <code>CBORObject.FromObject(Float.NaN)</code> could produce a CBOR-encoded
+     * object that differs between DotNet and Java, because
+     * <code>Float.NaN</code> / <code>Float.NaN</code> may have a different form in
+     * DotNet and Java (for example, the NaN value's sign may be negative
+     * in DotNet, but positive in Java).
      * @param value The parameter {@code value} is a 32-bit floating-point number.
      * @return A CBOR object generated from the given number.
      */
@@ -2273,7 +2283,15 @@ public static CBORObject FromObject(float value) {
     }
 
     /**
-     * Generates a CBOR object from a 64-bit floating-point number.
+     * Generates a CBOR object from a 64-bit floating-point number. The input value
+     * can be a not-a-number (NaN) value (such as <code>Double.NaN</code>);
+     * however, NaN values have multiple forms that are equivalent for many
+     * applications' purposes, and <code>Double.NaN</code> is only one of these
+     * equivalent forms. In fact, <code>CBORObject.FromObject(Double.NaN)</code>
+     * could produce a CBOR-encoded object that differs between DotNet and
+     * Java, because <code>Double.NaN</code> may have a different form in DotNet
+     * and Java (for example, the NaN value's sign may be negative in
+     * DotNet, but positive in Java).
      * @param value The parameter {@code value} is a 64-bit floating-point number.
      * @return A CBOR object generated from the given number.
      */

src/test/java/com/upokecenter/test/CBORNumberTest.java

@@ -643,13 +643,6 @@ public void TestAsEDecimal() {
           .AsNumber().ToEDecimal();
         Assert.assertEquals(objectTemp, objectTemp2);
       }
-      {
-        String stringTemp = ToObjectTest.TestToFromObjectRoundTrip(
-            Float.NaN).AsNumber().ToEDecimal().toString();
-        Assert.assertEquals(
-          "NaN",
-          stringTemp);
-      }
       {
         Object objectTemp = CBORTestCommon.DecPosInf;
         Object objectTemp2 =
@@ -665,12 +658,19 @@ public void TestAsEDecimal() {
         Assert.assertEquals(objectTemp, objectTemp2);
       }
       {
-        Object objectTemp = "NaN";
-        Object objectTemp2 =
+        boolean bo = ToObjectTest.TestToFromObjectRoundTrip(
+            Double.NaN).AsNumber().ToEDecimal().IsNaN();
+        if (!(bo)) {
+ Assert.fail();
+ }
+      }
+      {
+        boolean bo =
           ToObjectTest.TestToFromObjectRoundTrip(
-            Double.NaN).AsNumber().ToEDecimal()
-          .toString();
-        Assert.assertEquals(objectTemp, objectTemp2);
+            Float.NaN).AsNumber().ToEDecimal().IsNaN();
+        if (!(bo)) {
+ Assert.fail();
+ }
       }
       try {
         CBORObject.NewArray().AsNumber().ToEDecimal();

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

@@ -9613,7 +9613,7 @@ public static void TestParseNumberFxxLine(String line) {
         Assert.fail(line);
       }
       String f64 = line.substring(4 + 1 + 8 + 1, (4 + 1 + 8 + 1)+(16));
-      if (line.charAt(4+ 1 + 25) != ' ') {
+      if (line.charAt(4 + 26) != ' ') {
         Assert.fail(line);
       }
       String str = line.substring(4 + 1 + 8 + 1 + 16 + 1);

src/test/java/com/upokecenter/test/ToObjectTest.java

@@ -477,13 +477,6 @@ public void TestAsEDecimal() {
           .ToObject(EDecimal.class);
         Assert.assertEquals(objectTemp, objectTemp2);
       }
-      {
-        String stringTemp = ToObjectTest.TestToFromObjectRoundTrip(Float.NaN)
-          .ToObject(EDecimal.class).toString();
-        Assert.assertEquals(
-          "NaN",
-          stringTemp);
-      }
       {
         Object objectTemp = CBORTestCommon.DecPosInf;
         Object objectTemp2 =
@@ -499,11 +492,18 @@ public void TestAsEDecimal() {
         Assert.assertEquals(objectTemp, objectTemp2);
       }
       {
-        Object objectTemp = "NaN";
-        Object objectTemp2 =
-          ToObjectTest.TestToFromObjectRoundTrip(Double.NaN)
-          .ToObject(EDecimal.class).toString();
-        Assert.assertEquals(objectTemp, objectTemp2);
+        boolean bo = ((EDecimal)ToObjectTest.TestToFromObjectRoundTrip(Float.NaN)
+          .ToObject(EDecimal.class)).IsNaN();
+        if (!(bo)) {
+ Assert.fail();
+ }
+      }
+      {
+        boolean bo = ((EDecimal)ToObjectTest.TestToFromObjectRoundTrip(Double.NaN)
+          .ToObject(EDecimal.class)).IsNaN();
+        if (!(bo)) {
+ Assert.fail();
+ }
       }
       try {
         CBORObject.NewArray().ToObject(EDecimal.class);