From f5c8d93657803bd5482a3c56f84037e1c1bccdfc Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Sun, 7 Oct 2018 22:24:13 +0300 Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=B8=D0=BC=D0=B5?= =?UTF-8?q?=D0=BD=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D1=82=D0=B5=D1=81?= =?UTF-8?q?=D1=82=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...tityLocation.java => EntityLocationTest.java} | 8 ++++---- ...ion.java => ImmutableEntityLocationTest.java} | 6 +++--- .../{SpringConfig.java => TestSpringConfig.java} | 2 +- .../core/text/{TestText.java => TextTest.java} | 8 ++++---- ...actedCoords.java => CompactedCoordsTest.java} | 4 ++-- .../block/BlockLocationTest.java} | 9 ++++----- ...ayerManager.java => H2PlayerManagerTest.java} | 16 ++++++++-------- .../{TestH2Player.java => H2PlayerTest.java} | 4 ++-- ...eam.java => ByteArrayInputNetStreamTest.java} | 8 ++++---- ...kdataPacket.java => ChunkdataPacketTest.java} | 6 +++--- ...acket.java => PlayerAbilitiesPacketTest.java} | 4 ++-- ...zer.java => BlockLocationSerializerTest.java} | 4 ++-- 12 files changed, 39 insertions(+), 40 deletions(-) rename core/src/test/java/mc/core/{TestEntityLocation.java => EntityLocationTest.java} (96%) rename core/src/test/java/mc/core/{TestImmutableEntityLocation.java => ImmutableEntityLocationTest.java} (90%) rename core/src/test/java/mc/core/{SpringConfig.java => TestSpringConfig.java} (96%) rename core/src/test/java/mc/core/text/{TestText.java => TextTest.java} (97%) rename core/src/test/java/mc/core/utils/{TestCompactedCoords.java => CompactedCoordsTest.java} (92%) rename core/src/test/java/mc/core/{TestBlockLocation.java => world/block/BlockLocationTest.java} (88%) rename h2_playermanager/src/test/java/mc/core/h2db/{TestH2PlayerManager.java => H2PlayerManagerTest.java} (95%) rename h2_playermanager/src/test/java/mc/core/h2db/{TestH2Player.java => H2PlayerTest.java} (94%) rename proto_1.12.2/src/test/java/mc/core/network/proto_1_12_2/packets/{TestByteArrayInputNetStream.java => ByteArrayInputNetStreamTest.java} (92%) rename proto_1.12.2/src/test/java/mc/core/network/proto_1_12_2/packets/{TestChunkdataPacket.java => ChunkdataPacketTest.java} (96%) rename proto_1.12.2/src/test/java/mc/core/network/proto_1_12_2/packets/{TestPlayerAbilitiesPacket.java => PlayerAbilitiesPacketTest.java} (96%) rename proto_1.12.2/src/test/java/mc/core/network/proto_1_12_2/serializers/{TestBlockLocationSerializer.java => BlockLocationSerializerTest.java} (93%) diff --git a/core/src/test/java/mc/core/TestEntityLocation.java b/core/src/test/java/mc/core/EntityLocationTest.java similarity index 96% rename from core/src/test/java/mc/core/TestEntityLocation.java rename to core/src/test/java/mc/core/EntityLocationTest.java index 9a45675..052e8a6 100644 --- a/core/src/test/java/mc/core/TestEntityLocation.java +++ b/core/src/test/java/mc/core/EntityLocationTest.java @@ -8,7 +8,7 @@ import java.util.concurrent.ThreadLocalRandom; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; -class TestEntityLocation { +class EntityLocationTest { private static final ThreadLocalRandom rnd = ThreadLocalRandom.current(); private static final double minD = 0.0d, maxD = 10.0d; private static final float minF = 0.0f, maxF = 359.9f; @@ -25,7 +25,7 @@ class TestEntityLocation { } @Test - void testEquals() { + void equals_() { EntityLocation loc1 = new EntityLocation(x, y, z, yaw, pitch); EntityLocation loc2 = new EntityLocation(x, y, z, yaw, pitch); assertEquals(loc1, loc2); @@ -38,14 +38,14 @@ class TestEntityLocation { } @Test - void testClone() { + void clone_() { EntityLocation locOrig = new EntityLocation(x, y, z, yaw, pitch); EntityLocation locClone = locOrig.clone(); assertEquals(locOrig, locClone); } @Test - void testGetBlockXZ() { + void getBlockXZ() { EntityLocation location; location = new EntityLocation(0d, 0, 0d, 0f, 0f); diff --git a/core/src/test/java/mc/core/TestImmutableEntityLocation.java b/core/src/test/java/mc/core/ImmutableEntityLocationTest.java similarity index 90% rename from core/src/test/java/mc/core/TestImmutableEntityLocation.java rename to core/src/test/java/mc/core/ImmutableEntityLocationTest.java index 85cf4a9..0335538 100644 --- a/core/src/test/java/mc/core/TestImmutableEntityLocation.java +++ b/core/src/test/java/mc/core/ImmutableEntityLocationTest.java @@ -5,10 +5,10 @@ import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -class TestImmutableEntityLocation { +class ImmutableEntityLocationTest { @Test - void testSetValue() { + void setValue() { EntityLocation location = new ImmutableEntityLocation(1d, 2d, 3d, 4f, 5f); assertThrows(UnsupportedOperationException.class, () -> { @@ -24,7 +24,7 @@ class TestImmutableEntityLocation { } @Test - void testClone() { + void clone_() { EntityLocation locOrig = new ImmutableEntityLocation(1d, 2d, 3d, 4f, 5f); EntityLocation locClone = locOrig.clone(); diff --git a/core/src/test/java/mc/core/SpringConfig.java b/core/src/test/java/mc/core/TestSpringConfig.java similarity index 96% rename from core/src/test/java/mc/core/SpringConfig.java rename to core/src/test/java/mc/core/TestSpringConfig.java index 9484ce9..34dc1de 100644 --- a/core/src/test/java/mc/core/SpringConfig.java +++ b/core/src/test/java/mc/core/TestSpringConfig.java @@ -10,7 +10,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @Configuration -public class SpringConfig { +public class TestSpringConfig { @Bean() public World simpleMockWorld() { return mock(World.class); diff --git a/core/src/test/java/mc/core/text/TestText.java b/core/src/test/java/mc/core/text/TextTest.java similarity index 97% rename from core/src/test/java/mc/core/text/TestText.java rename to core/src/test/java/mc/core/text/TextTest.java index 4b90e29..fbb417b 100644 --- a/core/src/test/java/mc/core/text/TestText.java +++ b/core/src/test/java/mc/core/text/TextTest.java @@ -4,9 +4,9 @@ import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*; -class TestText { +class TextTest { @Test - void testToPlain() { + void toPlain() { final String m1 = "mes"; final String m2 = "sage"; final String message = m1 + m2; @@ -26,7 +26,7 @@ class TestText { } @Test - void testEquals() { + void equals_() { assertEquals(Text.of(), Text.of("")); assertEquals(Text.of(), Text.builder().build()); assertEquals(Text.of(), Text.builder("").build()); @@ -44,7 +44,7 @@ class TestText { } @Test - void testEmpty() { + void isEmpty() { assertTrue(Text.of().isEmpty()); assertTrue(Text.of((String) null).isEmpty()); assertTrue(Text.of((Text) null).isEmpty()); diff --git a/core/src/test/java/mc/core/utils/TestCompactedCoords.java b/core/src/test/java/mc/core/utils/CompactedCoordsTest.java similarity index 92% rename from core/src/test/java/mc/core/utils/TestCompactedCoords.java rename to core/src/test/java/mc/core/utils/CompactedCoordsTest.java index 7c82efb..f88443e 100644 --- a/core/src/test/java/mc/core/utils/TestCompactedCoords.java +++ b/core/src/test/java/mc/core/utils/CompactedCoordsTest.java @@ -6,9 +6,9 @@ import java.util.concurrent.ThreadLocalRandom; import static org.junit.jupiter.api.Assertions.assertEquals; -class TestCompactedCoords { +class CompactedCoordsTest { @Test - void testXZ() { + void compressXZ() { ThreadLocalRandom random = ThreadLocalRandom.current(); for (int i = 0; i < 100; i++) { diff --git a/core/src/test/java/mc/core/TestBlockLocation.java b/core/src/test/java/mc/core/world/block/BlockLocationTest.java similarity index 88% rename from core/src/test/java/mc/core/TestBlockLocation.java rename to core/src/test/java/mc/core/world/block/BlockLocationTest.java index 559d434..d716995 100644 --- a/core/src/test/java/mc/core/TestBlockLocation.java +++ b/core/src/test/java/mc/core/world/block/BlockLocationTest.java @@ -1,6 +1,5 @@ -package mc.core; +package mc.core.world.block; -import mc.core.world.block.BlockLocation; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -9,7 +8,7 @@ import java.util.concurrent.ThreadLocalRandom; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; -class TestBlockLocation { +class BlockLocationTest { private static final ThreadLocalRandom rnd = ThreadLocalRandom.current(); private static final int minI = 0, maxI = 10; private int x, y, z; @@ -22,7 +21,7 @@ class TestBlockLocation { } @Test - void testEquals() { + void equals_() { BlockLocation loc1 = new BlockLocation(x, y, z); BlockLocation loc2 = new BlockLocation(x, y, z); assertEquals(loc1, loc2); @@ -32,7 +31,7 @@ class TestBlockLocation { } @Test - void testClone() { + void clone_() { BlockLocation locOrig = new BlockLocation(x, y, z); BlockLocation locClone = locOrig.clone(); assertEquals(locOrig, locClone); diff --git a/h2_playermanager/src/test/java/mc/core/h2db/TestH2PlayerManager.java b/h2_playermanager/src/test/java/mc/core/h2db/H2PlayerManagerTest.java similarity index 95% rename from h2_playermanager/src/test/java/mc/core/h2db/TestH2PlayerManager.java rename to h2_playermanager/src/test/java/mc/core/h2db/H2PlayerManagerTest.java index c8fdf48..dd25625 100644 --- a/h2_playermanager/src/test/java/mc/core/h2db/TestH2PlayerManager.java +++ b/h2_playermanager/src/test/java/mc/core/h2db/H2PlayerManagerTest.java @@ -18,7 +18,7 @@ import static org.junit.jupiter.api.Assertions.*; @ExtendWith(SpringExtension.class) @ContextConfiguration(classes = {TestSpringConfig.class}) @DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD) -class TestH2PlayerManager { +class H2PlayerManagerTest { @Autowired private H2PlayerService h2PlayerService; @Autowired @@ -27,7 +27,7 @@ class TestH2PlayerManager { private H2PlayerManager playerManager; @Test - void testCreatePlayer() { + void createPlayer() { final String playerName = "NEW_PLAYER"; final Player newPlayer = playerManager.createPlayer(playerName, EntityLocation.ZERO(), mockWorld); @@ -45,7 +45,7 @@ class TestH2PlayerManager { } @Test - void testJoinServer() { + void joinServer() { assertEquals(0, playerManager.getCountPlayers()); final String playerName = "NEW_PLAYER"; @@ -57,7 +57,7 @@ class TestH2PlayerManager { } @Test - void testLeftServer() { + void leftServer() { assertEquals(0, playerManager.getCountPlayers()); final String playerName = "NEW_PLAYER"; @@ -87,7 +87,7 @@ class TestH2PlayerManager { } @Test - void testGetPlayer() { + void getPlayer() { assertEquals(0, playerManager.getCountPlayers()); final String playerName = "NEW_PLAYER"; @@ -104,7 +104,7 @@ class TestH2PlayerManager { } @Test - void testGetPlayers() { + void getPlayers() { assertEquals(0, playerManager.getCountPlayers()); final String playerName = "NEW_PLAYER"; @@ -128,7 +128,7 @@ class TestH2PlayerManager { } @Test - void testGetCountPlayers() { + void getCountPlayers() { assertEquals(0, playerManager.getCountPlayers()); final String playerName = "NEW_PLAYER"; @@ -145,7 +145,7 @@ class TestH2PlayerManager { } @Test - void testGetOfflinePlayer() { + void getOfflinePlayer() { final String playerName = "NEW_PLAYER"; final Player player = playerManager.createPlayer(playerName, EntityLocation.ZERO(), mockWorld); playerManager.joinServer(player); diff --git a/h2_playermanager/src/test/java/mc/core/h2db/TestH2Player.java b/h2_playermanager/src/test/java/mc/core/h2db/H2PlayerTest.java similarity index 94% rename from h2_playermanager/src/test/java/mc/core/h2db/TestH2Player.java rename to h2_playermanager/src/test/java/mc/core/h2db/H2PlayerTest.java index 5f60bdb..271fae7 100644 --- a/h2_playermanager/src/test/java/mc/core/h2db/TestH2Player.java +++ b/h2_playermanager/src/test/java/mc/core/h2db/H2PlayerTest.java @@ -7,9 +7,9 @@ import java.util.UUID; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; -class TestH2Player { +class H2PlayerTest { @Test - void testEquals() { + void equals_() { UUID uuid = UUID.randomUUID(); H2Player player1 = new H2Player(); diff --git a/proto_1.12.2/src/test/java/mc/core/network/proto_1_12_2/packets/TestByteArrayInputNetStream.java b/proto_1.12.2/src/test/java/mc/core/network/proto_1_12_2/packets/ByteArrayInputNetStreamTest.java similarity index 92% rename from proto_1.12.2/src/test/java/mc/core/network/proto_1_12_2/packets/TestByteArrayInputNetStream.java rename to proto_1.12.2/src/test/java/mc/core/network/proto_1_12_2/packets/ByteArrayInputNetStreamTest.java index b73500d..4964a77 100644 --- a/proto_1.12.2/src/test/java/mc/core/network/proto_1_12_2/packets/TestByteArrayInputNetStream.java +++ b/proto_1.12.2/src/test/java/mc/core/network/proto_1_12_2/packets/ByteArrayInputNetStreamTest.java @@ -7,11 +7,11 @@ import java.util.Random; import static org.junit.jupiter.api.Assertions.assertEquals; -class TestByteArrayInputNetStream { +class ByteArrayInputNetStreamTest { private Random rnd = new Random(); @Test - void testReadByte() { + void readByte() { final byte b0 = (byte) rnd.nextInt(); ByteArrayOutputNetStream netStream = new ByteArrayOutputNetStream(); netStream.writeByte(b0); @@ -23,7 +23,7 @@ class TestByteArrayInputNetStream { } @Test - void testReadInt() { + void readInt() { final int i0 = rnd.nextInt(); ByteArrayOutputNetStream netStream = new ByteArrayOutputNetStream(); netStream.writeInt(i0); @@ -35,7 +35,7 @@ class TestByteArrayInputNetStream { } @Test - void testReadFloat() { + void readFloat() { final float f0 = rnd.nextFloat(); ByteArrayOutputNetStream netStream = new ByteArrayOutputNetStream(); netStream.writeFloat(f0); diff --git a/proto_1.12.2/src/test/java/mc/core/network/proto_1_12_2/packets/TestChunkdataPacket.java b/proto_1.12.2/src/test/java/mc/core/network/proto_1_12_2/packets/ChunkdataPacketTest.java similarity index 96% rename from proto_1.12.2/src/test/java/mc/core/network/proto_1_12_2/packets/TestChunkdataPacket.java rename to proto_1.12.2/src/test/java/mc/core/network/proto_1_12_2/packets/ChunkdataPacketTest.java index cabb163..5060676 100644 --- a/proto_1.12.2/src/test/java/mc/core/network/proto_1_12_2/packets/TestChunkdataPacket.java +++ b/proto_1.12.2/src/test/java/mc/core/network/proto_1_12_2/packets/ChunkdataPacketTest.java @@ -22,13 +22,13 @@ import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -class TestChunkdataPacket { +class ChunkdataPacketTest { private static byte[] expectedPacketData; private World world; @BeforeAll static void beforeClassTest() throws IOException { - InputStream inputStream = TestChunkdataPacket.class.getResourceAsStream("ChunkDataPacket.bin"); + InputStream inputStream = ChunkdataPacketTest.class.getResourceAsStream("ChunkDataPacket.bin"); expectedPacketData = ByteStreams.toByteArray(inputStream); } @@ -77,7 +77,7 @@ class TestChunkdataPacket { } @Test - void test() { + void writePacket() { ChunkDataPacket packet = new ChunkDataPacket(); packet.setX(0); packet.setZ(0); diff --git a/proto_1.12.2/src/test/java/mc/core/network/proto_1_12_2/packets/TestPlayerAbilitiesPacket.java b/proto_1.12.2/src/test/java/mc/core/network/proto_1_12_2/packets/PlayerAbilitiesPacketTest.java similarity index 96% rename from proto_1.12.2/src/test/java/mc/core/network/proto_1_12_2/packets/TestPlayerAbilitiesPacket.java rename to proto_1.12.2/src/test/java/mc/core/network/proto_1_12_2/packets/PlayerAbilitiesPacketTest.java index cf4344c..229a15a 100644 --- a/proto_1.12.2/src/test/java/mc/core/network/proto_1_12_2/packets/TestPlayerAbilitiesPacket.java +++ b/proto_1.12.2/src/test/java/mc/core/network/proto_1_12_2/packets/PlayerAbilitiesPacketTest.java @@ -8,7 +8,7 @@ import java.util.Random; import static org.junit.jupiter.api.Assertions.assertEquals; -class TestPlayerAbilitiesPacket { +class PlayerAbilitiesPacketTest { private Random rnd = new Random(); private PlayerAbilitiesPacket packet; @@ -23,7 +23,7 @@ class TestPlayerAbilitiesPacket { } @Test - void test() { + void writePacket() { ByteArrayOutputNetStream netOutputStream = new ByteArrayOutputNetStream(); packet.writeSelf(netOutputStream); diff --git a/proto_1.12.2/src/test/java/mc/core/network/proto_1_12_2/serializers/TestBlockLocationSerializer.java b/proto_1.12.2/src/test/java/mc/core/network/proto_1_12_2/serializers/BlockLocationSerializerTest.java similarity index 93% rename from proto_1.12.2/src/test/java/mc/core/network/proto_1_12_2/serializers/TestBlockLocationSerializer.java rename to proto_1.12.2/src/test/java/mc/core/network/proto_1_12_2/serializers/BlockLocationSerializerTest.java index 51d6498..dda7500 100644 --- a/proto_1.12.2/src/test/java/mc/core/network/proto_1_12_2/serializers/TestBlockLocationSerializer.java +++ b/proto_1.12.2/src/test/java/mc/core/network/proto_1_12_2/serializers/BlockLocationSerializerTest.java @@ -8,7 +8,7 @@ import java.util.concurrent.ThreadLocalRandom; import static org.junit.jupiter.api.Assertions.assertEquals; -class TestBlockLocationSerializer { +class BlockLocationSerializerTest { private static final ThreadLocalRandom rnd = ThreadLocalRandom.current(); private static final int minI = 0, maxI = 10; private int x, y, z; @@ -21,7 +21,7 @@ class TestBlockLocationSerializer { } @Test - void test() { + void serialize() { BlockLocation location = new BlockLocation(x, y, z); final long serializedCoords = BlockLocationSerializer.toLong(location);