diff options
Diffstat (limited to 'test/jrummikub/model')
-rw-r--r-- | test/jrummikub/model/StoneTrayTest.java | 25 |
1 files changed, 3 insertions, 22 deletions
diff --git a/test/jrummikub/model/StoneTrayTest.java b/test/jrummikub/model/StoneTrayTest.java index 84fc799..1ffcb8f 100644 --- a/test/jrummikub/model/StoneTrayTest.java +++ b/test/jrummikub/model/StoneTrayTest.java @@ -7,8 +7,9 @@ import jrummikub.util.Pair; import org.junit.*; import static org.junit.Assert.*; + /** - * Tests for {@link StoneTray} + * Tests for {@link StoneTray} */ public class StoneTrayTest { class Thing implements Sizeable { @@ -32,6 +33,7 @@ public class StoneTrayTest { } private StoneTray<Thing> testTray; + /** */ @Before public void createTray() { @@ -148,15 +150,6 @@ public class StoneTrayTest { /** */ @Test - public void testWrongPickUp() { - Thing firstThing = new Thing(5, 5); - testTray.drop(firstThing, new Position(0, 0)); - Position testPosition = new Position(-2, -2); - assertNull(testTray.pickUp(testPosition)); - } - - /** */ - @Test public void testPickUpByObject() { Thing firstThing = new Thing(5, 5); testTray.drop(firstThing, new Position(0, 0)); @@ -171,18 +164,6 @@ public class StoneTrayTest { /** */ @Test - public void testRightPickUp() { - Thing firstThing = new Thing(5, 5); - testTray.drop(firstThing, new Position(0, 0)); - Thing secondThing = new Thing(3, 3); - testTray.drop(secondThing, new Position(-5, -5)); - Position testPosition = new Position(3, 3); - assertSame(testTray.pickUp(testPosition), firstThing); - assertNull(testTray.pickUp(testPosition)); - } - - /** */ - @Test public void testIterate() { List<Thing> testThings = new ArrayList<Thing>(); List<Position> testPositions = new ArrayList<Position>(); |