Merge branch 'Development' into story_64_sails
# Conflicts: # racevisionGame/src/main/java/mock/model/commandFactory/CommandFactory.java # racevisionGame/src/main/java/visualiser/model/ResizableRaceCanvas.java # racevisionGame/src/test/java/mock/model/MockBoatTest.java
This commit is contained in:
Joseph Gardner
@@ -1,5 +1,174 @@
|
||||
package mock.model;
|
||||
|
||||
import mock.dataInput.PolarParser;
|
||||
import mock.exceptions.InvalidPolarFileException;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import shared.model.Bearing;
|
||||
import shared.model.CompoundMark;
|
||||
import shared.model.GPSCoordinate;
|
||||
import shared.model.Mark;
|
||||
|
||||
import static org.junit.Assert.assertEquals;
|
||||
import static org.junit.Assert.fail;
|
||||
|
||||
public class MockBoatTest {
|
||||
//TODO
|
||||
|
||||
/**
|
||||
* boat made for testing
|
||||
*/
|
||||
private MockBoat firstTestBoat;
|
||||
|
||||
private Mark markToTest;
|
||||
private Mark markToTest2;
|
||||
|
||||
private GPSCoordinate highGPS;
|
||||
private GPSCoordinate middleGPS;
|
||||
private GPSCoordinate lowGPS;
|
||||
|
||||
/**
|
||||
* Creates the Polars object for the tests.
|
||||
*/
|
||||
@Before
|
||||
public void setUp() {
|
||||
//Read in polars.
|
||||
try {
|
||||
//Parse data file.
|
||||
Polars polars = PolarParser.parse("mock/polars/acc_polars.csv");
|
||||
|
||||
firstTestBoat = new MockBoat(1, "test", "NZ", polars);
|
||||
highGPS = new GPSCoordinate(-64.854000, 32.296577);
|
||||
middleGPS = new GPSCoordinate(-64.854000, 32.292500);
|
||||
lowGPS = new GPSCoordinate(-64.854000, 32.290000);
|
||||
markToTest = new Mark(1, "test MARK", middleGPS);
|
||||
markToTest2 = new Mark(2, "test MARK2", middleGPS);
|
||||
}
|
||||
catch (InvalidPolarFileException e) {
|
||||
fail("Couldn't parse polar file.");
|
||||
}
|
||||
}
|
||||
|
||||
//////////////////////////////Mark Higher////////////////////////////////
|
||||
|
||||
/**
|
||||
* Tests if the boat is lower than the mark that the port side method works if
|
||||
* boat is facing east
|
||||
*/
|
||||
@Test
|
||||
public void testIsPortSide() {
|
||||
firstTestBoat.setBearing(Bearing.fromDegrees(90));
|
||||
firstTestBoat.setCurrentPosition(lowGPS);
|
||||
markToTest.setPosition(highGPS);
|
||||
|
||||
assertEquals(firstTestBoat.isPortSide(markToTest), true);
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests if the boat is lower than the mark that the port side method works if
|
||||
* boat is facing west
|
||||
*/
|
||||
@Test
|
||||
public void testIsPortSideWrong() {
|
||||
firstTestBoat.setBearing(Bearing.fromDegrees(270));
|
||||
firstTestBoat.setCurrentPosition(lowGPS);
|
||||
markToTest.setPosition(highGPS);
|
||||
|
||||
assertEquals(firstTestBoat.isPortSide(markToTest), false);
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests if the boat is lower than the mark that the starboard side method works if
|
||||
* boat is facing east
|
||||
*/
|
||||
@Test
|
||||
public void testIsStarboardSideWrong() {
|
||||
firstTestBoat.setBearing(Bearing.fromDegrees(90));
|
||||
firstTestBoat.setCurrentPosition(lowGPS);
|
||||
markToTest.setPosition(highGPS);
|
||||
|
||||
assertEquals(firstTestBoat.isStarboardSide(markToTest), false);
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests if the boat is lower than the mark that the starboard side method works if
|
||||
* boat is facing west
|
||||
*/
|
||||
@Test
|
||||
public void testIsStarboardSide() {
|
||||
firstTestBoat.setBearing(Bearing.fromDegrees(270));
|
||||
firstTestBoat.setCurrentPosition(lowGPS);
|
||||
markToTest.setPosition(highGPS);
|
||||
|
||||
assertEquals(firstTestBoat.isStarboardSide(markToTest), true);
|
||||
}
|
||||
|
||||
|
||||
//////////////////////////////Mark Lower////////////////////////////////
|
||||
|
||||
/**
|
||||
* Tests if the boat is higher than the mark that the port side method works if
|
||||
* boat is facing east
|
||||
*/
|
||||
@Test
|
||||
public void testIsPortSideHigherWrong() {
|
||||
firstTestBoat.setBearing(Bearing.fromDegrees(90));
|
||||
firstTestBoat.setCurrentPosition(highGPS);
|
||||
markToTest.setPosition(lowGPS);
|
||||
|
||||
assertEquals(firstTestBoat.isPortSide(markToTest), false);
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests if the boat is higher than the mark that the port side method works if
|
||||
* boat is facing west
|
||||
*/
|
||||
@Test
|
||||
public void testIsPortSideHigher() {
|
||||
firstTestBoat.setBearing(Bearing.fromDegrees(270));
|
||||
firstTestBoat.setCurrentPosition(highGPS);
|
||||
markToTest.setPosition(lowGPS);
|
||||
|
||||
assertEquals(firstTestBoat.isPortSide(markToTest), true);
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests if the boat is higher than the mark that the starboard side method works if
|
||||
* boat is facing east
|
||||
*/
|
||||
@Test
|
||||
public void testIsStarboardSideHigher() {
|
||||
firstTestBoat.setBearing(Bearing.fromDegrees(90));
|
||||
firstTestBoat.setCurrentPosition(highGPS);
|
||||
markToTest.setPosition(lowGPS);
|
||||
|
||||
assertEquals(firstTestBoat.isStarboardSide(markToTest), true);
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests if the boat is higher than the mark that the starboard side method works if
|
||||
* boat is facing west
|
||||
*/
|
||||
@Test
|
||||
public void testIsStarboardSideHigherWrong() {
|
||||
firstTestBoat.setBearing(Bearing.fromDegrees(270));
|
||||
firstTestBoat.setCurrentPosition(highGPS);
|
||||
markToTest.setPosition(lowGPS);
|
||||
|
||||
assertEquals(firstTestBoat.isStarboardSide(markToTest), false);
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests if a boat is between a gate
|
||||
*/
|
||||
@Test
|
||||
public void testIsBetweenGate(){
|
||||
markToTest.setPosition(highGPS);
|
||||
markToTest2.setPosition(lowGPS);
|
||||
CompoundMark testGate = new CompoundMark(1, "test GATE", markToTest, markToTest2);
|
||||
|
||||
firstTestBoat.setCurrentPosition(middleGPS);
|
||||
|
||||
assertEquals(firstTestBoat.isBetweenGate(testGate), true);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,42 @@
|
||||
package mock.model.commandFactory;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
|
||||
import static org.junit.Assert.assertEquals;
|
||||
|
||||
/**
|
||||
* Created by David on 7/08/2017.
|
||||
*/
|
||||
public class TackGybeCommandTest {
|
||||
|
||||
private double degreeA;
|
||||
private double degreeB;
|
||||
private double degreeC;
|
||||
private double degreeD;
|
||||
TackGybeCommand tgc;
|
||||
|
||||
//Run before tests
|
||||
@Before
|
||||
public void setUp(){
|
||||
degreeA = 150.0;
|
||||
degreeB = 300.0;
|
||||
degreeC = 10.0;
|
||||
degreeD = 350.0;
|
||||
tgc = new TackGybeCommand(null, null);
|
||||
}
|
||||
|
||||
//Test when degree difference is <180
|
||||
@Test
|
||||
public void angleDistanceCalculationLow(){
|
||||
double result = tgc.calcDistance(degreeA, degreeB);
|
||||
assertEquals(150.0, result, 0);
|
||||
}
|
||||
|
||||
//Test when degree difference is >180
|
||||
@Test
|
||||
public void angleDistanceCalculationHigh(){
|
||||
double result = tgc.calcDistance(degreeC, degreeD);
|
||||
assertEquals(20.0, result, 0);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,58 @@
|
||||
package mock.model.commandFactory;
|
||||
|
||||
import mock.model.MockBoat;
|
||||
import mock.model.MockRace;
|
||||
import network.Messages.Enums.BoatActionEnum;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.mockito.Mock;
|
||||
import shared.model.Bearing;
|
||||
import shared.model.Boat;
|
||||
import shared.model.Race;
|
||||
import visualiser.model.VisualiserRace;
|
||||
|
||||
import static org.mockito.Mockito.when;
|
||||
import static org.testng.Assert.*;
|
||||
import static org.mockito.Mockito.mock;
|
||||
|
||||
/**
|
||||
* Created by connortaylorbrown on 4/08/17.
|
||||
*/
|
||||
public class WindCommandTest {
|
||||
private MockRace race;
|
||||
private MockBoat boat;
|
||||
private Command upwind;
|
||||
private Command downwind;
|
||||
private double initial;
|
||||
|
||||
private double offset = 3.0;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
race = mock(MockRace.class);
|
||||
boat = new MockBoat(0, "Bob", "NZ", null);
|
||||
|
||||
when(race.getWindDirection()).thenReturn(Bearing.fromDegrees(0.0));
|
||||
boat.setBearing(Bearing.fromDegrees(45.0));
|
||||
|
||||
upwind = CommandFactory.createCommand(race, boat, BoatActionEnum.UPWIND);
|
||||
downwind = CommandFactory.createCommand(race, boat, BoatActionEnum.DOWNWIND);
|
||||
|
||||
initial = boat.getBearing().degrees();
|
||||
}
|
||||
|
||||
/**
|
||||
* Ensure the difference between initial and final angle is 3 degrees
|
||||
*/
|
||||
@Test
|
||||
public void upwindCommandDecreasesAngle() {
|
||||
upwind.execute();
|
||||
assertEquals(initial - boat.getBearing().degrees(), -offset, 1e-5);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void downwindCommandIncreasesAngle() {
|
||||
downwind.execute();
|
||||
assertEquals(initial - boat.getBearing().degrees(), offset, 1e-5);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user