stone collection tests done
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@114 72836036-5685-4462-b002-a69064685172
This commit is contained in:
parent
20b7f250da
commit
8641164929
2 changed files with 39 additions and 3 deletions
|
@ -2,6 +2,7 @@ package jrummikub.control;
|
||||||
|
|
||||||
import static org.junit.Assert.*;
|
import static org.junit.Assert.*;
|
||||||
|
|
||||||
|
import java.util.Collections;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
|
@ -146,10 +147,45 @@ public class TurnControlTest {
|
||||||
mockView.playerPanel.handPanel.stoneClickEvent.emit(secondStone, true);
|
mockView.playerPanel.handPanel.stoneClickEvent.emit(secondStone, true);
|
||||||
|
|
||||||
mockView.tablePanel.stoneCollectionPanel.stoneClickEvent.emit(
|
mockView.tablePanel.stoneCollectionPanel.stoneClickEvent.emit(
|
||||||
firstStone, true);
|
firstStone, false);
|
||||||
|
|
||||||
assertCollection(Arrays.asList(secondStone));
|
assertCollection(Arrays.asList(secondStone));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void reorderCollection() {
|
||||||
|
|
||||||
|
TurnControl testControl = new TurnControl(null, null, mockView,
|
||||||
|
mockTimer);
|
||||||
|
Stone firstStone = new Stone(StoneColor.RED);
|
||||||
|
Stone secondStone = new Stone(StoneColor.BLACK);
|
||||||
|
|
||||||
|
mockView.playerPanel.handPanel.stoneClickEvent.emit(firstStone, true);
|
||||||
|
mockView.playerPanel.handPanel.stoneClickEvent.emit(secondStone, true);
|
||||||
|
|
||||||
|
mockView.tablePanel.stoneCollectionPanel.stoneClickEvent.emit(
|
||||||
|
firstStone, true);
|
||||||
|
|
||||||
|
assertCollection(Arrays.asList(secondStone, firstStone));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void deselectWholeCollection() {
|
||||||
|
|
||||||
|
TurnControl testControl = new TurnControl(null, null, mockView,
|
||||||
|
mockTimer);
|
||||||
|
Stone firstStone = new Stone(StoneColor.RED);
|
||||||
|
Stone secondStone = new Stone(StoneColor.BLACK);
|
||||||
|
|
||||||
|
mockView.playerPanel.handPanel.stoneClickEvent.emit(firstStone, true);
|
||||||
|
mockView.playerPanel.handPanel.stoneClickEvent.emit(secondStone, true);
|
||||||
|
|
||||||
|
mockView.tablePanel.stoneCollectionPanel.setClickEvent.emit(
|
||||||
|
firstStone, true);
|
||||||
|
|
||||||
|
assertCollection(new ArrayList<Stone>());
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
private void assertCollection(List<Stone> expected) {
|
private void assertCollection(List<Stone> expected) {
|
||||||
ArrayList<Stone> selectedStones = new ArrayList<Stone>(
|
ArrayList<Stone> selectedStones = new ArrayList<Stone>(
|
||||||
|
|
|
@ -7,6 +7,7 @@ import jrummikub.util.IEvent2;
|
||||||
public class MockStoneCollectionPanel implements IStoneCollectionPanel {
|
public class MockStoneCollectionPanel implements IStoneCollectionPanel {
|
||||||
|
|
||||||
public Event2<Stone,Boolean> stoneClickEvent = new Event2<Stone, Boolean>();
|
public Event2<Stone,Boolean> stoneClickEvent = new Event2<Stone, Boolean>();
|
||||||
|
public Event2<Stone,Boolean> setClickEvent = new Event2<Stone, Boolean>();
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public IEvent2<Stone, Boolean> getStoneClickEvent() {
|
public IEvent2<Stone, Boolean> getStoneClickEvent() {
|
||||||
|
@ -21,8 +22,7 @@ public class MockStoneCollectionPanel implements IStoneCollectionPanel {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public IEvent2<Stone, Boolean> getSetClickEvent() {
|
public IEvent2<Stone, Boolean> getSetClickEvent() {
|
||||||
// TODO Auto-generated method stub
|
return setClickEvent;
|
||||||
return null;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Reference in a new issue