Nettoyage des classes

src/main/java/model/ArrayGrid.java

@@ -59,7 +59,7 @@ public class ArrayGrid implements Grid {
    */
   @Override
   public Iterator<Square> iterator() {
-    return new SquareIterator(this);
+    return new SquareGridIterator(this);
   }
 
   public Square getSquare(int rowIndex, int columnIndex) {

src/main/java/model/ArraySquare.java

@@ -5,7 +5,7 @@ import java.util.List;
 
 public class ArraySquare implements Square {
   private Tile tile = EmptyTile.EMPTY_TILE;
-  private final Square[] neighborhood = new Square[CardinalDirection.NUMBER_OF_DIRECTIONS];
+  private final Square[] neighbors = new Square[CardinalDirection.NUMBER_OF_DIRECTIONS];
 
   public ArraySquare() {
     setEmptyNeighborhood();
@@ -36,16 +36,15 @@ public class ArraySquare implements Square {
 
   @Override
   public void setNeighbor(Square neighbor, CardinalDirection direction) {
-    this.neighborhood[direction.ordinal()] = neighbor;
+    this.neighbors[direction.ordinal()] = neighbor;
   }
 
   @Override
   public Square getNeighbor(CardinalDirection direction) {
-    return this.neighborhood[direction.ordinal()];
+    return this.neighbors[direction.ordinal()];
   }
 
-  @Override
-  public boolean accept(Tile tile) {
+  private boolean accept(Tile tile) {
     for(CardinalDirection direction : CardinalDirection.values()){
       if(!accept(tile, direction))
         return false;

src/main/java/model/EmptySquare.java

@@ -7,11 +7,6 @@ public class EmptySquare implements Square{
 
   private EmptySquare() {}
 
-  @Override
-  public boolean accept(Tile tile) {
-    return true;
-  }
-
   @Override
   public void put(Tile tile) {}
 

src/main/java/model/RandomTileSetGenerator.java

@@ -7,17 +7,17 @@ import java.util.List;
 import java.util.Random;
 
 public class RandomTileSetGenerator implements TileGenerator{
-  List<Tile> tiles = new ArrayList<>();
+  List<Tile> availableTiles = new ArrayList<>();
   Random randomGenerator;
 
   public RandomTileSetGenerator(Iterable<Tile> tiles, Random randomGenerator) {
     for(Tile tile : tiles)
-      this.tiles.add(tile);
+      this.availableTiles.add(tile);
     this.randomGenerator = randomGenerator;
   }
 
   @Override
   public Tile nextTile(Square square) {
-    return RandomUtil.randomElement(square.compatibleTiles(tiles), randomGenerator);
+    return RandomUtil.randomElement(square.compatibleTiles(availableTiles), randomGenerator);
   }
 }

src/main/java/model/RotatedTile.java

@@ -2,15 +2,15 @@ package model;
 
 public class RotatedTile implements Tile {
   private final Tile tile;
-  private final Rotation rotationType;
+  private final Rotation rotation;
 
-  public RotatedTile(Tile tile, Rotation rotationType) {
+  public RotatedTile(Tile tile, Rotation rotation) {
     this.tile = tile;
-    this.rotationType = rotationType;
+    this.rotation = rotation;
   }
 
   @Override
   public Side side(CardinalDirection direction) {
-    return tile.side(rotationType.rotatedDirection(direction));
+    return tile.side(rotation.rotatedDirection(direction));
   }
 }

src/main/java/model/Rotation.java

@@ -6,13 +6,13 @@ public enum Rotation {
   HALF_TURN(2),
   THREE_QUARTER_TURN(3);
 
-  private final int NumberOfQuarterTurns;
+  private final int numberOfQuarterTurns;
 
   Rotation(int numberOfQuarterTurns) {
-    NumberOfQuarterTurns = numberOfQuarterTurns;
+    this.numberOfQuarterTurns = numberOfQuarterTurns;
   }
 
-  public CardinalDirection rotatedDirection(CardinalDirection side) {
-    return CardinalDirection.values()[(side.ordinal() + this.NumberOfQuarterTurns) % CardinalDirection.NUMBER_OF_DIRECTIONS];
+  public CardinalDirection rotatedDirection(CardinalDirection direction) {
+    return CardinalDirection.values()[(direction.ordinal() + this.numberOfQuarterTurns) % CardinalDirection.NUMBER_OF_DIRECTIONS];
   }
 }

src/main/java/model/Square.java

@@ -3,7 +3,6 @@ package model;
 import java.util.List;
 
 public interface Square {
-  boolean accept(Tile tile);
   void put(Tile tile);
   Tile getTile();
   List<Tile> compatibleTiles(List<Tile> tiles);

src/main/java/model/SquareIterator.java → src/main/java/model/SquareGridIterator.java

@@ -2,12 +2,12 @@ package model;
 
 import java.util.Iterator;
 
-public class SquareIterator implements Iterator<Square> {
+public class SquareGridIterator implements Iterator<Square> {
   private int rowNext;
   private int columnNext;
   private final ArrayGrid grid;
 
-  SquareIterator(ArrayGrid grid) {
+  SquareGridIterator(ArrayGrid grid) {
     this.rowNext = 0;
     this.columnNext = 0;
     this.grid = grid;

src/test/java/model/EmptySquareTest.java

@@ -7,11 +7,6 @@ import java.util.List;
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class EmptySquareTest {
-  @Test
-  void testAccept(){
-    assertThat(EmptySquare.EMPTY_SQUARE.accept(EmptyTile.EMPTY_TILE)).isTrue();
-  }
-
   @Test
   void testGetTile(){
     assertThat(EmptySquare.EMPTY_SQUARE.getTile()).isEqualTo(EmptyTile.EMPTY_TILE);

src/test/java/model/RotationTest.java

+package model;
+
+import org.junit.jupiter.api.Test;
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class RotationTest {
+  @Test
+  void testRotatedDirection(){
+    assertThat(Rotation.NO_TURN.rotatedDirection(CardinalDirection.NORTH)).isEqualTo(CardinalDirection.NORTH);
+    assertThat(Rotation.QUARTER_TURN.rotatedDirection(CardinalDirection.EAST)).isEqualTo(CardinalDirection.SOUTH);
+    assertThat(Rotation.HALF_TURN.rotatedDirection(CardinalDirection.SOUTH)).isEqualTo(CardinalDirection.NORTH);
+    assertThat(Rotation.THREE_QUARTER_TURN.rotatedDirection(CardinalDirection.WEST)).isEqualTo(CardinalDirection.SOUTH);
+  }
+}