diff --git a/pom.xml b/pom.xml index a562d1a3..524b4562 100644 --- a/pom.xml +++ b/pom.xml @@ -25,6 +25,12 @@ json-simple 1.1.1 + + org.mockito + mockito-core + 2.7.13 + test + diff --git a/src/main/java/seng302/controllers/BoatPositionController.java b/src/main/java/seng302/controllers/BoatPositionController.java index 73aa895f..fd7515ac 100644 --- a/src/main/java/seng302/controllers/BoatPositionController.java +++ b/src/main/java/seng302/controllers/BoatPositionController.java @@ -42,4 +42,8 @@ public class BoatPositionController { positionVbox.getChildren().add(new Text(boat.getTeamName())); } } + + public ArrayList getBoatOrder() { + return boatOrder; + } } diff --git a/src/test/java/seng302/controllers/BoatPositionControllerTest.java b/src/test/java/seng302/controllers/BoatPositionControllerTest.java new file mode 100644 index 00000000..dd6366aa --- /dev/null +++ b/src/test/java/seng302/controllers/BoatPositionControllerTest.java @@ -0,0 +1,42 @@ +package seng302.controllers; + +import org.junit.Test; +import seng302.models.Boat; +import seng302.models.Event; +import seng302.models.mark.SingleMark; + +import java.util.ArrayList; +import java.util.Arrays; + +import static org.junit.Assert.*; +import static org.mockito.Mockito.when; + +/** + * Created by ptg19 on 23/03/17. + */ +public class BoatPositionControllerTest { + @Test + public void handleEvent() throws Exception { +// BoatPositionController controller = new BoatPositionController(); +// Boat boat1 = new Boat("boat1"); +// Boat boat2 = new Boat("boat2"); +// Boat boat3 = new Boat("boat3"); +// +// Event event1 = new Event(1.0, boat1, new SingleMark("mark0"), new SingleMark("mark1"), 0); +// Event event2 = new Event(1.0, boat2, new SingleMark("mark0"), new SingleMark("mark1"), 0); +// Event event3 = new Event(1.0, boat3, new SingleMark("mark0"), new SingleMark("mark1"), 0); +// controller.handleEvent(event1); +// controller.handleEvent(event2); +// controller.handleEvent(event3); +// assertEquals(controller.getBoatOrder(), new ArrayList(Arrays.asList(boat1, boat2, boat3))); + + +// Event event4 = new Event(1.0, boat3, new SingleMark("mark1"), new SingleMark("mark2"), 0); +// Event event5 = new Event(1.0, boat3, new SingleMark("mark1"), new SingleMark("mark2"), 1); +// Event event6 = new Event(1.0, boat3, new SingleMark("mark1"), new SingleMark("mark2"), 1); +// Event event7 = new Event(1.0, boat3, new SingleMark("mark1"), new SingleMark("mark2"), 1); +// Event event8 = new Event(1.0, boat3, new SingleMark("mark1"), new SingleMark("mark2"), 1); +// Event event9 = new Event(1.0, boat3, new SingleMark("mark1"), new SingleMark("mark2"), 1); + } + +} \ No newline at end of file