summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorMatthias Schiffer <mschiffer@universe-factory.net>2011-05-09 00:33:31 +0200
committerMatthias Schiffer <mschiffer@universe-factory.net>2011-05-09 00:33:31 +0200
commitb9fbe279c3d6e750f7c90ad0b244d315c9744bb2 (patch)
tree851c990deb831b4f61282682cc99e39d76301414 /test
parentb57a2d5090cc1c6460b1ce806713964af9ec60f4 (diff)
downloadJRummikub-b9fbe279c3d6e750f7c90ad0b244d315c9744bb2.tar
JRummikub-b9fbe279c3d6e750f7c90ad0b244d315c9744bb2.zip
Another fix for the Table pickUpStone method
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@179 72836036-5685-4462-b002-a69064685172
Diffstat (limited to 'test')
-rw-r--r--test/jrummikub/model/TableTest.java13
1 files changed, 12 insertions, 1 deletions
diff --git a/test/jrummikub/model/TableTest.java b/test/jrummikub/model/TableTest.java
index e113ba7..a806e14 100644
--- a/test/jrummikub/model/TableTest.java
+++ b/test/jrummikub/model/TableTest.java
@@ -67,13 +67,24 @@ public class TableTest {
}
@Test
- public void testPickNonexistentStone() {
+ public void testPickStoneFromEmptyTable() {
Stone targetStone = new Stone(BLACK);
testTable.pickUpStone(targetStone);
assertEquals(0, testTable.getSize());
}
@Test
+ public void testPickNonexistentStone() {
+ Stone targetStone = new Stone(BLACK);
+ Stone droppedStone = new Stone(RED);
+ StoneSet set = new StoneSet(droppedStone);
+ testTable.drop(set, new Position(0, 0));
+ testTable.pickUpStone(targetStone);
+ assertEquals(1, testTable.getSize());
+ assertSame(testTable.findStoneSet(droppedStone), set);
+ }
+
+ @Test
@SuppressWarnings("unused")
public void testPickUpStoneRun() {
Stone targetStone = new Stone(BLACK);