diff options
Diffstat (limited to 'src/ch/epfl/maze/tests/Competition.java')
-rw-r--r-- | src/ch/epfl/maze/tests/Competition.java | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/ch/epfl/maze/tests/Competition.java b/src/ch/epfl/maze/tests/Competition.java index ccbbe73..10a6c84 100644 --- a/src/ch/epfl/maze/tests/Competition.java +++ b/src/ch/epfl/maze/tests/Competition.java | |||
@@ -31,7 +31,6 @@ import static org.junit.Assert.assertTrue; | |||
31 | * against it.</li> | 31 | * against it.</li> |
32 | * </ul> | 32 | * </ul> |
33 | */ | 33 | */ |
34 | |||
35 | public class Competition { | 34 | public class Competition { |
36 | 35 | ||
37 | static final String COMPETITION_MAZE_FILE = "labyrinth.txt"; | 36 | static final String COMPETITION_MAZE_FILE = "labyrinth.txt"; |
@@ -42,7 +41,6 @@ public class Competition { | |||
42 | * Launches the competition between the {@code SpaceInvader} and the other | 41 | * Launches the competition between the {@code SpaceInvader} and the other |
43 | * animals. | 42 | * animals. |
44 | */ | 43 | */ |
45 | |||
46 | @BeforeClass | 44 | @BeforeClass |
47 | public static void setUpClass() { | 45 | public static void setUpClass() { |
48 | int[][] labyrinth = LabyrinthGenerator.readFromFile(COMPETITION_MAZE_FILE); | 46 | int[][] labyrinth = LabyrinthGenerator.readFromFile(COMPETITION_MAZE_FILE); |
@@ -112,7 +110,6 @@ public class Competition { | |||
112 | /** | 110 | /** |
113 | * Determines if the {@code SpaceInvader} has beaten the {@code Mouse}. | 111 | * Determines if the {@code SpaceInvader} has beaten the {@code Mouse}. |
114 | */ | 112 | */ |
115 | |||
116 | @Test | 113 | @Test |
117 | public void testVSMouse() { | 114 | public void testVSMouse() { |
118 | assertTrue("The SpaceInvader has not beaten the Mouse", rivalries.get("Mouse") > 0); | 115 | assertTrue("The SpaceInvader has not beaten the Mouse", rivalries.get("Mouse") > 0); |
@@ -121,7 +118,6 @@ public class Competition { | |||
121 | /** | 118 | /** |
122 | * Determines if the {@code SpaceInvader} has beaten the {@code Hamster}. | 119 | * Determines if the {@code SpaceInvader} has beaten the {@code Hamster}. |
123 | */ | 120 | */ |
124 | |||
125 | @Test | 121 | @Test |
126 | public void testVSHamster() { | 122 | public void testVSHamster() { |
127 | assertTrue("The SpaceInvader has not beaten the Hamster", rivalries.get("Hamster") > 0); | 123 | assertTrue("The SpaceInvader has not beaten the Hamster", rivalries.get("Hamster") > 0); |
@@ -130,7 +126,6 @@ public class Competition { | |||
130 | /** | 126 | /** |
131 | * Determines if the {@code SpaceInvader} has beaten the {@code Monkey}. | 127 | * Determines if the {@code SpaceInvader} has beaten the {@code Monkey}. |
132 | */ | 128 | */ |
133 | |||
134 | @Test | 129 | @Test |
135 | public void testVSMonkey() { | 130 | public void testVSMonkey() { |
136 | assertTrue("The SpaceInvader has not beaten the Monkey", rivalries.get("Monkey") > 0); | 131 | assertTrue("The SpaceInvader has not beaten the Monkey", rivalries.get("Monkey") > 0); |
@@ -139,7 +134,6 @@ public class Competition { | |||
139 | /** | 134 | /** |
140 | * Determines if the {@code SpaceInvader} has beaten the {@code Bear}. | 135 | * Determines if the {@code SpaceInvader} has beaten the {@code Bear}. |
141 | */ | 136 | */ |
142 | |||
143 | @Test | 137 | @Test |
144 | public void testVSBear() { | 138 | public void testVSBear() { |
145 | assertTrue("The SpaceInvader has not beaten the Bear", rivalries.get("Bear") > 0); | 139 | assertTrue("The SpaceInvader has not beaten the Bear", rivalries.get("Bear") > 0); |
@@ -148,9 +142,9 @@ public class Competition { | |||
148 | /** | 142 | /** |
149 | * Determines if the {@code SpaceInvader} has beaten the {@code Panda}. | 143 | * Determines if the {@code SpaceInvader} has beaten the {@code Panda}. |
150 | */ | 144 | */ |
151 | |||
152 | @Test | 145 | @Test |
153 | public void testVSPanda() { | 146 | public void testVSPanda() { |
154 | assertTrue("The SpaceInvader has not beaten the Panda", rivalries.get("Panda") > 0); | 147 | assertTrue("The SpaceInvader has not beaten the Panda", rivalries.get("Panda") > 0); |
155 | } | 148 | } |
149 | |||
156 | } | 150 | } |