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

Removed the rest of the shared model classes needed by mock

Browse Source 
#story[778]
This commit is contained in:
Erika Savell
2017-05-01 15:49:07 +12:00
parent d34dfc537e
commit 9acd519d7b
22 changed files with 202 additions and 478 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/BoatTest.java
+26 -27
View File
@@ -1,8 +1,8 @@
package seng302.Model;
import javafx.scene.paint.Color;
import org.junit.Test;
import SharedModel.*;
import static junit.framework.TestCase.*;
@@ -15,22 +15,21 @@ 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() {
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);
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() {
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);
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);
}
@@ -39,9 +38,9 @@ public class BoatTest {
@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);
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);
}
@@ -49,9 +48,9 @@ public class BoatTest {
@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);
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);
@@ -60,9 +59,9 @@ public class BoatTest {
@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);
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);
}
@@ -70,27 +69,27 @@ public class BoatTest {
@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);
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() {
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);
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() {
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);
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/RaceTest.java
+9 -9
View File
@@ -1,6 +1,6 @@
package seng302.Model;
import SharedModel.*;
import javafx.scene.paint.Color;
import org.junit.BeforeClass;
import org.junit.Ignore;
@@ -33,8 +33,8 @@ import static org.mockito.Mockito.verify;
public class RaceTest {
//
// private static MockOutput mockOutput;
// SharedModel.Leg START_LEG = new SharedModel.Leg("Start", new SharedModel.Marker(new SharedModel.GPSCoordinate(0, 0)), new SharedModel.Marker(new SharedModel.GPSCoordinate(1, 1)), 0);
// SharedModel.Leg FINISH_LEG = new SharedModel.Leg("Finish", new SharedModel.Marker(new SharedModel.GPSCoordinate(1, 1)), new SharedModel.Marker(new SharedModel.GPSCoordinate(2, 2)), 0);
// Leg START_LEG = new Leg("Start", new Marker(new GPSCoordinate(0, 0)), new Marker(new GPSCoordinate(1, 1)), 0);
// Leg FINISH_LEG = new Leg("Finish", new Marker(new GPSCoordinate(1, 1)), new Marker(new GPSCoordinate(2, 2)), 0);
//
// @BeforeClass
// public static void setUp() {
@@ -81,7 +81,7 @@ public class RaceTest {
// boats.add(boat1);
// boats.add(boat2);
//
// ArrayList<SharedModel.Leg> legs = new ArrayList<>();
// ArrayList<.Leg> legs = new ArrayList<>();
// legs.add(START_LEG);
// legs.add(FINISH_LEG);
//
@@ -104,7 +104,7 @@ public class RaceTest {
// ArrayList<Boat> boats = new ArrayList<>();
// boats.add(finishedBoat);
//
// ArrayList<SharedModel.Leg> legs = new ArrayList<>();
// ArrayList<.Leg> legs = new ArrayList<>();
// legs.add(FINISH_LEG);
//
// Race race = new Race(boats, legs, 5, mockOutput);
@@ -129,7 +129,7 @@ public class RaceTest {
// ArrayList<Boat> boats = new ArrayList<>();
// boats.add(unFinishedBoat);
//
// ArrayList<SharedModel.Leg> legs = new ArrayList<>();
// ArrayList<.Leg> legs = new ArrayList<>();
// legs.add(FINISH_LEG);
//
//
@@ -146,7 +146,7 @@ public class RaceTest {
//
// ArrayList<Boat> boats = new ArrayList<>();
//
// ArrayList<SharedModel.Leg> legs = new ArrayList<>();
// ArrayList<.Leg> legs = new ArrayList<>();
//
// legs.add(START_LEG);
// legs.add(FINISH_LEG);
@@ -170,7 +170,7 @@ public class RaceTest {
//
// ArrayList<Boat> boats = new ArrayList<>();
//
// ArrayList<SharedModel.Leg> legs = new ArrayList<>();
// ArrayList<.Leg> legs = new ArrayList<>();
// legs.add(START_LEG);
//
// Race race = new Race(boats, legs, 1, mockOutput);
@@ -204,7 +204,7 @@ public class RaceTest {
// boats.add(boat3);
// boats.add(boat4);
//
// ArrayList<SharedModel.Leg> legs = new ArrayList<>();
// ArrayList<.Leg> legs = new ArrayList<>();
// legs.add(START_LEG);
//
//