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

Implemented stone display in both controls, tested (weniger Mock-Mist)

Browse source 
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@140 72836036-5685-4462-b002-a69064685172
This commit is contained in:
Bennet Gerlach 2011-05-05 01:33:58 +02:00
parent 866197f315
commit 121afdf6c6
4 changed files with 43 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

23
test/jrummikub/control/RoundControlTest.java
View file

@ -9,7 +9,6 @@ import static org.junit.Assert.assertTrue;
import java.util.Iterator;
import jrummikub.model.GameState;
import jrummikub.model.MockGameState;
import jrummikub.model.MockTable;
import jrummikub.model.Position;
@ -35,13 +34,13 @@ public class RoundControlTest {
Stone stone = testGameState.getGameHeap().drawStone();
testGameState.table.drop(new StoneSet(stone), new Position(5, 0));
newTable = new MockTable();
newTable.drop(new StoneSet(stone), new Position(5, 0));
newTable.sets.add(testGameState.table.sets.get(0));
testGameState.table.clonedTable = newTable;
}
private void checkCorrectlyDealed() {
assertEquals(106 - testGameState.getPlayerCount() * 14 - testGameState.table.getSize(), testGameState
.getGameHeap().getSize());
assertEquals(106 - testGameState.getPlayerCount() * 14
- testGameState.table.getSize(), testGameState.getGameHeap().getSize());
for (int i = 0; i < testGameState.getPlayerCount(); i++) {
assertEquals(14, testGameState.getPlayer(i).getHand().getSize());
}
@ -56,12 +55,14 @@ public class RoundControlTest {
assertFalse(view.startTurnEvent.listeners.isEmpty());
checkTableDisplay();
}
private void checkTableDisplay() {
Iterator<Pair<StoneSet, Position>> stoneSetsView = view.tablePanel.stoneSets.iterator();
Iterator<Pair<StoneSet, Position>> stoneSetsModel = testGameState.table.sets.iterator();
while(stoneSetsView.hasNext()) {
Iterator<Pair<StoneSet, Position>> stoneSetsView = view.tablePanel.stoneSets
.iterator();
Iterator<Pair<StoneSet, Position>> stoneSetsModel = testGameState.table.sets
.iterator();
while (stoneSetsView.hasNext()) {
assertTrue(stoneSetsModel.hasNext());
assertSame(stoneSetsView.next(), stoneSetsModel.next());
}
@ -89,7 +90,7 @@ public class RoundControlTest {
checkTurnStartSetUp();
}
@Test
public void testTableDisplay() {
testRound.startRound();

5
test/jrummikub/view/MockTablePanel.java
View file

@ -21,7 +21,7 @@ public class MockTablePanel implements ITablePanel {
public String leftPlayerName;
public String topPlayerName;
public String rightPlayerName;
public Iterable<Pair<StoneSet, Position>> stoneSets;
@Override
@ -65,8 +65,7 @@ public class MockTablePanel implements ITablePanel {
@Override
public void setStoneSets(Iterable<Pair<StoneSet, Position>> stoneSets) {
// TODO Auto-generated method stub
this.stoneSets = stoneSets;
}
@Override