From 17ef882d44b20c02fd0d1b104480bfdf54cf9fcf Mon Sep 17 00:00:00 2001
From: Persson-dev <sim16.prib@gmail.com>
Date: Wed, 16 Apr 2025 19:29:31 +0200
Subject: [PATCH] remove board from constructor

---
 app/src/main/java/chess/ConsoleMain.java   |  3 +--
 app/src/main/java/chess/SwingMain.java     |  3 +--
 app/src/main/java/chess/model/Game.java    |  4 ++--
 app/src/main/java/chess/pgn/PgnExport.java |  6 ++----
 app/src/test/java/chess/AppTest.java       | 18 +++++++-----------
 5 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/app/src/main/java/chess/ConsoleMain.java b/app/src/main/java/chess/ConsoleMain.java
index 322cfe9..80c9bd0 100644
--- a/app/src/main/java/chess/ConsoleMain.java
+++ b/app/src/main/java/chess/ConsoleMain.java
@@ -5,14 +5,13 @@ package chess;
 
 import chess.controller.CommandExecutor;
 import chess.controller.commands.NewGameCommand;
-import chess.model.ChessBoard;
 import chess.model.Game;
 import chess.simulator.PromoteTest;
 import chess.view.consolerender.Console;
 
 public class ConsoleMain {
     public static void main(String[] args) {
-        Game game = new Game(new ChessBoard());
+        Game game = new Game();
         CommandExecutor commandExecutor = new CommandExecutor(game);
 
         PromoteTest promoteTest = new PromoteTest(commandExecutor);
diff --git a/app/src/main/java/chess/SwingMain.java b/app/src/main/java/chess/SwingMain.java
index 6ad22a2..1c8822c 100644
--- a/app/src/main/java/chess/SwingMain.java
+++ b/app/src/main/java/chess/SwingMain.java
@@ -4,7 +4,6 @@ import chess.ai.DumbAI;
 import chess.controller.CommandExecutor;
 import chess.controller.commands.NewGameCommand;
 import chess.controller.event.GameAdaptator;
-import chess.model.ChessBoard;
 import chess.model.Color;
 import chess.model.Game;
 import chess.pgn.PgnExport;
@@ -12,7 +11,7 @@ import chess.view.simplerender.Window;
 
 public class SwingMain {
 	public static void main(String[] args) {
-        Game game = new Game(new ChessBoard());
+        Game game = new Game();
         CommandExecutor commandExecutor = new CommandExecutor(game);
 
         Window window = new Window(commandExecutor, false);
diff --git a/app/src/main/java/chess/model/Game.java b/app/src/main/java/chess/model/Game.java
index 2ad9a6e..8982632 100644
--- a/app/src/main/java/chess/model/Game.java
+++ b/app/src/main/java/chess/model/Game.java
@@ -20,8 +20,8 @@ public class Game {
 		Draw, Check, CheckMate, OnGoing, Pat;
 	}
 
-	public Game(ChessBoard board) {
-		this.board = board;
+	public Game() {
+		this.board = new ChessBoard();
 		this.movesHistory = new Stack<>();
 		this.traitsPos = new HashMap<>();
 	}
diff --git a/app/src/main/java/chess/pgn/PgnExport.java b/app/src/main/java/chess/pgn/PgnExport.java
index c400b3c..3ad34f5 100644
--- a/app/src/main/java/chess/pgn/PgnExport.java
+++ b/app/src/main/java/chess/pgn/PgnExport.java
@@ -11,7 +11,6 @@ import chess.controller.commands.MoveCommand;
 import chess.controller.commands.NewGameCommand;
 import chess.controller.commands.PromoteCommand;
 import chess.controller.event.EmptyGameDispatcher;
-import chess.model.ChessBoard;
 import chess.model.Color;
 import chess.model.Coordinate;
 import chess.model.Game;
@@ -22,7 +21,7 @@ import chess.model.pieces.Pawn;
 public class PgnExport {
 
 	// public static void main(String[] args) {
-	// 	final Game game = new Game(new ChessBoard());
+	// 	final Game game = new Game();
 	// 	final CommandExecutor commandExecutor = new CommandExecutor(game);
 
 	// 	DumbAI ai1 = new DumbAI(commandExecutor, Color.White);
@@ -190,8 +189,7 @@ public class PgnExport {
 
 	public static String exportGame(Game game) {
 
-		ChessBoard board = new ChessBoard();
-		Game virtualGame = new Game(board);
+		Game virtualGame = new Game();
 
 		CommandExecutor executor = new CommandExecutor(virtualGame, new EmptyGameDispatcher());
 		executor.executeCommand(new NewGameCommand());
diff --git a/app/src/test/java/chess/AppTest.java b/app/src/test/java/chess/AppTest.java
index c82e541..e734791 100644
--- a/app/src/test/java/chess/AppTest.java
+++ b/app/src/test/java/chess/AppTest.java
@@ -3,24 +3,20 @@
  */
 package chess;
 
+import org.junit.jupiter.api.Test;
+
 import chess.ai.DumbAI;
 import chess.controller.Command;
 import chess.controller.CommandExecutor;
 import chess.controller.commands.NewGameCommand;
 import chess.controller.commands.UndoCommand;
 import chess.controller.event.GameAdaptator;
-import chess.model.*;
-import chess.model.pieces.*;
-import chess.simulator.Simulator;
-import chess.view.simplerender.Window;
-import org.junit.jupiter.api.Test;
-
-import java.util.List;
-import java.util.Objects;
+import chess.model.Color;
+import chess.model.Game;
 
 class AppTest {
     @Test void functionalRollback(){
-        Game game = new Game(new ChessBoard());
+        Game game = new Game();
         CommandExecutor commandExecutor = new CommandExecutor(game);
 
         DumbAI ai = new DumbAI(commandExecutor, Color.Black);
@@ -38,9 +34,9 @@ class AppTest {
                     result = commandExecutor.executeCommand(new UndoCommand());
                 } while (result != Command.CommandResult.NotAllowed);
 
-                Game initialGame = new Game(new ChessBoard());
+                Game initialGame = new Game();
                 CommandExecutor initialCommandExecutor = new CommandExecutor(initialGame);
-                commandExecutor.executeCommand(new NewGameCommand());
+                initialCommandExecutor.executeCommand(new NewGameCommand());
 
                 assert(game.getBoard().equals(initialGame.getBoard()));