Merge branch 'master' into story_61
Also got client-server handshake working. Multiple clients can connect and control their own boat. The client's boat has a larger black triangle drawn around it. Probably needs tidying up. Added isClientBoat boolean to VisualiserBoat. WindGenerator is now an interface, implemented by ConstantWindGenerator (useful for testing) and RandomWindGenerator. Added ConstantWindGeneratorTest. RandomWindGenerator was formerly WindGenerator. The WindGenerator is passed in to MockRace. CommandFactory throws a CommandConstructionException if it cannot create a command. MessageSerialiser and MessageDeserialiser correctly terminate on error. Readded VisualiserInput's switch statement in the main loop, pending a refactor. Removed the sleep statement from LobbyController - it was blocking javaFX thread. Lobby.fxml: moved buttons and text input into grid panes, so they don't break when you resize screen. Added some test object creation functions in several test classes (MockRaceTest.createMockRace(), BoatXMLReaderTest.createBoatDataSource(), etc...). #story[1095]
This commit is contained in:
@@ -1,5 +1,39 @@
|
||||
package shared.dataInput;
|
||||
|
||||
import shared.enums.XMLFileType;
|
||||
import shared.exceptions.InvalidRaceDataException;
|
||||
import shared.exceptions.XMLReaderException;
|
||||
|
||||
import javax.xml.transform.TransformerException;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
|
||||
public class RaceXMLReaderTest {
|
||||
//TODO
|
||||
|
||||
|
||||
|
||||
public static RaceDataSource createRaceDataSource() throws InvalidRaceDataException {
|
||||
|
||||
String raceXMLString = null;
|
||||
|
||||
try {
|
||||
raceXMLString = XMLReader.readXMLFileToString("mock/mockXML/raceTest.xml", StandardCharsets.UTF_8);
|
||||
|
||||
} catch (TransformerException | XMLReaderException e) {
|
||||
throw new InvalidRaceDataException("Could not read race XML file into a string.", e);
|
||||
|
||||
}
|
||||
|
||||
|
||||
try {
|
||||
|
||||
RaceXMLReader raceData = new RaceXMLReader(raceXMLString, XMLFileType.Contents);
|
||||
return raceData;
|
||||
|
||||
|
||||
} catch (XMLReaderException e) {
|
||||
throw new InvalidRaceDataException("Could not parse race XML file.", e);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user