Test de isLegal (à debug) [wip]

Diagrammes/Diagramme_Avalam.mmd

@@ -0,0 +1,218 @@
+---
+title: Avalam - Diagramme de classes (complet)
+---
+classDiagram
+
+    class AvalamBoard{
+        +SIZE: int
+        -MAX_HEIGHT: int
+        -grid: Tower[][]
+        -gameOver: boolean
+        -result: Result
+
+        +AvalamBoard(Tower[][] initialGrid, Player startingPlayer)
+        +AvalamBoard(Tower[][] initialGrid)
+        -AvalamBoard(Tower[][] grid, Player current, boolean gameOver, Result result)
+        +getTowerAt(int row, int col): Tower
+        -inBounds(int r, int c): boolean
+        -areAdjacent(int r1, int c1, int r2, int c2): boolean
+        -colorForPlayer(Player p): Color
+        +isGameOver(): boolean
+        +getResult(): Result
+        +isLegal(AbstractPly c): boolean
+        +doPly(AbstractPly c): void
+        +iterator(): Iterator<AbstractPly>
+        +safeCopy(): IBoard
+    }
+    
+    AvalamBoard "1" *-- "many" Tower
+    AvalamBoard ..> AvalamPly
+    
+    class AvalamPly{
+        -xFrom : int
+        -yFrom : int
+        -xTo : int
+        -yTo : int
+
+        +AvalamPly(Player player, int xFrom, int yFrom, int xTo, int yTo)
+        +getXFrom(): int
+        +getXFrom(): int
+        +getXFrom(): int
+        +getXFrom(): int
+
+        +toString(): String
+    }
+
+    
+    
+    class AvalamWindow{
+        -board : AvalamBoard
+        -scoreView : ScoreView
+        -turnView : TurnView
+        -boardView : BoardView
+        -mode: GameMode 
+        -botPlayer: Player
+        -idiotBot: IdiotBot
+        -alphaBot: AlphaBetaBot
+        -divineBot: Object
+        -botAnimating: boolean
+
+        +AvalamWindow()
+        +AvalamWindow(GameMode mode)
+        +AvalamWindow(GameMode mode, int alphaDepth)
+        +onBoardUpdated(): void
+        -maybePlayBotTurn(): void
+        -computeScore(Color c): int
+        -turnMessage(): String
+    }
+
+    AvalamWindow *-- AvalamBoard
+    AvalamWindow *-- BoardView
+    AvalamWindow *-- ScoreView
+    AvalamWindow *-- TurnView
+    AvalamWindow --> GameMode
+
+    class BoardLoader{
+        +loadFromFile(String resourcePath): Tower[][]
+    }
+    
+    
+
+    class BoardView{
+        -board: AvalamBoard
+        -backgroundLayer: BackgroundLayer
+        -highlightLayer: HighlightLayer
+        -pieceLayer: PieceLayer
+        -controller: InteractionController
+        -size: int
+        -spacing: int
+        -xBase: int
+        -yBase: int
+        -boardUpdateCallback: Runnable
+
+        +BoardView(AvalamBoard board, Runnable boardUpdateCallback)
+        +getController(): InteractionController
+        +setInteractionEnabled(boolean enabled): void
+        +onBoardUpdated(): void
+        +refresh(): void
+        -boardGrid(): Tower[][]
+        -boardGrid(): Tower[][]
+    }
+
+    BoardView *-- BackgroundLayer
+    BoardView *-- HighlightLayer
+    BoardView *-- PieceLayer
+    BoardView *-- InteractionController
+    BoardView --> AvalamBoard
+
+    class BackgroundLayer{
+        -img: Image
+        +BackgroundLayer(String resourcePath)
+        #paintComponent(Graphics g): void
+    }
+
+
+
+    class Color{
+        -YELLOW(int r, int g, int b)
+        -RED(int r, int g, int b)
+        -swingColor: java.awt.Color
+        +Color(int r, int g, int b)
+        +getSwingColor(): java.awt.Color
+        +toPlayer(): fr.iut_fbleau.GameAPI.Player
+    }
+
+    class GameMode{
+        PVP
+        PVBOT
+        PVALPHA
+        PVGOD 
+    }
+    
+    class HighlightLayer{
+        -xBase: int
+        -yBase: int
+        -spacing: int
+        -size: int
+        -legalMoves: List<Point>
+
+        +HighlightLayer(int xBase, int yBase, int spacing, int size)
+        +setLegalMoves(List<Point> moves): void
+        #paintComponent(Graphics g): void
+    }
+
+    class InteractionController{
+        -board: AvalamBoard
+        -selectedRow: int
+        -selectedCol: int
+        -legalMoves: List<Point>
+        -view: BoardView
+
+        +InteractionController(AvalamBoard board, BoardView view)
+        +onPieceClicked(int r, int c): void
+        +selectTower(int r, int c): void
+        -clearSelection(): void
+        -computeLegalMoves(): void
+        -tryMove(int r, int c): void
+    }
+
+    InteractionController --> AvalamBoard
+    InteractionController --> BoardView
+
+    class Main{
+        +main(String[] args): void
+    }
+
+    Main ..> AvalamWindow
+    Main ..> GameMode
+
+    class PieceButton{
+        -color: java.awt.Color
+        -height: int
+        -hover: boolean
+        +row: int
+        +col: int
+
+        +PieceButton(java.awt.Color c, int height, int row, int col)
+        #paintComponent(Graphics g): void
+        +contains(int x, int y): boolean
+
+    }
+    
+    class PieceLayer{
+        +PieceLayer()
+        +displayGrid(Tower[][] grid, int xBase, int yBase, int spacing, int size, java.util.function.BiConsumer<Integer, Integer> clickCallback): void
+    }
+
+    class ScoreView{
+        -scoreY: JLabel
+        -scoreR: JLabel
+
+        +ScoreView(int y, int r)
+        +updateScores(int y, int r): void
+    }
+
+    class Tower{
+        -height: byte
+        -color: Color
+
+        +Tower(int height, Color color)
+        +createTower(Color color): Tower
+        +getHeight(): int
+        +getColor(): Color
+        +mergeTower(Tower src): void
+        +toString(): String
+    }
+
+    Tower --> Color
+
+    class TurnView{
+        -text: JLabel
+
+        +TurnView(String initial)
+        +setTurn(String s): void
+    }
+
+    BoardLoader ..> Tower
+    PieceLayer ..> Tower
+    PieceButton ..> Tower

