From 9fdd74326a4170a689da1218f24d342fa040bdff Mon Sep 17 00:00:00 2001 From: ramollia <@> Date: Wed, 24 Sep 2025 15:44:38 +0200 Subject: [PATCH] refactor --- app/pom.xml | 85 ++++++++++++++ .../src/main/java/org/toop}/Main.java | 0 .../java/org/toop}/gui/BackgroundPanel.java | 0 .../java/org/toop}/gui/LocalGameSelector.form | 0 .../java/org/toop}/gui/LocalGameSelector.java | 0 .../org/toop}/gui/LocalServerSelector.form | 0 .../org/toop}/gui/LocalServerSelector.java | 0 .../org/toop}/gui/RemoteGameSelector.form | 0 .../org/toop}/gui/RemoteGameSelector.java | 0 .../org/toop}/tictactoe/LocalTicTacToe.java | 0 .../org/toop}/tictactoe/gui/UIGameBoard.form | 0 .../org/toop}/tictactoe/gui/UIGameBoard.java | 0 .../src}/main/resources/image/background.jpg | Bin .../src}/main/resources/image/icon.png | Bin {src => app/src}/main/resources/log4j2.xml | 0 framework/pom.xml | 16 +++ .../src/main/java/org/toop}/Logging.java | 0 .../java/org/toop}/eventbus/EventFlow.java | 0 .../org/toop}/eventbus/GlobalEventBus.java | 0 .../toop}/eventbus/events/EventWithUuid.java | 0 .../org/toop}/eventbus/events/Events.java | 0 .../org/toop}/eventbus/events/IEvent.java | 0 .../toop}/eventbus/events/NetworkEvents.java | 0 .../toop}/eventbus/events/ServerEvents.java | 0 .../toop}/networking/NetworkingClient.java | 0 .../networking/NetworkingClientManager.java | 0 .../NetworkingGameClientHandler.java | 0 .../NetworkingTicTacToeClientHandler.java | 0 framework/src/main/resources/log4j2.xml | 13 +++ .../src/test}/LoggingTest.java | 0 .../eventbus/EventPublisherSpeedTest.java | 0 .../eventbus/EventPublisherStressTest.java | 0 .../test}/eventbus/EventPublisherTest.java | 0 .../test}/eventbus/GlobalEventBusTest.java | 0 games/pom.xml | 7 ++ .../src/main/java/org/toop}/GameBase.java | 0 .../src/main/java/org/toop}/Player.java | 0 .../java/org/toop}/tictactoe/TicTacToe.java | 0 .../java/org/toop}/tictactoe/TicTacToeAI.java | 0 games/src/main/resources/log4j2.xml | 13 +++ .../src/test}/tictactoe/GameBaseTest.java | 2 - .../src/test}/tictactoe/PlayerTest.java | 2 - .../tictactoe/ai/MinMaxTicTacToeTest.java | 0 pom.xml | 86 +------------- .../java/org/toop/backend/TcpServerTest.java | 109 ------------------ .../org/toop/frontend/math/BoundsTest.java | 60 ---------- .../org/toop/frontend/math/ColorTest.java | 32 ----- 47 files changed, 139 insertions(+), 286 deletions(-) create mode 100644 app/pom.xml rename {src/main/java/org/toop/app => app/src/main/java/org/toop}/Main.java (100%) rename {src/main/java/org/toop/app => app/src/main/java/org/toop}/gui/BackgroundPanel.java (100%) rename {src/main/java/org/toop/app => app/src/main/java/org/toop}/gui/LocalGameSelector.form (100%) rename {src/main/java/org/toop/app => app/src/main/java/org/toop}/gui/LocalGameSelector.java (100%) rename {src/main/java/org/toop/app => app/src/main/java/org/toop}/gui/LocalServerSelector.form (100%) rename {src/main/java/org/toop/app => app/src/main/java/org/toop}/gui/LocalServerSelector.java (100%) rename {src/main/java/org/toop/app => app/src/main/java/org/toop}/gui/RemoteGameSelector.form (100%) rename {src/main/java/org/toop/app => app/src/main/java/org/toop}/gui/RemoteGameSelector.java (100%) rename {src/main/java/org/toop/app => app/src/main/java/org/toop}/tictactoe/LocalTicTacToe.java (100%) rename {src/main/java/org/toop/app => app/src/main/java/org/toop}/tictactoe/gui/UIGameBoard.form (100%) rename {src/main/java/org/toop/app => app/src/main/java/org/toop}/tictactoe/gui/UIGameBoard.java (100%) rename {src => app/src}/main/resources/image/background.jpg (100%) rename {src => app/src}/main/resources/image/icon.png (100%) rename {src => app/src}/main/resources/log4j2.xml (100%) create mode 100644 framework/pom.xml rename {src/main/java/org/toop/framework => framework/src/main/java/org/toop}/Logging.java (100%) rename {src/main/java/org/toop/framework => framework/src/main/java/org/toop}/eventbus/EventFlow.java (100%) rename {src/main/java/org/toop/framework => framework/src/main/java/org/toop}/eventbus/GlobalEventBus.java (100%) rename {src/main/java/org/toop/framework => framework/src/main/java/org/toop}/eventbus/events/EventWithUuid.java (100%) rename {src/main/java/org/toop/framework => framework/src/main/java/org/toop}/eventbus/events/Events.java (100%) rename {src/main/java/org/toop/framework => framework/src/main/java/org/toop}/eventbus/events/IEvent.java (100%) rename {src/main/java/org/toop/framework => framework/src/main/java/org/toop}/eventbus/events/NetworkEvents.java (100%) rename {src/main/java/org/toop/framework => framework/src/main/java/org/toop}/eventbus/events/ServerEvents.java (100%) rename {src/main/java/org/toop/framework => framework/src/main/java/org/toop}/networking/NetworkingClient.java (100%) rename {src/main/java/org/toop/framework => framework/src/main/java/org/toop}/networking/NetworkingClientManager.java (100%) rename {src/main/java/org/toop/framework => framework/src/main/java/org/toop}/networking/NetworkingGameClientHandler.java (100%) rename {src/main/java/org/toop/framework => framework/src/main/java/org/toop}/networking/handlers/NetworkingTicTacToeClientHandler.java (100%) create mode 100644 framework/src/main/resources/log4j2.xml rename {src/test/java/org/toop => framework/src/test}/LoggingTest.java (100%) rename {src/test/java/org/toop => framework/src/test}/eventbus/EventPublisherSpeedTest.java (100%) rename {src/test/java/org/toop => framework/src/test}/eventbus/EventPublisherStressTest.java (100%) rename {src/test/java/org/toop => framework/src/test}/eventbus/EventPublisherTest.java (100%) rename {src/test/java/org/toop => framework/src/test}/eventbus/GlobalEventBusTest.java (100%) create mode 100644 games/pom.xml rename {src/main/java/org/toop/games => games/src/main/java/org/toop}/GameBase.java (100%) rename {src/main/java/org/toop/games => games/src/main/java/org/toop}/Player.java (100%) rename {src/main/java/org/toop/games => games/src/main/java/org/toop}/tictactoe/TicTacToe.java (100%) rename {src/main/java/org/toop/games => games/src/main/java/org/toop}/tictactoe/TicTacToeAI.java (100%) create mode 100644 games/src/main/resources/log4j2.xml rename {src/test/java/org/toop/game => games/src/test}/tictactoe/GameBaseTest.java (97%) rename {src/test/java/org/toop/game => games/src/test}/tictactoe/PlayerTest.java (93%) rename {src/test/java/org/toop/game => games/src/test}/tictactoe/ai/MinMaxTicTacToeTest.java (100%) delete mode 100644 src/test/java/org/toop/backend/TcpServerTest.java delete mode 100644 src/test/java/org/toop/frontend/math/BoundsTest.java delete mode 100644 src/test/java/org/toop/frontend/math/ColorTest.java diff --git a/app/pom.xml b/app/pom.xml new file mode 100644 index 0000000..4c6e173 --- /dev/null +++ b/app/pom.xml @@ -0,0 +1,85 @@ + + 4.0.0 + + org.toop + pism + 1.0-SNAPSHOT + + + org.toop.Main + + + + + + maven-surefire-plugin + 3.5.4 + + stress + + + + maven-failsafe-plugin + 3.5.4 + + + org.apache.maven.plugins + maven-shade-plugin + 3.6.1 + + + + package + + + shade + + + + + + ${main-class} + + + + + + + + com.diffplug.spotless + spotless-maven-plugin + 2.46.1 + + + origin/main + + + + + + .gitattributes + .gitignore + + + + + + true + 4 + + + + + + + 1.28.0 + + true + true + + + + + + + \ No newline at end of file diff --git a/src/main/java/org/toop/app/Main.java b/app/src/main/java/org/toop/Main.java similarity index 100% rename from src/main/java/org/toop/app/Main.java rename to app/src/main/java/org/toop/Main.java diff --git a/src/main/java/org/toop/app/gui/BackgroundPanel.java b/app/src/main/java/org/toop/gui/BackgroundPanel.java similarity index 100% rename from src/main/java/org/toop/app/gui/BackgroundPanel.java rename to app/src/main/java/org/toop/gui/BackgroundPanel.java diff --git a/src/main/java/org/toop/app/gui/LocalGameSelector.form b/app/src/main/java/org/toop/gui/LocalGameSelector.form similarity index 100% rename from src/main/java/org/toop/app/gui/LocalGameSelector.form rename to app/src/main/java/org/toop/gui/LocalGameSelector.form diff --git a/src/main/java/org/toop/app/gui/LocalGameSelector.java b/app/src/main/java/org/toop/gui/LocalGameSelector.java similarity index 100% rename from src/main/java/org/toop/app/gui/LocalGameSelector.java rename to app/src/main/java/org/toop/gui/LocalGameSelector.java diff --git a/src/main/java/org/toop/app/gui/LocalServerSelector.form b/app/src/main/java/org/toop/gui/LocalServerSelector.form similarity index 100% rename from src/main/java/org/toop/app/gui/LocalServerSelector.form rename to app/src/main/java/org/toop/gui/LocalServerSelector.form diff --git a/src/main/java/org/toop/app/gui/LocalServerSelector.java b/app/src/main/java/org/toop/gui/LocalServerSelector.java similarity index 100% rename from src/main/java/org/toop/app/gui/LocalServerSelector.java rename to app/src/main/java/org/toop/gui/LocalServerSelector.java diff --git a/src/main/java/org/toop/app/gui/RemoteGameSelector.form b/app/src/main/java/org/toop/gui/RemoteGameSelector.form similarity index 100% rename from src/main/java/org/toop/app/gui/RemoteGameSelector.form rename to app/src/main/java/org/toop/gui/RemoteGameSelector.form diff --git a/src/main/java/org/toop/app/gui/RemoteGameSelector.java b/app/src/main/java/org/toop/gui/RemoteGameSelector.java similarity index 100% rename from src/main/java/org/toop/app/gui/RemoteGameSelector.java rename to app/src/main/java/org/toop/gui/RemoteGameSelector.java diff --git a/src/main/java/org/toop/app/tictactoe/LocalTicTacToe.java b/app/src/main/java/org/toop/tictactoe/LocalTicTacToe.java similarity index 100% rename from src/main/java/org/toop/app/tictactoe/LocalTicTacToe.java rename to app/src/main/java/org/toop/tictactoe/LocalTicTacToe.java diff --git a/src/main/java/org/toop/app/tictactoe/gui/UIGameBoard.form b/app/src/main/java/org/toop/tictactoe/gui/UIGameBoard.form similarity index 100% rename from src/main/java/org/toop/app/tictactoe/gui/UIGameBoard.form rename to app/src/main/java/org/toop/tictactoe/gui/UIGameBoard.form diff --git a/src/main/java/org/toop/app/tictactoe/gui/UIGameBoard.java b/app/src/main/java/org/toop/tictactoe/gui/UIGameBoard.java similarity index 100% rename from src/main/java/org/toop/app/tictactoe/gui/UIGameBoard.java rename to app/src/main/java/org/toop/tictactoe/gui/UIGameBoard.java diff --git a/src/main/resources/image/background.jpg b/app/src/main/resources/image/background.jpg similarity index 100% rename from src/main/resources/image/background.jpg rename to app/src/main/resources/image/background.jpg diff --git a/src/main/resources/image/icon.png b/app/src/main/resources/image/icon.png similarity index 100% rename from src/main/resources/image/icon.png rename to app/src/main/resources/image/icon.png diff --git a/src/main/resources/log4j2.xml b/app/src/main/resources/log4j2.xml similarity index 100% rename from src/main/resources/log4j2.xml rename to app/src/main/resources/log4j2.xml diff --git a/framework/pom.xml b/framework/pom.xml new file mode 100644 index 0000000..a1ee872 --- /dev/null +++ b/framework/pom.xml @@ -0,0 +1,16 @@ + + 4.0.0 + + org.toop + pism + 1.0-SNAPSHOT + + + + + io.netty + netty-all + 4.2.6.Final + + + \ No newline at end of file diff --git a/src/main/java/org/toop/framework/Logging.java b/framework/src/main/java/org/toop/Logging.java similarity index 100% rename from src/main/java/org/toop/framework/Logging.java rename to framework/src/main/java/org/toop/Logging.java diff --git a/src/main/java/org/toop/framework/eventbus/EventFlow.java b/framework/src/main/java/org/toop/eventbus/EventFlow.java similarity index 100% rename from src/main/java/org/toop/framework/eventbus/EventFlow.java rename to framework/src/main/java/org/toop/eventbus/EventFlow.java diff --git a/src/main/java/org/toop/framework/eventbus/GlobalEventBus.java b/framework/src/main/java/org/toop/eventbus/GlobalEventBus.java similarity index 100% rename from src/main/java/org/toop/framework/eventbus/GlobalEventBus.java rename to framework/src/main/java/org/toop/eventbus/GlobalEventBus.java diff --git a/src/main/java/org/toop/framework/eventbus/events/EventWithUuid.java b/framework/src/main/java/org/toop/eventbus/events/EventWithUuid.java similarity index 100% rename from src/main/java/org/toop/framework/eventbus/events/EventWithUuid.java rename to framework/src/main/java/org/toop/eventbus/events/EventWithUuid.java diff --git a/src/main/java/org/toop/framework/eventbus/events/Events.java b/framework/src/main/java/org/toop/eventbus/events/Events.java similarity index 100% rename from src/main/java/org/toop/framework/eventbus/events/Events.java rename to framework/src/main/java/org/toop/eventbus/events/Events.java diff --git a/src/main/java/org/toop/framework/eventbus/events/IEvent.java b/framework/src/main/java/org/toop/eventbus/events/IEvent.java similarity index 100% rename from src/main/java/org/toop/framework/eventbus/events/IEvent.java rename to framework/src/main/java/org/toop/eventbus/events/IEvent.java diff --git a/src/main/java/org/toop/framework/eventbus/events/NetworkEvents.java b/framework/src/main/java/org/toop/eventbus/events/NetworkEvents.java similarity index 100% rename from src/main/java/org/toop/framework/eventbus/events/NetworkEvents.java rename to framework/src/main/java/org/toop/eventbus/events/NetworkEvents.java diff --git a/src/main/java/org/toop/framework/eventbus/events/ServerEvents.java b/framework/src/main/java/org/toop/eventbus/events/ServerEvents.java similarity index 100% rename from src/main/java/org/toop/framework/eventbus/events/ServerEvents.java rename to framework/src/main/java/org/toop/eventbus/events/ServerEvents.java diff --git a/src/main/java/org/toop/framework/networking/NetworkingClient.java b/framework/src/main/java/org/toop/networking/NetworkingClient.java similarity index 100% rename from src/main/java/org/toop/framework/networking/NetworkingClient.java rename to framework/src/main/java/org/toop/networking/NetworkingClient.java diff --git a/src/main/java/org/toop/framework/networking/NetworkingClientManager.java b/framework/src/main/java/org/toop/networking/NetworkingClientManager.java similarity index 100% rename from src/main/java/org/toop/framework/networking/NetworkingClientManager.java rename to framework/src/main/java/org/toop/networking/NetworkingClientManager.java diff --git a/src/main/java/org/toop/framework/networking/NetworkingGameClientHandler.java b/framework/src/main/java/org/toop/networking/NetworkingGameClientHandler.java similarity index 100% rename from src/main/java/org/toop/framework/networking/NetworkingGameClientHandler.java rename to framework/src/main/java/org/toop/networking/NetworkingGameClientHandler.java diff --git a/src/main/java/org/toop/framework/networking/handlers/NetworkingTicTacToeClientHandler.java b/framework/src/main/java/org/toop/networking/handlers/NetworkingTicTacToeClientHandler.java similarity index 100% rename from src/main/java/org/toop/framework/networking/handlers/NetworkingTicTacToeClientHandler.java rename to framework/src/main/java/org/toop/networking/handlers/NetworkingTicTacToeClientHandler.java diff --git a/framework/src/main/resources/log4j2.xml b/framework/src/main/resources/log4j2.xml new file mode 100644 index 0000000..18686f2 --- /dev/null +++ b/framework/src/main/resources/log4j2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/test/java/org/toop/LoggingTest.java b/framework/src/test/LoggingTest.java similarity index 100% rename from src/test/java/org/toop/LoggingTest.java rename to framework/src/test/LoggingTest.java diff --git a/src/test/java/org/toop/eventbus/EventPublisherSpeedTest.java b/framework/src/test/eventbus/EventPublisherSpeedTest.java similarity index 100% rename from src/test/java/org/toop/eventbus/EventPublisherSpeedTest.java rename to framework/src/test/eventbus/EventPublisherSpeedTest.java diff --git a/src/test/java/org/toop/eventbus/EventPublisherStressTest.java b/framework/src/test/eventbus/EventPublisherStressTest.java similarity index 100% rename from src/test/java/org/toop/eventbus/EventPublisherStressTest.java rename to framework/src/test/eventbus/EventPublisherStressTest.java diff --git a/src/test/java/org/toop/eventbus/EventPublisherTest.java b/framework/src/test/eventbus/EventPublisherTest.java similarity index 100% rename from src/test/java/org/toop/eventbus/EventPublisherTest.java rename to framework/src/test/eventbus/EventPublisherTest.java diff --git a/src/test/java/org/toop/eventbus/GlobalEventBusTest.java b/framework/src/test/eventbus/GlobalEventBusTest.java similarity index 100% rename from src/test/java/org/toop/eventbus/GlobalEventBusTest.java rename to framework/src/test/eventbus/GlobalEventBusTest.java diff --git a/games/pom.xml b/games/pom.xml new file mode 100644 index 0000000..68816de --- /dev/null +++ b/games/pom.xml @@ -0,0 +1,7 @@ + + 4.0.0 + + org.toop + pism + 1.0-SNAPSHOT + \ No newline at end of file diff --git a/src/main/java/org/toop/games/GameBase.java b/games/src/main/java/org/toop/GameBase.java similarity index 100% rename from src/main/java/org/toop/games/GameBase.java rename to games/src/main/java/org/toop/GameBase.java diff --git a/src/main/java/org/toop/games/Player.java b/games/src/main/java/org/toop/Player.java similarity index 100% rename from src/main/java/org/toop/games/Player.java rename to games/src/main/java/org/toop/Player.java diff --git a/src/main/java/org/toop/games/tictactoe/TicTacToe.java b/games/src/main/java/org/toop/tictactoe/TicTacToe.java similarity index 100% rename from src/main/java/org/toop/games/tictactoe/TicTacToe.java rename to games/src/main/java/org/toop/tictactoe/TicTacToe.java diff --git a/src/main/java/org/toop/games/tictactoe/TicTacToeAI.java b/games/src/main/java/org/toop/tictactoe/TicTacToeAI.java similarity index 100% rename from src/main/java/org/toop/games/tictactoe/TicTacToeAI.java rename to games/src/main/java/org/toop/tictactoe/TicTacToeAI.java diff --git a/games/src/main/resources/log4j2.xml b/games/src/main/resources/log4j2.xml new file mode 100644 index 0000000..18686f2 --- /dev/null +++ b/games/src/main/resources/log4j2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/test/java/org/toop/game/tictactoe/GameBaseTest.java b/games/src/test/tictactoe/GameBaseTest.java similarity index 97% rename from src/test/java/org/toop/game/tictactoe/GameBaseTest.java rename to games/src/test/tictactoe/GameBaseTest.java index 25d94dd..3d21823 100644 --- a/src/test/java/org/toop/game/tictactoe/GameBaseTest.java +++ b/games/src/test/tictactoe/GameBaseTest.java @@ -1,7 +1,5 @@ package org.toop.game.tictactoe; -import static org.junit.jupiter.api.Assertions.*; - import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.toop.games.GameBase; diff --git a/src/test/java/org/toop/game/tictactoe/PlayerTest.java b/games/src/test/tictactoe/PlayerTest.java similarity index 93% rename from src/test/java/org/toop/game/tictactoe/PlayerTest.java rename to games/src/test/tictactoe/PlayerTest.java index 9975d1e..abf2d58 100644 --- a/src/test/java/org/toop/game/tictactoe/PlayerTest.java +++ b/games/src/test/tictactoe/PlayerTest.java @@ -1,7 +1,5 @@ package org.toop.game.tictactoe; -import static org.junit.jupiter.api.Assertions.*; - import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.toop.games.Player; diff --git a/src/test/java/org/toop/game/tictactoe/ai/MinMaxTicTacToeTest.java b/games/src/test/tictactoe/ai/MinMaxTicTacToeTest.java similarity index 100% rename from src/test/java/org/toop/game/tictactoe/ai/MinMaxTicTacToeTest.java rename to games/src/test/tictactoe/ai/MinMaxTicTacToeTest.java diff --git a/pom.xml b/pom.xml index 487a851..435e53c 100644 --- a/pom.xml +++ b/pom.xml @@ -13,8 +13,6 @@ 25 UTF-8 - - org.toop.app.Main @@ -96,85 +94,11 @@ error_prone_annotations 2.42.0 - - - - io.netty - netty-all - 4.2.6.Final - - - - - maven-surefire-plugin - 3.5.4 - - stress - - - - maven-failsafe-plugin - 3.5.4 - - - org.apache.maven.plugins - maven-shade-plugin - 3.6.1 - - - package - - - shade - - - - - - ${main-class} - - - - - - - - com.diffplug.spotless - spotless-maven-plugin - 2.46.1 - - - origin/main - - - - - - .gitattributes - .gitignore - - - - - - true - 4 - - - - - - - 1.28.0 - - true - true - - - - - - + + framework + games + app + \ No newline at end of file diff --git a/src/test/java/org/toop/backend/TcpServerTest.java b/src/test/java/org/toop/backend/TcpServerTest.java deleted file mode 100644 index 512850e..0000000 --- a/src/test/java/org/toop/backend/TcpServerTest.java +++ /dev/null @@ -1,109 +0,0 @@ -package org.toop.backend; - -import static org.junit.jupiter.api.Assertions.*; - -import java.io.*; -import java.net.Socket; -import java.util.concurrent.TimeUnit; -import org.junit.jupiter.api.*; -import org.toop.backend.tictactoe.TcpServer; - -class TcpServerTest { - - static class TestTcpServer extends TcpServer { - public TestTcpServer(int port) throws IOException { - super(port); - } - - @Override - public void run() { - // Call super.run() in a separate thread if needed - super.run(); - } - } - - private TestTcpServer server; - private Thread serverThread; - private int port = 12345; - - @BeforeEach - void setup() throws IOException { - server = new TestTcpServer(port); - serverThread = new Thread(server::run); - serverThread.start(); - } - - @AfterEach - void teardown() { - server.stop(); - try { - serverThread.join(1000); - } catch (InterruptedException ignored) { - } - } - - @Test - void testServerStartsAndStops() { - assertTrue(server.isRunning()); - server.stop(); - assertFalse(server.isRunning()); - } - - @Test - void testClientMessageEnqueued() throws IOException, InterruptedException { - Socket client = new Socket("localhost", port); - PrintWriter out = new PrintWriter(client.getOutputStream(), true); - - String message = "hello server"; - out.println(message); - - String received = server.receivedQueue.poll(1, TimeUnit.SECONDS); - assertEquals(message, received); - - client.close(); - } - - @Test - void testSendQueueSendsToClient() throws IOException, InterruptedException { - Socket client = new Socket("localhost", port); - BufferedReader in = new BufferedReader(new InputStreamReader(client.getInputStream())); - - String msg = "test message"; - server.sendQueue.put(msg); - - // The server may need some time to deliver - String received = in.readLine(); - assertEquals(msg, received); - - client.close(); - } - - // @Test - // void testGetNewestCommand() throws InterruptedException { - // String command = "move 1 2"; - // server.receivedQueue.put(command); - // - // ParsedCommand parsed = server.getNewestCommand(); - // System.out.println(parsed); - // assertNotNull(parsed); - // assertEquals(command, parsed.returnMessage); TODO: Test later - // } - - // @Test - // void testMultipleClients() throws IOException, InterruptedException { - // Socket client1 = new Socket("localhost", port); - // Socket client2 = new Socket("localhost", port); - // - // PrintWriter out1 = new PrintWriter(client1.getOutputStream(), true); - // PrintWriter out2 = new PrintWriter(client2.getOutputStream(), true); - // - // out1.println("msg1"); - // out2.println("msg2"); - // - // assertEquals("msg1", server.receivedQueue.poll(1, TimeUnit.SECONDS)); - // assertEquals("msg2", server.receivedQueue.poll(1, TimeUnit.SECONDS)); - // - // client1.close(); - // client2.close(); - // } TODO: Temp disable for MVP -} diff --git a/src/test/java/org/toop/frontend/math/BoundsTest.java b/src/test/java/org/toop/frontend/math/BoundsTest.java deleted file mode 100644 index d8bfd98..0000000 --- a/src/test/java/org/toop/frontend/math/BoundsTest.java +++ /dev/null @@ -1,60 +0,0 @@ -package org.toop.frontend.math; - -import static org.junit.jupiter.api.Assertions.*; - -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; - -class BoundsTest { - - private Bounds bounds; - - @BeforeEach - void setUp() { - bounds = new Bounds(10, 20, 100, 50); - } - - @Test - void testConstructorAndGetters() { - assertEquals(10, bounds.getX()); - assertEquals(20, bounds.getY()); - assertEquals(100, bounds.getWidth()); - assertEquals(50, bounds.getHeight()); - } - - @Test - void testSetUpdatesFields() { - bounds.set(5, 15, 50, 25); - - assertEquals(5, bounds.getX()); - assertEquals(15, bounds.getY()); - assertEquals(50, bounds.getWidth()); - assertEquals(25, bounds.getHeight()); - } - - @Test - void testCheckInsideBounds() { - // Points inside the bounds - assertTrue(bounds.check(10, 20)); // top-left corner - assertTrue(bounds.check(110, 70)); // bottom-right corner - assertTrue(bounds.check(60, 45)); // inside - } - - @Test - void testCheckOutsideBounds() { - // Points outside the bounds - assertFalse(bounds.check(9, 20)); // left - assertFalse(bounds.check(10, 19)); // above - assertFalse(bounds.check(111, 70)); // right - assertFalse(bounds.check(110, 71)); // below - } - - @Test - void testCheckOnEdgeBounds() { - // Points on the edges should be considered inside - assertTrue(bounds.check(10, 20)); // top-left - assertTrue(bounds.check(110, 20)); // top-right - assertTrue(bounds.check(10, 70)); // bottom-left - assertTrue(bounds.check(110, 70)); // bottom-right - } -} diff --git a/src/test/java/org/toop/frontend/math/ColorTest.java b/src/test/java/org/toop/frontend/math/ColorTest.java deleted file mode 100644 index ab979e0..0000000 --- a/src/test/java/org/toop/frontend/math/ColorTest.java +++ /dev/null @@ -1,32 +0,0 @@ -package org.toop.frontend.math; - -import static org.junit.jupiter.api.Assertions.*; - -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; - -class ColorTest { - - private Color color; - - @BeforeEach - void setUp() { - color = new Color(0.1f, 0.5f, 0.9f); - } - - @Test - void testConstructorAndGetters() { - assertEquals(0.1f, color.r(), 0.0001, "Red component should match"); - assertEquals(0.5f, color.g(), 0.0001, "Green component should match"); - assertEquals(0.9f, color.b(), 0.0001, "Blue component should match"); - } - - @Test - void testDifferentColorValues() { - Color c = new Color(1.0f, 0.0f, 0.5f); - - assertEquals(1.0f, c.r(), 0.0001); - assertEquals(0.0f, c.g(), 0.0001); - assertEquals(0.5f, c.b(), 0.0001); - } -}