refactor KVP#toString;

add test cases;
esaulpaugh · Jun 5, 2024 · cfea774 · cfea774
1 parent 3db9c78
commit cfea774
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/src/main/java/com/esaulpaugh/headlong/rlp/KVP.java b/src/main/java/com/esaulpaugh/headlong/rlp/KVP.java
@@ -112,10 +112,13 @@ public String toString() {
         sb.append('[');
         final Iterator<RLPItem> iter = value.asRLPList().iterator();
         if (iter.hasNext()) {
-            sb.append('"').append(iter.next().asString(ASCII)).append('"');
-        }
-        while (iter.hasNext()) {
-            sb.append(", ").append('"').append(iter.next().asString(ASCII)).append('"');
+            for (;;) {
+                sb.append('"').append(iter.next().asString(ASCII)).append('"');
+                if (!iter.hasNext()) {
+                    break;
+                }
+                sb.append(", ");
+            }
         }
         return sb.append(']').toString();
     }

diff --git a/src/test/java/com/esaulpaugh/headlong/rlp/EIP778Test.java b/src/test/java/com/esaulpaugh/headlong/rlp/EIP778Test.java
@@ -472,4 +472,10 @@ public void testOutOfOrder() throws Throwable {
                 "key out of order",
                 () -> Record.parse(enr, VERIFIER));
     }
+
+    @Test
+    public void testToString() {
+        assertEquals("key0 --> 76616c756530", new KVP("key0", "value0", ASCII).toString());
+        assertEquals("key1 --> [\"dd\", \"\"]", new KVP("key1", RLPDecoder.RLP_STRICT.wrapBits(0xc482646480L)).toString());
+    }
 }