From d47e291d19dfc2c3a351c0ba94469e3d50637411 Mon Sep 17 00:00:00 2001 From: Ida Massow Date: Sun, 19 Jun 2011 00:28:23 +0200 Subject: =?UTF-8?q?Tests=20f=C3=BCr=20NetworkControl?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@473 72836036-5685-4462-b002-a69064685172 --- mock/jrummikub/control/network/MockConnectionControl.java | 12 ++++++------ mock/jrummikub/view/MockGameListPanel.java | 11 +++++++---- mock/jrummikub/view/MockSettingsPanel.java | 4 ++-- src/jrummikub/control/ApplicationControl.java | 6 ++++-- src/jrummikub/control/network/ConnectionControl.java | 4 ++-- src/jrummikub/control/network/NetworkControl.java | 12 +++++------- 6 files changed, 26 insertions(+), 23 deletions(-) diff --git a/mock/jrummikub/control/network/MockConnectionControl.java b/mock/jrummikub/control/network/MockConnectionControl.java index 6ecfe75..7d97c78 100644 --- a/mock/jrummikub/control/network/MockConnectionControl.java +++ b/mock/jrummikub/control/network/MockConnectionControl.java @@ -39,6 +39,8 @@ public class MockConnectionControl implements IConnectionControl { public boolean connected; /** */ public boolean failOnConnect; + /** */ + public GameData joinedGame; @Override public String getNickname() { @@ -112,20 +114,18 @@ public class MockConnectionControl implements IConnectionControl { @Override public GameData getCurrentGame() { - // TODO Auto-generated method stub - return null; + return currentGame; } @Override public void setCurrentGame(GameData game) { - // TODO Auto-generated method stub - + currentGame = game; } @Override public void joinGame(GameData game) { - // TODO Auto-generated method stub - + currentGame = game; + joinedGame = game; } @Override diff --git a/mock/jrummikub/view/MockGameListPanel.java b/mock/jrummikub/view/MockGameListPanel.java index d578df3..58af553 100644 --- a/mock/jrummikub/view/MockGameListPanel.java +++ b/mock/jrummikub/view/MockGameListPanel.java @@ -1,5 +1,6 @@ package jrummikub.view; +import java.util.ArrayList; import java.util.List; import jrummikub.util.GameData; @@ -16,6 +17,10 @@ public class MockGameListPanel implements IGameListPanel { public MockEvent openNewGameEvent = new MockEvent(); /** */ public MockEvent cancelEvent = new MockEvent(); + /** */ + public List gameList = new ArrayList(); + /** */ + public String channelName; @Override public IEvent getOpenNewGameEvent() { @@ -34,14 +39,12 @@ public class MockGameListPanel implements IGameListPanel { @Override public void setChannelName(String name) { - // TODO Auto-generated method stub - + channelName = name; } @Override public void setGameList(List games) { - // TODO Auto-generated method stub - + gameList = games; } } diff --git a/mock/jrummikub/view/MockSettingsPanel.java b/mock/jrummikub/view/MockSettingsPanel.java index 0948d9e..594a3b3 100644 --- a/mock/jrummikub/view/MockSettingsPanel.java +++ b/mock/jrummikub/view/MockSettingsPanel.java @@ -77,6 +77,7 @@ public class MockSettingsPanel implements ISettingsPanel { /** */ public Set stoneColors; private MockEvent backEvent = new MockEvent(); + public SettingsMode settingsMode; @Override public IEvent getAddPlayerEvent() { @@ -216,8 +217,7 @@ public class MockSettingsPanel implements ISettingsPanel { @Override public void setSettingsMode(SettingsMode mode) { - // TODO Auto-generated method stub - + settingsMode = mode; } @Override diff --git a/src/jrummikub/control/ApplicationControl.java b/src/jrummikub/control/ApplicationControl.java index 3e429d2..bcf497f 100644 --- a/src/jrummikub/control/ApplicationControl.java +++ b/src/jrummikub/control/ApplicationControl.java @@ -1,5 +1,6 @@ package jrummikub.control; +import jrummikub.control.network.ConnectionControl; import jrummikub.control.network.NetworkControl; import jrummikub.model.GameSettings; import jrummikub.model.GameState; @@ -71,7 +72,7 @@ public class ApplicationControl { @Override public void handle() { abortControls(); - + loginControl = new LoginControl(view); loginControl.getLoginEvent().add(new IListener1() { @Override @@ -149,7 +150,8 @@ public class ApplicationControl { } private void createNetworkControl(LoginData loginData) { - networkControl = new NetworkControl(loginData, view); + ConnectionControl connectionControl = new ConnectionControl(loginData); + networkControl = new NetworkControl(loginData, connectionControl, view); networkControl.getStopNetworkEvent().add(new IListener() { @Override diff --git a/src/jrummikub/control/network/ConnectionControl.java b/src/jrummikub/control/network/ConnectionControl.java index e435309..81f6095 100644 --- a/src/jrummikub/control/network/ConnectionControl.java +++ b/src/jrummikub/control/network/ConnectionControl.java @@ -32,7 +32,7 @@ import org.jivesoftware.smack.util.Base64; import org.jivesoftware.smackx.muc.DiscussionHistory; import org.jivesoftware.smackx.muc.MultiUserChat; -class ConnectionControl implements IConnectionControl { +public class ConnectionControl implements IConnectionControl { private final static String ELEMENT_NAME = "rummikub"; private final static String NAMESPACE = "http://home.universe-factory.net/rummikub/"; @@ -57,7 +57,7 @@ class ConnectionControl implements IConnectionControl { private volatile GameData offeredGame; - ConnectionControl(LoginData loginData) { + public ConnectionControl(LoginData loginData) { this.loginData = loginData; } diff --git a/src/jrummikub/control/network/NetworkControl.java b/src/jrummikub/control/network/NetworkControl.java index a8faac5..cfb3c14 100644 --- a/src/jrummikub/control/network/NetworkControl.java +++ b/src/jrummikub/control/network/NetworkControl.java @@ -40,12 +40,13 @@ public class NetworkControl { * @param view * for events and handlers */ - public NetworkControl(final LoginData loginData, final IView view) { + public NetworkControl(final LoginData loginData, + IConnectionControl connectionControl, final IView view) { this.view = view; - connectionControl = new ConnectionControl(loginData); + this.connectionControl = connectionControl; addConnectionSetupListeners(loginData, view); - addConnectionControlListeners(loginData, view); + addConnectionControlListeners(view); connections.add(view.getGameListPanel().getJoinEvent().add( new IListener1() { @@ -81,13 +82,10 @@ public class NetworkControl { /** * Adds the listeners for connection control events * - * @param loginData - * player's login data * @param view * view for events */ - public void addConnectionControlListeners(final LoginData loginData, - final IView view) { + public void addConnectionControlListeners(final IView view) { connections.add(connectionControl.getGameOfferEvent().add( new IListener1() { @Override -- cgit v1.2.3