Merge remote-tracking branch 'origin/dev' into clean_9

Author: shroffk

epics-util/src/main/java/org/epics/util/array/ListUByte.java

@@ -134,9 +134,9 @@ public String toString() {
         builder.append("[");
         int i = 0;
         for (; i < size() - 1; i++) {
-            builder.append(getByte(i)).append(", ");
+            builder.append(getShort(i)).append(", ");
         }
-        builder.append(getByte(i)).append("]");
+        builder.append(getShort(i)).append("]");
         return builder.toString();
     }
 

epics-util/src/main/java/org/epics/util/array/ListUInteger.java

@@ -133,9 +133,9 @@ public String toString() {
         builder.append("[");
         int i = 0;
         for (; i < size() - 1; i++) {
-            builder.append(getInt(i)).append(", ");
+            builder.append(getLong(i)).append(", ");
         }
-        builder.append(getInt(i)).append("]");
+        builder.append(getLong(i)).append("]");
         return builder.toString();
     }
 

epics-util/src/main/java/org/epics/util/array/ListULong.java

@@ -136,9 +136,9 @@ public String toString() {
         builder.append("[");
         int i = 0;
         for (; i < size() - 1; i++) {
-            builder.append(getLong(i)).append(", ");
+            builder.append(Long.toUnsignedString(getLong(i))).append(", ");
         }
-        builder.append(getLong(i)).append("]");
+        builder.append(Long.toUnsignedString(getLong(i))).append("]");
         return builder.toString();
     }
 

epics-util/src/main/java/org/epics/util/array/ListUShort.java

@@ -134,9 +134,9 @@ public String toString() {
         builder.append("[");
         int i = 0;
         for (; i < size() - 1; i++) {
-            builder.append(getShort(i)).append(", ");
+            builder.append(getInt(i)).append(", ");
         }
-        builder.append(getShort(i)).append("]");
+        builder.append(getInt(i)).append("]");
         return builder.toString();
     }
 

epics-util/src/test/java/org/epics/util/array/ArrayByteTest.java

@@ -51,4 +51,10 @@ public void serialization1() throws Exception {
         assertThat(read, not(sameInstance(array)));
         assertThat(read, equalTo(array));
     }
+
+    @Test
+    public void toStringOverflow() {
+        ListNumber list = ArrayByte.of(new byte[] {-1, 0, 1});
+        assertThat(list.toString(), equalTo("[-1, 0, 1]"));
+    }
 }

epics-util/src/test/java/org/epics/util/array/ArrayIntegerTest.java

@@ -49,4 +49,10 @@ public void serialization1() throws Exception {
         assertThat(read, not(sameInstance(array)));
         assertThat(read, equalTo(array));
     }
+
+    @Test
+    public void toStringOverflow() {
+        ListNumber list = ArrayInteger.of(new int[] {-1, 0, 1});
+        assertThat(list.toString(), equalTo("[-1, 0, 1]"));
+    }
 }

epics-util/src/test/java/org/epics/util/array/ArrayLongTest.java

@@ -51,4 +51,10 @@ public void serialization1() throws Exception {
         assertThat(read, not(sameInstance(array)));
         assertThat(read, equalTo(array));
     }
+
+    @Test
+    public void toStringOverflow() {
+        ListNumber list = ArrayLong.of(new long[] {-1, 0, 1});
+        assertThat(list.toString(), equalTo("[-1, 0, 1]"));
+    }
 }

epics-util/src/test/java/org/epics/util/array/ArrayShortTest.java

@@ -51,4 +51,10 @@ public void serialization1() throws Exception {
         assertThat(read, not(sameInstance(array)));
         assertThat(read, equalTo(array));
     }
+
+    @Test
+    public void toStringOverflow() {
+        ListNumber list = ArrayShort.of(new short[] {-1, 0, 1});
+        assertThat(list.toString(), equalTo("[-1, 0, 1]"));
+    }
 }

epics-util/src/test/java/org/epics/util/array/ArrayUByteTest.java

@@ -51,4 +51,10 @@ public void serialization1() throws Exception {
         assertThat(read, not(sameInstance(array)));
         assertThat(read, equalTo(array));
     }
+
+    @Test
+    public void toStringOverflow() {
+        ListNumber list = ArrayUByte.of(new byte[] {-1, 0, 1});
+        assertThat(list.toString(), equalTo("[255, 0, 1]"));
+    }
 }

epics-util/src/test/java/org/epics/util/array/ArrayUIntegerTest.java

@@ -49,4 +49,10 @@ public void serialization1() throws Exception {
         assertThat(read, not(sameInstance(array)));
         assertThat(read, equalTo(array));
     }
+
+    @Test
+    public void toStringOverflow() {
+        ListNumber list = ArrayUInteger.of(new int[] {-1, 0, 1});
+        assertThat(list.toString(), equalTo("[4294967295, 0, 1]"));
+    }
 }