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

Solved conflicts

Browse source 
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@189 72836036-5685-4462-b002-a69064685172
This commit is contained in:
Ida Massow 2011-05-09 18:53:37 +02:00
parent f247b3666b
commit 3f8853b3e6
2 changed files with 51 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

16
test/jrummikub/control/TurnControlTest.java
View file

@ -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