mirror of
https://github.com/michaelrausch/Party-Parrots-At-Sea.git
synced 2026-05-09 06:18:44 +00:00
Changed package heirachy. Merged Controller and StartScreenController.
#refactor
This commit is contained in:
Calum
@@ -1,7 +1,7 @@
|
||||
//package seng302;
|
||||
//
|
||||
//import org.junit.Test;
|
||||
//import seng302.models.Boat;
|
||||
//import seng302.model.Boat;
|
||||
//
|
||||
//import static org.junit.Assert.assertEquals;
|
||||
//
|
||||
|
||||
@@ -3,7 +3,7 @@ package seng302;
|
||||
import javafx.scene.paint.Color;
|
||||
import org.junit.Assert;
|
||||
import org.junit.Test;
|
||||
import seng302.models.Colors;
|
||||
import seng302.model.Colors;
|
||||
|
||||
import static org.junit.Assert.assertArrayEquals;
|
||||
import static org.junit.Assert.assertEquals;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package seng302;
|
||||
|
||||
import org.junit.Test;
|
||||
import seng302.controllers.RaceViewController;
|
||||
import seng302.visualiser.controllers.RaceViewController;
|
||||
|
||||
import static org.junit.Assert.assertTrue;
|
||||
|
||||
|
||||
+1
-3
@@ -1,10 +1,8 @@
|
||||
package seng302.models.map;
|
||||
package seng302.model.map;
|
||||
|
||||
import org.junit.Test;
|
||||
import seng302.utilities.GeoPoint;
|
||||
|
||||
import java.awt.geom.Point2D;
|
||||
|
||||
import static org.junit.Assert.*;
|
||||
|
||||
/**
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package seng302.models.mark;
|
||||
package seng302.model.mark;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
+2
-2
@@ -1,4 +1,4 @@
|
||||
package seng302.models.stream;
|
||||
package seng302.model.stream;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
@@ -8,7 +8,7 @@ import java.lang.reflect.Method;
|
||||
import java.net.Socket;
|
||||
import java.util.Comparator;
|
||||
import java.util.concurrent.PriorityBlockingQueue;
|
||||
import seng302.models.stream.packets.StreamPacket;
|
||||
import seng302.model.stream.packets.StreamPacket;
|
||||
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.when;
|
||||
@@ -1,95 +0,0 @@
|
||||
// TODO: 4/05/17 cir27 - Currently the CI cannot build these tests. Unsure of exact issue but believe it may be a driver issue. Find a way to make tests work.
|
||||
|
||||
//package seng302.models;
|
||||
//
|
||||
//public class BoatGroupTest {
|
||||
//
|
||||
//}
|
||||
package seng302.models;
|
||||
/*
|
||||
* Created by cir27 on 4/05/17.
|
||||
|
||||
public class BoatGroupTest {
|
||||
BoatGroup boatGroup;
|
||||
@Before
|
||||
public void setUp () {
|
||||
Yacht b = new Yacht("TEST", 0.0, "T" ,0);
|
||||
boatGroup = new BoatGroup(b, Color.BLACK);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void setDestinationFirstUseForcesLocationUpdate () {
|
||||
boatGroup.setDestination(10, 10, 90, 0);
|
||||
Polygon bp = (Polygon) boatGroup.getChildren().get(2);
|
||||
Assert.assertTrue(10 == bp.getLayoutX());
|
||||
Assert.assertTrue(10 == bp.getLayoutY());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void setDestinationFutureUseDoesntForce () {
|
||||
for (int i = 0; i < 60; i++) {
|
||||
boatGroup.setDestination(200, 200, 90, 0);
|
||||
}
|
||||
boatGroup.setDestination(210, 210, 90, 0);
|
||||
Polygon bp = (Polygon) boatGroup.getChildren().get(2);
|
||||
Assert.assertTrue(200 == bp.getLayoutX());
|
||||
Assert.assertTrue(200 == bp.getLayoutY());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void setDestinationUnrealisticMovementForceUpdate () {
|
||||
Polygon bp = (Polygon) boatGroup.getChildren().get(2);
|
||||
double xLocation = bp.getLayoutX();
|
||||
double yLocation = bp.getLayoutY();
|
||||
boatGroup.setDestination(xLocation + 500, yLocation + 500, 90, 0);
|
||||
Assert.assertTrue(xLocation + 500 == bp.getLayoutX());
|
||||
Assert.assertTrue(yLocation + 500 == bp.getLayoutY());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void setDestinationUnrealisticNegativeForceUpdate () {
|
||||
Polygon bp = (Polygon) boatGroup.getChildren().get(2);
|
||||
double xLocation = bp.getLayoutX();
|
||||
double yLocation = bp.getLayoutY();
|
||||
boatGroup.setDestination(xLocation - 500, yLocation - 500, 90, 0);
|
||||
Assert.assertTrue(xLocation - 500 == bp.getLayoutX());
|
||||
Assert.assertTrue(yLocation - 500 == bp.getLayoutY());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void updatePositionGeneratesExpectedMovement () {
|
||||
Polygon bp = (Polygon) boatGroup.getChildren().get(2);
|
||||
double xLocation = bp.getLayoutX();
|
||||
double yLocation = bp.getLayoutY();
|
||||
int movement = 10;
|
||||
double delay = RaceObject.getExpectedUpdateInterval();
|
||||
double defaultTimePeriod = 1000 / 60;
|
||||
double expectedMovement = movement / delay * defaultTimePeriod;
|
||||
for (int i = 0; i < 60; i++) {
|
||||
boatGroup.setDestination(xLocation, yLocation, 90, 0);
|
||||
}
|
||||
boatGroup.setDestination(xLocation + 10, yLocation + 10, 90, 0);
|
||||
boatGroup.updatePosition(1000/60);
|
||||
Assert.assertEquals(expectedMovement, bp.getLayoutX() - xLocation, 0.0);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void correctRaceID () {
|
||||
Assert.assertTrue(boatGroup.hasRaceId(0));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void incorrectRaceID () {
|
||||
Assert.assertTrue(!boatGroup.hasRaceId(2));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void nothingOnWrongId () {
|
||||
Polygon bp = (Polygon) boatGroup.getChildren().get(2);
|
||||
double originalX = bp.getLayoutX();
|
||||
double originalY = bp.getLayoutY();
|
||||
boatGroup.setDestination(10, 10, 90, 12);
|
||||
Assert.assertTrue(originalX == bp.getLayoutX());
|
||||
Assert.assertTrue(originalY == bp.getLayoutY());
|
||||
}
|
||||
}*/
|
||||
@@ -1,90 +0,0 @@
|
||||
// TODO: 4/05/17 cir27 - Currently the CI cannot build these tests. Unsure of exact issue but believe it may be a driver issue. Find a way to make tests work.
|
||||
//
|
||||
//package seng302.models;
|
||||
//
|
||||
//public class MarkGroupTest {
|
||||
//
|
||||
//}
|
||||
package seng302.models;
|
||||
/*
|
||||
import javafx.scene.shape.Circle;
|
||||
import seng302.*;
|
||||
import javafx.geometry.Point2D;
|
||||
import org.junit.Assert;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import seng302.models.mark.*;
|
||||
|
||||
/**
|
||||
* Created by cir27 on 4/05/17.
|
||||
*/
|
||||
//public class MarkGroupTest {
|
||||
// private MarkGroup gateMG;
|
||||
// private MarkGroup singleMG;
|
||||
//
|
||||
// @Before
|
||||
// public void setUp () {
|
||||
// Mark single = new SingleMark("SM", 0, 0 , 0);
|
||||
// Mark gate = new GateMark(
|
||||
// "GM",
|
||||
// MarkType.OPEN_GATE,
|
||||
// new SingleMark("GM1", 0, 0, 1),
|
||||
// new SingleMark("GM2", 0, 0, 2),
|
||||
// 0,
|
||||
// 0);
|
||||
// gateMG = new MarkGroup(gate, new Point2D(10, 10), new Point2D(20, 20));
|
||||
// singleMG = new MarkGroup(single, new Point2D(0, 0));
|
||||
// }
|
||||
//
|
||||
// @Test
|
||||
// public void hasIDSingle () {
|
||||
// Assert.assertTrue(singleMG.hasRaceId(0));
|
||||
// Assert.assertTrue(!singleMG.hasRaceId(100,12));
|
||||
// }
|
||||
//
|
||||
// @Test
|
||||
// public void hasIdGate () {
|
||||
// Assert.assertTrue(gateMG.hasRaceId(1));
|
||||
// Assert.assertTrue(gateMG.hasRaceId(2));
|
||||
// Assert.assertTrue(!gateMG.hasRaceId(100,12));
|
||||
// }
|
||||
//
|
||||
// @Test
|
||||
// public void nothingOnWrongId () {
|
||||
// double originalX = singleMG.getChildren().get(0).getLayoutX();
|
||||
// double originalY = singleMG.getChildren().get(0).getLayoutY();
|
||||
// singleMG.setDestination(10, 10, 0, 4);
|
||||
// singleMG.updatePosition(400);
|
||||
// Assert.assertTrue(originalX == singleMG.getChildren().get(0).getLayoutX());
|
||||
// Assert.assertTrue(originalY == singleMG.getChildren().get(0).getLayoutY());
|
||||
// }
|
||||
//
|
||||
// @Test
|
||||
// public void correctMovementCorrectIdSingle () {
|
||||
// double originalX = singleMG.getChildren().get(0).getLayoutX();
|
||||
// double originalY = singleMG.getChildren().get(0).getLayoutY();
|
||||
// long timeinterval = 1000/60;
|
||||
// double expectedChange = 10 / 200 * timeinterval;
|
||||
// singleMG.setDestination(originalX + 10, originalY + 10, 0, 0);
|
||||
// singleMG.updatePosition(timeinterval);
|
||||
// Assert.assertTrue(originalX + expectedChange == singleMG.getChildren().get(0).getLayoutX());
|
||||
// Assert.assertTrue(originalY + expectedChange == singleMG.getChildren().get(0).getLayoutY());
|
||||
// }
|
||||
//
|
||||
// @Test
|
||||
// public void correctMovementCorrectIDGate () {
|
||||
// double originalX1 = gateMG.getChildren().get(0).getLayoutX();
|
||||
// double originalY1 = gateMG.getChildren().get(0).getLayoutY();
|
||||
// double originalX2 = gateMG.getChildren().get(1).getLayoutX();
|
||||
// double originalY2 = gateMG.getChildren().get(1).getLayoutY();
|
||||
// long timeinterval = 1000/60;
|
||||
// double expectedChange = 10 / 200 * timeinterval;
|
||||
// gateMG.setDestination(originalX1 + 10, originalY1 + 10, 0, 1);
|
||||
// gateMG.setDestination(originalX2 + 10, originalY2 + 10, 0, 2);
|
||||
// gateMG.updatePosition(timeinterval);
|
||||
// Assert.assertTrue(originalX1 + expectedChange == gateMG.getChildren().get(0).getLayoutX());
|
||||
// Assert.assertTrue(originalY1 + expectedChange == gateMG.getChildren().get(0).getLayoutY());
|
||||
// Assert.assertTrue(originalX2 + expectedChange == gateMG.getChildren().get(1).getLayoutX());
|
||||
// Assert.assertTrue(originalY2 + expectedChange == gateMG.getChildren().get(1).getLayoutY());
|
||||
// }
|
||||
//}
|
||||
@@ -1,36 +0,0 @@
|
||||
//package seng302.models.parsers;
|
||||
//
|
||||
//import org.junit.Before;
|
||||
//import org.junit.Test;
|
||||
//import seng302.models.Boat;
|
||||
//import seng302.models.Yacht;
|
||||
//
|
||||
//import java.util.ArrayList;
|
||||
//
|
||||
//import static org.junit.Assert.*;
|
||||
//
|
||||
///**
|
||||
// * Created by Haoming on 18/03/17.
|
||||
// */
|
||||
//public class TeamsParserTest {
|
||||
//
|
||||
// private TeamsParser tp;
|
||||
// @Before
|
||||
// public void readFile() {
|
||||
// tp = new TeamsParser("/config/teams.xml");
|
||||
// }
|
||||
//
|
||||
// @Test
|
||||
// public void getBoats() throws Exception {
|
||||
// ArrayList<Yacht> boats = tp.getBoats();
|
||||
//
|
||||
// assertEquals(6, boats.size(), 1e-10);
|
||||
//
|
||||
// assertEquals("Oracle Team USA", boats.get(0).getBoatName());
|
||||
// //assertEquals(30.9, boats.get(0).getVelocity(), 1e-10);
|
||||
//
|
||||
// assertEquals("Groupama Team France", boats.get(5).getBoatName());
|
||||
// //assertEquals(45.6, boats.get(5).getVelocity(), 1e-10);
|
||||
// }
|
||||
//
|
||||
//}
|
||||
@@ -3,8 +3,8 @@ package seng302.visualizer.annotations;
|
||||
import org.junit.After;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import seng302.controllers.annotations.Annotation;
|
||||
import seng302.controllers.annotations.ImportantAnnotationsState;
|
||||
import seng302.visualiser.controllers.annotations.Annotation;
|
||||
import seng302.visualiser.controllers.annotations.ImportantAnnotationsState;
|
||||
|
||||
import static org.junit.Assert.assertEquals;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user