Diagrammes/Diagramme_Bot.mmd

@@ -0,0 +1,27 @@
+---
+title: Bot - Diagramme de classes (complet)
+---
+classDiagram
+
+    class AlphaBetaBot{
+        -me: Player
+        -maxDepth: int
+        -rng: Random
+
+        +AlphaBetaBot(Player p, int maxDepth)
+        +giveYourMove(IBoard board): AbstractPly
+        -alphaBeta(IBoard board, int depth, int alpha, int beta): int
+        -terminalValue(IBoard board): int
+        -evaluate(IBoard board): int
+        -listMoves(IBoard board): List<AbstractPly>
+    }
+
+    class DivineBot{
+
+    }
+
+    class IdiotBot{
+        -rng: Random
+        +IdiotBot(Player p)
+        +giveYourMove(IBoard board): AbstractPly
+    }

Diagrammes/Diagramme_GameAPI

@@ -0,0 +1,73 @@
+---
+title: GameAPI - Diagramme de classes (complet)
+---
+classDiagram
+
+    class AbstractBoard{
+        <<abstract>>
+        -currentPlayer: Player
+        -history: Deque<AbstractPly>
+
+        +AbstractBoard(Player p, Deque<AbstractPly> h)
+        #setNextPlayer(): void
+        #addPlyToHistory(AbstractPly c): void
+        #removePlyFromHistory(): AbstractPly
+        #getLastPlyFromHistory(): AbstractPly
+        +getCurrentPlayer()
+        +isGameOver(): boolean
+        +getResult(): Result
+        +isLegal(AbstractPly c): boolean
+        +iterator(): Iterator<AbstractPly>
+        +doPly(AbstractPly c): void
+        +undoPly(): void
+        +safeCopy(): IBoard
+    }
+
+    class AbstractGame{
+        <<abstract>>
+        -currentBoard: IBoard
+        -mapPlayers: EnumMap<Player, AbstractGamePlayer>
+
+        +AbstractGame(IBoard b, EnumMap<Player,AbstractGamePlayer> m)
+        +run(): Result
+    }
+
+    class AbstractGamePlayer{
+        <<abstract>>
+        -iAm: Player
+        
+        +AbstractGamePlayer(Player p)
+        +giveYourMove(IBoard p): AbstractPly
+    }
+
+    class AbstractPly{
+        <<abstract>>
+        -joueur: Player
+        
+        +AbstractPly(Player j)
+        +getPlayer(): Player
+    }
+
+    class IBoard{
+        +getCurrentPlayer(): Player
+        +isGameOver(): boolean
+        +getResult(): Result
+        +isLegal(AbstractPly c): boolean
+        +iterator(): Iterator<AbstractPly>
+        +doPly(AbstractPly c): void
+        +undoPly(): void
+        +safeCopy(): IBoard
+    }
+
+    class Player{
+        <<enumerate>>
+        PLAYER1
+        PLAYER2
+    }
+
+    class Result{
+        <<enumerate>>
+        WIN
+        DRAW
+        LOSS
+    }

