From d14446a12e7dcc88ae82db77f470d1bd0e410f09 Mon Sep 17 00:00:00 2001 From: David Wu Date: Tue, 25 Apr 2017 12:24:39 +1200 Subject: [PATCH] Added extra constructor in Race. -Constructor is used for junit testing for Race class. #story[778] --- mock/src/main/java/seng302/Data/RaceData.java | 2 ++ mock/src/main/java/seng302/Model/Race.java | 5 +++++ mock/src/test/java/seng302/Model/RaceTest.java | 7 ++++++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/mock/src/main/java/seng302/Data/RaceData.java b/mock/src/main/java/seng302/Data/RaceData.java index 5517bf54..a9a4b90a 100644 --- a/mock/src/main/java/seng302/Data/RaceData.java +++ b/mock/src/main/java/seng302/Data/RaceData.java @@ -152,6 +152,8 @@ public class RaceData { StreamResult result = new StreamResult(stringWriter); transformer.transform(source,result); + System.out.println(stringWriter.toString()); + return stringWriter.toString(); diff --git a/mock/src/main/java/seng302/Model/Race.java b/mock/src/main/java/seng302/Model/Race.java index 48fe3b42..352746a5 100644 --- a/mock/src/main/java/seng302/Model/Race.java +++ b/mock/src/main/java/seng302/Model/Race.java @@ -64,6 +64,11 @@ public class Race implements Runnable { } + //Constructor used in testing + public Race(List boats, List legs, int scaleFactor) { + this(boats, legs, scaleFactor, null); + } + public Race(RaceDataSource raceData, int scaleFactor, OutputStream outputStream) { this(raceData.getBoats(), raceData.getLegs(), scaleFactor, outputStream); } diff --git a/mock/src/test/java/seng302/Model/RaceTest.java b/mock/src/test/java/seng302/Model/RaceTest.java index 236e2211..d8e0ca51 100644 --- a/mock/src/test/java/seng302/Model/RaceTest.java +++ b/mock/src/test/java/seng302/Model/RaceTest.java @@ -3,8 +3,13 @@ package seng302.Model; import javafx.scene.paint.Color; import org.junit.Ignore; import org.junit.Test; +import org.xml.sax.SAXException; import seng302.GPSCoordinate; +import seng302.Mock.RaceDataSource; +import seng302.RaceXMLReader; +import javax.xml.parsers.ParserConfigurationException; +import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -22,7 +27,7 @@ public class RaceTest { @Ignore @Test - public void timerCanBeDisabled() { + public void timerCanBeDisabled(){ BoatInRace boat1 = new BoatInRace("Test 1", 10000, Color.ALICEBLUE, "t1", 1); BoatInRace boat2 = new BoatInRace("Test 2", 10000, Color.BURLYWOOD, "t2", 2); //BoatInRace[] boats = new BoatInRace[]{boat1, boat2};