update Java version

Author: peteroupc

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

@@ -124,6 +124,7 @@ static String ToStringHelper(CBORObject obj, int depth) {
               sb.append(HexAlphabet.charAt((cp >> 8) & 15));
               sb.append(HexAlphabet.charAt((cp >> 4) & 15));
               sb.append(HexAlphabet.charAt(cp & 15));
+              ++i;
             } else if (cp >= 0x7F || cp < 0x20 || cp == (int)'\\' || cp ==
 (int)'\"') {
               sb.append("\\u");

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

@@ -471,8 +471,10 @@ public static int ByteArrayCompare(byte[] a, byte[] b) {
       }
       int c = Math.min(a.length, b.length);
       for (int i = 0; i < c; ++i) {
-        if (a[i] != b[i]) {
-          return (a[i] < b[i]) ? -1 : 1;
+        byte ai = a[i];
+        byte bi = b[i];
+        if (ai != bi) {
+          return ((((int)ai) & 0xff) < (((int)bi) & 0xff)) ? -1 : 1;
         }
       }
       return (a.length != b.length) ? ((a.length < b.length) ? -1 : 1) : 0;
@@ -489,8 +491,10 @@ public static int ByteArrayCompareLengthFirst(byte[] a, byte[] b) {
         return a.length < b.length ? -1 : 1;
       }
       for (int i = 0; i < a.length; ++i) {
-        if (a[i] != b[i]) {
-          return (a[i] < b[i]) ? -1 : 1;
+        byte ai = a[i];
+        byte bi = b[i];
+        if (ai != bi) {
+          return ((((int)ai) & 0xff) < (((int)bi) & 0xff)) ? -1 : 1;
         }
       }
       return 0;

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

@@ -11229,8 +11229,8 @@ public void TestRoundTripRegressions() {
   (byte)0xe1,
   (byte)0x99,
   (byte)0x92,
-  (byte)0xf0, (
-  byte)0xb5, (byte)0xa4, (byte)0xa2, 0x3a, 0x77, 0x11, 0x4c, 0x6f,
+  (byte)0xf0,
+  (byte)0xb5, (byte)0xa4, (byte)0xa2, 0x3a, 0x77, 0x11, 0x4c, 0x6f,
   (byte)0xff,
  };
 CBORTestCommon.AssertRoundTrip(CBORObject.DecodeFromBytes(bytes, options));
@@ -11292,8 +11292,8 @@ public void TestRoundTripRegressions() {
   (byte)0xd2,
   (byte)0xe7,
   (byte)0x99, 0x00, 0x01, 0x1b, 0x2a, 0x6e, 0x6f, 0x67, 0x4b, 0x18, 0x60,
-  0x51, 0x1b, 0x46, (
-  byte)0x9f, (byte)0xd3, (byte)0xb7, (byte)0xf4, 0x74, (byte)0xad, 0x6c,
+  0x51, 0x1b, 0x46,
+  (byte)0x9f, (byte)0xd3, (byte)0xb7, (byte)0xf4, 0x74, (byte)0xad, 0x6c,
   (byte)0xff,
  };
 CBORTestCommon.AssertRoundTrip(CBORObject.DecodeFromBytes(bytes, options));
@@ -11375,4 +11375,208 @@ public void TestToObject_TypeMapper() {
           stringTemp);
       }
     }
+
+@Test
+public void TestRegressionFour() {
+   CBORObject o1 = CBORObject.FromObject(new byte[] { (byte)5, (byte)2 });
+   CBORObject o2 = CBORObject.FromObject(new byte[] { (byte)0x85, (byte)2 });
+   TestCommon.CompareTestLess(o1, o2);
+}
+
+@Test
+public void TestRegressionOne() {
+{
+CBOREncodeOptions options = new CBOREncodeOptions();
+byte[] bytes = new byte[] {
+  (byte)0xbf, 0x0d,
+  (byte)0xdb, 0x7f, 0x53,
+  (byte)0xd5, 0x1e,
+  (byte)0xab, 0x1f,
+  (byte)0xb2,
+  (byte)0xc2,
+  (byte)0xb8, 0x02, 0x7f, 0x7a, 0x00, 0x00, 0x00, 0x09,
+  (byte)0xf0,
+  (byte)0xb8,
+  (byte)0xbf,
+  (byte)0xbf, 0x00,
+  (byte)0xf0,
+  (byte)0x9d,
+  (byte)0x84,
+  (byte)0xa1,
+  (byte)0xff, 0x1a, 0x00, 0x46, 0x31,
+  (byte)0xdf, 0x7f, 0x69, 0x05, 0x47, 0x76, 0x4f, 0x01,
+  (byte)0xf4,
+  (byte)0x80,
+  (byte)0x80,
+  (byte)0x80, (byte)0xff, 0x3a, 0x0a, (byte)0xaa, (byte)0xf2, 0x00,
+  (byte)0xff,
+ };
+byte[] encodedBytes = new byte[] {
+  (byte)0xa1, 0x0d,
+  (byte)0xdb, 0x7f, 0x53,
+  (byte)0xd5, 0x1e,
+  (byte)0xab, 0x1f,
+  (byte)0xb2,
+  (byte)0xc2,
+  (byte)0xa2, 0x69, 0x05, 0x47, 0x76, 0x4f, 0x01,
+  (byte)0xf4,
+  (byte)0x80,
+  (byte)0x80,
+  (byte)0x80, 0x3a, 0x0a,
+  (byte)0xaa,
+  (byte)0xf2, 0x00, 0x69,
+  (byte)0xf0,
+  (byte)0xb8,
+  (byte)0xbf,
+  (byte)0xbf, 0x00, (
+  byte)0xf0, (byte)0x9d, (byte)0x84, (byte)0xa1, 0x1a, 0x00, 0x46, 0x31,
+  (byte)0xdf,
+ };
+CBORTestCommon.AssertRoundTrip(CBORObject.DecodeFromBytes(bytes));
+CBORTestCommon.AssertRoundTrip(CBORObject.DecodeFromBytes(encodedBytes));
+}
+}
+
+@Test
+public void TestRegressionTwo() {
+{
+CBOREncodeOptions options = new CBOREncodeOptions();
+byte[] bytes = new byte[] {
+  (byte)0xb8, 0x02, 0x7f, 0x7a, 0x00, 0x00, 0x00,
+  0x09,
+  (byte)0xf0,
+  (byte)0xb8,
+  (byte)0xbf,
+  (byte)0xbf, 0x00,
+  (byte)0xf0,
+  (byte)0x9d,
+  (byte)0x84,
+  (byte)0xa1,
+  (byte)0xff, 0x1a, 0x00, 0x46, 0x31,
+  (byte)0xdf, 0x7f, 0x69, 0x05, 0x47, 0x76, 0x4f, 0x01,
+  (byte)0xf4,
+  (byte)0x80,
+  (byte)0x80,
+  (byte)0x80, (byte)0xff, 0x3a, 0x0a, (byte)0xaa, (byte)0xf2, 0x00,
+ };
+byte[] encodedBytes = new byte[] {
+  (byte)0xa2, 0x69, 0x05, 0x47, 0x76, 0x4f,
+  0x01,
+  (byte)0xf4,
+  (byte)0x80,
+  (byte)0x80,
+  (byte)0x80, 0x3a, 0x0a,
+  (byte)0xaa,
+  (byte)0xf2, 0x00, 0x69,
+  (byte)0xf0,
+  (byte)0xb8,
+  (byte)0xbf,
+  (byte)0xbf, 0x00, (
+  byte)0xf0, (byte)0x9d, (byte)0x84, (byte)0xa1, 0x1a, 0x00, 0x46, 0x31,
+  (byte)0xdf,
+ };
+CBORTestCommon.AssertRoundTrip(CBORObject.DecodeFromBytes(bytes));
+CBORTestCommon.AssertRoundTrip(CBORObject.DecodeFromBytes(encodedBytes));
+}
+}
+
+@Test
+public void TestRegressionThree() {
+{
+CBOREncodeOptions options = new CBOREncodeOptions();
+byte[] bytes = new byte[] {
+  (byte)0xb8, 0x02, 0x7f, 0x7a, 0x00, 0x00, 0x00,
+  0x09,
+  (byte)0xf0,
+  (byte)0xb8,
+  (byte)0xbf,
+  (byte)0xbf, 0x00,
+  (byte)0xf0,
+  (byte)0x9d,
+  (byte)0x84,
+  (byte)0xa1,
+  (byte)0xff, 0, 0x7f, 0x69, 0x05, 0x47, 0x76, 0x4f, 0x01,
+  (byte)0xf4,
+  (byte)0x80,
+  (byte)0x80,
+  (byte)0x80, (byte)0xff, 0,
+ };
+byte[] encodedBytes = new byte[] {
+  (byte)0xa2, 0x69, 0x05, 0x47, 0x76, 0x4f,
+  0x01,
+  (byte)0xf4,
+  (byte)0x80,
+  (byte)0x80,
+  (byte)0x80, 0, 0x69,
+  (byte)0xf0,
+  (byte)0xb8, (
+  byte)0xbf, (byte)0xbf, 0x00, (byte)0xf0, (byte)0x9d, (byte)0x84,
+  (byte)0xa1, 0,
+ };
+CBORTestCommon.AssertRoundTrip(CBORObject.DecodeFromBytes(bytes));
+CBORTestCommon.AssertRoundTrip(CBORObject.DecodeFromBytes(encodedBytes));
+}
+}
+
+@Test
+public void TestStringCompareBug() {
+  CBORObject a, b, c, d;
+  byte[] bytes = new byte[] {
+    0x69, 0x05, 0x47, 0x76, 0x4f, 0x01,
+    (byte)0xf4,
+    (byte)0x80,
+    (byte)0x80,
+    (byte)0x80,
+   };
+  a = CBORObject.DecodeFromBytes(bytes);
+  c = a;
+  bytes = new byte[] {
+    0x7f, 0x69, 0x05, 0x47, 0x76, 0x4f, 0x01,
+    (byte)0xf4,
+    (byte)0x80,
+    (byte)0x80,
+    (byte)0x80, (byte)0xff,
+   };
+  b = CBORObject.DecodeFromBytes(bytes);
+  d = b;
+  TestCommon.CompareTestEqual(a, b);
+  bytes = new byte[] {
+    0x7f, 0x7a, 0x00, 0x00, 0x00, 0x09,
+    (byte)0xf0,
+    (byte)0xb8,
+    (byte)0xbf,
+    (byte)0xbf, 0x00,
+    (byte)0xf0,
+    (byte)0x9d,
+    (byte)0x84,
+    (byte)0xa1,
+    (byte)0xff,
+   };
+   a = CBORObject.DecodeFromBytes(bytes);
+   bytes = new byte[] {
+     0x7f, 0x69,
+     (byte)0xf0,
+     (byte)0xb8,
+     (byte)0xbf,
+     (byte)0xbf, 0x00,
+     (byte)0xf0,
+     (byte)0x9d,
+     (byte)0x84,
+     (byte)0xa1,
+     (byte)0xff,
+    };
+   b = CBORObject.DecodeFromBytes(bytes);
+   TestCommon.CompareTestEqual(a, b);
+ TestCommon.CompareTestLess(c, a);
+ TestCommon.CompareTestLess(c, b);
+ TestCommon.CompareTestLess(d, a);
+ TestCommon.CompareTestLess(d, b);
+ CBORObject o1 = CBORObject.NewMap();
+ o1.Add(b, CBORObject.FromObject(0));
+ o1.Add(c, CBORObject.FromObject(0));
+ CBORObject o2 = CBORObject.NewMap();
+ o2.Add(c, CBORObject.FromObject(0));
+ o2.Add(b, CBORObject.FromObject(0));
+ TestCommon.CompareTestEqual(a, b);
+}
   }