summaryrefslogtreecommitdiffstats
path: root/test/jrummikub
diff options
context:
space:
mode:
authorIda Massow <massow@informatik.uni-luebeck.de>2011-05-10 16:31:09 +0200
committerIda Massow <massow@informatik.uni-luebeck.de>2011-05-10 16:31:09 +0200
commit982c2e6e2baf20eace331c19f6aef91b29e3c773 (patch)
treeafabe6e9fc50cc7e5d1a83ed586c4acec58f7dd7 /test/jrummikub
parentcdd0949db3bdec31a4d0516bc9180ca39dca2782 (diff)
downloadJRummikub-982c2e6e2baf20eace331c19f6aef91b29e3c773.tar
JRummikub-982c2e6e2baf20eace331c19f6aef91b29e3c773.zip
Rechtschreibfehler und überflüssige pickUp(position) Klasse gefixt
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@227 72836036-5685-4462-b002-a69064685172
Diffstat (limited to 'test/jrummikub')
-rw-r--r--test/jrummikub/model/StoneTrayTest.java25
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>();