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

Tests for dropping on hand

Browse source 
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@206 72836036-5685-4462-b002-a69064685172
This commit is contained in:
Jannis Harder 2011-05-10 01:39:32 +02:00
parent 56b75e037a
commit ce982fcdaf
6 changed files with 78 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
mock/jrummikub/model/MockHand.java
View file

@ -1,8 +1,10 @@
package jrummikub.model;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
import jrummikub.util.Pair;
@ -10,6 +12,8 @@ public class MockHand implements IHand {
public List<Pair<Stone, Position>> stones = new ArrayList<Pair<Stone, Position>>();
public Set<Stone> pickups = new HashSet<Stone>();
public Iterable<Pair<Stone, Position>> iterable;
@Override
@ -29,13 +33,16 @@ public class MockHand implements IHand {
}
@Override
public void pickUp(Stone object) {
List<Pair<Stone, Position>> itList = new ArrayList(stones);
public boolean pickUp(Stone object) {
List<Pair<Stone, Position>> itList = new ArrayList<Pair<Stone, Position>>(stones);
for (Pair<Stone, Position> entry : itList) {
if (entry.getFirst() == object) {
stones.remove(entry);
pickups.add(object);
return true;
}
}
return false;
}
@Override

5
mock/jrummikub/model/MockTable.java
View file

@ -43,9 +43,8 @@ public class MockTable implements ITable {
}
@Override
public void pickUp(StoneSet object) {
// TODO Auto-generated method stub
public boolean pickUp(StoneSet object) {
return false;
}
@Override

5
mock/jrummikub/view/MockHandPanel.java
View file

@ -5,6 +5,7 @@ import java.util.List;
import jrummikub.model.Position;
import jrummikub.model.Stone;
import jrummikub.util.Event1;
import jrummikub.util.Event2;
import jrummikub.util.IEvent1;
import jrummikub.util.IEvent2;
@ -14,6 +15,7 @@ public class MockHandPanel implements IHandPanel {
public Event2<Stone, Boolean> stoneClickEvent = new Event2<Stone, Boolean>();
public List<Pair<Stone, Position>> stones;
public Event2<Stone, Boolean> rangeClickEvent = new Event2<Stone, Boolean>();
public Event1<Position> clickEvent = new Event1<Position>();
@Override
public IEvent2<Stone, Boolean> getStoneClickEvent() {
@ -33,8 +35,7 @@ public class MockHandPanel implements IHandPanel {
@Override
public IEvent1<Position> getClickEvent() {
// TODO Auto-generated method stub
return null;
return clickEvent;
}
@Override

2
src/jrummikub/model/IStoneTray.java
View file

@ -33,7 +33,7 @@ public interface IStoneTray<E extends Sizeable> extends
*/
public Position getPosition(E object);
public void pickUp(E object);
public boolean pickUp(E object);
public IStoneTray<E> clone();

4
src/jrummikub/model/StoneTray.java
View file

@ -217,8 +217,8 @@ public class StoneTray<E extends Sizeable> implements IStoneTray<E> {
* @see jrummikub.model.IStoneTray#pickUp(E)
*/
@Override
public void pickUp(E object) {
objects.remove(object);
public boolean pickUp(E object) {
return null != objects.remove(object);
}
/*

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

@ -11,8 +11,10 @@ import static org.junit.Assert.assertTrue;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
import jrummikub.model.IHand;
import jrummikub.model.ITable;
@ -1026,4 +1028,63 @@ public class TurnControlTest {
checkHandDisplay(mockHand);
}
@Test
public void testDropHandValid() {
testControl.startTurn();
Stone firstStone = new Stone(StoneColor.RED);
Stone secondStone = new Stone(StoneColor.BLACK);
mockHand.drop(firstStone, new Position(0,0));
mockHand.drop(secondStone, new Position(1,0));
mockView.playerPanel.handPanel.stoneClickEvent.emit(firstStone, true);
mockView.playerPanel.handPanel.stoneClickEvent.emit(secondStone, true);
mockView.playerPanel.handPanel.clickEvent.emit(new Position(2,0.25f));
assertCollection(new ArrayList<Stone>());
Set<Stone> expected = new HashSet<Stone>(Arrays.asList(firstStone, secondStone));
assertEquals(expected, mockHand.pickups);
Set<Stone> handStones = new HashSet<Stone>();
for (Pair<Stone, Position> stone : mockHand.stones) {
assertEquals(stone.getSecond(), new Position(2,0));
handStones.add(stone.getFirst());
}
assertEquals(expected, handStones);
}
@Test
public void testDropHandInvalid() {
testControl.startTurn();
Stone firstStone = new Stone(StoneColor.RED);
Stone secondStone = new Stone(StoneColor.BLACK);
Stone thirdStone = new Stone(13, StoneColor.BLACK);
mockHand.drop(firstStone, new Position(0,0));
mockHand.drop(thirdStone, new Position(1,0));
mockView.playerPanel.handPanel.stoneClickEvent.emit(firstStone, true);
mockView.tablePanel.stoneClickEvent.emit(secondStone, true);
mockView.playerPanel.handPanel.stoneClickEvent.emit(thirdStone, true);
mockView.playerPanel.handPanel.clickEvent.emit(new Position(2,0.25f));
assertCollection(Arrays.asList(secondStone));
Set<Stone> expected = new HashSet<Stone>(Arrays.asList(firstStone, thirdStone));
assertEquals(expected, mockHand.pickups);
Set<Stone> handStones = new HashSet<Stone>();
for (Pair<Stone, Position> stone : mockHand.stones) {
assertEquals(stone.getSecond(), new Position(2,0));
handStones.add(stone.getFirst());
}
assertEquals(expected, handStones);
}
}