neocturne/JRummikub
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rechtschreibfehler und überflüssige pickUp(position) Klasse gefixt

Browse source 
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@227 72836036-5685-4462-b002-a69064685172
This commit is contained in:
Ida Massow 2011-05-10 16:31:09 +02:00
parent cdd0949db3
commit 982c2e6e2b
7 changed files with 27 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

25
test/jrummikub/model/StoneTrayTest.java
View file

@ -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() {
@ -146,15 +148,6 @@ public class StoneTrayTest {
assertEquals(1, thirdPosition.getY(), 0.00001);
}
/** */
@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() {
@ -169,18 +162,6 @@ public class StoneTrayTest {
assertTrue(testTray.iterator().hasNext());
}
/** */
@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() {