Add stone dealing to RoundControl and fix some tests... again.
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@160 72836036-5685-4462-b002-a69064685172
This commit is contained in:
parent
511b1139ea
commit
55b19cef1d
3 changed files with 7 additions and 4 deletions
|
@ -68,8 +68,7 @@ public class MockTablePanel implements ITablePanel {
|
|||
|
||||
@Override
|
||||
public IStoneCollectionPanel getStoneCollectionPanel() {
|
||||
// TODO Auto-generated method stub
|
||||
return null;
|
||||
return stoneCollectionPanel;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -116,7 +116,11 @@ public class RoundControl {
|
|||
}
|
||||
|
||||
private void dealStone() {
|
||||
// gameState.getActivePlayer().getHand().drop(object, position)
|
||||
gameState
|
||||
.getActivePlayer()
|
||||
.getHand()
|
||||
.drop(gameState.getGameHeap().drawStone(),
|
||||
new Position(7 + (int) (Math.random() * 6), 0.5f));
|
||||
}
|
||||
|
||||
private void dealPenalty(int count) {
|
||||
|
|
|
@ -67,7 +67,7 @@ public class RoundControlTest {
|
|||
private void checkTableDisplay() {
|
||||
Iterator<Pair<StoneSet, Position>> stoneSetsView = view.tablePanel.stoneSets
|
||||
.iterator();
|
||||
Iterator<Pair<StoneSet, Position>> stoneSetsModel = testGameState.table.sets
|
||||
Iterator<Pair<StoneSet, Position>> stoneSetsModel = testGameState.table.clone().sets
|
||||
.iterator();
|
||||
|
||||
while (stoneSetsView.hasNext()) {
|
||||
|
|
Reference in a new issue