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

Test und implementierung von tableSetDifference, getestet und alles :-)

Browse source 
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@246 72836036-5685-4462-b002-a69064685172
This commit is contained in:
Ida Massow 2011-05-16 22:24:11 +02:00
parent a4f5beb005
commit 46cf40c44f
2 changed files with 74 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/jrummikub/control/RoundControl.java
View file

@ -33,9 +33,9 @@ public class RoundControl {
* Create a new RoundControl using the given gameState and view
*
* @param gameState
* initial game state
* initial game state
* @param view
* view used for user interaction
* view used for user interaction
*/
public RoundControl(IGameState gameState, IView view) {
this.gameState = gameState;
@ -99,14 +99,17 @@ public class RoundControl {
for (int i = 0; i < gameState.getPlayerCount(); i++) {
IHand hand = gameState.getNthNextPlayer(i).getHand();
for (int j = 0; j < 7; j++) {
hand.drop(gameState.getGameHeap().drawStone(), new Position(j, 0));
hand.drop(gameState.getGameHeap().drawStone(), new Position(j, 1));
hand.drop(gameState.getGameHeap().drawStone(), new Position(j,
0));
hand.drop(gameState.getGameHeap().drawStone(), new Position(j,
1));
}
}
}
private void endOfTurn() {
Set<Stone> tableDiff = tableDifference(gameState.getTable(), clonedTable);
Set<Stone> tableDiff = tableDifference(gameState.getTable(),
clonedTable);
if (!tableDiff.isEmpty()) { // Player has made a move
if (clonedTable.isValid()) {
@ -145,7 +148,18 @@ public class RoundControl {
ret.remove(stone);
}
}
return ret;
}
static List<StoneSet> tableSetDifference(ITable oldTable, ITable newTable) {
List<StoneSet> ret = new ArrayList<StoneSet>();
for (Pair<StoneSet, Position> entry : newTable) {
ret.add(entry.getFirst());
}
for (Pair<StoneSet, Position> entry : oldTable) {
ret.remove(entry.getFirst());
}
return ret;
}

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

@ -2,6 +2,7 @@ package jrummikub.control;
import static jrummikub.model.StoneColor.BLACK;
import static jrummikub.model.StoneColor.BLUE;
import static jrummikub.model.StoneColor.ORANGE;
import static jrummikub.model.StoneColor.RED;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@ -13,15 +14,18 @@ import static org.junit.Assert.assertTrue;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
import jrummikub.model.Hand;
import jrummikub.model.IHand;
import jrummikub.model.ITable;
import jrummikub.model.MockGameState;
import jrummikub.model.MockTable;
import jrummikub.model.Position;
import jrummikub.model.Stone;
import jrummikub.model.StoneSet;
import jrummikub.model.Table;
import jrummikub.util.Pair;
import jrummikub.view.MockView;
@ -276,4 +280,55 @@ public class RoundControlTest {
assertTrue(expectedStones.containsAll(stones));
assertTrue(stones.containsAll(expectedStones));
}
@Test
public void testTableSetDifference() {
ITable oldTable = new Table();
Stone blueOne = new Stone(1, BLUE);
Stone redOne = new Stone(1, RED);
Stone blackOne = new Stone(1, BLACK);
Stone orangeOne = new Stone(1, ORANGE);
Stone blueTwo = new Stone(2, BLUE);
Stone blueThree = new Stone(3, BLUE);
Stone blueFour = new Stone(4, BLUE);
StoneSet oldSet1 = new StoneSet(Arrays.asList(blueOne, redOne,
blackOne, orangeOne));
StoneSet oldSet2 = new StoneSet(Arrays.asList(blueTwo, blueThree,
blueFour));
oldTable.drop(oldSet1, new Position(0, 0));
oldTable.drop(oldSet2, new Position(0, 0));
ITable newTable = (Table) oldTable.clone();
List<StoneSet> newSets = RoundControl.tableSetDifference(oldTable,
newTable);
List<StoneSet> vanishedSets = RoundControl.tableSetDifference(newTable,
oldTable);
assertTrue(newSets.isEmpty());
assertTrue(vanishedSets.isEmpty());
newTable.pickUp(oldSet2);
newTable.drop(oldSet2.join(new StoneSet(new Stone(5, BLUE))),
new Position(0, 0));
newSets = RoundControl.tableSetDifference(oldTable, newTable);
vanishedSets = RoundControl.tableSetDifference(newTable, oldTable);
assertFalse(newSets.isEmpty());
assertFalse(vanishedSets.isEmpty());
assertEquals(1, newSets.size());
assertEquals(1, vanishedSets.size());
Stone redTwo = new Stone(2, RED);
Stone redThree = new Stone(3, RED);
Stone redFour = new Stone(4, RED);
StoneSet oldSet3 = new StoneSet(
Arrays.asList(redTwo, redThree, redFour));
ITable newTable2 = (Table) oldTable.clone();
newTable2.drop(oldSet3, new Position(0, 0));
newSets = RoundControl.tableSetDifference(oldTable, newTable2);
vanishedSets = RoundControl.tableSetDifference(newTable2, oldTable);
assertFalse(newSets.isEmpty());
assertTrue(vanishedSets.isEmpty());
assertEquals(1, newSets.size());
}
}