Makefile

@@ -1,3 +1,6 @@
+# === Environnements ===
+TEST_ENV = "bin:/usr/share/java/junit.jar:/usr/share/java/hamcrest-core.jar"
+
 # === Répertoires ===
 SRC_DIR = fr
 BIN_DIR = bin
@@ -12,12 +15,16 @@ SOURCES := $(shell find $(SRC_DIR) -name "*.java")
 # === Classe principale ===
 MAIN_CLASS = fr.iut_fbleau.Avalam.Main
 
+# === Classe de test ===
+TEST_CLASS = fr.iut_fbleau.Tests.AvalamBoardTest
+
 # === Commandes Java ===
 JC = javac
-JCFLAGS = -d $(BIN_DIR)
+JCFLAGS = -d $(BIN_DIR) -cp $(TEST_ENV)
 
 JAVA = java
 JAVAFLAGS = -cp $(BIN_DIR)
+JAVAFLAGS_TESTS = -cp $(TEST_ENV)
 
 # === Règle par défaut ===
 all: build
@@ -43,6 +50,12 @@ run:
 	@echo "===> Lancement du jeu Avalam..."
 	@$(JAVA) $(JAVAFLAGS) $(MAIN_CLASS)
 
+# === Tests ===
+test:
+	@echo "===> Lancement des tests..."
+	@$(JAVA) $(JAVAFLAGS_TESTS) org.junit.runner.JUnitCore $(TEST_CLASS)
+	@echo "... Fin des tests."
+
 # === Nettoyage ===
 clean:
 	@echo "===> Suppression des fichiers compilés..."

fr/iut_fbleau/Avalam/BackgroundLayer.java

@@ -0,0 +1,37 @@
+package fr.iut_fbleau.Avalam;
+
+import javax.swing.*;
+import java.awt.*;
+
+/**
+* La classe <code>BackgroundLayer</code>
+* 
+* Sous composant de BoardView affichant l’image de fond.
+*/
+public class BackgroundLayer extends JComponent {
+    private Image img;
+
+    /**
+    * Construit une couche de fond.
+    *
+    * @param resourcePath chemin de l'image de fond
+    */
+    public BackgroundLayer(String resourcePath) {
+        img = Toolkit.getDefaultToolkit().getImage(
+                getClass().getClassLoader().getResource(resourcePath)
+        );
+    }
+
+    /**
+    * Dessine l'image de fond.
+    *
+    * @param g contexte graphique
+    */
+    @Override
+    protected void paintComponent(Graphics g) {
+        super.paintComponent(g);
+        if (img != null) {
+            g.drawImage(img, 0, 0, getWidth(), getHeight(), this);
+        }
+    }
+}

