Java/Packets: Fix some IO issues.

And add more tests.

Author: e3ndr

java/packets/pom.xml

@@ -23,7 +23,7 @@
 		<dependency>
 			<groupId>co.casterlabs.commons</groupId>
 			<artifactId>io</artifactId>
-			<version>082a719</version>
+			<version>3f8687d</version>
 			<scope>compile</scope>
 		</dependency>
 

java/packets/src/main/java/co/casterlabs/flux/packets/protocols/bytes/_Marshall.java

@@ -6,30 +6,30 @@
 import co.casterlabs.commons.io.bytes.writing.ByteWriter;
 import co.casterlabs.flux.packets.Packet;
 
-interface _Marshall<T extends Packet> {
+public interface _Marshall<T extends Packet> {
 
     public T read(ByteReader reader) throws IOException;
 
     public void write(T packet, ByteWriter writer) throws IOException;
 
     public long sizeOf(T packet);
 
-    static void varstr16(ByteWriter writer, byte[] bytes) throws IOException {
+    public static void varstr16(ByteWriter writer, byte[] bytes) throws IOException {
         writer.be.u16(bytes.length);
         writer.write(bytes);
     }
 
-    static void varstr31(ByteWriter writer, byte[] bytes) throws IOException {
-        writer.be.s32(bytes.length);
-        writer.write(bytes);
+    public static byte[] varstr16(ByteReader reader) throws IOException {
+        int length = reader.be.u16() & 0xFFFF;
+        return reader.read(length);
     }
 
-    static byte[] varstr16(ByteReader reader) throws IOException {
-        int length = reader.be.u16();
-        return reader.read(length);
+    public static void varstr31(ByteWriter writer, byte[] bytes) throws IOException {
+        writer.be.s32(bytes.length);
+        writer.write(bytes);
     }
 
-    static byte[] varstr31(ByteReader reader) throws IOException {
+    public static byte[] varstr31(ByteReader reader) throws IOException {
         int length = reader.be.s32();
         return reader.read(length);
     }

java/packets/src/test/java/co/casterlabs/flux/test/packets/TestBinaryWire.java

@@ -3,6 +3,8 @@
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.util.concurrent.ThreadLocalRandom;
+
 import org.junit.jupiter.api.Test;
 
 import co.casterlabs.commons.io.bytes.reading.ArrayByteReader;
@@ -88,7 +90,11 @@ public void message_string() throws WireProtocolException {
     public void message_binary() throws WireProtocolException {
         UserID from = UserID.random();
         TubeID tube = new TubeID("example");
-        Message<byte[]> message = new Message<>("abcdefghijklmnopqrstuvwxyz".getBytes());
+
+        byte[] bytes = new byte[128];
+        ThreadLocalRandom.current().nextBytes(bytes);
+
+        Message<byte[]> message = new Message<>(bytes);
 
         test(new PacketMessage(tube, from, message));
     }
@@ -104,7 +110,11 @@ public void publish_string() throws WireProtocolException {
     @Test
     public void publish_binary() throws WireProtocolException {
         TubeID tube = new TubeID("example");
-        Message<byte[]> message = new Message<>("abcdefghijklmnopqrstuvwxyz".getBytes());
+
+        byte[] bytes = new byte[128];
+        ThreadLocalRandom.current().nextBytes(bytes);
+
+        Message<byte[]> message = new Message<>(bytes);
 
         test(new PacketPublish(tube, message));
     }
@@ -134,7 +144,7 @@ private static void test(Packet source) throws WireProtocolException {
         PROTOCOL.serialize(copy, writer2);
 
         assertEquals(writer.buffer().length, writer2.buffer().length, "byte len");
-        assertEquals(writer.buffer().length, PROTOCOL.sizeOf(source), "sizeof");
+        assertEquals(PROTOCOL.sizeOf(source), writer.buffer().length, "sizeof");
         assertArrayEquals(writer.buffer(), writer2.buffer(), "sane");
         assertEquals(source, copy, "equals");
     }

java/packets/src/test/java/co/casterlabs/flux/test/packets/TestJsonWire.java

@@ -2,6 +2,8 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.util.concurrent.ThreadLocalRandom;
+
 import org.junit.jupiter.api.Test;
 
 import co.casterlabs.flux.packets.Packet;
@@ -85,7 +87,11 @@ public void message_string() throws WireProtocolException {
     public void message_binary() throws WireProtocolException {
         UserID from = UserID.random();
         TubeID tube = new TubeID("example");
-        Message<byte[]> message = new Message<>("abcdefghijklmnopqrstuvwxyz".getBytes());
+
+        byte[] bytes = new byte[128];
+        ThreadLocalRandom.current().nextBytes(bytes);
+
+        Message<byte[]> message = new Message<>(bytes);
 
         test(new PacketMessage(tube, from, message));
     }
@@ -101,7 +107,11 @@ public void publish_string() throws WireProtocolException {
     @Test
     public void publish_binary() throws WireProtocolException {
         TubeID tube = new TubeID("example");
-        Message<byte[]> message = new Message<>("abcdefghijklmnopqrstuvwxyz".getBytes());
+
+        byte[] bytes = new byte[128];
+        ThreadLocalRandom.current().nextBytes(bytes);
+
+        Message<byte[]> message = new Message<>(bytes);
 
         test(new PacketPublish(tube, message));
     }

java/packets/src/test/java/co/casterlabs/flux/test/packets/TestMarshall.java

@@ -0,0 +1,45 @@
+package co.casterlabs.flux.test.packets;
+
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+
+import java.io.IOException;
+import java.util.concurrent.ThreadLocalRandom;
+
+import org.junit.jupiter.api.Test;
+
+import co.casterlabs.commons.io.bytes.reading.ArrayByteReader;
+import co.casterlabs.commons.io.bytes.reading.ByteReader;
+import co.casterlabs.commons.io.bytes.writing.ArrayByteWriter;
+import co.casterlabs.flux.packets.protocols.bytes._Marshall;
+
+public class TestMarshall {
+
+    @Test
+    public void varstr16() throws IOException {
+        byte[] bytes = new byte[128];
+        ThreadLocalRandom.current().nextBytes(bytes);
+
+        ArrayByteWriter writer = new ArrayByteWriter(0);
+        _Marshall.varstr16(writer, bytes);
+
+        ByteReader reader = new ArrayByteReader(writer.buffer());
+        byte[] copy = _Marshall.varstr16(reader);
+
+        assertArrayEquals(bytes, copy, "sane");
+    }
+
+    @Test
+    public void varstr31() throws IOException {
+        byte[] bytes = new byte[128];
+        ThreadLocalRandom.current().nextBytes(bytes);
+
+        ArrayByteWriter writer = new ArrayByteWriter(0);
+        _Marshall.varstr31(writer, bytes);
+
+        ByteReader reader = new ArrayByteReader(writer.buffer());
+        byte[] copy = _Marshall.varstr31(reader);
+
+        assertArrayEquals(bytes, copy, "sane");
+    }
+
+}