diff options
| author | Ida Massow <massow@informatik.uni-luebeck.de> | 2011-05-09 18:53:37 +0200 |
|---|---|---|
| committer | Ida Massow <massow@informatik.uni-luebeck.de> | 2011-05-09 18:53:37 +0200 |
| commit | 3f8853b3e68c19af3281a6b02ce361956f406953 (patch) | |
| tree | c9c92a92671835e513a4ccf17de869da2ee64fd6 /test/jrummikub | |
| parent | f247b3666b295451da46851cfa71c5ae76b232ff (diff) | |
| download | JRummikub-3f8853b3e68c19af3281a6b02ce361956f406953.tar JRummikub-3f8853b3e68c19af3281a6b02ce361956f406953.zip | |
Solved conflicts
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@189 72836036-5685-4462-b002-a69064685172
Diffstat (limited to 'test/jrummikub')
| -rw-r--r-- | test/jrummikub/control/TurnControlTest.java | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/test/jrummikub/control/TurnControlTest.java b/test/jrummikub/control/TurnControlTest.java index f195fbc..97c39d0 100644 --- a/test/jrummikub/control/TurnControlTest.java +++ b/test/jrummikub/control/TurnControlTest.java @@ -552,8 +552,10 @@ public class TurnControlTest { assertSame(newSet2.get(3), blackFour); assertSame(newSet2.get(4), blackFive); // versuche, links was wegzunehmen und wieder anzuhängen - mockView.tablePanel.stoneClickEvent.emit(redOne, false); - mockView.playerPanel.handPanel.stoneClickEvent.emit(blueFour, true); + mockView.playerPanel.handPanel.stoneClickEvent.emit(blueFour, false); + mockView.tablePanel.stoneClickEvent.emit(redOne, true); + mockView.tablePanel.leftConnectorClickEvent.emit(newSet2); + // handcheck assertEquals(0, mockHand.getSize()); // tablecheck @@ -569,8 +571,8 @@ public class TurnControlTest { assertEquals(7, newSet1.size()); // setcheck2 assertEquals(6, newSet2.size()); - assertSame(newSet2.get(0), redOne); - assertSame(newSet2.get(1), blueFour); + assertSame(newSet2.get(0), blueFour); + assertSame(newSet2.get(1), redOne); assertSame(newSet2.get(2), redThree); assertSame(newSet2.get(3), blueTwo); assertSame(newSet2.get(4), blackFour); @@ -666,8 +668,10 @@ public class TurnControlTest { assertSame(newSet2.get(3), redOne); assertSame(newSet2.get(4), redThree); // versuche, rechts was wegzunehmen und wieder anzuhängen - mockView.tablePanel.stoneClickEvent.emit(redThree, false); - mockView.playerPanel.handPanel.stoneClickEvent.emit(blueFour, true); + mockView.playerPanel.handPanel.stoneClickEvent.emit(blueFour, false); + mockView.tablePanel.stoneClickEvent.emit(redThree, true); + mockView.tablePanel.rightConnectorClickEvent.emit(newSet2); + // handcheck assertEquals(0, mockHand.getSize()); // tablecheck |