aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimothée Floure2016-02-29 13:54:26 +0100
committerTimothée Floure2016-02-29 13:54:26 +0100
commit3fd6365255ba761f45f34bff3fef27a28b3a1785 (patch)
treee8335f9836c5672fd26cc04dc4ad16613a79212d
parent746aafc3f0e8212282a5fbf31de7a83d2a618dc8 (diff)
downloadxblast-3fd6365255ba761f45f34bff3fef27a28b3a1785.tar.gz
Fix typo in comment + remove tests on null input
-rw-r--r--src/ch/epfl/xblast/server/Board.java1
-rw-r--r--src/ch/epfl/xblast/server/Ticks.java2
-rw-r--r--test/ch/epfl/xblast/ListsTest.java6
-rw-r--r--test/ch/epfl/xblast/server/BoardTest.java2
4 files changed, 1 insertions, 10 deletions
diff --git a/src/ch/epfl/xblast/server/Board.java b/src/ch/epfl/xblast/server/Board.java
index c8d3e01..fa91587 100644
--- a/src/ch/epfl/xblast/server/Board.java
+++ b/src/ch/epfl/xblast/server/Board.java
@@ -117,7 +117,6 @@ public final class Board {
117 117
118 rowsList.add(Lists.<Block>mirrored(halfInnerBoard.get(i))); 118 rowsList.add(Lists.<Block>mirrored(halfInnerBoard.get(i)));
119 } 119 }
120
121 return ofInnerBlocksWalled(rowsList); 120 return ofInnerBlocksWalled(rowsList);
122 } 121 }
123} 122}
diff --git a/src/ch/epfl/xblast/server/Ticks.java b/src/ch/epfl/xblast/server/Ticks.java
index 8c1e134..8793adb 100644
--- a/src/ch/epfl/xblast/server/Ticks.java
+++ b/src/ch/epfl/xblast/server/Ticks.java
@@ -12,7 +12,7 @@ public interface Ticks {
12 public static int PLAYER_INVULNERABLE_TICKS = 64; 12 public static int PLAYER_INVULNERABLE_TICKS = 64;
13 13
14 /** 14 /**
15 * Duration of 15 * Duration of the timer of a bomb.
16 */ 16 */
17 public static int BOMB_FUSE_TICKS = 100; 17 public static int BOMB_FUSE_TICKS = 100;
18 18
diff --git a/test/ch/epfl/xblast/ListsTest.java b/test/ch/epfl/xblast/ListsTest.java
index 6a98b3f..42b317f 100644
--- a/test/ch/epfl/xblast/ListsTest.java
+++ b/test/ch/epfl/xblast/ListsTest.java
@@ -16,12 +16,6 @@ public class ListsTest {
16 Lists.<Integer>mirrored(sampleList); 16 Lists.<Integer>mirrored(sampleList);
17 } 17 }
18 18
19 @Test(expected=IllegalArgumentException.class)
20 public void isNullListThrowingException() {
21 List<Integer> sampleList = Arrays.asList();
22 Lists.<Integer>mirrored(sampleList);
23 }
24
25 @Test 19 @Test
26 public void isListMirrored() { 20 public void isListMirrored() {
27 List<Integer> sampleList = Arrays.asList(1,2,3,4,5); 21 List<Integer> sampleList = Arrays.asList(1,2,3,4,5);
diff --git a/test/ch/epfl/xblast/server/BoardTest.java b/test/ch/epfl/xblast/server/BoardTest.java
index 7868e70..e40769b 100644
--- a/test/ch/epfl/xblast/server/BoardTest.java
+++ b/test/ch/epfl/xblast/server/BoardTest.java
@@ -12,7 +12,6 @@ import static org.junit.Assert.*;
12 * @author Pacien TRAN-GIRARD (261948) 12 * @author Pacien TRAN-GIRARD (261948)
13 */ 13 */
14public class BoardTest { 14public class BoardTest {
15
16 @Test(expected=IllegalArgumentException.class) 15 @Test(expected=IllegalArgumentException.class)
17 public void isBoardBuilderEmptyInputThrowingException() { 16 public void isBoardBuilderEmptyInputThrowingException() {
18 List<Sq<Block>> blocks = new ArrayList<Sq<Block>>(); 17 List<Sq<Block>> blocks = new ArrayList<Sq<Block>>();
@@ -20,7 +19,6 @@ public class BoardTest {
20 19
21 } 20 }
22 21
23
24 @Test(expected=IllegalArgumentException.class) 22 @Test(expected=IllegalArgumentException.class)
25 public void isBoardBuilderIllegalInputThrowingException() { 23 public void isBoardBuilderIllegalInputThrowingException() {
26 List<Sq<Block>> blocks = new ArrayList<Sq<Block>>(); 24 List<Sq<Block>> blocks = new ArrayList<Sq<Block>>();