diff --git a/src/main/java/me/mrletsplay/shareclientcore/document/SharedDocument.java b/src/main/java/me/mrletsplay/shareclientcore/document/SharedDocument.java index e4d901a..f059630 100644 --- a/src/main/java/me/mrletsplay/shareclientcore/document/SharedDocument.java +++ b/src/main/java/me/mrletsplay/shareclientcore/document/SharedDocument.java @@ -53,8 +53,6 @@ public class SharedDocument implements MessageListener { Change[] changes = new Change[bytes.length]; for(int i = 0; i < bytes.length; i++) { -// System.out.println(charBefore); -// System.out.println(charAfter); Identifier[] newPos = Util.generatePositionBetween(charBefore.position(), charAfter.position(), site); lamport++; Char ch = new Char(newPos, lamport, bytes[i]); @@ -63,11 +61,6 @@ public class SharedDocument implements MessageListener { charBefore = ch; } -// System.out.println("!! New changes:"); -// for(Change c : changes) { -// System.out.println(c); -// } - return changes; } diff --git a/src/main/java/me/mrletsplay/shareclientcore/document/Util.java b/src/main/java/me/mrletsplay/shareclientcore/document/Util.java index ea2e84d..7bd6659 100644 --- a/src/main/java/me/mrletsplay/shareclientcore/document/Util.java +++ b/src/main/java/me/mrletsplay/shareclientcore/document/Util.java @@ -30,7 +30,6 @@ public class Util { System.err.println("Got invalid positions"); System.err.println(Arrays.toString(before)); System.err.println(Arrays.toString(after)); - Thread.dumpStack(); throw new IllegalArgumentException("before must be strictly less than after"); } diff --git a/src/test/java/me/mrletsplay/shareclientcore/DecimalTest.java b/src/test/java/me/mrletsplay/shareclientcore/DecimalTest.java index cdb221e..b153012 100644 --- a/src/test/java/me/mrletsplay/shareclientcore/DecimalTest.java +++ b/src/test/java/me/mrletsplay/shareclientcore/DecimalTest.java @@ -3,8 +3,6 @@ package me.mrletsplay.shareclientcore; import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -import java.util.Arrays; - import org.junit.jupiter.api.Test; import me.mrletsplay.shareclientcore.document.Identifier; @@ -121,7 +119,7 @@ public class DecimalTest { Identifier[] a = { new Identifier(1, 0), new Identifier(2, 1) }; Identifier[] b = { new Identifier(1, 0), new Identifier(2, 2) }; Identifier[] newIdent = Util.generatePositionBetween(a, b, 3); - Identifier[] expected = { new Identifier(1, 0), new Identifier(2, 1), new Identifier(1, 3) }; + Identifier[] expected = { new Identifier(1, 0), new Identifier(2, 1), new Identifier(0, 3), new Identifier(1, 3) }; assertArrayEquals(expected, newIdent); } @@ -145,8 +143,9 @@ public class DecimalTest { public void testGeneratePositionEdgeCase1() { Identifier[] a = { new Identifier(3, 0), new Identifier(1, 1) }; Identifier[] b = { new Identifier(3, 1) }; - Identifier[] sus = Util.generatePositionBetween(a, b, 1); - System.out.println(Arrays.toString(sus)); + Identifier[] newIdent = Util.generatePositionBetween(a, b, 1); + Identifier[] expected = { new Identifier(3, 0), new Identifier(1, 1), new Identifier(1, 1) }; + assertArrayEquals(expected, newIdent); } } diff --git a/src/test/java/me/mrletsplay/shareclientcore/SharingTest.java b/src/test/java/me/mrletsplay/shareclientcore/SharingTest.java index 350c73e..6aa70cb 100644 --- a/src/test/java/me/mrletsplay/shareclientcore/SharingTest.java +++ b/src/test/java/me/mrletsplay/shareclientcore/SharingTest.java @@ -53,12 +53,10 @@ public class SharingTest { private void performRandomEdit(Random r, SharedDocument document) { if(document.getContents().length == 0 || r.nextBoolean()) { -// System.out.println("INSERT"); char[] insert = new char[r.nextInt(16)]; for(int j = 0; j < insert.length; j++) insert[j] = CHARS.charAt(r.nextInt(CHARS.length())); document.localInsert(r.nextInt(document.getContents().length + 1), String.valueOf(insert)); }else { -// System.out.println("DELETE"); int len = document.getContents().length; int idx = r.nextInt(len); int n = r.nextInt(Math.min(16, len - idx)) + 1; @@ -83,9 +81,6 @@ public class SharingTest { Random r = new Random(0); for(int i = 0; i < 10_000; i++) { performRandomEdit(r, r.nextBoolean() ? sharedA : sharedB); - -// System.out.println("A: " + sharedA.getContentsAsString()); -// System.out.println("B: " + sharedB.getContentsAsString()); assertEquals(sharedA.getContentsAsString(), sharedB.getContentsAsString()); } } @@ -109,22 +104,17 @@ public class SharingTest { Random r = new Random(2); for(int i = 0; i < 1000; i++) { -// System.out.println(i); - // Perform some random edits for(int j = 0; j < 100; j++) { boolean bEdit = r.nextBoolean(); -// System.out.println(bEdit ? "B EDIT" : "A EDIT"); performRandomEdit(r, bEdit ? sharedA : sharedB); } // Randomly interleave messages while(!messagesA.isEmpty() || !messagesB.isEmpty()) { if(messagesB.isEmpty() || (!messagesA.isEmpty() && r.nextBoolean())) { -// System.out.println("A -> B: " + messagesA.get(0)); b.receive(messagesA.remove(0)); }else { -// System.out.println("B -> A: " + messagesB.get(0)); a.receive(messagesB.remove(0)); } }