diff options
Diffstat (limited to 'test/ch')
-rw-r--r-- | test/ch/epfl/xblast/CellTest.java | 29 | ||||
-rw-r--r-- | test/ch/epfl/xblast/DirectionTest.java | 2 | ||||
-rw-r--r-- | test/ch/epfl/xblast/SubCellTest.java | 25 | ||||
-rw-r--r-- | test/ch/epfl/xblast/namecheck/NameCheck01.java | 11 | ||||
-rw-r--r-- | test/ch/epfl/xblast/namecheck/NameCheck02.java | 9 | ||||
-rw-r--r-- | test/ch/epfl/xblast/server/BlockTest.java | 5 | ||||
-rw-r--r-- | test/ch/epfl/xblast/server/BoardTest.java | 53 |
7 files changed, 78 insertions, 56 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 @@ | |||
1 | package ch.epfl.xblast; | 1 | package ch.epfl.xblast; |
2 | 2 | ||
3 | import org.junit.Test; | ||
4 | |||
3 | import static org.junit.Assert.assertEquals; | 5 | import static org.junit.Assert.assertEquals; |
4 | import static org.junit.Assert.assertFalse; | 6 | import static org.junit.Assert.assertFalse; |
5 | 7 | ||
6 | import org.junit.Test; | 8 | /** |
7 | 9 | * @author EPFL | |
10 | */ | ||
8 | public class CellTest { | 11 | public class CellTest { |
12 | |||
9 | @Test | 13 | @Test |
10 | public void rowMajorIndexCorrespondsToOrder() { | 14 | public void rowMajorIndexCorrespondsToOrder() { |
11 | int i = 0; | 15 | int i = 0; |
12 | for (Cell c: Cell.ROW_MAJOR_ORDER) | 16 | for (Cell c : Cell.ROW_MAJOR_ORDER) |
13 | assertEquals(i++, c.rowMajorIndex()); | 17 | assertEquals(i++, c.rowMajorIndex()); |
14 | assertEquals(Cell.COUNT, i); | 18 | assertEquals(Cell.COUNT, i); |
15 | } | 19 | } |
@@ -19,7 +23,7 @@ public class CellTest { | |||
19 | assertEquals(Cell.COUNT, Cell.SPIRAL_ORDER.size()); | 23 | assertEquals(Cell.COUNT, Cell.SPIRAL_ORDER.size()); |
20 | 24 | ||
21 | boolean[] cellSeen = new boolean[Cell.COUNT]; | 25 | boolean[] cellSeen = new boolean[Cell.COUNT]; |
22 | for (Cell c: Cell.SPIRAL_ORDER) { | 26 | for (Cell c : Cell.SPIRAL_ORDER) { |
23 | assertFalse(cellSeen[c.rowMajorIndex()]); | 27 | assertFalse(cellSeen[c.rowMajorIndex()]); |
24 | cellSeen[c.rowMajorIndex()] = true; | 28 | cellSeen[c.rowMajorIndex()] = true; |
25 | } | 29 | } |
@@ -28,9 +32,9 @@ public class CellTest { | |||
28 | @Test | 32 | @Test |
29 | public void spiralOrderNeighborsAreSpatialNeighbors() { | 33 | public void spiralOrderNeighborsAreSpatialNeighbors() { |
30 | Cell pred = Cell.SPIRAL_ORDER.get(0); | 34 | Cell pred = Cell.SPIRAL_ORDER.get(0); |
31 | for (Cell c: Cell.SPIRAL_ORDER.subList(1, Cell.SPIRAL_ORDER.size())) { | 35 | for (Cell c : Cell.SPIRAL_ORDER.subList(1, Cell.SPIRAL_ORDER.size())) { |
32 | int areNeighborsCount = 0; | 36 | int areNeighborsCount = 0; |
33 | for (Direction d: Direction.values()) { | 37 | for (Direction d : Direction.values()) { |
34 | if (pred.equals(c.neighbor(d))) | 38 | if (pred.equals(c.neighbor(d))) |
35 | areNeighborsCount += 1; | 39 | areNeighborsCount += 1; |
36 | } | 40 | } |
@@ -51,18 +55,19 @@ public class CellTest { | |||
51 | @Test | 55 | @Test |
52 | public void neighborsOfOriginAreCorrect() { | 56 | public void neighborsOfOriginAreCorrect() { |
53 | Cell c = new Cell(0, 0); | 57 | Cell c = new Cell(0, 0); |
54 | assertEquals(new Cell( 0, 12), c.neighbor(Direction.N)); | 58 | assertEquals(new Cell(0, 12), c.neighbor(Direction.N)); |
55 | assertEquals(new Cell( 1, 0), c.neighbor(Direction.E)); | 59 | assertEquals(new Cell(1, 0), c.neighbor(Direction.E)); |
56 | assertEquals(new Cell( 0, 1), c.neighbor(Direction.S)); | 60 | assertEquals(new Cell(0, 1), c.neighbor(Direction.S)); |
57 | assertEquals(new Cell(14, 0), c.neighbor(Direction.W)); | 61 | assertEquals(new Cell(14, 0), c.neighbor(Direction.W)); |
58 | } | 62 | } |
59 | 63 | ||
60 | @Test | 64 | @Test |
61 | public void oppositeNeighborOfNeighborIsThis() { | 65 | public void oppositeNeighborOfNeighborIsThis() { |
62 | for (Cell c: Cell.ROW_MAJOR_ORDER) { | 66 | for (Cell c : Cell.ROW_MAJOR_ORDER) { |
63 | for (Direction d: Direction.values()) { | 67 | for (Direction d : Direction.values()) { |
64 | assertEquals(c, c.neighbor(d).neighbor(d.opposite())); | 68 | assertEquals(c, c.neighbor(d).neighbor(d.opposite())); |
65 | } | 69 | } |
66 | } | 70 | } |
67 | } | 71 | } |
72 | |||
68 | } | 73 | } |
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.*; | |||
9 | * @author Pacien TRAN-GIRARD (261948) | 9 | * @author Pacien TRAN-GIRARD (261948) |
10 | */ | 10 | */ |
11 | public class DirectionTest { | 11 | public class DirectionTest { |
12 | |||
12 | @Test | 13 | @Test |
13 | public void oppositeOfOppositeIsIdentity() { | 14 | public void oppositeOfOppositeIsIdentity() { |
14 | for (Direction d : Direction.values()) | 15 | for (Direction d : Direction.values()) |
@@ -48,4 +49,5 @@ public class DirectionTest { | |||
48 | assertEquals(0, d.yVector() + d.opposite().yVector()); | 49 | assertEquals(0, d.yVector() + d.opposite().yVector()); |
49 | } | 50 | } |
50 | } | 51 | } |
52 | |||
51 | } | 53 | } |
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 @@ | |||
1 | package ch.epfl.xblast; | 1 | package ch.epfl.xblast; |
2 | 2 | ||
3 | import org.junit.Test; | ||
4 | |||
3 | import static org.junit.Assert.assertEquals; | 5 | import static org.junit.Assert.assertEquals; |
4 | import static org.junit.Assert.assertTrue; | 6 | import static org.junit.Assert.assertTrue; |
5 | 7 | ||
6 | import org.junit.Test; | 8 | /** |
7 | 9 | * @author EPFL | |
10 | */ | ||
8 | public class SubCellTest { | 11 | public class SubCellTest { |
12 | |||
9 | @Test | 13 | @Test |
10 | public void centralSubCellOfKnowCellIsCorrect() { | 14 | public void centralSubCellOfKnowCellIsCorrect() { |
11 | SubCell c = SubCell.centralSubCellOf(new Cell(2, 1)); | 15 | SubCell c = SubCell.centralSubCellOf(new Cell(2, 1)); |
@@ -15,13 +19,13 @@ public class SubCellTest { | |||
15 | 19 | ||
16 | @Test | 20 | @Test |
17 | public void centralSubCellIsCentral() { | 21 | public void centralSubCellIsCentral() { |
18 | for (Cell c: Cell.ROW_MAJOR_ORDER) | 22 | for (Cell c : Cell.ROW_MAJOR_ORDER) |
19 | assertTrue(SubCell.centralSubCellOf(c).isCentral()); | 23 | assertTrue(SubCell.centralSubCellOf(c).isCentral()); |
20 | } | 24 | } |
21 | 25 | ||
22 | @Test | 26 | @Test |
23 | public void distanceToCentralOfCentralIsZero() { | 27 | public void distanceToCentralOfCentralIsZero() { |
24 | for (Cell c: Cell.ROW_MAJOR_ORDER) | 28 | for (Cell c : Cell.ROW_MAJOR_ORDER) |
25 | assertEquals(0, SubCell.centralSubCellOf(c).distanceToCentral()); | 29 | assertEquals(0, SubCell.centralSubCellOf(c).distanceToCentral()); |
26 | } | 30 | } |
27 | 31 | ||
@@ -43,18 +47,19 @@ public class SubCellTest { | |||
43 | @Test | 47 | @Test |
44 | public void neighborsOfOriginAreCorrect() { | 48 | public void neighborsOfOriginAreCorrect() { |
45 | SubCell c = new SubCell(0, 0); | 49 | SubCell c = new SubCell(0, 0); |
46 | assertEquals(new SubCell( 0, 207), c.neighbor(Direction.N)); | 50 | assertEquals(new SubCell(0, 207), c.neighbor(Direction.N)); |
47 | assertEquals(new SubCell( 1, 0), c.neighbor(Direction.E)); | 51 | assertEquals(new SubCell(1, 0), c.neighbor(Direction.E)); |
48 | assertEquals(new SubCell( 0, 1), c.neighbor(Direction.S)); | 52 | assertEquals(new SubCell(0, 1), c.neighbor(Direction.S)); |
49 | assertEquals(new SubCell(239, 0), c.neighbor(Direction.W)); | 53 | assertEquals(new SubCell(239, 0), c.neighbor(Direction.W)); |
50 | } | 54 | } |
51 | 55 | ||
52 | @Test | 56 | @Test |
53 | public void containingCellOfCentralsNeighborIsCorrect() { | 57 | public void containingCellOfCentralsNeighborIsCorrect() { |
54 | for (Cell c: Cell.ROW_MAJOR_ORDER) { | 58 | for (Cell c : Cell.ROW_MAJOR_ORDER) { |
55 | SubCell s = SubCell.centralSubCellOf(c); | 59 | SubCell s = SubCell.centralSubCellOf(c); |
56 | for (Direction d: Direction.values()) | 60 | for (Direction d : Direction.values()) |
57 | assertEquals(c, s.neighbor(d).containingCell()); | 61 | assertEquals(c, s.neighbor(d).containingCell()); |
58 | } | 62 | } |
59 | } | 63 | } |
64 | |||
60 | } | 65 | } |
diff --git a/test/ch/epfl/xblast/namecheck/NameCheck01.java b/test/ch/epfl/xblast/namecheck/NameCheck01.java index 278d85b..7d079c5 100644 --- a/test/ch/epfl/xblast/namecheck/NameCheck01.java +++ b/test/ch/epfl/xblast/namecheck/NameCheck01.java | |||
@@ -1,18 +1,20 @@ | |||
1 | package ch.epfl.xblast.namecheck; | 1 | package ch.epfl.xblast.namecheck; |
2 | 2 | ||
3 | import java.util.List; | ||
4 | |||
5 | import ch.epfl.xblast.Cell; | 3 | import ch.epfl.xblast.Cell; |
6 | import ch.epfl.xblast.Direction; | 4 | import ch.epfl.xblast.Direction; |
7 | import ch.epfl.xblast.SubCell; | 5 | import ch.epfl.xblast.SubCell; |
8 | 6 | ||
7 | import java.util.List; | ||
8 | |||
9 | /** | 9 | /** |
10 | * Classe abstraite utilisant tous les éléments de l'étape 1, pour essayer de | 10 | * Classe abstraite utilisant tous les éléments de l'étape 1, pour essayer de |
11 | * garantir que ceux-ci ont le bon nom et les bons types. Attention, ceci n'est | 11 | * garantir que ceux-ci ont le bon nom et les bons types. Attention, ceci n'est |
12 | * pas un test unitaire, et n'a pas pour but d'être exécuté! | 12 | * pas un test unitaire, et n'a pas pour but d'être exécuté! |
13 | * | ||
14 | * @author EPFL | ||
13 | */ | 15 | */ |
14 | |||
15 | abstract class NameCheck01 { | 16 | abstract class NameCheck01 { |
17 | |||
16 | void checkDirection() { | 18 | void checkDirection() { |
17 | Direction d = Direction.N; | 19 | Direction d = Direction.N; |
18 | d = Direction.E; | 20 | d = Direction.E; |
@@ -36,7 +38,7 @@ abstract class NameCheck01 { | |||
36 | } | 38 | } |
37 | 39 | ||
38 | void checkSubCell() { | 40 | void checkSubCell() { |
39 | SubCell c = SubCell.centralSubCellOf(new Cell(0,0)); | 41 | SubCell c = SubCell.centralSubCellOf(new Cell(0, 0)); |
40 | c = new SubCell(0, 0); | 42 | c = new SubCell(0, 0); |
41 | int t = c.x() + c.y() + c.distanceToCentral(); | 43 | int t = c.x() + c.y() + c.distanceToCentral(); |
42 | if (t < 10 && c.isCentral()) | 44 | if (t < 10 && c.isCentral()) |
@@ -46,4 +48,5 @@ abstract class NameCheck01 { | |||
46 | System.out.println(cc); | 48 | System.out.println(cc); |