Remove some public keyword usage which are not required with Junit 5

OneLiteFeatherNET · Nov 1, 2024 · 6031c8c · 6031c8c
1 parent 5fd6895
commit 6031c8c
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 24 deletions.
diff --git a/src/test/java/net/minestom/server/collision/EntityBlockPhysicsIntegrationTest.java b/src/test/java/net/minestom/server/collision/EntityBlockPhysicsIntegrationTest.java
@@ -62,7 +62,7 @@ void entityPhysicsCheckCollision(Env env) {
     }
 
     @Test
-    public void entityPhysicsCheckShortDiagonal(Env env) {
+    void entityPhysicsCheckShortDiagonal(Env env) {
         var instance = env.createFlatInstance();
         instance.setBlock(0, 42, 1, Block.STONE);
 

diff --git a/src/test/java/net/minestom/server/entity/pathfinding/PathfinderIntegrationTest.java b/src/test/java/net/minestom/server/entity/pathfinding/PathfinderIntegrationTest.java
@@ -16,11 +16,10 @@
 import java.util.List;
 import java.util.Set;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.Assertions.*;
 
 @ExtendWith(MicrotusExtension.class)
-public class PathfinderIntegrationTest {
+class PathfinderIntegrationTest {
 
     /**
      * Validate that the path is valid
@@ -31,7 +30,7 @@ public class PathfinderIntegrationTest {
      */
     private boolean validateNodes(List<PNode> nodes, Instance instance) {
         if (nodes == null) fail("Path is null");
-        if (nodes.size() == 0) fail("Path is empty");
+        if (nodes.isEmpty()) fail("Path is empty");
 
         nodes.forEach((node) -> {
             if (instance.getBlock(node.blockX(), node.blockY(), node.blockZ()).isSolid()) {
@@ -43,7 +42,7 @@ private boolean validateNodes(List<PNode> nodes, Instance instance) {
     }
 
     @Test
-    public void testTall(Env env) {
+    void testTall(Env env) {
         var i = env.createFlatInstance();
 
         ChunkUtils.forChunksInRange(0, 0, 10, (x, z) -> {
@@ -66,7 +65,7 @@ public void testTall(Env env) {
     }
 
     @Test
-    public void testStraightLine(Env env) {
+    void testStraightLine(Env env) {
         var i = env.createFlatInstance();
 
         ChunkUtils.forChunksInRange(0, 0, 10, (x, z) -> {
@@ -86,7 +85,7 @@ public void testStraightLine(Env env) {
     }
 
     @Test
-    public void testShort(Env env) {
+    void testShort(Env env) {
         var i = env.createFlatInstance();
 
         ChunkUtils.forChunksInRange(0, 0, 10, (x, z) -> {
@@ -107,7 +106,7 @@ public void testShort(Env env) {
     }
 
     @Test
-    public void testBug(Env env) {
+    void testBug(Env env) {
         var i = env.createFlatInstance();
 
         ChunkUtils.forChunksInRange(0, 0, 10, (x, z) -> {
@@ -132,7 +131,7 @@ public void testBug(Env env) {
     }
 
     @Test
-    public void testPFNodeEqual(Env env) {
+    void testPFNodeEqual(Env env) {
         PNode node1 = new PNode(new Pos(0.777, 0, 0), 2, 0, PNode.Type.WALK, null);
         PNode node2 = new PNode(new Pos(0.777, 0, 0), 0, 3, PNode.Type.WALK, node1);
 
@@ -145,7 +144,7 @@ public void testPFNodeEqual(Env env) {
     }
 
     @Test
-    public void testStraightLineBlocked(Env env) {
+    void testStraightLineBlocked(Env env) {
         var i = env.createFlatInstance();
 
         ChunkUtils.forChunksInRange(0, 0, 10, (x, z) -> {
@@ -196,7 +195,7 @@ public void testStraightLineBlocked(Env env) {
     }
 
     @Test
-    public void testGravitySnap(Env env) {
+    void testGravitySnap(Env env) {
         var i = env.createFlatInstance();
 
         ChunkUtils.forChunksInRange(0, 0, 10, (x, z) -> {
@@ -208,6 +207,7 @@ public void testGravitySnap(Env env) {
         var nodeGenerator = new GroundNodeGenerator();
 
         var snapped = nodeGenerator.gravitySnap(i, -140.74433362614695, 40.58268292446131, 18.87966960447388, zombie.getBoundingBox(), 100);
+        assertTrue(snapped.isPresent());
         assertEquals(40.0, snapped.getAsDouble());
     }
 }
diff --git a/src/test/java/net/minestom/server/instance/BlockTest.java b/src/test/java/net/minestom/server/instance/BlockTest.java
@@ -88,7 +88,7 @@ void testShape() {
     }
 
     @Test
-    public void testDuplicateProperties() {
+    void testDuplicateProperties() {
         HashSet<Integer> assignedStates = new HashSet<>();
         for (Block block : Block.values()) {
             for (Block blockWithState : block.possibleStates()) {
@@ -98,7 +98,7 @@ public void testDuplicateProperties() {
     }
 
     @Test
-    public void testStateIdConversion() {
+    void testStateIdConversion() {
         for (Block block : Block.values()) {
             for (Block blockWithState : block.possibleStates()) {
                 assertEquals(blockWithState, Block.fromStateId(blockWithState.stateId()));

diff --git a/src/test/java/net/minestom/server/instance/anvil/AnvilLoaderIntegrationTest.java b/src/test/java/net/minestom/server/instance/anvil/AnvilLoaderIntegrationTest.java
@@ -28,12 +28,12 @@
 import static org.junit.jupiter.api.Assertions.assertNull;
 
 @ExtendWith(MicrotusExtension.class)
-public class AnvilLoaderIntegrationTest {
+class AnvilLoaderIntegrationTest {
 
     private static final Path testRoot = Path.of("src", "test", "resources", "net", "minestom", "server", "instance");
 
     @Test
-    public void loadVanillaRegion(Env env) throws IOException {
+    void loadVanillaRegion(Env env) throws IOException {
         // load a full vanilla region, not checking any content just making sure it loads without issues.
 
         var worldFolder = extractWorld("anvil_vanilla_sample");
@@ -60,7 +60,7 @@ public boolean supportsParallelSaving() {
     }
 
     @Test
-    public void parallelSaveNonexistentFiles(Env env) throws Exception {
+    void parallelSaveNonexistentFiles(Env env) throws Exception {
         var worldFolder = Files.createTempDirectory("minestom-test-world-parallel-save");
         AnvilLoader chunkLoader = new AnvilLoader(worldFolder);
         Instance instance = env.createFlatInstance(chunkLoader);
@@ -82,7 +82,7 @@ public void parallelSaveNonexistentFiles(Env env) throws Exception {
     }
 
     @Test
-    public void loadHouse(Env env) throws IOException {
+    void loadHouse(Env env) throws IOException {
         // load a world that contains only a basic house and make sure it is loaded properly
 
         var worldFolder = extractWorld("anvil_loader");
@@ -178,7 +178,7 @@ public boolean supportsParallelSaving() {
     }
 
     @Test
-    public void loadAndSaveChunk(Env env) throws IOException, InterruptedException {
+    void loadAndSaveChunk(Env env) throws IOException, InterruptedException {
         var worldFolder = extractWorld("anvil_loader");
         Instance instance = env.createFlatInstance(new AnvilLoader(worldFolder) {
             // Force loads inside current thread

diff --git a/src/test/java/net/minestom/server/item/component/AbstractItemComponentTest.java b/src/test/java/net/minestom/server/item/component/AbstractItemComponentTest.java
@@ -22,7 +22,7 @@
 
 @ExtendWith(MicrotusExtension.class)
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
-public abstract class AbstractItemComponentTest<T> {
+abstract class AbstractItemComponentTest<T> {
 
     protected abstract @NotNull DataComponent<T> component();
 
@@ -34,7 +34,7 @@ public abstract class AbstractItemComponentTest<T> {
 
     @ParameterizedTest(name = "{0}")
     @MethodSource("directReadWriteMethodSource")
-    public void directReadWriteTest(String testName, @NotNull T entry, Env env) {
+    void directReadWriteTest(String testName, @NotNull T entry, Env env) {
         var context = new BinaryTagSerializer.ContextWithRegistries(env.process());
         if (component().isSerialized()) {
             var written1 = component().write(context, entry);

diff --git a/src/test/java/net/minestom/server/network/PacketWriteReadTest.java b/src/test/java/net/minestom/server/network/PacketWriteReadTest.java
@@ -39,15 +39,15 @@
 /**
  * Ensures that packet can be written and read correctly.
  */
-public class PacketWriteReadTest {
+class PacketWriteReadTest {
     private static final List<ServerPacket> SERVER_PACKETS = new ArrayList<>();
     private static final List<ClientPacket> CLIENT_PACKETS = new ArrayList<>();
 
     private static final Component COMPONENT = Component.text("Hey");
     private static final Vec VEC = new Vec(5, 5, 5);
 
     @BeforeAll
-    public static void setupServer() {
+    static void setupServer() {
         // Handshake
         SERVER_PACKETS.add(new ResponsePacket(new JsonObject().toString()));
         // Status
@@ -156,7 +156,7 @@ public static void setupServer() {
     }
 
     @BeforeAll
-    public static void setupClient() {
+    static void setupClient() {
         CLIENT_PACKETS.add(new ClientHandshakePacket(755, "localhost", 25565, ClientHandshakePacket.Intent.LOGIN));
     }