fr/iut_fbleau/Avalam/BoardView.java

@@ -1,192 +1,159 @@
-package fr.iut_fbleau.Avalam;
+package fr.iut_fbleau.Avalam;
-
+
-import javax.swing.*;
+import javax.swing.*;
-import java.awt.*;
+import java.awt.*;
-
+
-/**
+/**
-* La classe <code>BoardView</code>
+* La classe <code>BoardView</code>
-*
+*
-* Représente la vue principale du plateau Avalam.
+* Représente la vue principale du plateau Avalam.
-* Elle gère :
+* Elle gère :
-* - l’affichage des tours (PieceLayer)
+* - l’affichage des tours (PieceLayer)
-* - l’affichage des coups possibles (HighlightLayer)
+* - l’affichage des coups possibles (HighlightLayer)
-* - l’affichage du fond graphique
+* - l’affichage du fond graphique (BackgroundLayer)
-* - les clics via InteractionController
+* - les clics via InteractionController
-*
+*
-* Cette classe ne contient aucune logique de règles du jeu.
+* Cette classe ne contient aucune logique de règles du jeu.
-*
+*
-* @version 1.0
+* @version 1.0
-* Date :
+* Date :
-* Licence :
+* Licence :
-*/
+*/
-public class BoardView extends JLayeredPane {
+public class BoardView extends JLayeredPane {
-
+
-    //Attributs
+    //Attributs
-
+
-    /** Référence au moteur Avalam. */
+    /** Référence au moteur Avalam. */
-    private AvalamBoard board;
+    private AvalamBoard board;
-
+
-    /** Couche d’affichage du fond. */
+    /** Couche d’affichage du fond. */
-    private BackgroundLayer backgroundLayer;
+    private BackgroundLayer backgroundLayer;
-
+
-    /** Couche d’affichage des coups possibles. */
+    /** Couche d’affichage des coups possibles. */
-    private HighlightLayer highlightLayer;
+    private HighlightLayer highlightLayer;
-
+
-    /** Couche d’affichage des pièces. */
+    /** Couche d’affichage des pièces. */
-    private PieceLayer pieceLayer;
+    private PieceLayer pieceLayer;
-
+
-    /** Contrôleur des interactions. */
+    /** Contrôleur des interactions. */
-    private InteractionController controller;
+    private InteractionController controller;
-
+
-    /** Taille d’un pion en pixels. */
+    /** Taille d’un pion en pixels. */
-    private final int size = 50;
+    private final int size = 50;
-
+
-    /** Espacement entre les cases. */
+    /** Espacement entre les cases. */
-    private final int spacing = 70;
+    private final int spacing = 70;
-
+
-    /** Décalage horizontal du plateau. */
+    /** Décalage horizontal du plateau. */
-    private final int xBase = 60;
+    private final int xBase = 60;
-
+
-    /** Décalage vertical du plateau. */
+    /** Décalage vertical du plateau. */
-    private final int yBase = 60;
+    private final int yBase = 60;
-
+
-    /** Callback vers AvalamWindow pour mise à jour (score, tour, fin). */
+    /** Callback vers AvalamWindow pour mise à jour (score, tour, fin). */
-    private Runnable boardUpdateCallback;
+    private Runnable boardUpdateCallback;
-
+
-    //Constructeur
+    //Constructeur
-
+
-    /**
+    /**
-    * Construit la vue du plateau.
+    * Construit la vue du plateau.
-    *
+    *
-    * @param board moteur du jeu
+    * @param board moteur du jeu
-    * @param boardUpdateCallback callback à appeler après un coup
+    * @param boardUpdateCallback callback à appeler après un coup
-    */
+    */
-    public BoardView(AvalamBoard board, Runnable boardUpdateCallback) {
+    public BoardView(AvalamBoard board, Runnable boardUpdateCallback) {
-        this.board = board;
+        this.board = board;
-        this.boardUpdateCallback = boardUpdateCallback;
+        this.boardUpdateCallback = boardUpdateCallback;
-
+
-        setLayout(null);
+        setLayout(null);
-
+
-        // Contrôleur
+        // Contrôleur
-        this.controller = new InteractionController(board, this);
+        this.controller = new InteractionController(board, this);
-
+
-        // Couche fond
+        // Couche fond
-        backgroundLayer = new BackgroundLayer("fr/iut_fbleau/Res/BackgroundAvalam.png");
+        backgroundLayer = new BackgroundLayer("fr/iut_fbleau/Res/BackgroundAvalam.png");
-        backgroundLayer.setBounds(0, 0, 725, 725);
+        backgroundLayer.setBounds(0, 0, 725, 725);
-        add(backgroundLayer, JLayeredPane.FRAME_CONTENT_LAYER);
+        add(backgroundLayer, JLayeredPane.FRAME_CONTENT_LAYER);
-
+
-        // Couche highlight
+        // Couche highlight
-        highlightLayer = new HighlightLayer(xBase, yBase, spacing, size);
+        highlightLayer = new HighlightLayer(xBase, yBase, spacing, size);
-        add(highlightLayer, JLayeredPane.DEFAULT_LAYER);
+        add(highlightLayer, JLayeredPane.DEFAULT_LAYER);
-
+
-        // Couche pièces
+        // Couche pièces
-        pieceLayer = new PieceLayer();
+        pieceLayer = new PieceLayer();
-        add(pieceLayer, JLayeredPane.PALETTE_LAYER);
+        add(pieceLayer, JLayeredPane.PALETTE_LAYER);
-
+
-        setPreferredSize(new Dimension(725, 725));
+        setPreferredSize(new Dimension(725, 725));
-
+
-        refresh();
+        refresh();
-    }
+    }
-
+
-    //Méthodes
+    //Méthodes
-
+
-    /**
+    /**
-    * Retourne le contrôleur d'interactions (utile pour simuler les clics du bot).
+    * Retourne le contrôleur d'interactions (utile pour simuler les clics du bot).
-    *
+    *
-    * @return contrôleur
+    * @return contrôleur
-    */
+    */
-    public InteractionController getController() {
+    public InteractionController getController() {
-        return controller;
+        return controller;
-    }
+    }
-
+
-    /**
+    /**
-    * Active/désactive les interactions utilisateur sur le plateau.
+    * Active/désactive les interactions utilisateur sur le plateau.
-    * Utile pendant l'animation du bot pour éviter des clics concurrents.
+    * Utile pendant l'animation du bot pour éviter des clics concurrents.
-    *
+    *
-    * @param enabled true pour activer, false pour désactiver
+    * @param enabled true pour activer, false pour désactiver
-    */
+    */
-    public void setInteractionEnabled(boolean enabled) {
+    public void setInteractionEnabled(boolean enabled) {
-        // Désactive la couche des pièces (boutons) principalement
+        // Désactive la couche des pièces (boutons) principalement
-        pieceLayer.setEnabled(enabled);
+        pieceLayer.setEnabled(enabled);
-        for (Component c : pieceLayer.getComponents()) {
+        for (Component c : pieceLayer.getComponents()) {
-            c.setEnabled(enabled);
+            c.setEnabled(enabled);
-        }
+        }
-    }
+    }
-
+
-    /**
+    /**
-    * Appelé par le contrôleur après un coup.
+    * Appelé par le contrôleur après un coup.
-    */
+    */
-    public void onBoardUpdated() {
+    public void onBoardUpdated() {
-        if (boardUpdateCallback != null) {
+        if (boardUpdateCallback != null) {
-            boardUpdateCallback.run();
+            boardUpdateCallback.run();
-        }
+        }
-    }
+    }
-
+
-    /**
+    /**
-    * Rafraîchit les couches visuelles.
+    * Rafraîchit les couches visuelles.
-    */
+    */
-    public void refresh() {
+    public void refresh() {
-
+
-        pieceLayer.displayGrid(
+        pieceLayer.displayGrid(
-                boardGrid(),
+                boardGrid(),
-                xBase, yBase, spacing, size,
+                xBase, yBase, spacing, size,
-                (r, c) -> controller.onPieceClicked(r, c)
+                (r, c) -> controller.onPieceClicked(r, c)
-        );
+        );
-
+
-        highlightLayer.setLegalMoves(controller.getLegalMoves());
+        highlightLayer.setLegalMoves(controller.getLegalMoves());
-
+
-        backgroundLayer.repaint();
+        backgroundLayer.repaint();
-        highlightLayer.repaint();
+        highlightLayer.repaint();
-        pieceLayer.repaint();
+        pieceLayer.repaint();
-        repaint();
+        repaint();
-    }
+    }
-
+
-    /**
+    /**
-    * Récupère la grille depuis le moteur.
+    * Récupère la grille depuis le moteur.
-    *
+    *
-    * @return grille 9x9 de tours
+    * @return grille 9x9 de tours
-    */
+    */
-    private Tower[][] boardGrid() {
+    private Tower[][] boardGrid() {
-        Tower[][] grid = new Tower[AvalamBoard.SIZE][AvalamBoard.SIZE];
+        Tower[][] grid = new Tower[AvalamBoard.SIZE][AvalamBoard.SIZE];
-
+
-        for (int r = 0; r < AvalamBoard.SIZE; r++) {
+        for (int r = 0; r < AvalamBoard.SIZE; r++) {
-            for (int c = 0; c < AvalamBoard.SIZE; c++) {
+            for (int c = 0; c < AvalamBoard.SIZE; c++) {
-                grid[r][c] = board.getTowerAt(r, c);
+                grid[r][c] = board.getTowerAt(r, c);
-            }
+            }
-        }
+        }
-        return grid;
+        return grid;
-    }
+    }
-
+}
-    //Affichage
-
-    /**
-    * Composant affichant l’image de fond.
-    */
-    private static class BackgroundLayer extends JComponent {
-        private Image img;
-
-        /**
-        * Construit une couche de fond.
-        *
-        * @param resourcePath chemin de l'image de fond
-        */
-        public BackgroundLayer(String resourcePath) {
-            img = Toolkit.getDefaultToolkit().getImage(
-                    getClass().getClassLoader().getResource(resourcePath)
-            );
-        }
-
-        /**
-        * Dessine l'image de fond.
-        *
-        * @param g contexte graphique
-        */
-        @Override
-        protected void paintComponent(Graphics g) {
-            super.paintComponent(g);
-            if (img != null) {
-                g.drawImage(img, 0, 0, getWidth(), getHeight(), this);
-            }
-        }
-    }
-}

