Added extra constructor in Race.

-Constructor is used for junit testing for Race class.

#story[778]
This commit is contained in:
David Wu
2017-04-25 12:24:39 +12:00
parent c2183a68a0
commit d14446a12e
3 changed files with 13 additions and 1 deletions
@@ -152,6 +152,8 @@ public class RaceData {
StreamResult result = new StreamResult(stringWriter); StreamResult result = new StreamResult(stringWriter);
transformer.transform(source,result); transformer.transform(source,result);
System.out.println(stringWriter.toString());
return stringWriter.toString(); return stringWriter.toString();
@@ -64,6 +64,11 @@ public class Race implements Runnable {
} }
//Constructor used in testing
public Race(List<BoatInRace> boats, List<Leg> legs, int scaleFactor) {
this(boats, legs, scaleFactor, null);
}
public Race(RaceDataSource raceData, int scaleFactor, OutputStream outputStream) { public Race(RaceDataSource raceData, int scaleFactor, OutputStream outputStream) {
this(raceData.getBoats(), raceData.getLegs(), scaleFactor, outputStream); this(raceData.getBoats(), raceData.getLegs(), scaleFactor, outputStream);
} }
@@ -3,8 +3,13 @@ package seng302.Model;
import javafx.scene.paint.Color; import javafx.scene.paint.Color;
import org.junit.Ignore; import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import org.xml.sax.SAXException;
import seng302.GPSCoordinate; 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.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
@@ -22,7 +27,7 @@ public class RaceTest {
@Ignore @Ignore
@Test @Test
public void timerCanBeDisabled() { public void timerCanBeDisabled(){
BoatInRace boat1 = new BoatInRace("Test 1", 10000, Color.ALICEBLUE, "t1", 1); BoatInRace boat1 = new BoatInRace("Test 1", 10000, Color.ALICEBLUE, "t1", 1);
BoatInRace boat2 = new BoatInRace("Test 2", 10000, Color.BURLYWOOD, "t2", 2); BoatInRace boat2 = new BoatInRace("Test 2", 10000, Color.BURLYWOOD, "t2", 2);
//BoatInRace[] boats = new BoatInRace[]{boat1, boat2}; //BoatInRace[] boats = new BoatInRace[]{boat1, boat2};