diff --git a/common/pom.xml b/common/pom.xml index 66edc42..f341aa4 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -59,5 +59,11 @@ 2.0.17 + + org.junit.jupiter + junit-jupiter + test + + diff --git a/common/src/main/java/cz/jzitnik/common/socket/messages/Test.java b/common/src/main/java/cz/jzitnik/common/socket/messages/Test.java deleted file mode 100644 index c009969..0000000 --- a/common/src/main/java/cz/jzitnik/common/socket/messages/Test.java +++ /dev/null @@ -1,11 +0,0 @@ -package cz.jzitnik.common.socket.messages; - -import cz.jzitnik.common.socket.SocketMessage; - -/** - * Test message for socket communication. - * - * @author Jakub Žitník (jzitnik) - */ -public class Test implements SocketMessage { -} diff --git a/common/src/test/java/cz/jzitnik/common/models/coordinates/RoomCordsTest.java b/common/src/test/java/cz/jzitnik/common/models/coordinates/RoomCordsTest.java new file mode 100644 index 0000000..85680c2 --- /dev/null +++ b/common/src/test/java/cz/jzitnik/common/models/coordinates/RoomCordsTest.java @@ -0,0 +1,76 @@ +package cz.jzitnik.common.models.coordinates; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.CsvSource; + +import static org.junit.jupiter.api.Assertions.*; + +class RoomCordsTest { + + @Test + void testConstructor() { + RoomCords cords = new RoomCords(10, 20); + assertEquals(10, cords.getX()); + assertEquals(20, cords.getY()); + } + + @Test + void testUpdateCordsWithInts() { + RoomCords cords = new RoomCords(0, 0); + cords.updateCords(5, 10); + assertEquals(5, cords.getX()); + assertEquals(10, cords.getY()); + } + + @Test + void testUpdateCordsWithRoomCords() { + RoomCords cords = new RoomCords(0, 0); + RoomCords newCords = new RoomCords(15, 25); + cords.updateCords(newCords); + assertEquals(15, cords.getX()); + assertEquals(25, cords.getY()); + } + + @Test + void testCalculateDistance() { + RoomCords cords1 = new RoomCords(0, 0); + RoomCords cords2 = new RoomCords(3, 4); + double distance = cords1.calculateDistance(cords2); + assertEquals(5.0, distance, 0.0001); + } + + @Test + void testCalculateDistanceToSelf() { + RoomCords cords = new RoomCords(5, 5); + double distance = cords.calculateDistance(cords); + assertEquals(0.0, distance, 0.0001); + } + + @Test + void testCalculateDistanceThrowsOnNull() { + RoomCords cords = new RoomCords(0, 0); + assertThrows(IllegalArgumentException.class, () -> cords.calculateDistance(null)); + } + + @Test + void testClone() { + RoomCords original = new RoomCords(7, 8); + RoomCords cloned = original.clone(); + assertEquals(original.getX(), cloned.getX()); + assertEquals(original.getY(), cloned.getY()); + assertNotSame(original, cloned); + } + + @ParameterizedTest + @CsvSource({ + "0, 0, 10, 10", + "5, 5, 15, 15", + "-5, -5, 0, 0" + }) + void testUpdateCordsWithValues(int x, int y, int expectedX, int expectedY) { + RoomCords cords = new RoomCords(x, y); + assertEquals(x, cords.getX()); + assertEquals(y, cords.getY()); + } +} diff --git a/common/src/test/java/cz/jzitnik/common/models/coordinates/RoomPartTest.java b/common/src/test/java/cz/jzitnik/common/models/coordinates/RoomPartTest.java new file mode 100644 index 0000000..520b497 --- /dev/null +++ b/common/src/test/java/cz/jzitnik/common/models/coordinates/RoomPartTest.java @@ -0,0 +1,73 @@ +package cz.jzitnik.common.models.coordinates; + +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.*; + +class RoomPartTest { + + @Test + void testConstructor() { + RoomCords start = new RoomCords(0, 0); + RoomCords end = new RoomCords(10, 10); + RoomPart roomPart = new RoomPart(start, end); + assertEquals(start, roomPart.getStart()); + assertEquals(end, roomPart.getEnd()); + } + + @Test + void testIsWithinReturnsTrueForPointInside() { + RoomPart roomPart = new RoomPart(new RoomCords(0, 0), new RoomCords(10, 10)); + assertTrue(roomPart.isWithin(new RoomCords(5, 5))); + } + + @Test + void testIsWithinReturnsTrueForPointOnEdge() { + RoomPart roomPart = new RoomPart(new RoomCords(0, 0), new RoomCords(10, 10)); + assertTrue(roomPart.isWithin(new RoomCords(0, 0))); + assertTrue(roomPart.isWithin(new RoomCords(10, 10))); + } + + @Test + void testIsWithinReturnsFalseForPointOutside() { + RoomPart roomPart = new RoomPart(new RoomCords(0, 0), new RoomCords(10, 10)); + assertFalse(roomPart.isWithin(new RoomCords(15, 5))); + assertFalse(roomPart.isWithin(new RoomCords(5, 15))); + assertFalse(roomPart.isWithin(new RoomCords(-1, 5))); + } + + @Test + void testIsOverlappingReturnsTrueForOverlappingParts() { + RoomPart part1 = new RoomPart(new RoomCords(0, 0), new RoomCords(10, 10)); + RoomPart part2 = new RoomPart(new RoomCords(5, 5), new RoomCords(15, 15)); + assertTrue(part1.isOverlapping(part2)); + } + + @Test + void testIsOverlappingReturnsTrueForIdenticalParts() { + RoomPart part1 = new RoomPart(new RoomCords(0, 0), new RoomCords(10, 10)); + RoomPart part2 = new RoomPart(new RoomCords(0, 0), new RoomCords(10, 10)); + assertTrue(part1.isOverlapping(part2)); + } + + @Test + void testIsOverlappingReturnsFalseForNonOverlappingParts() { + RoomPart part1 = new RoomPart(new RoomCords(0, 0), new RoomCords(10, 10)); + RoomPart part2 = new RoomPart(new RoomCords(20, 20), new RoomCords(30, 30)); + assertFalse(part1.isOverlapping(part2)); + } + + @Test + void testIsOverlappingReturnsTrueForAdjacentParts() { + RoomPart part1 = new RoomPart(new RoomCords(0, 0), new RoomCords(10, 10)); + RoomPart part2 = new RoomPart(new RoomCords(10, 0), new RoomCords(20, 10)); + assertTrue(part1.isOverlapping(part2)); + } + + @Test + void testIsOverlappingWithOnePartInsideAnother() { + RoomPart part1 = new RoomPart(new RoomCords(0, 0), new RoomCords(20, 20)); + RoomPart part2 = new RoomPart(new RoomCords(5, 5), new RoomCords(15, 15)); + assertTrue(part1.isOverlapping(part2)); + } +} diff --git a/game/pom.xml b/game/pom.xml index 3a308de..e5063c0 100644 --- a/game/pom.xml +++ b/game/pom.xml @@ -123,13 +123,6 @@ org.junit.jupiter junit-jupiter - 6.0.2 - - - - org.junit.jupiter - junit-jupiter-api - 6.0.2 test diff --git a/game/src/main/java/cz/jzitnik/client/events/DroppedItemRerender.java b/game/src/main/java/cz/jzitnik/client/events/DroppedItemRerender.java index 1f421de..3445fe1 100644 --- a/game/src/main/java/cz/jzitnik/client/events/DroppedItemRerender.java +++ b/game/src/main/java/cz/jzitnik/client/events/DroppedItemRerender.java @@ -3,5 +3,10 @@ package cz.jzitnik.client.events; import cz.jzitnik.client.game.objects.DroppedItem; import cz.jzitnik.client.utils.events.Event; +/** + * Event triggered when a dropped item in the game world needs to be rerendered. + * + * @param droppedItem the dropped item to rerender + */ public record DroppedItemRerender(DroppedItem droppedItem) implements Event { -} +} \ No newline at end of file diff --git a/game/src/main/java/cz/jzitnik/client/events/FullRedrawEvent.java b/game/src/main/java/cz/jzitnik/client/events/FullRedrawEvent.java index cc88a6e..7e73a26 100644 --- a/game/src/main/java/cz/jzitnik/client/events/FullRedrawEvent.java +++ b/game/src/main/java/cz/jzitnik/client/events/FullRedrawEvent.java @@ -2,5 +2,8 @@ package cz.jzitnik.client.events; import cz.jzitnik.client.utils.events.Event; +/** + * Event triggered when the entire screen needs to be fully redrawn. + */ public class FullRedrawEvent implements Event { -} +} \ No newline at end of file diff --git a/game/src/main/java/cz/jzitnik/client/events/FullRoomDraw.java b/game/src/main/java/cz/jzitnik/client/events/FullRoomDraw.java index 7097833..08478fc 100644 --- a/game/src/main/java/cz/jzitnik/client/events/FullRoomDraw.java +++ b/game/src/main/java/cz/jzitnik/client/events/FullRoomDraw.java @@ -4,6 +4,10 @@ import cz.jzitnik.client.utils.events.Event; import lombok.Getter; import lombok.NoArgsConstructor; +/** + * Event triggered when the current room needs to be fully drawn. + * Can optionally trigger a full rerender of all elements. + */ @NoArgsConstructor @Getter public class FullRoomDraw implements Event { diff --git a/game/src/main/java/cz/jzitnik/client/events/InventoryRerender.java b/game/src/main/java/cz/jzitnik/client/events/InventoryRerender.java index 998db13..da55d4d 100644 --- a/game/src/main/java/cz/jzitnik/client/events/InventoryRerender.java +++ b/game/src/main/java/cz/jzitnik/client/events/InventoryRerender.java @@ -2,5 +2,8 @@ package cz.jzitnik.client.events; import cz.jzitnik.client.utils.events.Event; +/** + * Event triggered when the player's inventory display needs to be rerendered. + */ public class InventoryRerender implements Event { -} +} \ No newline at end of file diff --git a/game/src/main/java/cz/jzitnik/client/events/RenderStats.java b/game/src/main/java/cz/jzitnik/client/events/RenderStats.java index 2df5177..e1325cf 100644 --- a/game/src/main/java/cz/jzitnik/client/events/RenderStats.java +++ b/game/src/main/java/cz/jzitnik/client/events/RenderStats.java @@ -2,5 +2,8 @@ package cz.jzitnik.client.events; import cz.jzitnik.client.utils.events.Event; +/** + * Event triggered when the player stats display needs to be rerendered. + */ public class RenderStats implements Event { -} +} \ No newline at end of file diff --git a/game/src/main/java/cz/jzitnik/client/events/RerenderScreen.java b/game/src/main/java/cz/jzitnik/client/events/RerenderScreen.java index 404d48c..8423dc1 100644 --- a/game/src/main/java/cz/jzitnik/client/events/RerenderScreen.java +++ b/game/src/main/java/cz/jzitnik/client/events/RerenderScreen.java @@ -6,6 +6,11 @@ import cz.jzitnik.client.utils.events.Event; import lombok.AllArgsConstructor; import lombok.Data; +/** + * Event triggered when specific parts of the screen need to be rerendered. + * + * @param parts the screen parts that need to be rerendered + */ public record RerenderScreen(ScreenPart[] parts) implements Event { public RerenderScreen(ScreenPart part) { this(new ScreenPart[]{part}); diff --git a/game/src/main/java/cz/jzitnik/client/events/RoomChangeEvent.java b/game/src/main/java/cz/jzitnik/client/events/RoomChangeEvent.java index 7573d09..568f4c8 100644 --- a/game/src/main/java/cz/jzitnik/client/events/RoomChangeEvent.java +++ b/game/src/main/java/cz/jzitnik/client/events/RoomChangeEvent.java @@ -3,5 +3,10 @@ package cz.jzitnik.client.events; import cz.jzitnik.client.events.handlers.FullRoomDrawHandler; import cz.jzitnik.client.utils.events.Event; +/** + * Event triggered when the player changes to a different room. + * + * @param door the door position from which the player entered the new room + */ public record RoomChangeEvent(FullRoomDrawHandler.DoorPosition door) implements Event { -} +} \ No newline at end of file diff --git a/game/src/main/java/cz/jzitnik/client/events/SendSocketMessageEvent.java b/game/src/main/java/cz/jzitnik/client/events/SendSocketMessageEvent.java index 291299a..4b0eb42 100644 --- a/game/src/main/java/cz/jzitnik/client/events/SendSocketMessageEvent.java +++ b/game/src/main/java/cz/jzitnik/client/events/SendSocketMessageEvent.java @@ -3,5 +3,10 @@ package cz.jzitnik.client.events; import cz.jzitnik.client.utils.events.Event; import cz.jzitnik.common.socket.SocketMessage; +/** + * Event triggered when a socket message needs to be sent to the server. + * + * @param message the socket message to send + */ public record SendSocketMessageEvent(SocketMessage message) implements Event { -} +} \ No newline at end of file diff --git a/game/src/main/java/cz/jzitnik/client/socket/events/TestHandler.java b/game/src/main/java/cz/jzitnik/client/socket/events/TestHandler.java deleted file mode 100644 index e7a7cca..0000000 --- a/game/src/main/java/cz/jzitnik/client/socket/events/TestHandler.java +++ /dev/null @@ -1,25 +0,0 @@ -package cz.jzitnik.client.socket.events; - -import cz.jzitnik.client.annotations.SocketEventHandler; -import cz.jzitnik.client.socket.AbstractSocketEventHandler; -import cz.jzitnik.common.socket.messages.Test; -import lombok.extern.slf4j.Slf4j; - -/** - * Handler for the Test socket event. - * - * @author Jakub Žitník (jzitnik) - */ -@Slf4j -@SocketEventHandler(Test.class) -public class TestHandler extends AbstractSocketEventHandler { - /** - * Handles the Test event. - * - * @param event The Test event - */ - @Override - public void handle(Test event) { - log.debug("Got test: {}", event); - } -} diff --git a/game/src/main/java/cz/jzitnik/client/ui/GlobalShortcuts.java b/game/src/main/java/cz/jzitnik/client/ui/GlobalShortcuts.java index 59cd700..d346f1d 100644 --- a/game/src/main/java/cz/jzitnik/client/ui/GlobalShortcuts.java +++ b/game/src/main/java/cz/jzitnik/client/ui/GlobalShortcuts.java @@ -7,7 +7,6 @@ import cz.jzitnik.client.annotations.ui.KeyboardPressHandler; import cz.jzitnik.client.annotations.ui.UI; import cz.jzitnik.client.events.*; import cz.jzitnik.client.utils.events.EventManager; -import cz.jzitnik.common.socket.messages.Test; /** * UI component for global keyboard shortcuts. @@ -58,17 +57,4 @@ public class GlobalShortcuts { eventManager.emitEvent(new PlayerMoveEvent(event.getKeyStroke())); return true; } - - /** - * Sends a test socket message. - * - * @param event The keyboard event - * @return true - */ - @KeyboardPressHandler(character = 'p') - public boolean debugSocket(KeyboardPressEvent event) { - eventManager.emitEvent(new SendSocketMessageEvent(new Test())); - - return true; - } } diff --git a/game/src/test/java/cz/jzitnik/client/game/RequirementTest.java b/game/src/test/java/cz/jzitnik/client/game/RequirementTest.java new file mode 100644 index 0000000..374d3e1 --- /dev/null +++ b/game/src/test/java/cz/jzitnik/client/game/RequirementTest.java @@ -0,0 +1,40 @@ +package cz.jzitnik.client.game; + +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.*; + +class RequirementTest { + + @Test + void testConstructor() { + Requirement requirement = new Requirement("key"); + assertEquals("key", requirement.itemType()); + } + + @Test + void testItemTypeCanBeNull() { + Requirement requirement = new Requirement(null); + assertNull(requirement.itemType()); + } + + @Test + void testItemTypeEquality() { + Requirement req1 = new Requirement("sword"); + Requirement req2 = new Requirement("sword"); + assertEquals(req1, req2); + } + + @Test + void testDifferentItemTypesAreNotEqual() { + Requirement req1 = new Requirement("key"); + Requirement req2 = new Requirement("sword"); + assertNotEquals(req1, req2); + } + + @Test + void testToString() { + Requirement requirement = new Requirement("gold"); + assertTrue(requirement.toString().contains("gold")); + } +} diff --git a/game/src/test/java/cz/jzitnik/common/socket/messages/PlayerMoveTest.java b/game/src/test/java/cz/jzitnik/common/socket/messages/PlayerMoveTest.java new file mode 100644 index 0000000..a85b129 --- /dev/null +++ b/game/src/test/java/cz/jzitnik/common/socket/messages/PlayerMoveTest.java @@ -0,0 +1,54 @@ +package cz.jzitnik.common.socket.messages.player; + +import cz.jzitnik.common.models.coordinates.RoomCords; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.*; + +class PlayerMoveTest { + + @Test + void testConstructor() { + RoomCords cords = new RoomCords(10, 20); + PlayerMove move = new PlayerMove(cords, PlayerRotation.RIGHT); + + assertEquals(cords, move.newCords()); + assertEquals(PlayerRotation.RIGHT, move.playerRotation()); + } + + @Test + void testWithNullCords() { + PlayerMove move = new PlayerMove(null, PlayerRotation.FRONT); + assertNull(move.newCords()); + assertEquals(PlayerRotation.FRONT, move.playerRotation()); + } + + @Test + void testWithNullRotation() { + RoomCords cords = new RoomCords(5, 5); + PlayerMove move = new PlayerMove(cords, null); + assertEquals(cords, move.newCords()); + assertNull(move.playerRotation()); + } + + @Test + void testAllRotations() { + RoomCords cords = new RoomCords(0, 0); + + for (PlayerRotation rotation : PlayerRotation.values()) { + PlayerMove move = new PlayerMove(cords, rotation); + assertEquals(rotation, move.playerRotation()); + } + } + + @Test + void testEquality() { + RoomCords cords1 = new RoomCords(10, 20); + RoomCords cords2 = new RoomCords(10, 20); + + PlayerMove move1 = new PlayerMove(cords1, PlayerRotation.LEFT); + PlayerMove move2 = new PlayerMove(cords2, PlayerRotation.LEFT); + + assertEquals(move1, move2); + } +} diff --git a/pom.xml b/pom.xml index 23c1f55..3f094ca 100644 --- a/pom.xml +++ b/pom.xml @@ -45,6 +45,11 @@ none + + org.apache.maven.plugins + maven-surefire-plugin + 3.5.2 + diff --git a/server/pom.xml b/server/pom.xml index 3a9cb56..ffae68d 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -106,5 +106,11 @@ reflections 0.10.2 + + + org.junit.jupiter + junit-jupiter + test + diff --git a/server/src/test/java/cz/jzitnik/server/game/GameTest.java b/server/src/test/java/cz/jzitnik/server/game/GameTest.java new file mode 100644 index 0000000..616c832 --- /dev/null +++ b/server/src/test/java/cz/jzitnik/server/game/GameTest.java @@ -0,0 +1,72 @@ +package cz.jzitnik.server.game; + +import cz.jzitnik.common.socket.messages.items.ItemTookFromChest; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import java.util.ArrayList; +import java.util.List; + +import static org.junit.jupiter.api.Assertions.*; + +class GameTest { + + private Game game; + private static final String PASSWORD = "test123"; + + @BeforeEach + void setUp() { + game = new Game(PASSWORD, new ArrayList<>()); + } + + @Test + void testConstructor() { + assertEquals(PASSWORD, game.getPassword()); + assertNotNull(game.getPlayers()); + assertTrue(game.getPlayers().isEmpty()); + } + + @Test + void testGetItemModifiers() { + assertNotNull(game.getItemModifiers()); + assertTrue(game.getItemModifiers().isEmpty()); + } + + @Test + void testItemModifiersAreIndependent() { + Game game1 = new Game("pass", new ArrayList<>()); + Game game2 = new Game("pass", new ArrayList<>()); + + game1.getItemModifiers().add(new ItemTookFromChest("room1", 1)); + + assertTrue(game2.getItemModifiers().isEmpty()); + } + + @Test + void testPasswordIsStored() { + String customPassword = "secret"; + Game customGame = new Game(customPassword, new ArrayList<>()); + assertEquals(customPassword, customGame.getPassword()); + } + + @Test + void testEmptyPassword() { + Game emptyPasswordGame = new Game("", new ArrayList<>()); + assertEquals("", emptyPasswordGame.getPassword()); + } + + @Test + void testNullPassword() { + Game nullPasswordGame = new Game(null, new ArrayList<>()); + assertNull(nullPasswordGame.getPassword()); + } + + @Test + void testPlayersListCanBeModifiedExternally() { + List players = new ArrayList<>(); + Game game = new Game("pass", players); + + assertDoesNotThrow(() -> players.add(new Client(null, null, null))); + assertEquals(1, game.getPlayers().size()); + } +} diff --git a/server/src/test/java/cz/jzitnik/server/game/PlayerTest.java b/server/src/test/java/cz/jzitnik/server/game/PlayerTest.java new file mode 100644 index 0000000..0255a44 --- /dev/null +++ b/server/src/test/java/cz/jzitnik/server/game/PlayerTest.java @@ -0,0 +1,87 @@ +package cz.jzitnik.server.game; + +import cz.jzitnik.common.models.coordinates.RoomCords; +import cz.jzitnik.common.models.coordinates.RoomPart; +import cz.jzitnik.common.models.player.PlayerCreation; +import cz.jzitnik.common.socket.messages.player.PlayerRotation; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.*; + +class PlayerTest { + + private PlayerCreation playerCreation; + private RoomCords cords; + private RoomPart collider; + + @BeforeEach + void setUp() { + cords = new RoomCords(100, 200); + collider = new RoomPart(new RoomCords(95, 195), new RoomCords(105, 205)); + playerCreation = new PlayerCreation(cords, collider); + } + + @Test + void testConstructor() { + Player player = new Player(playerCreation); + assertEquals(playerCreation.getId(), player.getId()); + } + + @Test + void testGetCords() { + Player player = new Player(playerCreation); + assertNotNull(player.getCords()); + assertEquals(cords.getX(), player.getCords().getX()); + assertEquals(cords.getY(), player.getCords().getY()); + } + + @Test + void testDefaultRotation() { + Player player = new Player(playerCreation); + assertEquals(PlayerRotation.FRONT, player.getPlayerRotation()); + } + + @Test + void testSetPlayerRotation() { + Player player = new Player(playerCreation); + player.setPlayerRotation(PlayerRotation.LEFT); + assertEquals(PlayerRotation.LEFT, player.getPlayerRotation()); + + player.setPlayerRotation(PlayerRotation.RIGHT); + assertEquals(PlayerRotation.RIGHT, player.getPlayerRotation()); + + player.setPlayerRotation(PlayerRotation.BACK); + assertEquals(PlayerRotation.BACK, player.getPlayerRotation()); + } + + @Test + void testSetCurrentRoom() { + Player player = new Player(playerCreation); + player.setCurrentRoom("room1"); + assertEquals("room1", player.getCurrentRoom()); + + player.setCurrentRoom("room2"); + assertEquals("room2", player.getCurrentRoom()); + } + + @Test + void testToPlayerCreation() { + Player player = new Player(playerCreation); + PlayerCreation result = player.toPlayerCreation(); + + assertNotNull(result); + assertEquals(player.getCords().getX(), result.getPlayerCords().getX()); + assertEquals(player.getCords().getY(), result.getPlayerCords().getY()); + } + + @Test + void testIdIsFinal() { + Player player = new Player(playerCreation); + int originalId = player.getId(); + + playerCreation.setId(999); + + assertEquals(originalId, player.getId()); + } +}