fr/iut_fbleau/Tests/AvalamBoardTest.java

@@ -0,0 +1,122 @@
+package fr.iut_fbleau.Tests;
+
+import fr.iut_fbleau.GameAPI.AbstractPly;
+import fr.iut_fbleau.GameAPI.Player;
+
+import fr.iut_fbleau.Avalam.AvalamBoard;
+import fr.iut_fbleau.Avalam.AvalamPly;
+import fr.iut_fbleau.Avalam.Tower;
+import fr.iut_fbleau.Avalam.Color;
+
+import org.junit.Before;
+import org.junit.Test;
+//import org.mockito.Mockito;  //À retirer si Mockito absent
+
+import static org.junit.Assert.*;
+
+/**
+* La classe <code>AvalamBoardTest</code> test si la méthode isLegal() fonctionne comme prévu.
+*/
+public class AvalamBoardTest {
+
+    private Tower[][] grid;
+    private AvalamBoard board;
+
+    @Before
+    public void setUp() {
+        grid = new Tower[AvalamBoard.SIZE][AvalamBoard.SIZE];
+        // Par défaut, current player sera PLAYER1 via constructeur sans joueur
+        board = new AvalamBoard(grid);
+    }
+
+    /*
+    @Test  //À retirer si Mockito absent
+    public void nonAvalamPly_returnsFalse() {
+        AbstractPly fake = Mockito.mock(AbstractPly.class); // instance non-AvalamPly
+        assertFalse(board.isLegal(fake));
+    }*/
+
+    @Test
+    public void outOfBounds_returnsFalse() {
+        grid[2][2] = new Tower(1, Color.YELLOW);
+        grid[2][3] = new Tower(1, Color.RED);
+        AvalamPly p = new AvalamPly(Player.PLAYER1, -1, 2, 2, 3);
+        assertFalse(board.isLegal(p));
+
+        AvalamPly p2 = new AvalamPly(Player.PLAYER1, 2, 2, 9, 3);
+        assertFalse(board.isLegal(p2));
+    }
+
+    @Test
+    public void sameCell_returnsFalse() {
+        grid[4][4] = new Tower(1, Color.YELLOW);
+        AvalamPly p = new AvalamPly(Player.PLAYER1, 4, 4, 4, 4);
+        assertFalse(board.isLegal(p));
+    }
+
+    @Test
+    public void emptySourceOrDest_returnsFalse() {
+        // source null
+        grid[3][3] = null;
+        grid[3][4] = new Tower(1, Color.RED);
+        AvalamPly p1 = new AvalamPly(Player.PLAYER1, 3, 3, 3, 4);
+        assertFalse(board.isLegal(p1));
+
+        // dest null
+        grid[5][5] = new Tower(1, Color.YELLOW);
+        grid[5][6] = null;
+        AvalamPly p2 = new AvalamPly(Player.PLAYER1, 5, 5, 5, 6);
+        assertFalse(board.isLegal(p2));
+    }
+
+    @Test
+    public void sourceNotOwned_returnsFalse() {
+        // current player = PLAYER1 -> color must be YELLOW
+        grid[2][2] = new Tower(1, Color.RED); // not owned
+        grid[2][3] = new Tower(1, Color.YELLOW);
+        AvalamPly p = new AvalamPly(Player.PLAYER1, 2, 2, 2, 3);
+        assertFalse(board.isLegal(p));
+    }
+
+    @Test
+    public void notAdjacent_returnsFalse() {
+        grid[0][0] = new Tower(1, Color.YELLOW);
+        grid[0][2] = new Tower(1, Color.RED);
+        AvalamPly p = new AvalamPly(Player.PLAYER1, 0, 0, 0, 2);
+        assertFalse(board.isLegal(p));
+    }
+
+    @Test
+    public void sameColor_returnsFalse() {
+        grid[6][6] = new Tower(1, Color.YELLOW);
+        grid[6][7] = new Tower(1, Color.YELLOW); // same color as source
+        AvalamPly p = new AvalamPly(Player.PLAYER1, 6, 6, 6, 7);
+        assertFalse(board.isLegal(p));
+    }
+
+    @Test
+    public void tooTallAfterMerge_returnsFalse() {
+        grid[1][1] = new Tower(3, Color.YELLOW);
+        grid[1][2] = new Tower(3, Color.RED); // 3+3 = 6 > MAX_HEIGHT (5)
+        AvalamPly p = new AvalamPly(Player.PLAYER1, 1, 1, 1, 2);
+        assertFalse(board.isLegal(p));
+    }
+
+    @Test
+    public void validMove_returnsTrue() {
+        grid[4][4] = new Tower(2, Color.YELLOW); // owned by PLAYER1
+        grid[4][5] = new Tower(2, Color.RED);    // opposite color
+        AvalamPly p = new AvalamPly(Player.PLAYER1, 4, 4, 4, 5);
+        assertTrue(board.isLegal(p));
+    }
+
+    @Test
+    public void currentPlayerMismatchInPlyDoesNotAffectOwnershipCheck() {
+        // Even if AvalamPly is constructed with a player value, isLegal uses board.getCurrentPlayer()
+        grid[7][7] = new Tower(1, Color.YELLOW); // owned by PLAYER1 (board default)
+        grid[7][8] = new Tower(1, Color.RED);
+        // Construct ply with PLAYER2 explicitly — ownership check should still compare to board.getCurrentPlayer()
+        AvalamPly p = new AvalamPly(Player.PLAYER2, 7, 7, 7, 8);
+        assertFalse(board.isLegal(p));
+    }
+}