From a1c0cb89f67386738fc59426fd68737a393e1827 Mon Sep 17 00:00:00 2001 From: Jannis Harder Date: Wed, 25 May 2011 17:10:43 +0200 Subject: Added test and implementation for an inspection turn before the first turn git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@273 72836036-5685-4462-b002-a69064685172 --- mock/jrummikub/model/MockRoundState.java | 14 +++++++++++++- mock/jrummikub/view/MockTablePanel.java | 3 ++- 2 files changed, 15 insertions(+), 2 deletions(-) (limited to 'mock') diff --git a/mock/jrummikub/model/MockRoundState.java b/mock/jrummikub/model/MockRoundState.java index 1ebc575..bf2f475 100644 --- a/mock/jrummikub/model/MockRoundState.java +++ b/mock/jrummikub/model/MockRoundState.java @@ -22,8 +22,10 @@ public class MockRoundState implements IRoundState { public GameSettings gameSettings; /** */ public IPlayer lastPlayer; - /** */ + public int turnNumber; + /** */ + public MockRoundState() { table = new MockTable(); players = new ArrayList(); @@ -39,6 +41,7 @@ public class MockRoundState implements IRoundState { gameHeap = new StoneHeap(); gameSettings = new GameSettings(); gameSettings.setInitialMeldThreshold(30); + turnNumber = -3; } @Override @@ -113,4 +116,13 @@ public class MockRoundState implements IRoundState { } return players.get(j); } + + public int getTurnNumber() { + return turnNumber; + } + + @Override + public void nextTurn() { + turnNumber++; + } } diff --git a/mock/jrummikub/view/MockTablePanel.java b/mock/jrummikub/view/MockTablePanel.java index ca3db6e..212452c 100644 --- a/mock/jrummikub/view/MockTablePanel.java +++ b/mock/jrummikub/view/MockTablePanel.java @@ -7,6 +7,7 @@ import jrummikub.util.Event1; import jrummikub.util.Event2; import jrummikub.util.IEvent1; import jrummikub.util.IEvent2; +import jrummikub.util.MockEvent1; import jrummikub.util.Pair; /** @@ -21,7 +22,7 @@ public class MockTablePanel implements ITablePanel { /** */ public Event2 rangeClickEvent = new Event2(); /** */ - public Event1 clickEvent = new Event1(); + public MockEvent1 clickEvent = new MockEvent1(); /** */ public Event1 leftConnectorClickEvent = new Event1(); /** */ -- cgit v1.2.3