From ce982fcdaf1a15981419e7a88802bc225795e6a4 Mon Sep 17 00:00:00 2001 From: Jannis Harder Date: Tue, 10 May 2011 01:39:32 +0200 Subject: Tests for dropping on hand git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@206 72836036-5685-4462-b002-a69064685172 --- mock/jrummikub/model/MockHand.java | 11 +++++- mock/jrummikub/model/MockTable.java | 5 +-- mock/jrummikub/view/MockHandPanel.java | 5 ++- src/jrummikub/model/IStoneTray.java | 2 +- src/jrummikub/model/StoneTray.java | 4 +- test/jrummikub/control/TurnControlTest.java | 61 +++++++++++++++++++++++++++++ 6 files changed, 78 insertions(+), 10 deletions(-) diff --git a/mock/jrummikub/model/MockHand.java b/mock/jrummikub/model/MockHand.java index 994f7f5..f8388d0 100644 --- a/mock/jrummikub/model/MockHand.java +++ b/mock/jrummikub/model/MockHand.java @@ -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> stones = new ArrayList>(); + public Set pickups = new HashSet(); + public Iterable> iterable; @Override @@ -29,13 +33,16 @@ public class MockHand implements IHand { } @Override - public void pickUp(Stone object) { - List> itList = new ArrayList(stones); + public boolean pickUp(Stone object) { + List> itList = new ArrayList>(stones); for (Pair entry : itList) { if (entry.getFirst() == object) { stones.remove(entry); + pickups.add(object); + return true; } } + return false; } @Override diff --git a/mock/jrummikub/model/MockTable.java b/mock/jrummikub/model/MockTable.java index 0bbbe0a..f17e5df 100644 --- a/mock/jrummikub/model/MockTable.java +++ b/mock/jrummikub/model/MockTable.java @@ -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 diff --git a/mock/jrummikub/view/MockHandPanel.java b/mock/jrummikub/view/MockHandPanel.java index 6069019..cb97ef7 100644 --- a/mock/jrummikub/view/MockHandPanel.java +++ b/mock/jrummikub/view/MockHandPanel.java @@ -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 stoneClickEvent = new Event2(); public List> stones; public Event2 rangeClickEvent = new Event2(); + public Event1 clickEvent = new Event1(); @Override public IEvent2 getStoneClickEvent() { @@ -33,8 +35,7 @@ public class MockHandPanel implements IHandPanel { @Override public IEvent1 getClickEvent() { - // TODO Auto-generated method stub - return null; + return clickEvent; } @Override diff --git a/src/jrummikub/model/IStoneTray.java b/src/jrummikub/model/IStoneTray.java index bdf7f86..11fcbbb 100644 --- a/src/jrummikub/model/IStoneTray.java +++ b/src/jrummikub/model/IStoneTray.java @@ -33,7 +33,7 @@ public interface IStoneTray extends */ public Position getPosition(E object); - public void pickUp(E object); + public boolean pickUp(E object); public IStoneTray clone(); diff --git a/src/jrummikub/model/StoneTray.java b/src/jrummikub/model/StoneTray.java index 8b83371..3418aec 100644 --- a/src/jrummikub/model/StoneTray.java +++ b/src/jrummikub/model/StoneTray.java @@ -217,8 +217,8 @@ public class StoneTray implements IStoneTray { * @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); } /* diff --git a/test/jrummikub/control/TurnControlTest.java b/test/jrummikub/control/TurnControlTest.java index 44b7729..b018182 100644 --- a/test/jrummikub/control/TurnControlTest.java +++ b/test/jrummikub/control/TurnControlTest.java @@ -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()); + + Set expected = new HashSet(Arrays.asList(firstStone, secondStone)); + assertEquals(expected, mockHand.pickups); + + Set handStones = new HashSet(); + for (Pair 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 expected = new HashSet(Arrays.asList(firstStone, thirdStone)); + assertEquals(expected, mockHand.pickups); + + Set handStones = new HashSet(); + for (Pair stone : mockHand.stones) { + assertEquals(stone.getSecond(), new Position(2,0)); + handStones.add(stone.getFirst()); + } + assertEquals(expected, handStones); + } + } -- cgit v1.2.3