michael/Party-Parrots-At-Sea
1
0
Fork 0
mirror of https://github.com/michaelrausch/Party-Parrots-At-Sea.git synced 2026-05-09 06:18:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge to integrate develop with separated Yacht classes. Functionality from this branch is not yet completed.

Browse Source 
#refactor
This commit is contained in:
Calum
2017-08-16 01:23:38 +12:00
parent e3fbbd4590
commit 7c5f146b11
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/seng302/visualiser/ClientToServerTests/RegularPacketsTest.java
+9 -11
View File
@@ -3,8 +3,6 @@ package seng302.visualiser.ClientToServerTests;
import org.junit.After; import org.junit.After;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import seng302.gameServer.GameStages;
import seng302.gameServer.GameState;
import seng302.gameServer.MainServerThread; import seng302.gameServer.MainServerThread;
import seng302.visualiser.ClientToServerThread; import seng302.visualiser.ClientToServerThread;
@@ -18,10 +16,10 @@ public class RegularPacketsTest {
@Before @Before
public void setup() throws Exception { public void setup() throws Exception {
new GameState("localhost"); // new GameState("localhost");
serverThread = new MainServerThread(); // serverThread = new MainServerThread();
clientThread = new ClientToServerThread("localhost", 4942); // clientThread = new ClientToServerThread("localhost", 4942);
GameState.setCurrentStage(GameStages.RACING); // GameState.setCurrentStage(GameStages.RACING);
} }
@Test @Test
@@ -68,10 +66,10 @@ public class RegularPacketsTest {
@After @After
public void teardown () throws Exception { public void teardown () throws Exception {
clientThread.setSocketToClose(); // clientThread.setSocketToClose();
serverThread.terminate(); // serverThread.terminate();
GameState.setCurrentStage(GameStages.LOBBYING); // GameState.setCurrentStage(GameStages.LOBBYING);
for (int i = 0; i<20; i++) // for (int i = 0; i<20; i++)
SleepThreadMaxDelay(); //Make sure socket is closed and toolkit remade. // SleepThreadMaxDelay(); //Make sure socket is closed and toolkit remade.
} }
} }