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

Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules

Browse Source 
# Conflicts:
#	mock/src/test/java/seng302/Model/RaceTest.java
This commit is contained in:
David Wu
2017-05-01 16:39:26 +12:00
parent 0bfc9a5a39 7cb4b2228d
commit 4811b7f4ea
30 changed files with 475 additions and 661 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mock/src/test/java/seng302/DataInput/RegattaXMLTest.java
+1 -1
View File
@@ -2,7 +2,7 @@ package seng302.DataInput;
import org.junit.Before;
import org.junit.Test;
import SharedModel.Regatta;
import seng302.Model.Regatta;
import static org.junit.Assert.*;
mock/src/test/java/seng302/Model/BoatInRaceTest.java
-155
View File
@@ -1,155 +0,0 @@
package seng302.Model;
import javafx.scene.paint.Color;
import org.junit.Test;
import SharedModel.*;
import static junit.framework.TestCase.*;
/**
* Created by esa46 on 22/03/17.
*/
public class BoatInRaceTest {
private GPSCoordinate ORIGIN_COORDS = new GPSCoordinate(0, 0);
private SharedModel.BoatInRace TEST_BOAT = new SharedModel.BoatInRace("Test", 1, Color.ALICEBLUE, "tt", 1);
@Test
public void calculateDueNorthAzimuthReturns0() {
SharedModel.Marker startMarker = new SharedModel.Marker(ORIGIN_COORDS);
SharedModel.Marker endMarker = new SharedModel.Marker(new GPSCoordinate(50, 0));
SharedModel.Leg start = new SharedModel.Leg("Start", startMarker, endMarker, 0);
TEST_BOAT.setCurrentLeg(start);
assertEquals(TEST_BOAT.calculateAzimuth(), 0, 1e-8);
}
@Test
public void calculateDueSouthAzimuthReturns180() {
SharedModel.Marker startMarker = new SharedModel.Marker(ORIGIN_COORDS);
SharedModel.Marker endMarker = new SharedModel.Marker(new GPSCoordinate(-50, 0));
SharedModel.Leg start = new SharedModel.Leg("Start", startMarker, endMarker, 0);
TEST_BOAT.setCurrentLeg(start);
assertEquals(TEST_BOAT.calculateAzimuth(), 180, 1e-8);
}
@Test
public void calculateDueEastAzimuthReturns90() {
SharedModel.Marker startMarker = new SharedModel.Marker(ORIGIN_COORDS);
SharedModel.Marker endMarker = new SharedModel.Marker(new GPSCoordinate(0, 50));
SharedModel.Leg start = new SharedModel.Leg("Start", startMarker, endMarker, 0);
TEST_BOAT.setCurrentLeg(start);
assertEquals(TEST_BOAT.calculateAzimuth(), 90, 1e-8);
}
@Test
public void calculateDueWestAzimuthReturnsNegative90() {
SharedModel.Marker startMarker = new SharedModel.Marker(ORIGIN_COORDS);
SharedModel.Marker endMarker = new SharedModel.Marker(new GPSCoordinate(0, -50));
SharedModel.Leg start = new SharedModel.Leg("Start", startMarker, endMarker, 0);
TEST_BOAT.setCurrentLeg(start);
assertEquals(TEST_BOAT.calculateAzimuth(), -90, 1e-8);
}
@Test
public void calculateDueNorthHeadingReturns0() {
SharedModel.Marker startMarker = new SharedModel.Marker(ORIGIN_COORDS);
SharedModel.Marker endMarker = new SharedModel.Marker(new GPSCoordinate(50, 0));
SharedModel.Leg start = new SharedModel.Leg("Start", startMarker, endMarker, 0);
TEST_BOAT.setCurrentLeg(start);
assertEquals(TEST_BOAT.calculateHeading(), 0, 1e-8);
}
@Test
public void calculateDueEastHeadingReturns90() {
SharedModel.Marker startMarker = new SharedModel.Marker(ORIGIN_COORDS);
SharedModel.Marker endMarker = new SharedModel.Marker(new GPSCoordinate(0, 50));
SharedModel.Leg start = new SharedModel.Leg("Start", startMarker, endMarker, 0);
TEST_BOAT.setCurrentLeg(start);
assertEquals(TEST_BOAT.calculateHeading(), 90, 1e-8);
}
@Test
public void calculateDueSouthHeadingReturns180() {
SharedModel.Marker startMarker = new SharedModel.Marker(ORIGIN_COORDS);
SharedModel.Marker endMarker = new SharedModel.Marker(new GPSCoordinate(-50, 0));
SharedModel.Leg start = new SharedModel.Leg("Start", startMarker, endMarker, 0);
TEST_BOAT.setCurrentLeg(start);
assertEquals(TEST_BOAT.calculateHeading(), 180, 1e-8);
}
@Test
public void calculateDueWestHeadingReturns270() {
SharedModel.Marker startMarker = new SharedModel.Marker(ORIGIN_COORDS);
SharedModel.Marker endMarker = new SharedModel.Marker(new GPSCoordinate(0, -50));
SharedModel.Leg start = new SharedModel.Leg("Start", startMarker, endMarker, 0);
TEST_BOAT.setCurrentLeg(start);
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/BoatTest.java
+98
View File
@@ -0,0 +1,98 @@
package seng302.Model;
import org.junit.Test;
import static junit.framework.TestCase.*;
/**
* Created by esa46 on 22/03/17.
*/
public class BoatTest {
private GPSCoordinate ORIGIN_COORDS = new GPSCoordinate(0, 0);
private Boat TEST_BOAT = new Boat("Test", 1, "tt", 1);
@Test
public void calculateDueNorthAzimuthReturns0() {
Marker startMarker = new Marker(ORIGIN_COORDS);
Marker endMarker = new Marker(new GPSCoordinate(50, 0));
Leg start = new Leg("Start", startMarker, endMarker, 0);
TEST_BOAT.setCurrentLeg(start);
assertEquals(TEST_BOAT.calculateAzimuth(), 0, 1e-8);
}
@Test
public void calculateDueSouthAzimuthReturns180() {
Marker startMarker = new Marker(ORIGIN_COORDS);
Marker endMarker = new Marker(new GPSCoordinate(-50, 0));
Leg start = new Leg("Start", startMarker, endMarker, 0);
TEST_BOAT.setCurrentLeg(start);
assertEquals(TEST_BOAT.calculateAzimuth(), 180, 1e-8);
}
@Test
public void calculateDueEastAzimuthReturns90() {
Marker startMarker = new Marker(ORIGIN_COORDS);
Marker endMarker = new Marker(new GPSCoordinate(0, 50));
Leg start = new Leg("Start", startMarker, endMarker, 0);
TEST_BOAT.setCurrentLeg(start);
assertEquals(TEST_BOAT.calculateAzimuth(), 90, 1e-8);
}
@Test
public void calculateDueWestAzimuthReturnsNegative90() {
Marker startMarker = new Marker(ORIGIN_COORDS);
Marker endMarker = new Marker(new GPSCoordinate(0, -50));
Leg start = new Leg("Start", startMarker, endMarker, 0);
TEST_BOAT.setCurrentLeg(start);
assertEquals(TEST_BOAT.calculateAzimuth(), -90, 1e-8);
}
@Test
public void calculateDueNorthHeadingReturns0() {
Marker startMarker = new Marker(ORIGIN_COORDS);
Marker endMarker = new Marker(new GPSCoordinate(50, 0));
Leg start = new Leg("Start", startMarker, endMarker, 0);
TEST_BOAT.setCurrentLeg(start);
assertEquals(TEST_BOAT.calculateHeading(), 0, 1e-8);
}
@Test
public void calculateDueEastHeadingReturns90() {
Marker startMarker = new Marker(ORIGIN_COORDS);
Marker endMarker = new Marker(new GPSCoordinate(0, 50));
Leg start = new Leg("Start", startMarker, endMarker, 0);
TEST_BOAT.setCurrentLeg(start);
assertEquals(TEST_BOAT.calculateHeading(), 90, 1e-8);
}
@Test
public void calculateDueSouthHeadingReturns180() {
Marker startMarker = new Marker(ORIGIN_COORDS);
Marker endMarker = new Marker(new GPSCoordinate(-50, 0));
Leg start = new Leg("Start", startMarker, endMarker, 0);
TEST_BOAT.setCurrentLeg(start);
assertEquals(TEST_BOAT.calculateHeading(), 180, 1e-8);
}
@Test
public void calculateDueWestHeadingReturns270() {
Marker startMarker = new Marker(ORIGIN_COORDS);
Marker endMarker = new Marker(new GPSCoordinate(0, -50));
Leg start = new Leg("Start", startMarker, endMarker, 0);
TEST_BOAT.setCurrentLeg(start);
assertEquals(TEST_BOAT.calculateHeading(), 270, 1e-8);
}
}
mock/src/test/java/seng302/Model/LegTest.java
+2 -4
View File
@@ -2,10 +2,8 @@ package seng302.Model;
import org.geotools.referencing.GeodeticCalculator;
import org.junit.Test;
import SharedModel.Constants;
import SharedModel.GPSCoordinate;
import SharedModel.Leg;
import SharedModel.Marker;
import seng302.Constants;
import java.awt.geom.Point2D;
mock/src/test/java/seng302/Model/MarkerTest.java
-2
View File
@@ -2,8 +2,6 @@ package seng302.Model;
import org.junit.Ignore;
import org.junit.Test;
import SharedModel.GPSCoordinate;
import SharedModel.Marker;
import static org.junit.Assert.assertTrue;
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) {