From 3fd6365255ba761f45f34bff3fef27a28b3a1785 Mon Sep 17 00:00:00 2001 From: Timothée Floure Date: Mon, 29 Feb 2016 13:54:26 +0100 Subject: Fix typo in comment + remove tests on null input --- src/ch/epfl/xblast/server/Board.java | 1 - src/ch/epfl/xblast/server/Ticks.java | 2 +- test/ch/epfl/xblast/ListsTest.java | 6 ------ test/ch/epfl/xblast/server/BoardTest.java | 2 -- 4 files changed, 1 insertion(+), 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 { rowsList.add(Lists.mirrored(halfInnerBoard.get(i))); } - return ofInnerBlocksWalled(rowsList); } } 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 { public static int PLAYER_INVULNERABLE_TICKS = 64; /** - * Duration of + * Duration of the timer of a bomb. */ public static int BOMB_FUSE_TICKS = 100; 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 { Lists.mirrored(sampleList); } - @Test(expected=IllegalArgumentException.class) - public void isNullListThrowingException() { - List sampleList = Arrays.asList(); - Lists.mirrored(sampleList); - } - @Test public void isListMirrored() { List 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.*; * @author Pacien TRAN-GIRARD (261948) */ public class BoardTest { - @Test(expected=IllegalArgumentException.class) public void isBoardBuilderEmptyInputThrowingException() { List> blocks = new ArrayList>(); @@ -20,7 +19,6 @@ public class BoardTest { } - @Test(expected=IllegalArgumentException.class) public void isBoardBuilderIllegalInputThrowingException() { List> blocks = new ArrayList>(); -- cgit v1.2.3