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

Rather than a high frequency loop sending all packets a low frequency loop is made then destroyed on button press for sending turn packets. This means a fast response time on button press but fewer packets sent.

Browse Source 
#implement #issue[38]
This commit is contained in:
Calum
2017-08-13 18:38:24 +12:00
parent 30a6cb98ec
commit 2093e79b6a
11 changed files with 95 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/seng302/visualiser/ClientToServerTests/RegularPacketsTest.java
+10 -10
View File
@@ -4,20 +4,18 @@ import java.util.ArrayList;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.FixMethodOrder;
import org.junit.Test;
import org.junit.runners.MethodSorters;
import seng302.gameServer.GameStages;
import seng302.gameServer.GameState;
import seng302.gameServer.MainServerThread;
import seng302.gameServer.server.messages.BoatActionType;
import seng302.gameServer.server.messages.BoatAction;
import seng302.model.Yacht;
import seng302.visualiser.ClientToServerThread;
/**
* Test for checking how regularly packets are sent from ClientToServer Thread.
*/
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
//@FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class RegularPacketsTest {
private MainServerThread serverThread;
@@ -39,12 +37,12 @@ public class RegularPacketsTest {
Yacht yacht = new ArrayList<>(GameState.getYachts().values()).get(0);
double startAngle = yacht.getHeading();
long startTime = System.currentTimeMillis();
clientThread.sendBoatEvent(BoatActionType.UPWIND);
clientThread.sendBoatAction(BoatAction.UPWIND);
Thread.sleep(200);
while (Math.abs(yacht.getHeading() - startAngle) < TEST_DISTANCE) {
//Wait for yacht to move
Thread.sleep(1);
}
clientThread.sendBoatEvent(BoatActionType.MAINTAIN_HEADING);
clientThread.sendBoatAction(BoatAction.MAINTAIN_HEADING);
long endTime = System.currentTimeMillis();
SleepThreadMaxDelay();
//Allowed to be two loops of delay due to loop delay and processing delay at client + server ends.
@@ -58,7 +56,7 @@ public class RegularPacketsTest {
SleepThreadMaxDelay();
Yacht yacht = new ArrayList<>(GameState.getYachts().values()).get(0);
boolean startState = yacht.getSailIn();
clientThread.sendBoatEvent(BoatActionType.SAILS_IN);
clientThread.sendBoatAction(BoatAction.SAILS_IN);
SleepThreadMaxDelay();
Assert.assertEquals(startState, !yacht.getSailIn());
}
@@ -73,7 +71,7 @@ public class RegularPacketsTest {
Yacht testYacht = new Yacht("", 0, "", "", "", "");
testYacht.setHeading(heading);
testYacht.tackGybe(windDirection);
clientThread.sendBoatEvent(BoatActionType.TACK_GYBE);
clientThread.sendBoatAction(BoatAction.TACK_GYBE);
SleepThreadMaxDelay();
Assert.assertEquals(testYacht.getHeading(), yacht.getHeading(), 1);
}
@@ -88,9 +86,11 @@ public class RegularPacketsTest {
}
@After
public void teardown () {
public void teardown () throws Exception {
serverThread.terminate();
clientThread.setSocketToClose();
GameState.setCurrentStage(GameStages.LOBBYING);
SleepThreadMaxDelay(); //Make sure socket is closed.
SleepThreadMaxDelay();
}
}