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

Removed BoatInRace from shared model, refactored

Browse Source 
#story[778]
This commit is contained in:
Erika Savell
2017-05-01 15:06:56 +12:00
parent 7e569b59b7
commit 3f748bfdb6
15 changed files with 223 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mock/src/test/java/seng302/Model/BoatInRaceTest.java → mock/src/test/java/seng302/Model/BoatTest.java
+2 -58
View File
@@ -9,11 +9,11 @@ import static junit.framework.TestCase.*;
/**
* Created by esa46 on 22/03/17.
*/
public class BoatInRaceTest {
public class BoatTest {
private GPSCoordinate ORIGIN_COORDS = new GPSCoordinate(0, 0);
private SharedModel.BoatInRace TEST_BOAT = new SharedModel.BoatInRace("Test", 1, Color.ALICEBLUE, "tt", 1);
private Boat TEST_BOAT = new Boat("Test", 1, "tt", 1);
@Test
@@ -95,61 +95,5 @@ public class BoatInRaceTest {
assertEquals(TEST_BOAT.calculateHeading(), 270, 1e-8);
}
@Test
public void createNewBoatCreatesInstanceOfSuperClass() {
SharedModel.BoatInRace testBoat = new SharedModel.BoatInRace("Boat", 20, Color.ALICEBLUE, "tt", 1);
testBoat.setName("Name can change");
assertTrue(testBoat instanceof SharedModel.Boat);
assertTrue(testBoat.getCurrentLeg() == null);
assertTrue(testBoat.getCurrentPosition() == null);
assertTrue(testBoat.toString().contains("Name can change"));
assertEquals(testBoat.getVelocity(), 20.0);
assertTrue(testBoat.getVelocityProp().toString().contains("20"));
assertTrue(testBoat.getAbbrev().equals("tt"));
assertTrue(testBoat.getColour().equals(Color.ALICEBLUE));
assertEquals(testBoat.getSourceID(), 1);
assertFalse(testBoat.isFinished());
}
@Test
public void getWakeAtProperHeading() throws Exception {
SharedModel.BoatInRace boat = new SharedModel.BoatInRace("Test", 1, Color.ALICEBLUE, "tt", 1);
// Construct leg of 0 degrees
SharedModel.Marker startMarker = new SharedModel.Marker(ORIGIN_COORDS);
SharedModel.Marker endMarker = new SharedModel.Marker(new GPSCoordinate(50, 0));
SharedModel.Leg leg0deg = new SharedModel.Leg("Start", startMarker, endMarker, 0);
boat.setCurrentLeg(leg0deg);
boat.setCurrentPosition(new GPSCoordinate(0, 0));
assertEquals(0, boat.calculateHeading(), 1e-8);
// Construct leg from wake - heading should be 180 degrees
SharedModel.Leg leg180deg = new SharedModel.Leg("Start", startMarker, new SharedModel.Marker(boat.getWake()), 0);
boat.setCurrentLeg(leg180deg);
assertEquals(180, boat.calculateHeading(), 1e-8);
}
@Test
public void getWakeProportionalToVelocity() throws Exception {
SharedModel.BoatInRace boat = new SharedModel.BoatInRace("Test", 10, Color.ALICEBLUE, "tt", 1);
// Construct leg of 0 degrees at 0 N
SharedModel.Marker startMarker = new SharedModel.Marker(ORIGIN_COORDS);
SharedModel.Marker endMarker = new SharedModel.Marker(new GPSCoordinate(50, 0));
SharedModel.Leg leg0deg = new SharedModel.Leg("Start", startMarker, endMarker, 0);
boat.setCurrentLeg(leg0deg);
boat.setCurrentPosition(new GPSCoordinate(0, 0));
// Get latitude of endpoint of wake at 10 kn (longitude is 0)
double endpointAt10Kn = boat.getWake().getLatitude();
// Latitude of endpoint at 20 kn should be twice endpoint at 10 kn
boat.setVelocity(20);
assertEquals(2 * endpointAt10Kn, boat.getWake().getLatitude(), 1e-8);
}
}
mock/src/test/java/seng302/Model/RaceTest.java
+15 -15
View File
@@ -75,9 +75,9 @@ public class RaceTest {
//
// @Test
// public void timerCanBeDisabled() {
// SharedModel.BoatInRace boat1 = new SharedModel.BoatInRace("Test 1", 10000, Color.ALICEBLUE, "t1", 1);
// SharedModel.BoatInRace boat2 = new SharedModel.BoatInRace("Test 2", 10000, Color.BURLYWOOD, "t2", 2);
// List<SharedModel.BoatInRace> boats = new ArrayList<>();
// Boat boat1 = new Boat("Test 1", 10000, Color.ALICEBLUE, "t1", 1);
// Boat boat2 = new Boat("Test 2", 10000, Color.BURLYWOOD, "t2", 2);
// List<Boat> boats = new ArrayList<>();
// boats.add(boat1);
// boats.add(boat2);
//
@@ -96,12 +96,12 @@ public class RaceTest {
// @Test
// public void checkPositionUpdatesNumberFinishedBoats() {
//
// SharedModel.BoatInRace finishedBoat = new SharedModel.BoatInRace("Test", 1000, Color.ALICEBLUE, "tt", 1);
// Boat finishedBoat = new Boat("Test", 1000, Color.ALICEBLUE, "tt", 1);
// finishedBoat.setDistanceTravelledInLeg(500);
//
// finishedBoat.setCurrentLeg(FINISH_LEG);
//
// ArrayList<SharedModel.BoatInRace> boats = new ArrayList<>();
// ArrayList<Boat> boats = new ArrayList<>();
// boats.add(finishedBoat);
//
// ArrayList<SharedModel.Leg> legs = new ArrayList<>();
@@ -121,12 +121,12 @@ public class RaceTest {
// @Test
// public void checkPositionDoesntUpdateNumberFinishedBoats() {
//
// SharedModel.BoatInRace unFinishedBoat = new SharedModel.BoatInRace("Test", 10, Color.ALICEBLUE, "tt", 1);
// Boat unFinishedBoat = new Boat("Test", 10, Color.ALICEBLUE, "tt", 1);
// unFinishedBoat.setDistanceTravelledInLeg(0);
//
// unFinishedBoat.setCurrentLeg(FINISH_LEG);
//
// ArrayList<SharedModel.BoatInRace> boats = new ArrayList<>();
// ArrayList<Boat> boats = new ArrayList<>();
// boats.add(unFinishedBoat);
//
// ArrayList<SharedModel.Leg> legs = new ArrayList<>();
@@ -144,7 +144,7 @@ public class RaceTest {
// @Test
// public void distanceTravelledBeforeUpdatingLegIsRetained() {
//
// ArrayList<SharedModel.BoatInRace> boats = new ArrayList<>();
// ArrayList<Boat> boats = new ArrayList<>();
//
// ArrayList<SharedModel.Leg> legs = new ArrayList<>();
//
@@ -154,7 +154,7 @@ public class RaceTest {
// Race race = new Race(boats, legs, 1, mockOutput);
// race.setDnfChance(0);
//
// SharedModel.BoatInRace unFinishedBoat = new SharedModel.BoatInRace("Test", 10, Color.ALICEBLUE, "tt", 4);
// Boat unFinishedBoat = new Boat("Test", 10, Color.ALICEBLUE, "tt", 4);
// unFinishedBoat.setDistanceTravelledInLeg(100);
// unFinishedBoat.setCurrentLeg(START_LEG);
//
@@ -168,7 +168,7 @@ public class RaceTest {
// @Test
// public void timerDelaysByHalfSecond() throws InterruptedException {
//
// ArrayList<SharedModel.BoatInRace> boats = new ArrayList<>();
// ArrayList<Boat> boats = new ArrayList<>();
//
// ArrayList<SharedModel.Leg> legs = new ArrayList<>();
// legs.add(START_LEG);
@@ -194,11 +194,11 @@ public class RaceTest {
// float vel2 = (float) 1.999;
// float vel3 = (float) 32.5;
// float vel4 = 500;
// SharedModel.BoatInRace boat1 = new SharedModel.BoatInRace("test", vel1, Color.ALICEBLUE, "tt",1);
// SharedModel.BoatInRace boat2 = new SharedModel.BoatInRace("test", vel2, Color.ALICEBLUE, "tt", 2);
// SharedModel.BoatInRace boat3 = new SharedModel.BoatInRace("test", vel3, Color.ALICEBLUE, "tt", 3);
// SharedModel.BoatInRace boat4 = new SharedModel.BoatInRace("test", vel4, Color.ALICEBLUE, "tt", 4);
// ArrayList<SharedModel.BoatInRace> boats = new ArrayList<>();
// Boat boat1 = new Boat("test", vel1, Color.ALICEBLUE, "tt",1);
// Boat boat2 = new Boat("test", vel2, Color.ALICEBLUE, "tt", 2);
// Boat boat3 = new Boat("test", vel3, Color.ALICEBLUE, "tt", 3);
// Boat boat4 = new Boat("test", vel4, Color.ALICEBLUE, "tt", 4);
// ArrayList<Boat> boats = new ArrayList<>();
// boats.add(boat1);
// boats.add(boat2);
// boats.add(boat3);
mock/src/test/java/seng302/Model/RaceXMLTest.java
+8 -8
View File
@@ -5,7 +5,7 @@ package seng302.Model;/**
import org.junit.Ignore;
import org.junit.Test;
import seng302.DataInput.RaceXMLReader;
import SharedModel.BoatInRace;
import java.util.List;
@@ -29,29 +29,29 @@ public class RaceXMLTest {
try {
RaceXMLReader raceXMLReader = new RaceXMLReader("raceXML/bermuda_AC35.xml", false);
raceXMLReader.readBoats();
List<BoatInRace> boats = raceXMLReader.getBoats();
List<Boat> boats = raceXMLReader.getBoats();
assertTrue(boats.size() == 6);
//test boat 1
assertEquals(boats.get(0).getName().getValue(), "ORACLE TEAM USA");
assertEquals(boats.get(0).getName(), "ORACLE TEAM USA");
assertTrue(boats.get(0).getVelocity() == 20);
//test boat 2
assertEquals(boats.get(1).getName().getValue(), "Land Rover BAR");
assertEquals(boats.get(1).getName(), "Land Rover BAR");
assertTrue(boats.get(1).getVelocity() == 30);
assertEquals(boats.get(1).getAbbrev(), "GBR");
//test boat 3
assertEquals(boats.get(2).getName().getValue(), "SoftBank Team Japan");
assertEquals(boats.get(2).getName(), "SoftBank Team Japan");
assertTrue(boats.get(2).getVelocity() == 25);
assertEquals(boats.get(2).getAbbrev(), "JPN");
//test boat 4
assertEquals(boats.get(3).getName().getValue(), "Groupama Team France");
assertEquals(boats.get(3).getName(), "Groupama Team France");
assertTrue(boats.get(3).getVelocity() == 20);
assertEquals(boats.get(3).getAbbrev(), "FRA");
//test boat 5
assertEquals(boats.get(4).getName().getValue(), "Artemis Racing");
assertEquals(boats.get(4).getName(), "Artemis Racing");
assertTrue(boats.get(4).getVelocity() == 29);
assertEquals(boats.get(4).getAbbrev(), "SWE");
//test boat 6
assertEquals(boats.get(5).getName().getValue(), "Emirates Team New Zealand");
assertEquals(boats.get(5).getName(), "Emirates Team New Zealand");
assertTrue(boats.get(5).getVelocity() == 62);
assertEquals(boats.get(5).getAbbrev(), "NZL");
} catch (Exception e) {