From 58a8002eb4d9fbe9032fde4de665417dc5a2507a Mon Sep 17 00:00:00 2001 From: pedretl Date: Mon, 13 Apr 2026 16:00:11 +0200 Subject: [PATCH] rename packages lower case --- src/main/java/client/DeckGridAppFX.java | 13 +++++-- src/main/java/client/DeckViewerFX.java | 6 +-- src/main/java/module-info.java | 12 +++--- .../{Server => server}/BuildingManager.java | 12 +++--- .../{Server => server}/BuildingRules.java | 2 +- src/main/java/{Server => server}/Era.java | 2 +- .../java/{Server => server}/EventsSolver.java | 9 ++--- .../java/{Server => server}/GameBoard.java | 9 ++--- .../java/{Server => server}/OfferingTile.java | 2 +- src/main/java/{Server => server}/Player.java | 4 +- src/main/java/{Server => server}/Symbol.java | 2 +- .../java/{Server => server}/TotemColor.java | 2 +- src/main/java/{Server => server}/Tribe.java | 10 ++--- .../java/{Server => server}/TurnTile.java | 6 +-- .../java/{Server => server}/TurnTileOld.java | 2 +- .../automaton}/ActionResult.java | 2 +- .../automaton}/Automaton.java | 2 +- .../Automaton => server/automaton}/Game.java | 16 ++++---- .../automaton}/GameState.java | 2 +- .../Cards => server/cards}/BuildingCard.java | 6 +-- .../{Server/Cards => server/cards}/Card.java | 4 +- .../Cards => server/cards}/CardDeck.java | 7 ++-- .../Cards => server/cards}/CharacterCard.java | 6 +-- .../Cards => server/cards}/CharacterType.java | 2 +- .../{Server/Cards => server/cards}/Event.java | 2 +- .../Cards => server/cards}/EventCard.java | 6 +-- .../Cards => server/cards}/Trigger.java | 2 +- .../utils}/EventsManagerException.java | 2 +- .../Utils => server/utils}/GameException.java | 2 +- .../utils}/LoadingCardsException.java | 2 +- .../BuildingManagerTest.java | 10 ++--- .../{Server => server}/EventsSolverTest.java | 12 +++--- .../{Server => server}/GameBoardTest.java | 6 +-- .../{Server => server}/OfferingTileTest.java | 2 +- .../java/{Server => server}/PlayerTest.java | 2 +- .../java/{Server => server}/TribeTest.java | 12 +++--- .../{Server => server}/TurnTileOldTest.java | 2 +- .../java/{Server => server}/TurnTileTest.java | 38 +++++++------------ .../automaton}/GameTest.java | 4 +- .../cards}/BuildingCardTest.java | 6 +-- .../Cards => server/cards}/CardDeckTest.java | 5 ++- .../cards}/CharacterCardTest.java | 6 +-- .../Cards => server/cards}/EventCardTest.java | 6 +-- 43 files changed, 127 insertions(+), 140 deletions(-) rename src/main/java/{Server => server}/BuildingManager.java (97%) rename src/main/java/{Server => server}/BuildingRules.java (98%) rename src/main/java/{Server => server}/Era.java (95%) rename src/main/java/{Server => server}/EventsSolver.java (96%) rename src/main/java/{Server => server}/GameBoard.java (99%) rename src/main/java/{Server => server}/OfferingTile.java (99%) rename src/main/java/{Server => server}/Player.java (97%) rename src/main/java/{Server => server}/Symbol.java (76%) rename src/main/java/{Server => server}/TotemColor.java (95%) rename src/main/java/{Server => server}/Tribe.java (98%) rename src/main/java/{Server => server}/TurnTile.java (97%) rename src/main/java/{Server => server}/TurnTileOld.java (99%) rename src/main/java/{Server/Automaton => server/automaton}/ActionResult.java (95%) rename src/main/java/{Server/Automaton => server/automaton}/Automaton.java (97%) rename src/main/java/{Server/Automaton => server/automaton}/Game.java (98%) rename src/main/java/{Server/Automaton => server/automaton}/GameState.java (98%) rename src/main/java/{Server/Cards => server/cards}/BuildingCard.java (97%) rename src/main/java/{Server/Cards => server/cards}/Card.java (93%) rename src/main/java/{Server/Cards => server/cards}/CardDeck.java (97%) rename src/main/java/{Server/Cards => server/cards}/CharacterCard.java (95%) rename src/main/java/{Server/Cards => server/cards}/CharacterType.java (82%) rename src/main/java/{Server/Cards => server/cards}/Event.java (80%) rename src/main/java/{Server/Cards => server/cards}/EventCard.java (94%) rename src/main/java/{Server/Cards => server/cards}/Trigger.java (93%) rename src/main/java/{Server/Utils => server/utils}/EventsManagerException.java (87%) rename src/main/java/{Server/Utils => server/utils}/GameException.java (85%) rename src/main/java/{Server/Utils => server/utils}/LoadingCardsException.java (86%) rename src/test/java/{Server => server}/BuildingManagerTest.java (98%) rename src/test/java/{Server => server}/EventsSolverTest.java (97%) rename src/test/java/{Server => server}/GameBoardTest.java (98%) rename src/test/java/{Server => server}/OfferingTileTest.java (98%) rename src/test/java/{Server => server}/PlayerTest.java (99%) rename src/test/java/{Server => server}/TribeTest.java (96%) rename src/test/java/{Server => server}/TurnTileOldTest.java (98%) rename src/test/java/{Server => server}/TurnTileTest.java (60%) rename src/test/java/{Server/Automaton => server/automaton}/GameTest.java (82%) rename src/test/java/{Server/Cards => server/cards}/BuildingCardTest.java (94%) rename src/test/java/{Server/Cards => server/cards}/CardDeckTest.java (99%) rename src/test/java/{Server/Cards => server/cards}/CharacterCardTest.java (92%) rename src/test/java/{Server/Cards => server/cards}/EventCardTest.java (91%) diff --git a/src/main/java/client/DeckGridAppFX.java b/src/main/java/client/DeckGridAppFX.java index fdf5e76..938be8f 100644 --- a/src/main/java/client/DeckGridAppFX.java +++ b/src/main/java/client/DeckGridAppFX.java @@ -1,9 +1,10 @@ package client; -import Server.*; -import Server.Automaton.ActionResult; -import Server.Automaton.Game; -import Server.Cards.*; +import server.*; +import server.*; +import server.automaton.ActionResult; +import server.automaton.Game; +import server.cards.*; import javafx.animation.*; import javafx.application.Application; import javafx.application.Platform; @@ -29,6 +30,10 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.rendering.PDFRenderer; +import server.cards.BuildingCard; +import server.cards.Card; +import server.cards.CharacterCard; +import server.cards.CharacterType; import java.awt.image.BufferedImage; import java.io.IOException; diff --git a/src/main/java/client/DeckViewerFX.java b/src/main/java/client/DeckViewerFX.java index 507ede0..cc80fa7 100644 --- a/src/main/java/client/DeckViewerFX.java +++ b/src/main/java/client/DeckViewerFX.java @@ -1,8 +1,8 @@ package client; -import Server.Automaton.Game; -import Server.Player; -import Server.TotemColor; +import server.automaton.Game; +import server.Player; +import server.TotemColor; import javafx.application.Application; import javafx.embed.swing.SwingFXUtils; import javafx.geometry.Insets; diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java index 0d579e5..c8788b7 100644 --- a/src/main/java/module-info.java +++ b/src/main/java/module-info.java @@ -8,12 +8,12 @@ module org.example.mesosll07 { requires org.apache.logging.log4j; opens org.example.mesosll07 to javafx.fxml; - exports Server; - opens Server to javafx.fxml; - exports Server.Cards; - opens Server.Cards to javafx.fxml; - exports Server.Automaton; - opens Server.Automaton to javafx.fxml; + exports server; + opens server to javafx.fxml; + exports server.cards; + opens server.cards to javafx.fxml; + exports server.automaton; + opens server.automaton to javafx.fxml; exports client; opens client to javafx.fxml; } \ No newline at end of file diff --git a/src/main/java/Server/BuildingManager.java b/src/main/java/server/BuildingManager.java similarity index 97% rename from src/main/java/Server/BuildingManager.java rename to src/main/java/server/BuildingManager.java index 40857c4..d0704f7 100644 --- a/src/main/java/Server/BuildingManager.java +++ b/src/main/java/server/BuildingManager.java @@ -1,10 +1,10 @@ -package Server; +package server; -import Server.Cards.BuildingCard; -import Server.Cards.CharacterCard; -import Server.Cards.CharacterType; -import Server.Cards.Trigger; -import Server.Utils.EventsManagerException; +import server.cards.BuildingCard; +import server.cards.CharacterCard; +import server.cards.CharacterType; +import server.cards.Trigger; +import server.utils.EventsManagerException; import java.util.ArrayList; diff --git a/src/main/java/Server/BuildingRules.java b/src/main/java/server/BuildingRules.java similarity index 98% rename from src/main/java/Server/BuildingRules.java rename to src/main/java/server/BuildingRules.java index 5c2aaca..a64127e 100644 --- a/src/main/java/Server/BuildingRules.java +++ b/src/main/java/server/BuildingRules.java @@ -1,4 +1,4 @@ -package Server; +package server; import java.util.*; diff --git a/src/main/java/Server/Era.java b/src/main/java/server/Era.java similarity index 95% rename from src/main/java/Server/Era.java rename to src/main/java/server/Era.java index d797dd4..7fa7c06 100644 --- a/src/main/java/Server/Era.java +++ b/src/main/java/server/Era.java @@ -1,4 +1,4 @@ -package Server; +package server; public enum Era { I, diff --git a/src/main/java/Server/EventsSolver.java b/src/main/java/server/EventsSolver.java similarity index 96% rename from src/main/java/Server/EventsSolver.java rename to src/main/java/server/EventsSolver.java index 23bb2ae..1ac8489 100644 --- a/src/main/java/Server/EventsSolver.java +++ b/src/main/java/server/EventsSolver.java @@ -1,9 +1,8 @@ -package Server; +package server; -import Server.Cards.Event; -import Server.Cards.EventCard; -import Server.Cards.Trigger; -import Server.Utils.EventsManagerException; +import server.cards.Event; +import server.cards.EventCard; +import server.utils.EventsManagerException; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/Server/GameBoard.java b/src/main/java/server/GameBoard.java similarity index 99% rename from src/main/java/Server/GameBoard.java rename to src/main/java/server/GameBoard.java index 4684da7..859d75d 100644 --- a/src/main/java/Server/GameBoard.java +++ b/src/main/java/server/GameBoard.java @@ -1,12 +1,11 @@ -package Server; +package server; -import Server.Automaton.Game; -import Server.Cards.*; +import server.cards.*; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import server.cards.*; import java.util.ArrayList; -import java.util.HashMap; import java.util.Iterator; import java.util.List; @@ -35,7 +34,7 @@ public class GameBoard { private Era era; - private final CardDeck cardDeck; + private final CardDeck cardDeck; private final List topRow; private final List bottomRow; private final List offeringTiles; diff --git a/src/main/java/Server/OfferingTile.java b/src/main/java/server/OfferingTile.java similarity index 99% rename from src/main/java/Server/OfferingTile.java rename to src/main/java/server/OfferingTile.java index 1c9b3dd..e79f0ec 100644 --- a/src/main/java/Server/OfferingTile.java +++ b/src/main/java/server/OfferingTile.java @@ -1,4 +1,4 @@ -package Server; +package server; import java.util.Collections; import java.util.List; diff --git a/src/main/java/Server/Player.java b/src/main/java/server/Player.java similarity index 97% rename from src/main/java/Server/Player.java rename to src/main/java/server/Player.java index 23e7ea5..cda24eb 100644 --- a/src/main/java/Server/Player.java +++ b/src/main/java/server/Player.java @@ -1,6 +1,6 @@ -package Server; +package server; -import Server.Cards.CharacterCard; +import server.cards.CharacterCard; import java.util.Objects; diff --git a/src/main/java/Server/Symbol.java b/src/main/java/server/Symbol.java similarity index 76% rename from src/main/java/Server/Symbol.java rename to src/main/java/server/Symbol.java index e0a67a5..ff57844 100644 --- a/src/main/java/Server/Symbol.java +++ b/src/main/java/server/Symbol.java @@ -1,4 +1,4 @@ -package Server; +package server; public enum Symbol { UP, diff --git a/src/main/java/Server/TotemColor.java b/src/main/java/server/TotemColor.java similarity index 95% rename from src/main/java/Server/TotemColor.java rename to src/main/java/server/TotemColor.java index 5ad405b..8e19d2c 100644 --- a/src/main/java/Server/TotemColor.java +++ b/src/main/java/server/TotemColor.java @@ -1,4 +1,4 @@ -package Server; +package server; import javafx.scene.paint.Color; diff --git a/src/main/java/Server/Tribe.java b/src/main/java/server/Tribe.java similarity index 98% rename from src/main/java/Server/Tribe.java rename to src/main/java/server/Tribe.java index e38fec3..966184a 100644 --- a/src/main/java/Server/Tribe.java +++ b/src/main/java/server/Tribe.java @@ -1,9 +1,9 @@ -package Server; +package server; -import Server.Cards.BuildingCard; -import Server.Cards.CharacterCard; -import Server.Cards.CharacterType; -import Server.Cards.Trigger; +import server.cards.BuildingCard; +import server.cards.CharacterCard; +import server.cards.CharacterType; +import server.cards.Trigger; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/Server/TurnTile.java b/src/main/java/server/TurnTile.java similarity index 97% rename from src/main/java/Server/TurnTile.java rename to src/main/java/server/TurnTile.java index f050f3c..566ef9e 100644 --- a/src/main/java/Server/TurnTile.java +++ b/src/main/java/server/TurnTile.java @@ -1,4 +1,4 @@ -package Server; +package server; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -42,10 +42,10 @@ public class TurnTile { /** * Randomises the initial turn order. Call once during game setup. */ - public void setInitialOrder(List players) { + public void setInitialOrder(List players, boolean random) { List shuffled = new ArrayList<>(players); - Collections.shuffle(shuffled); + if (random) Collections.shuffle(shuffled); for (int i = 0; i < shuffled.size(); i++) { positions[i] = shuffled.get(i); } diff --git a/src/main/java/Server/TurnTileOld.java b/src/main/java/server/TurnTileOld.java similarity index 99% rename from src/main/java/Server/TurnTileOld.java rename to src/main/java/server/TurnTileOld.java index 1d780d0..f877148 100644 --- a/src/main/java/Server/TurnTileOld.java +++ b/src/main/java/server/TurnTileOld.java @@ -1,4 +1,4 @@ -package Server; +package server; import java.util.List; diff --git a/src/main/java/Server/Automaton/ActionResult.java b/src/main/java/server/automaton/ActionResult.java similarity index 95% rename from src/main/java/Server/Automaton/ActionResult.java rename to src/main/java/server/automaton/ActionResult.java index 4c7717a..86a36aa 100644 --- a/src/main/java/Server/Automaton/ActionResult.java +++ b/src/main/java/server/automaton/ActionResult.java @@ -1,4 +1,4 @@ -package Server.Automaton; +package server.automaton; public class ActionResult { private final boolean success; diff --git a/src/main/java/Server/Automaton/Automaton.java b/src/main/java/server/automaton/Automaton.java similarity index 97% rename from src/main/java/Server/Automaton/Automaton.java rename to src/main/java/server/automaton/Automaton.java index b41996f..16108bd 100644 --- a/src/main/java/Server/Automaton/Automaton.java +++ b/src/main/java/server/automaton/Automaton.java @@ -1,4 +1,4 @@ -package Server.Automaton; +package server.automaton; public class Automaton { diff --git a/src/main/java/Server/Automaton/Game.java b/src/main/java/server/automaton/Game.java similarity index 98% rename from src/main/java/Server/Automaton/Game.java rename to src/main/java/server/automaton/Game.java index 41598a8..a370a26 100644 --- a/src/main/java/Server/Automaton/Game.java +++ b/src/main/java/server/automaton/Game.java @@ -1,8 +1,10 @@ -package Server.Automaton; +package server.automaton; -import Server.*; -import Server.Cards.*; -import Server.Utils.LoadingCardsException; +import server.*; +import server.cards.*; +import server.*; +import server.cards.*; +import server.utils.LoadingCardsException; import java.io.InputStream; import java.util.ArrayList; @@ -48,7 +50,7 @@ public class Game { // ------------------------------------------------------------------------- private final List players; - private GameBoard gameBoard; + private GameBoard gameBoard; private int round; private GameState state; @@ -106,7 +108,7 @@ public class Game { gameBoard.initOfferingTiles(players.size()); gameBoard.setupInitialRows(players.size()); - gameBoard.getTurnTile().setInitialOrder(players); + gameBoard.getTurnTile().setInitialOrder(players, true); dealInitialFood(); round = 1; @@ -255,7 +257,7 @@ public class Game { */ private void filterImpossibleActions(Player player) { - Card ctop = gameBoard.getTopRow().stream().filter(s -> s instanceof CharacterCard || s instanceof BuildingCard).findFirst().orElse(null); + Card ctop = gameBoard.getTopRow().stream().filter(s -> s instanceof CharacterCard || s instanceof BuildingCard).findFirst().orElse(null); Card cdown = gameBoard.getBottomRow().stream().filter(s -> s instanceof CharacterCard || s instanceof BuildingCard).findFirst().orElse(null); boolean topEmpty = ctop == null; diff --git a/src/main/java/Server/Automaton/GameState.java b/src/main/java/server/automaton/GameState.java similarity index 98% rename from src/main/java/Server/Automaton/GameState.java rename to src/main/java/server/automaton/GameState.java index 7420de9..4d6ab0d 100644 --- a/src/main/java/Server/Automaton/GameState.java +++ b/src/main/java/server/automaton/GameState.java @@ -1,4 +1,4 @@ -package Server.Automaton; +package server.automaton; public enum GameState implements Comparable { UNKNOWN, diff --git a/src/main/java/Server/Cards/BuildingCard.java b/src/main/java/server/cards/BuildingCard.java similarity index 97% rename from src/main/java/Server/Cards/BuildingCard.java rename to src/main/java/server/cards/BuildingCard.java index 78442d5..88ebd26 100644 --- a/src/main/java/Server/Cards/BuildingCard.java +++ b/src/main/java/server/cards/BuildingCard.java @@ -1,7 +1,7 @@ -package Server.Cards; +package server.cards; -import Server.Era; -import Server.Player; +import server.Era; +import server.Player; public class BuildingCard extends Card{ private final int cost; diff --git a/src/main/java/Server/Cards/Card.java b/src/main/java/server/cards/Card.java similarity index 93% rename from src/main/java/Server/Cards/Card.java rename to src/main/java/server/cards/Card.java index 45bb193..63dfa92 100644 --- a/src/main/java/Server/Cards/Card.java +++ b/src/main/java/server/cards/Card.java @@ -1,6 +1,6 @@ -package Server.Cards; +package server.cards; -import Server.Era; +import server.Era; public abstract class Card { private final int cardId; diff --git a/src/main/java/Server/Cards/CardDeck.java b/src/main/java/server/cards/CardDeck.java similarity index 97% rename from src/main/java/Server/Cards/CardDeck.java rename to src/main/java/server/cards/CardDeck.java index 4b86c7d..8f48054 100644 --- a/src/main/java/Server/Cards/CardDeck.java +++ b/src/main/java/server/cards/CardDeck.java @@ -1,8 +1,7 @@ -package Server.Cards; +package server.cards; -import Server.Automaton.Game; -import Server.Era; -import Server.Utils.LoadingCardsException; +import server.Era; +import server.utils.LoadingCardsException; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/Server/Cards/CharacterCard.java b/src/main/java/server/cards/CharacterCard.java similarity index 95% rename from src/main/java/Server/Cards/CharacterCard.java rename to src/main/java/server/cards/CharacterCard.java index dd377d6..aa80328 100644 --- a/src/main/java/Server/Cards/CharacterCard.java +++ b/src/main/java/server/cards/CharacterCard.java @@ -1,7 +1,7 @@ -package Server.Cards; +package server.cards; -import Server.Era; -import Server.Utils.LoadingCardsException; +import server.Era; +import server.utils.LoadingCardsException; public class CharacterCard extends Card{ private final CharacterType characterType; diff --git a/src/main/java/Server/Cards/CharacterType.java b/src/main/java/server/cards/CharacterType.java similarity index 82% rename from src/main/java/Server/Cards/CharacterType.java rename to src/main/java/server/cards/CharacterType.java index 6c6b938..c4b8feb 100644 --- a/src/main/java/Server/Cards/CharacterType.java +++ b/src/main/java/server/cards/CharacterType.java @@ -1,4 +1,4 @@ -package Server.Cards; +package server.cards; public enum CharacterType { INVENTOR, diff --git a/src/main/java/Server/Cards/Event.java b/src/main/java/server/cards/Event.java similarity index 80% rename from src/main/java/Server/Cards/Event.java rename to src/main/java/server/cards/Event.java index 3f46f28..bab5628 100644 --- a/src/main/java/Server/Cards/Event.java +++ b/src/main/java/server/cards/Event.java @@ -1,4 +1,4 @@ -package Server.Cards; +package server.cards; public enum Event { SUSTAINMENT, diff --git a/src/main/java/Server/Cards/EventCard.java b/src/main/java/server/cards/EventCard.java similarity index 94% rename from src/main/java/Server/Cards/EventCard.java rename to src/main/java/server/cards/EventCard.java index c9de2e8..5ecce33 100644 --- a/src/main/java/Server/Cards/EventCard.java +++ b/src/main/java/server/cards/EventCard.java @@ -1,7 +1,7 @@ -package Server.Cards; +package server.cards; -import Server.Era; -import Server.Utils.LoadingCardsException; +import server.Era; +import server.utils.LoadingCardsException; public class EventCard extends Card { private final Event event; diff --git a/src/main/java/Server/Cards/Trigger.java b/src/main/java/server/cards/Trigger.java similarity index 93% rename from src/main/java/Server/Cards/Trigger.java rename to src/main/java/server/cards/Trigger.java index 9c583c9..8540b5c 100644 --- a/src/main/java/Server/Cards/Trigger.java +++ b/src/main/java/server/cards/Trigger.java @@ -1,4 +1,4 @@ -package Server.Cards; +package server.cards; public enum Trigger { FOOD_FOR_SIX, diff --git a/src/main/java/Server/Utils/EventsManagerException.java b/src/main/java/server/utils/EventsManagerException.java similarity index 87% rename from src/main/java/Server/Utils/EventsManagerException.java rename to src/main/java/server/utils/EventsManagerException.java index 37126a2..4c26ccc 100644 --- a/src/main/java/Server/Utils/EventsManagerException.java +++ b/src/main/java/server/utils/EventsManagerException.java @@ -1,4 +1,4 @@ -package Server.Utils; +package server.utils; public class EventsManagerException extends RuntimeException { public EventsManagerException(String message) { diff --git a/src/main/java/Server/Utils/GameException.java b/src/main/java/server/utils/GameException.java similarity index 85% rename from src/main/java/Server/Utils/GameException.java rename to src/main/java/server/utils/GameException.java index 257d1af..8ae81ba 100644 --- a/src/main/java/Server/Utils/GameException.java +++ b/src/main/java/server/utils/GameException.java @@ -1,4 +1,4 @@ -package Server.Utils; +package server.utils; public class GameException extends RuntimeException { public GameException(String message) { diff --git a/src/main/java/Server/Utils/LoadingCardsException.java b/src/main/java/server/utils/LoadingCardsException.java similarity index 86% rename from src/main/java/Server/Utils/LoadingCardsException.java rename to src/main/java/server/utils/LoadingCardsException.java index 40f772e..33dff03 100644 --- a/src/main/java/Server/Utils/LoadingCardsException.java +++ b/src/main/java/server/utils/LoadingCardsException.java @@ -1,4 +1,4 @@ -package Server.Utils; +package server.utils; public class LoadingCardsException extends RuntimeException { public LoadingCardsException(String message) { diff --git a/src/test/java/Server/BuildingManagerTest.java b/src/test/java/server/BuildingManagerTest.java similarity index 98% rename from src/test/java/Server/BuildingManagerTest.java rename to src/test/java/server/BuildingManagerTest.java index e6701a4..448db39 100644 --- a/src/test/java/Server/BuildingManagerTest.java +++ b/src/test/java/server/BuildingManagerTest.java @@ -1,10 +1,8 @@ -package Server; +package server; -import Server.Cards.BuildingCard; - -import Server.Cards.CardDeck; -import Server.Cards.CharacterCard; -import Server.Cards.EventCard; +import server.cards.CardDeck; +import server.cards.CharacterCard; +import server.cards.EventCard; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/src/test/java/Server/EventsSolverTest.java b/src/test/java/server/EventsSolverTest.java similarity index 97% rename from src/test/java/Server/EventsSolverTest.java rename to src/test/java/server/EventsSolverTest.java index 5b635f4..54613ff 100644 --- a/src/test/java/Server/EventsSolverTest.java +++ b/src/test/java/server/EventsSolverTest.java @@ -1,10 +1,10 @@ -package Server; +package server; -import Server.Cards.Card; -import Server.Cards.CardDeck; -import Server.Cards.CharacterCard; -import Server.Cards.EventCard; -import Server.Utils.EventsManagerException; +import server.cards.Card; +import server.cards.CardDeck; +import server.cards.CharacterCard; +import server.cards.EventCard; +import server.utils.EventsManagerException; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/src/test/java/Server/GameBoardTest.java b/src/test/java/server/GameBoardTest.java similarity index 98% rename from src/test/java/Server/GameBoardTest.java rename to src/test/java/server/GameBoardTest.java index ee3e97c..e3e8e1a 100644 --- a/src/test/java/Server/GameBoardTest.java +++ b/src/test/java/server/GameBoardTest.java @@ -1,11 +1,11 @@ -package Server; +package server; -import Server.Cards.*; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import server.*; +import server.cards.CardDeck; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/Server/OfferingTileTest.java b/src/test/java/server/OfferingTileTest.java similarity index 98% rename from src/test/java/Server/OfferingTileTest.java rename to src/test/java/server/OfferingTileTest.java index 75235ef..f5cf5e8 100644 --- a/src/test/java/Server/OfferingTileTest.java +++ b/src/test/java/server/OfferingTileTest.java @@ -1,4 +1,4 @@ -package Server; +package server; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/Server/PlayerTest.java b/src/test/java/server/PlayerTest.java similarity index 99% rename from src/test/java/Server/PlayerTest.java rename to src/test/java/server/PlayerTest.java index f43209f..e098b30 100644 --- a/src/test/java/Server/PlayerTest.java +++ b/src/test/java/server/PlayerTest.java @@ -1,4 +1,4 @@ -package Server; +package server; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/Server/TribeTest.java b/src/test/java/server/TribeTest.java similarity index 96% rename from src/test/java/Server/TribeTest.java rename to src/test/java/server/TribeTest.java index 75f9596..ca05eb5 100644 --- a/src/test/java/Server/TribeTest.java +++ b/src/test/java/server/TribeTest.java @@ -1,13 +1,11 @@ -package Server; +package server; -import Server.Cards.BuildingCard; -import Server.Cards.CharacterCard; -import Server.Cards.CharacterType; -import Server.Cards.Trigger; -import Server.Era; +import server.cards.BuildingCard; +import server.cards.CharacterCard; +import server.cards.CharacterType; +import server.cards.Trigger; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/src/test/java/Server/TurnTileOldTest.java b/src/test/java/server/TurnTileOldTest.java similarity index 98% rename from src/test/java/Server/TurnTileOldTest.java rename to src/test/java/server/TurnTileOldTest.java index 51b5da4..d055284 100644 --- a/src/test/java/Server/TurnTileOldTest.java +++ b/src/test/java/server/TurnTileOldTest.java @@ -1,4 +1,4 @@ -package Server; +package server; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/Server/TurnTileTest.java b/src/test/java/server/TurnTileTest.java similarity index 60% rename from src/test/java/Server/TurnTileTest.java rename to src/test/java/server/TurnTileTest.java index f623c43..9e2d716 100644 --- a/src/test/java/Server/TurnTileTest.java +++ b/src/test/java/server/TurnTileTest.java @@ -1,4 +1,4 @@ -package Server; +package server; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -19,7 +19,6 @@ class TurnTileTest { List players = new ArrayList<>(); @BeforeEach public void setUp(){ - players.add(player1); players.add(player2); players.add(player3); @@ -27,38 +26,27 @@ class TurnTileTest { players.add(player5); turnTile = new TurnTile(5); } -/** + @Test void startOrder() { - assertEquals(5, turnTileOld.startOrder(players).length); + turnTile.setInitialOrder(players, false); + assertEquals(player1, turnTile.nextToPlace()); + assertEquals(player2, turnTile.nextToPlace()); + assertEquals(player3, turnTile.nextToPlace()); + assertEquals(player4, turnTile.nextToPlace()); + assertEquals(player5, turnTile.nextToPlace()); } @Test void giveReward() { - turnTileOld.startOrder(players); + turnTile.setInitialOrder(players, false); player5.addFood(1); - assertEquals(0, turnTileOld.giveReward(player5).getFoodTokens()); - + System.out.println(player5); + turnTile.returnTotem(player5); + System.out.println(player5); + assertEquals(0, player5.getFoodTokens()); } - @Test - void nextPlayer() { - - //test that the method proceeds along the array - turnTileOld.startOrder(players); - assertEquals(player2, turnTileOld.nextPlayer()); - - } - - @Test - void addPlayer() { - - //verify that the first player changes - - turnTileOld.startOrder(players); - assertEquals(player2, turnTileOld.addPlayer(player2)); - } - **/ } \ No newline at end of file diff --git a/src/test/java/Server/Automaton/GameTest.java b/src/test/java/server/automaton/GameTest.java similarity index 82% rename from src/test/java/Server/Automaton/GameTest.java rename to src/test/java/server/automaton/GameTest.java index eceae75..e7ec7a8 100644 --- a/src/test/java/Server/Automaton/GameTest.java +++ b/src/test/java/server/automaton/GameTest.java @@ -1,9 +1,7 @@ -package Server.Automaton; +package server.automaton; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; - class GameTest { @Test diff --git a/src/test/java/Server/Cards/BuildingCardTest.java b/src/test/java/server/cards/BuildingCardTest.java similarity index 94% rename from src/test/java/Server/Cards/BuildingCardTest.java rename to src/test/java/server/cards/BuildingCardTest.java index f06e587..c89a87e 100644 --- a/src/test/java/Server/Cards/BuildingCardTest.java +++ b/src/test/java/server/cards/BuildingCardTest.java @@ -1,9 +1,9 @@ -package Server.Cards; +package server.cards; import org.junit.jupiter.api.Test; -import static Server.Era.I; -import static Server.Era.II; +import static server.Era.I; +import static server.Era.II; import static org.junit.jupiter.api.Assertions.*; class BuildingCardTest { diff --git a/src/test/java/Server/Cards/CardDeckTest.java b/src/test/java/server/cards/CardDeckTest.java similarity index 99% rename from src/test/java/Server/Cards/CardDeckTest.java rename to src/test/java/server/cards/CardDeckTest.java index 1668bb0..dfa9a96 100644 --- a/src/test/java/Server/Cards/CardDeckTest.java +++ b/src/test/java/server/cards/CardDeckTest.java @@ -1,9 +1,10 @@ -package Server.Cards; +package server.cards; import org.junit.jupiter.api.Test; import java.util.List; -import Server.Era; + +import server.Era; import static org.junit.jupiter.api.Assertions.*; class CardDeckTest { diff --git a/src/test/java/Server/Cards/CharacterCardTest.java b/src/test/java/server/cards/CharacterCardTest.java similarity index 92% rename from src/test/java/Server/Cards/CharacterCardTest.java rename to src/test/java/server/cards/CharacterCardTest.java index 936d117..860c306 100644 --- a/src/test/java/Server/Cards/CharacterCardTest.java +++ b/src/test/java/server/cards/CharacterCardTest.java @@ -1,9 +1,9 @@ -package Server.Cards; +package server.cards; -import Server.Utils.LoadingCardsException; +import server.utils.LoadingCardsException; import org.junit.jupiter.api.Test; -import static Server.Era.I; +import static server.Era.I; import static org.junit.jupiter.api.Assertions.*; class CharacterCardTest { diff --git a/src/test/java/Server/Cards/EventCardTest.java b/src/test/java/server/cards/EventCardTest.java similarity index 91% rename from src/test/java/Server/Cards/EventCardTest.java rename to src/test/java/server/cards/EventCardTest.java index db225ac..a40e7d6 100644 --- a/src/test/java/Server/Cards/EventCardTest.java +++ b/src/test/java/server/cards/EventCardTest.java @@ -1,9 +1,9 @@ -package Server.Cards; +package server.cards; -import Server.Utils.LoadingCardsException; +import server.utils.LoadingCardsException; import org.junit.jupiter.api.Test; -import static Server.Era.I; +import static server.Era.I; import static org.junit.jupiter.api.Assertions.*; class EventCardTest {