Adaptation du test (Board copie la grille) (à tester)

fr/iut_fbleau/Tests/AvalamBoardTest.java

@@ -10,7 +10,7 @@ import fr.iut_fbleau.Avalam.Color;
 
 import org.junit.Before;
 import org.junit.Test;
-//import org.mockito.Mockito;  //À retirer si Mockito absent
+//import org.mockito.Mockito;  //Mockito absent
 
 import static org.junit.Assert.*;
 
@@ -25,98 +25,99 @@ public class AvalamBoardTest {
     @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);
+
+        //Création des tours de tests
+        /* Motif
+        1,0,2 | 2,0,3
+        2,1,0 | 2,3,0
+        0,2,1 | 0,1,1
+        */
+        grid[4][2] = new Tower(2, Color.YELLOW);
+        grid[6][2] = new Tower(3, Color.RED);
+
+        grid[4][3] = new Tower(2, Color.RED);
+        grid[5][3] = new Tower(3, Color.YELLOW);
+
+        grid[5][4] = new Tower(1, Color.RED);
+        grid[6][4] = new Tower(1, Color.YELLOW);
+
+        //Joueur courant initialisé à 1, soit jaune
+        board = new AvalamBoard(grid);  //AvalamBoard copie la grille
     }
 
     /*
-    @Test  //À retirer si Mockito absent
+    @Test  //Mockito absent
     public void nonAvalamPly_returnsFalse() {
-        AbstractPly fake = Mockito.mock(AbstractPly.class); // instance non-AvalamPly
+        //Vérifie si l'instance est bien AvalamPly
+        AbstractPly fake = Mockito.mock(AbstractPly.class);  //Crée une 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);
+        //Source "out of box"
+        AvalamPly p = new AvalamPly(Player.PLAYER1, -1, 2, 4, 2);
         assertFalse(board.isLegal(p));
 
-        AvalamPly p2 = new AvalamPly(Player.PLAYER1, 2, 2, 9, 3);
+        //Destination "out of box"
+        AvalamPly p2 = new AvalamPly(Player.PLAYER1, 6, 4, 9, 4);
         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);
+        AvalamPly p = new AvalamPly(Player.PLAYER1, 5, 4, 5, 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);
+        //Source null
+        AvalamPly p1 = new AvalamPly(Player.PLAYER1, 5, 5, 5, 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);
+        //Destination null
+        AvalamPly p2 = new AvalamPly(Player.PLAYER1, 6, 4, 6, 3);
         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);
+        //Le joueur courant n'est pas rouge
+        AvalamPly p = new AvalamPly(Player.PLAYER1, 5, 4, 6, 4);
         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);
+        AvalamPly p = new AvalamPly(Player.PLAYER1, 4, 2, 6, 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);
+        //La couleur des tours est identique
+        AvalamPly p = new AvalamPly(Player.PLAYER1, 4, 2, 5, 3);
         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);
+        //Hauteur maximale dépassé : 3+3 = 6 > MAX_HEIGHT (5)
+        AvalamPly p = new AvalamPly(Player.PLAYER1, 5, 3, 6, 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);
+        AvalamPly p = new AvalamPly(Player.PLAYER1, 5, 3, 4, 3);  //Hauteur limite à 5
         assertTrue(board.isLegal(p));
     }
 
-    @Test
+    @Test  //À vérifier
     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);
+        //Si le coup est construit avec le mauvais joueur
+        AvalamPly p = new AvalamPly(Player.PLAYER2, 4, 2, 4, 3);
         assertFalse(board.isLegal(p));
     }
 }