update Java version

Author: peteroupc

src/test/java/com/upokecenter/test/BigIntegerTest.java

@@ -45,7 +45,14 @@ public void TestCanFitInInt() {
     }
     @Test
     public void TestCompareTo() {
-      // not implemented yet
+      FastRandom r = new FastRandom();
+      for (int i = 0; i < 500; ++i) {
+        BigInteger bigintA = RandomObjects.RandomBigInteger(r);
+        BigInteger bigintB = RandomObjects.RandomBigInteger(r);
+        BigInteger bigintC = RandomObjects.RandomBigInteger(r);
+        TestCommon.CompareTestRelations(bigintA, bigintB, bigintC);
+        TestCommon.CompareTestConsistency(bigintA, bigintB, bigintC);
+      }
     }
     @Test
     public void TestDivide() {

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

@@ -1049,30 +1049,137 @@ public void TestCanTruncatedIntFitInInt64() {
         }
       }
     }
+
+    static void CompareDecimals(CBORObject o1, CBORObject o2) {
+      int cmpDecFrac = o1.AsExtendedDecimal().compareTo(o2.AsExtendedDecimal());
+      int cmpCobj = TestCommon.CompareTestReciprocal(o1, o2);
+      if (cmpDecFrac != cmpCobj) {
+        Assert.assertEquals(TestCommon.ObjectMessages(o1, o2, "Compare: Results don't match"),cmpDecFrac,cmpCobj);
+      }
+      TestCommon.AssertRoundTrip(o1);
+      TestCommon.AssertRoundTrip(o2);
+    }
+
     @Test
     public void TestCompareTo() {
+      FastRandom r = new FastRandom();
+      int CompareCount = 500;
+      for (int i = 0; i < CompareCount; ++i) {
+        CBORObject o1 = RandomObjects.RandomCBORObject(r);
+        CBORObject o2 = RandomObjects.RandomCBORObject(r);
+        CBORObject o3 = RandomObjects.RandomCBORObject(r);
+        TestCommon.CompareTestRelations(o1, o2, o3);
+      }
+      for (int i = 0; i < 5000; ++i) {
+        CBORObject o1 = RandomObjects.RandomNumber(r);
+        CBORObject o2 = RandomObjects.RandomNumber(r);
+        CompareDecimals(o1, o2);
+      }
+      for (int i = 0; i < 50; ++i) {
+        CBORObject o1 = CBORObject.FromObject(Float.NEGATIVE_INFINITY);
+        CBORObject o2 = RandomObjects.RandomNumberOrRational(r);
+        if (o2.IsInfinity() || o2.IsNaN()) {
+          continue;
+        }
+        TestCommon.CompareTestLess(o1, o2);
+        o1 = CBORObject.FromObject(Double.NEGATIVE_INFINITY);
+        TestCommon.CompareTestLess(o1, o2);
+        o1 = CBORObject.FromObject(Float.POSITIVE_INFINITY);
+        TestCommon.CompareTestLess(o2, o1);
+        o1 = CBORObject.FromObject(Double.POSITIVE_INFINITY);
+        TestCommon.CompareTestLess(o2, o1);
+        o1 = CBORObject.FromObject(Float.NaN);
+        TestCommon.CompareTestLess(o2, o1);
+        o1 = CBORObject.FromObject(Double.NaN);
+        TestCommon.CompareTestLess(o2, o1);
+      }
+      byte[] bytes1 = {  0, 1  };
+      byte[] bytes2 = {  0, 2  };
+      byte[] bytes3 = {  0, 2, 0  };
+      byte[] bytes4 = {  1, 1  };
+      byte[] bytes5 = {  1, 1, 4  };
+      byte[] bytes6 = {  1, 2  };
+      byte[] bytes7 = {  1, 2, 6  };
+      CBORObject[] sortedObjects = {
+        CBORObject.Undefined, CBORObject.Null,
+        CBORObject.False, CBORObject.True,
+        CBORObject.FromObject(Double.NEGATIVE_INFINITY),
+        CBORObject.FromObject(ExtendedDecimal.FromString("-1E+5000")),
+        CBORObject.FromObject(Long.MIN_VALUE),
+        CBORObject.FromObject(Integer.MIN_VALUE),
+        CBORObject.FromObject(-2), CBORObject.FromObject(-1),
+        CBORObject.FromObject(0), CBORObject.FromObject(1),
+        CBORObject.FromObject(2), CBORObject.FromObject(Long.MAX_VALUE),
+        CBORObject.FromObject(ExtendedDecimal.FromString("1E+5000")),
+        CBORObject.FromObject(Double.POSITIVE_INFINITY),
+        CBORObject.FromObject(Double.NaN), CBORObject.FromSimpleValue(0),
+        CBORObject.FromSimpleValue(19), CBORObject.FromSimpleValue(32),
+        CBORObject.FromSimpleValue(255), CBORObject.FromObject(bytes1),
+        CBORObject.FromObject(bytes2), CBORObject.FromObject(bytes3),
+        CBORObject.FromObject(bytes4), CBORObject.FromObject(bytes5),
+        CBORObject.FromObject(bytes6), CBORObject.FromObject(bytes7),
+        CBORObject.FromObject("aa"), CBORObject.FromObject("ab"),
+        CBORObject.FromObject("abc"), CBORObject.FromObject("ba"),
+        CBORObject.FromObject(CBORObject.NewArray()),
+        CBORObject.FromObject(CBORObject.NewMap()),
+      };
+      for (int i = 0; i < sortedObjects.length; ++i) {
+        for (int j = i; j < sortedObjects.length; ++j) {
+          if (i == j) {
+            TestCommon.CompareTestEqual(sortedObjects[i], sortedObjects[j]);
+          } else {
+            TestCommon.CompareTestLess(sortedObjects[i], sortedObjects[j]);
+          }
+        }
+        Assert.assertEquals(1, sortedObjects[i].compareTo(null));
+      }
+      CBORObject sp = CBORObject.FromObject(Float.POSITIVE_INFINITY);
+      CBORObject sn = CBORObject.FromObject(Float.NEGATIVE_INFINITY);
+      CBORObject snan = CBORObject.FromObject(Float.NaN);
+      CBORObject dp = CBORObject.FromObject(Double.POSITIVE_INFINITY);
+      CBORObject dn = CBORObject.FromObject(Double.NEGATIVE_INFINITY);
+      CBORObject dnan = CBORObject.FromObject(Double.NaN);
+      TestCommon.CompareTestEqual(sp, sp);
+      TestCommon.CompareTestEqual(sp, dp);
+      TestCommon.CompareTestEqual(dp, dp);
+      TestCommon.CompareTestEqual(sn, sn);
+      TestCommon.CompareTestEqual(sn, dn);
+      TestCommon.CompareTestEqual(dn, dn);
+      TestCommon.CompareTestEqual(snan, snan);
+      TestCommon.CompareTestEqual(snan, dnan);
+      TestCommon.CompareTestEqual(dnan, dnan);
+      TestCommon.CompareTestLess(sn, sp);
+      TestCommon.CompareTestLess(sn, dp);
+      TestCommon.CompareTestLess(sn, snan);
+      TestCommon.CompareTestLess(sn, dnan);
+      TestCommon.CompareTestLess(sp, snan);
+      TestCommon.CompareTestLess(sp, dnan);
+      TestCommon.CompareTestLess(dn, dp);
+      TestCommon.CompareTestLess(dp, dnan);
       Assert.assertEquals(1, CBORObject.True.compareTo(null));
       Assert.assertEquals(1, CBORObject.False.compareTo(null));
       Assert.assertEquals(1, CBORObject.Null.compareTo(null));
       Assert.assertEquals(1, CBORObject.NewArray().compareTo(null));
       Assert.assertEquals(1, CBORObject.NewMap().compareTo(null));
       Assert.assertEquals(1, CBORObject.FromObject(100).compareTo(null));
       Assert.assertEquals(1, CBORObject.FromObject(Double.NaN).compareTo(null));
-      CBORTest.CompareTestLess(CBORObject.Undefined, CBORObject.Null);
-      CBORTest.CompareTestLess(CBORObject.Null, CBORObject.False);
-      CBORTest.CompareTestLess(CBORObject.False, CBORObject.True);
-      CBORTest.CompareTestLess(CBORObject.False, CBORObject.FromObject(0));
-      CBORTest.CompareTestLess(CBORObject.False, CBORObject.FromSimpleValue(0));
-      CBORTest.CompareTestLess(
+      TestCommon.CompareTestLess(CBORObject.Undefined, CBORObject.Null);
+      TestCommon.CompareTestLess(CBORObject.Null, CBORObject.False);
+      TestCommon.CompareTestLess(CBORObject.False, CBORObject.True);
+      TestCommon.CompareTestLess(CBORObject.False, CBORObject.FromObject(0));
+   TestCommon.CompareTestLess(
+CBORObject.False,
+CBORObject.FromSimpleValue(0));
+      TestCommon.CompareTestLess(
         CBORObject.FromSimpleValue(0),
         CBORObject.FromSimpleValue(1));
-      CBORTest.CompareTestLess(
+      TestCommon.CompareTestLess(
         CBORObject.FromObject(0),
         CBORObject.FromObject(1));
-      CBORTest.CompareTestLess(
+      TestCommon.CompareTestLess(
         CBORObject.FromObject(0.0f),
         CBORObject.FromObject(1.0f));
-      CBORTest.CompareTestLess(
+      TestCommon.CompareTestLess(
         CBORObject.FromObject(0.0),
         CBORObject.FromObject(1.0));
     }