New main
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@127 72836036-5685-4462-b002-a69064685172
This commit is contained in:
parent
b0a90ad6f0
commit
db7489a5c7
6 changed files with 40 additions and 224 deletions
|
@ -21,7 +21,7 @@ import org.junit.Test;
|
|||
public class TurnControlTest {
|
||||
|
||||
class MockTimer implements ITurnTimer {
|
||||
public boolean timerRunning;
|
||||
public boolean timerRunning = false;
|
||||
public Event timeRunOutEvent = new Event();
|
||||
|
||||
@Override
|
||||
|
@ -55,6 +55,11 @@ public class TurnControlTest {
|
|||
testControl = new TurnControl(null, mockTable, mockView, mockTimer);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void startTimer() {
|
||||
assertTrue(mockTimer.timerRunning);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void viewEndOfTurn() {
|
||||
eventFired = false;
|
||||
|
@ -141,8 +146,8 @@ public class TurnControlTest {
|
|||
mockView.playerPanel.handPanel.stoneClickEvent.emit(firstStone, true);
|
||||
mockView.playerPanel.handPanel.stoneClickEvent.emit(secondStone, true);
|
||||
|
||||
mockView.tablePanel.stoneCollectionPanel.stoneClickEvent.emit(
|
||||
firstStone, false);
|
||||
mockView.tablePanel.stoneCollectionPanel.stoneClickEvent.emit(firstStone,
|
||||
false);
|
||||
|
||||
assertCollection(Arrays.asList(secondStone));
|
||||
}
|
||||
|
@ -156,8 +161,8 @@ public class TurnControlTest {
|
|||
mockView.playerPanel.handPanel.stoneClickEvent.emit(firstStone, true);
|
||||
mockView.playerPanel.handPanel.stoneClickEvent.emit(secondStone, true);
|
||||
|
||||
mockView.tablePanel.stoneCollectionPanel.stoneClickEvent.emit(
|
||||
firstStone, true);
|
||||
mockView.tablePanel.stoneCollectionPanel.stoneClickEvent.emit(firstStone,
|
||||
true);
|
||||
|
||||
assertCollection(Arrays.asList(secondStone, firstStone));
|
||||
}
|
||||
|
@ -262,8 +267,7 @@ public class TurnControlTest {
|
|||
Stone stone2 = new Stone(2, StoneColor.RED);
|
||||
Stone stone3 = new Stone(3, StoneColor.RED);
|
||||
Stone stone4 = new Stone(4, StoneColor.RED);
|
||||
StoneSet set1 = new StoneSet(Arrays.asList(stone1, stone2, stone3,
|
||||
stone4));
|
||||
StoneSet set1 = new StoneSet(Arrays.asList(stone1, stone2, stone3, stone4));
|
||||
|
||||
mockTable.findStoneSet.put(stone1, set1);
|
||||
mockTable.findStoneSet.put(stone3, set1);
|
||||
|
@ -283,8 +287,7 @@ public class TurnControlTest {
|
|||
Stone stone2 = new Stone(2, StoneColor.RED);
|
||||
Stone stone3 = new Stone(3, StoneColor.RED);
|
||||
Stone stone4 = new Stone(4, StoneColor.RED);
|
||||
StoneSet set1 = new StoneSet(Arrays.asList(stone1, stone2, stone3,
|
||||
stone4));
|
||||
StoneSet set1 = new StoneSet(Arrays.asList(stone1, stone2, stone3, stone4));
|
||||
|
||||
mockTable.findStoneSet.put(stone1, set1);
|
||||
mockTable.findStoneSet.put(stone3, set1);
|
||||
|
|
|
@ -9,20 +9,19 @@ import jrummikub.util.Event1;
|
|||
import jrummikub.util.Event2;
|
||||
import jrummikub.util.IEvent1;
|
||||
import jrummikub.util.IEvent2;
|
||||
import jrummikub.util.Pair;
|
||||
|
||||
public class MockTablePanel implements ITablePanel {
|
||||
|
||||
public Event2<Stone, Boolean> stoneClickEvent = new Event2<Stone, Boolean>();
|
||||
public Event2<Stone, Boolean> setClickEvent = new Event2<Stone, Boolean>();
|
||||
public Event2<Stone, Boolean> rangeClickEvent = new Event2<Stone, Boolean>();
|
||||
|
||||
|
||||
public MockStoneCollectionPanel stoneCollectionPanel = new MockStoneCollectionPanel();
|
||||
public String leftPlayerName;
|
||||
public String topPlayerName;
|
||||
public String rightPlayerName;
|
||||
|
||||
|
||||
|
||||
@Override
|
||||
public IEvent2<Stone, Boolean> getStoneClickEvent() {
|
||||
// TODO Auto-generated method stub
|
||||
|
@ -63,7 +62,7 @@ public class MockTablePanel implements ITablePanel {
|
|||
}
|
||||
|
||||
@Override
|
||||
public void setStoneSets(Map<StoneSet, Position> stoneSets) {
|
||||
public void setStoneSets(Iterable<Pair<StoneSet, Position>> stoneSets) {
|
||||
// TODO Auto-generated method stub
|
||||
|
||||
}
|
||||
|
|
Reference in a new issue