Merge branch '02_board' into 'master' 02_board

02 board



See merge request !1

8 files changed, 359 insertions, 26 deletions

diff --git a/test/ch/epfl/xblast/CellTest.java b/test/ch/epfl/xblast/CellTest.java
index ba8becc..c5d93e8 100644
--- a/test/ch/epfl/xblast/CellTest.java
+++ b/test/ch/epfl/xblast/CellTest.java
@@ -1,15 +1,19 @@
 package ch.epfl.xblast;
 
+import org.junit.Test;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 
-import org.junit.Test;
-
+/**
+ * @author EPFL
+ */
 public class CellTest {
+
     @Test
     public void rowMajorIndexCorrespondsToOrder() {
         int i = 0;
-        for (Cell c: Cell.ROW_MAJOR_ORDER)
+        for (Cell c : Cell.ROW_MAJOR_ORDER)
             assertEquals(i++, c.rowMajorIndex());
         assertEquals(Cell.COUNT, i);
     }
@@ -19,7 +23,7 @@ public class CellTest {
         assertEquals(Cell.COUNT, Cell.SPIRAL_ORDER.size());
 
         boolean[] cellSeen = new boolean[Cell.COUNT];
-        for (Cell c: Cell.SPIRAL_ORDER) {
+        for (Cell c : Cell.SPIRAL_ORDER) {
             assertFalse(cellSeen[c.rowMajorIndex()]);
             cellSeen[c.rowMajorIndex()] = true;
         }
@@ -28,9 +32,9 @@ public class CellTest {
     @Test
     public void spiralOrderNeighborsAreSpatialNeighbors() {
         Cell pred = Cell.SPIRAL_ORDER.get(0);
-        for (Cell c: Cell.SPIRAL_ORDER.subList(1, Cell.SPIRAL_ORDER.size())) {
+        for (Cell c : Cell.SPIRAL_ORDER.subList(1, Cell.SPIRAL_ORDER.size())) {
             int areNeighborsCount = 0;
-            for (Direction d: Direction.values()) {
+            for (Direction d : Direction.values()) {
                 if (pred.equals(c.neighbor(d)))
                     areNeighborsCount += 1;
             }
@@ -51,18 +55,19 @@ public class CellTest {
     @Test
     public void neighborsOfOriginAreCorrect() {
         Cell c = new Cell(0, 0);
-        assertEquals(new Cell( 0, 12), c.neighbor(Direction.N));
-        assertEquals(new Cell( 1,  0), c.neighbor(Direction.E));
-        assertEquals(new Cell( 0,  1), c.neighbor(Direction.S));
-        assertEquals(new Cell(14,  0), c.neighbor(Direction.W));
+        assertEquals(new Cell(0, 12), c.neighbor(Direction.N));
+        assertEquals(new Cell(1, 0), c.neighbor(Direction.E));
+        assertEquals(new Cell(0, 1), c.neighbor(Direction.S));
+        assertEquals(new Cell(14, 0), c.neighbor(Direction.W));
     }
 
     @Test
     public void oppositeNeighborOfNeighborIsThis() {
-        for (Cell c: Cell.ROW_MAJOR_ORDER) {
-            for (Direction d: Direction.values()) {
+        for (Cell c : Cell.ROW_MAJOR_ORDER) {
+            for (Direction d : Direction.values()) {
                 assertEquals(c, c.neighbor(d).neighbor(d.opposite()));
             }
         }
     }
+
 }
diff --git a/test/ch/epfl/xblast/DirectionTest.java b/test/ch/epfl/xblast/DirectionTest.java
index 0ebb3b7..49cf4be 100644
--- a/test/ch/epfl/xblast/DirectionTest.java
+++ b/test/ch/epfl/xblast/DirectionTest.java
@@ -9,6 +9,7 @@ import static org.junit.Assert.*;
  * @author Pacien TRAN-GIRARD (261948)
  */
 public class DirectionTest {
+
     @Test
     public void oppositeOfOppositeIsIdentity() {
         for (Direction d : Direction.values())
@@ -48,4 +49,5 @@ public class DirectionTest {
             assertEquals(0, d.yVector() + d.opposite().yVector());
         }
     }
+
 }
diff --git a/test/ch/epfl/xblast/ListsTest.java b/test/ch/epfl/xblast/ListsTest.java
new file mode 100644
index 0000000..b898399
--- /dev/null
+++ b/test/ch/epfl/xblast/ListsTest.java
@@ -0,0 +1,51 @@
+package ch.epfl.xblast;
+
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+import static org.junit.Assert.assertEquals;
+
+/**
+ * @author Pacien TRAN-GIRARD (261948)
+ * @author Timothée FLOURE (257420)
+ */
+public class ListsTest {
+
+    @Test(expected = IllegalArgumentException.class)
+    public void isEmptyListThrowingException() {
+        List<Integer> emptyList = new ArrayList<>();
+        Lists.mirrored(emptyList);
+    }
+
+    @Test
+    public void isListMirrored() {
+        List<Integer> sampleList = Arrays.asList(1, 2, 3, 4, 5);
+        List<Integer> expected = Arrays.asList(1, 2, 3, 4, 5, 4, 3, 2, 1);
+
+        assertEquals(expected, Lists.mirrored(sampleList));
+    }
+
+    @Test
+    public void mirroredListSizeIsCorrect() {
+        int sampleSize = 10;
+        List<Integer> sampleList = IntStream.range(0, sampleSize).boxed().collect(Collectors.toList());
+        List<Integer> mirrored = Lists.mirrored(sampleList);
+
+        assertEquals(sampleSize * 2 - 1, mirrored.size());
+    }
+
+    @Test
+    public void mirrorElementsAreEqual() {
+        List<Integer> sampleList = IntStream.range(0, 10).boxed().collect(Collectors.toList());
+        List<Integer> mirrored = Lists.mirrored(sampleList);
+
+        for (int i = 0; i < mirrored.size() / 2; ++i)
+            assertEquals(mirrored.get(i), mirrored.get(mirrored.size() - 1 - i));
+    }
+
+}
diff --git a/test/ch/epfl/xblast/SubCellTest.java b/test/ch/epfl/xblast/SubCellTest.java
index 1c79791..b3450e1 100644
--- a/test/ch/epfl/xblast/SubCellTest.java
+++ b/test/ch/epfl/xblast/SubCellTest.java
@@ -1,11 +1,15 @@
 package ch.epfl.xblast;
 
+import org.junit.Test;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
-import org.junit.Test;
-
+/**
+ * @author EPFL
+ */
 public class SubCellTest {
+
     @Test
     public void centralSubCellOfKnowCellIsCorrect() {
         SubCell c = SubCell.centralSubCellOf(new Cell(2, 1));
@@ -15,13 +19,13 @@ public class SubCellTest {
 
     @Test
     public void centralSubCellIsCentral() {
-        for (Cell c: Cell.ROW_MAJOR_ORDER)
+        for (Cell c : Cell.ROW_MAJOR_ORDER)
             assertTrue(SubCell.centralSubCellOf(c).isCentral());
     }
 
     @Test
     public void distanceToCentralOfCentralIsZero() {
-        for (Cell c: Cell.ROW_MAJOR_ORDER)
+        for (Cell c : Cell.ROW_MAJOR_ORDER)
             assertEquals(0, SubCell.centralSubCellOf(c).distanceToCentral());
     }
 
@@ -43,18 +47,19 @@ public class SubCellTest {
     @Test
     public void neighborsOfOriginAreCorrect() {
         SubCell c = new SubCell(0, 0);
-        assertEquals(new SubCell(  0, 207), c.neighbor(Direction.N));
-        assertEquals(new SubCell(  1,   0), c.neighbor(Direction.E));
-        assertEquals(new SubCell(  0,   1), c.neighbor(Direction.S));
-        assertEquals(new SubCell(239,   0), c.neighbor(Direction.W));
+        assertEquals(new SubCell(0, 207), c.neighbor(Direction.N));
+        assertEquals(new SubCell(1, 0), c.neighbor(Direction.E));
+        assertEquals(new SubCell(0, 1), c.neighbor(Direction.S));
+        assertEquals(new SubCell(239, 0), c.neighbor(Direction.W));
     }
 
     @Test
     public void containingCellOfCentralsNeighborIsCorrect() {