diff --git a/protocol/src/test/java/mc/protocol/buffer/NetByteBufReadTest.java b/protocol/src/test/java/mc/protocol/buffer/NetByteBufReadTest.java index 1fe676a..839e9b1 100644 --- a/protocol/src/test/java/mc/protocol/buffer/NetByteBufReadTest.java +++ b/protocol/src/test/java/mc/protocol/buffer/NetByteBufReadTest.java @@ -1,6 +1,7 @@ package mc.protocol.buffer; import io.netty.buffer.Unpooled; +import mc.protocol.pool.UnpooledNetByteBuf; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -33,7 +34,7 @@ class NetByteBufReadTest { void readBoolean(byte sourceByte, boolean expectedValue) { baos.write(sourceByte); - NetByteBuf netByteBuf = new NetByteBuf(Unpooled.wrappedBuffer(baos.toByteArray())); + NetByteBuf netByteBuf = new UnpooledNetByteBuf(Unpooled.wrappedBuffer(baos.toByteArray())); assertEquals(expectedValue, netByteBuf.readBoolean()); } @@ -44,7 +45,7 @@ class NetByteBufReadTest { random.nextBytes(bytes); baos.write(bytes[0]); - NetByteBuf netByteBuf = new NetByteBuf(Unpooled.wrappedBuffer(baos.toByteArray())); + NetByteBuf netByteBuf = new UnpooledNetByteBuf(Unpooled.wrappedBuffer(baos.toByteArray())); assertEquals(bytes[0], netByteBuf.readByte()); } @@ -54,7 +55,7 @@ class NetByteBufReadTest { void readUnsignedByte(byte sourceByte, int expectedValue) { baos.write(sourceByte); - NetByteBuf netByteBuf = new NetByteBuf(Unpooled.wrappedBuffer(baos.toByteArray())); + NetByteBuf netByteBuf = new UnpooledNetByteBuf(Unpooled.wrappedBuffer(baos.toByteArray())); assertEquals(expectedValue, netByteBuf.readUnsignedByte()); } @@ -64,7 +65,7 @@ class NetByteBufReadTest { int value = Integer.valueOf(random.nextInt()).shortValue(); new DataOutputStream(baos).writeShort(value); - NetByteBuf netByteBuf = new NetByteBuf(Unpooled.wrappedBuffer(baos.toByteArray())); + NetByteBuf netByteBuf = new UnpooledNetByteBuf(Unpooled.wrappedBuffer(baos.toByteArray())); assertEquals(value, netByteBuf.readShort()); } @@ -74,7 +75,7 @@ class NetByteBufReadTest { int value = 32768; new DataOutputStream(baos).writeShort(value); - NetByteBuf netByteBuf = new NetByteBuf(Unpooled.wrappedBuffer(baos.toByteArray())); + NetByteBuf netByteBuf = new UnpooledNetByteBuf(Unpooled.wrappedBuffer(baos.toByteArray())); assertEquals(value, netByteBuf.readUnsignedShort()); } @@ -89,7 +90,7 @@ class NetByteBufReadTest { baos.write(bytes); - NetByteBuf netByteBuf = new NetByteBuf(Unpooled.wrappedBuffer(baos.toByteArray())); + NetByteBuf netByteBuf = new UnpooledNetByteBuf(Unpooled.wrappedBuffer(baos.toByteArray())); assertEquals(string, netByteBuf.readString()); } @@ -105,7 +106,7 @@ class NetByteBufReadTest { baos.write(bytes); - NetByteBuf netByteBuf = new NetByteBuf(Unpooled.wrappedBuffer(baos.toByteArray())); + NetByteBuf netByteBuf = new UnpooledNetByteBuf(Unpooled.wrappedBuffer(baos.toByteArray())); assertThrows(NetIOException.class, () -> netByteBuf.readString(length)); } @@ -124,7 +125,7 @@ class NetByteBufReadTest { baos.write(bytes); - NetByteBuf netByteBuf = new NetByteBuf(Unpooled.wrappedBuffer(baos.toByteArray())); + NetByteBuf netByteBuf = new UnpooledNetByteBuf(Unpooled.wrappedBuffer(baos.toByteArray())); assertThrows(NetIOException.class, () -> netByteBuf.readString(-1)); } @@ -134,7 +135,7 @@ class NetByteBufReadTest { void readVarInt(byte[] sourceBytes, int expectedValue) throws IOException { baos.write(sourceBytes); - NetByteBuf netByteBuf = new NetByteBuf(Unpooled.wrappedBuffer(baos.toByteArray())); + NetByteBuf netByteBuf = new UnpooledNetByteBuf(Unpooled.wrappedBuffer(baos.toByteArray())); assertEquals(expectedValue, netByteBuf.readVarInt()); } @@ -143,7 +144,7 @@ class NetByteBufReadTest { void readVarInt_tooBig() throws IOException { baos.write(new byte[]{ (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0x0F }); - NetByteBuf netByteBuf = new NetByteBuf(Unpooled.wrappedBuffer(baos.toByteArray())); + NetByteBuf netByteBuf = new UnpooledNetByteBuf(Unpooled.wrappedBuffer(baos.toByteArray())); assertEquals(-1, netByteBuf.readVarInt()); } @@ -153,7 +154,7 @@ class NetByteBufReadTest { void readVarLong(byte[] sourceBytes, long expectedValue) throws IOException { baos.write(sourceBytes); - NetByteBuf netByteBuf = new NetByteBuf(Unpooled.wrappedBuffer(baos.toByteArray())); + NetByteBuf netByteBuf = new UnpooledNetByteBuf(Unpooled.wrappedBuffer(baos.toByteArray())); assertEquals(expectedValue, netByteBuf.readVarLong()); } @@ -164,7 +165,7 @@ class NetByteBufReadTest { (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0x0F }); - NetByteBuf netByteBuf = new NetByteBuf(Unpooled.wrappedBuffer(baos.toByteArray())); + NetByteBuf netByteBuf = new UnpooledNetByteBuf(Unpooled.wrappedBuffer(baos.toByteArray())); assertEquals(-1, netByteBuf.readVarLong()); } @@ -196,7 +197,7 @@ class NetByteBufReadTest { (byte) (leastSignificantBits & 0xFF) }); - NetByteBuf netByteBuf = new NetByteBuf(Unpooled.wrappedBuffer(baos.toByteArray())); + NetByteBuf netByteBuf = new UnpooledNetByteBuf(Unpooled.wrappedBuffer(baos.toByteArray())); assertEquals(uuid, netByteBuf.readUUID()); } @@ -208,7 +209,7 @@ class NetByteBufReadTest { baos.write(bytes); byte[] actualBytes = new byte[128]; - NetByteBuf netByteBuf = new NetByteBuf(Unpooled.wrappedBuffer(baos.toByteArray())); + NetByteBuf netByteBuf = new UnpooledNetByteBuf(Unpooled.wrappedBuffer(baos.toByteArray())); assertEquals(bytes.length, netByteBuf.readableBytes()); @@ -225,7 +226,7 @@ class NetByteBufReadTest { baos.write(bytes); byte[] buff = new byte[128]; - NetByteBuf netByteBuf = new NetByteBuf(Unpooled.wrappedBuffer(baos.toByteArray())); + NetByteBuf netByteBuf = new UnpooledNetByteBuf(Unpooled.wrappedBuffer(baos.toByteArray())); netByteBuf.readBytes(buff, 3, 11); byte[] expectedBytes = new byte[11]; diff --git a/protocol/src/test/java/mc/protocol/buffer/NetByteBufWriteTest.java b/protocol/src/test/java/mc/protocol/buffer/NetByteBufWriteTest.java index c1c101d..a94709d 100644 --- a/protocol/src/test/java/mc/protocol/buffer/NetByteBufWriteTest.java +++ b/protocol/src/test/java/mc/protocol/buffer/NetByteBufWriteTest.java @@ -2,6 +2,7 @@ package mc.protocol.buffer; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; +import mc.protocol.pool.UnpooledNetByteBuf; import org.apache.commons.lang3.RandomStringUtils; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; @@ -30,7 +31,7 @@ class NetByteBufWriteTest { @MethodSource("paramsWriteBoolean") void writeBoolean(boolean sourceValue, byte expectedByte) { ByteBuf byteBuf = Unpooled.buffer(); - NetByteBuf netByteBuf = new NetByteBuf(byteBuf); + NetByteBuf netByteBuf = new UnpooledNetByteBuf(byteBuf); netByteBuf.writeBoolean(sourceValue); @@ -41,7 +42,7 @@ class NetByteBufWriteTest { @MethodSource("paramsWriteByte") void writeByte(byte sourceValue, byte expectedByte) { ByteBuf byteBuf = Unpooled.buffer(); - NetByteBuf netByteBuf = new NetByteBuf(byteBuf); + NetByteBuf netByteBuf = new UnpooledNetByteBuf(byteBuf); netByteBuf.writeByte(sourceValue); @@ -51,7 +52,7 @@ class NetByteBufWriteTest { @Test void writeUnsignedByte() { ByteBuf byteBuf = Unpooled.buffer(); - NetByteBuf netByteBuf = new NetByteBuf(byteBuf); + NetByteBuf netByteBuf = new UnpooledNetByteBuf(byteBuf); netByteBuf.writeUnsignedByte(129); @@ -62,7 +63,7 @@ class NetByteBufWriteTest { @MethodSource("paramsWriteString") void writeString(String string, int exceptedLength) { ByteBuf byteBuf = Unpooled.buffer(); - NetByteBuf netByteBuf = new NetByteBuf(byteBuf); + NetByteBuf netByteBuf = new UnpooledNetByteBuf(byteBuf); netByteBuf.writeString(string); @@ -81,11 +82,11 @@ class NetByteBufWriteTest { String overSizeString = RandomStringUtils.randomAscii(Short.MAX_VALUE + Short.MAX_VALUE); ByteBuf byteBuf = Unpooled.buffer(); - NetByteBuf netByteBuf = new NetByteBuf(byteBuf); + NetByteBuf netByteBuf = new UnpooledNetByteBuf(byteBuf); netByteBuf.writeString(overSizeString); - NetByteBuf netByteBuf2 = new NetByteBuf(byteBuf.copy()); + NetByteBuf netByteBuf2 = new UnpooledNetByteBuf(byteBuf.copy()); String actualString = netByteBuf2.readString(); String expectedString = overSizeString.substring(0, Short.MAX_VALUE); @@ -97,7 +98,7 @@ class NetByteBufWriteTest { @MethodSource("paramsWriteVarInt") void writeVarInt(int sourceValue, byte[] expectedBytes) { ByteBuf byteBuf = Unpooled.buffer(); - NetByteBuf netByteBuf = new NetByteBuf(byteBuf); + NetByteBuf netByteBuf = new UnpooledNetByteBuf(byteBuf); netByteBuf.writeVarInt(sourceValue); byte[] actualArray = netByteBuf.copy(0, netByteBuf.readableBytes()).array(); @@ -109,7 +110,7 @@ class NetByteBufWriteTest { @MethodSource({ "paramsWriteVarInt", "paramsWriteVarLong" }) void writeVarLong(long sourceValue, byte[] expectedBytes) { ByteBuf byteBuf = Unpooled.buffer(); - NetByteBuf netByteBuf = new NetByteBuf(byteBuf); + NetByteBuf netByteBuf = new UnpooledNetByteBuf(byteBuf); netByteBuf.writeVarLong(sourceValue); byte[] actualArray = netByteBuf.copy(0, netByteBuf.readableBytes()).array(); @@ -122,7 +123,7 @@ class NetByteBufWriteTest { final UUID uuid = UUID.randomUUID(); ByteBuf byteBuf = Unpooled.buffer(); - NetByteBuf netByteBuf = new NetByteBuf(byteBuf); + NetByteBuf netByteBuf = new UnpooledNetByteBuf(byteBuf); netByteBuf.writeUUID(uuid); @@ -158,7 +159,7 @@ class NetByteBufWriteTest { random.nextBytes(bytes); ByteBuf byteBuf = Unpooled.buffer(); - NetByteBuf netByteBuf = new NetByteBuf(byteBuf); + NetByteBuf netByteBuf = new UnpooledNetByteBuf(byteBuf); netByteBuf.writeBytes(bytes); byte[] actualArray = netByteBuf.copy(0, netByteBuf.readableBytes()).array(); @@ -172,7 +173,7 @@ class NetByteBufWriteTest { random.nextBytes(bytes); ByteBuf byteBuf = Unpooled.buffer(); - NetByteBuf netByteBuf = new NetByteBuf(byteBuf); + NetByteBuf netByteBuf = new UnpooledNetByteBuf(byteBuf); netByteBuf.writeBytes(bytes, 3, 11);