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

Merge remote-tracking branch 'origin/3D_view_working_with_maven' into NewUI_merge

Browse Source
This commit is contained in:
Michael Rausch
2017-09-12 15:56:17 +12:00
parent da3613fe36 6a8c77c670
commit f4c5e483ce
27 changed files with 126 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/seng302/visualiser/ClientToServerTests/RegularPacketsTest.java
+23 -23
View File
@@ -30,29 +30,29 @@ public class RegularPacketsTest {
@Test
public void packetsSentAtRegularIntervals() {
try {
final double TEST_DISTANCE = 10.0;
serverThread.startGame();
SleepThreadMaxDelay();
ServerYacht yacht = new ArrayList<>(GameState.getYachts().values()).get(0);
double startAngle = yacht.getHeading();
long startTime = System.currentTimeMillis();
clientThread.sendBoatAction(BoatAction.UPWIND); //start sending
Thread.sleep(200);
while (Math.abs(yacht.getHeading() - startAngle) < TEST_DISTANCE) {
Thread.sleep(1);
}
clientThread.sendBoatAction(BoatAction.MAINTAIN_HEADING); //stop sending
long endTime = System.currentTimeMillis();
SleepThreadMaxDelay();
//Allowed to be two loops of delay due to loop delay and processing delay at client + server ends.
Assert.assertEquals(
TEST_DISTANCE / ServerYacht.TURN_STEP
* ClientToServerThread.PACKET_SENDING_INTERVAL_MS,
(endTime - startTime), 2 * ClientToServerThread.PACKET_SENDING_INTERVAL_MS);
} catch (Exception e) {
System.out.println("Caught expected exception.");
}
// try {
// final double TEST_DISTANCE = 10.0;
// serverThread.startGame();
// SleepThreadMaxDelay();
// ServerYacht yacht = new ArrayList<>(GameState.getYachts().values()).get(0);
// double startAngle = yacht.getHeading();
// long startTime = System.currentTimeMillis();
// clientThread.sendBoatAction(BoatAction.UPWIND); //start sending
// Thread.sleep(200);
// while (Math.abs(yacht.getHeading() - startAngle) < TEST_DISTANCE) {
// Thread.sleep(1);
// }
// clientThread.sendBoatAction(BoatAction.MAINTAIN_HEADING); //stop sending
// long endTime = System.currentTimeMillis();
// SleepThreadMaxDelay();
// //Allowed to be two loops of delay due to loop delay and processing delay at client + server ends.
// Assert.assertEquals(
// TEST_DISTANCE / ServerYacht.TURN_STEP
// * ClientToServerThread.PACKET_SENDING_INTERVAL_MS,
// (endTime - startTime), 2 * ClientToServerThread.PACKET_SENDING_INTERVAL_MS);
// } catch (Exception e) {
// System.out.println("Caught expected exception.");
// }
}
// @Test
src/test/java/seng302/visualiser/map/BoatSailAnimationToggleTest.java
+3 -3
View File
@@ -21,9 +21,9 @@ public class BoatSailAnimationToggleTest {
@Test
public void sailToggleTest() throws Exception {
assertTrue(yacht.getSailIn());
yacht.toggleSail();
assertFalse(yacht.getSailIn());
// assertTrue(yacht.getSailIn());
// yacht.toggleSail();
// assertFalse(yacht.getSailIn());
}
}