fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mock now serializes and sends Boat.xml, Race.xml, Regatta.xml, Heartbeat, BoatLocation messages.

Browse Source 
#story[778]
This commit is contained in:
fjc40
2017-04-28 01:30:03 +12:00
parent 90f8bec415
commit d29c0a9439
4 changed files with 201 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mock/src/test/java/seng302/Model/RaceTest.java
+11 -7
View File
@@ -3,6 +3,10 @@ package seng302.Model;
import javafx.scene.paint.Color;
import org.junit.Ignore;
import org.junit.Test;
import SharedModel.BoatInRace;
import SharedModel.GPSCoordinate;
import SharedModel.Leg;
import SharedModel.Marker;
import java.util.ArrayList;
import java.util.List;
@@ -32,7 +36,7 @@ public class RaceTest {
legs.add(START_LEG);
legs.add(FINISH_LEG);
Race race = new Race(boats, legs, 5);
Race race = new Race(boats, legs, 5, System.out);
race.setDnfChance(0);
long timeStarted = System.currentTimeMillis();
race.run();
@@ -53,7 +57,7 @@ public class RaceTest {
ArrayList<Leg> legs = new ArrayList<>();
legs.add(FINISH_LEG);
Race race = new Race(boats, legs, 1);
Race race = new Race(boats, legs, 1, System.out);
race.setDnfChance(0);
assertEquals(race.boatsFinished, 0);
@@ -77,7 +81,7 @@ public class RaceTest {
ArrayList<Leg> legs = new ArrayList<>();
legs.add(FINISH_LEG);
Race race = new Race(boats, legs, 1);
Race race = new Race(boats, legs, 1, System.out);
race.setDnfChance(0);
assertEquals(race.boatsFinished, 0);
@@ -95,7 +99,7 @@ public class RaceTest {
legs.add(START_LEG);
legs.add(FINISH_LEG);
Race race = new Race(boats, legs, 1);
Race race = new Race(boats, legs, 1, System.out);
race.setDnfChance(0);
BoatInRace unFinishedBoat = new BoatInRace("Test", 10, Color.ALICEBLUE, "tt", 1);
@@ -152,7 +156,7 @@ public class RaceTest {
ArrayList<Leg> legs = new ArrayList<>();
legs.add(START_LEG);
Race race = new Race(boats, legs, scaleFactor);
Race race = new Race(boats, legs, scaleFactor, System.out);
race.setDnfChance(0);
assertEquals(race.getStartingBoats().get(0).getScaledVelocity(), vel1 * scaleFactor, 1e-6);
@@ -170,7 +174,7 @@ public class RaceTest {
ArrayList<Leg> legs = new ArrayList<>();
legs.add(START_LEG);
Race race = new Race(boats, legs, scaleFactor);
Race race = new Race(boats, legs, scaleFactor, System.out);
race.totalTimeElapsed = 6000; //6 seconds
assertTrue(race.calcTimer().equals("Race clock: 00:01:00"));
}
@@ -184,7 +188,7 @@ public class RaceTest {
ArrayList<Leg> legs = new ArrayList<>();
legs.add(START_LEG);
Race race = new Race(boats, legs, scaleFactor);
Race race = new Race(boats, legs, scaleFactor, System.out);
race.totalTimeElapsed = 3213000;
assertTrue(race.calcTimer().equals("Race clock: 02:40:39"));