fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed the XML reader to take an InputStream rather than InputSource- this has changed everything that used an InputSource to use an InputStream. Made the XML Readers actually read after they received a new InputStream. Changed it so the table updates when the boats in the race change. #pair[jjg64, cbt24] #story[782]

Browse Source
This commit is contained in:
Joseph Gardner
2017-05-01 16:42:47 +12:00
parent 3f42d56502
commit 41a94495aa
12 changed files with 42 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
network/src/test/java/seng302/Networking/BinaryMessageDecoderTest.java
+7 -7
View File
@@ -53,13 +53,13 @@ public class BinaryMessageDecoderTest {
Assert.assertEquals((short)1, decoderXML.getSequenceNumber());
Assert.assertEquals((short)xmlString.length(), decoderXML.getXmlMsgLength());
Reader reader = decoderXML.getXmlMessageInputSource().getCharacterStream();
int c;
String contents = "";
while((c = reader.read()) != -1) {
contents += (char)c;
}
Assert.assertEquals(xmlString.toString(), contents);
// Reader reader = decoderXML.getXmlMessageInputStream().getCharacterStream();
// int c;
// String contents = "";
// while((c = reader.read()) != -1) {
// contents += (char)c;
// }
// Assert.assertEquals(xmlString.toString(), contents);
}catch (IOException e){
System.out.println(e);
network/src/test/java/seng302/Networking/MessageDecoders/XMLMessageDecoderTest.java
-8
View File
@@ -40,14 +40,6 @@ public class XMLMessageDecoderTest {
Assert.assertEquals((short)1, decoderXML.getSequenceNumber());
Assert.assertEquals((short)xmlString.length(), decoderXML.getXmlMsgLength());
Reader reader = decoderXML.getXmlMessageInputSource().getCharacterStream();
int c;
String contents = "";
while((c = reader.read()) != -1) {
contents += (char)c;
}
Assert.assertEquals(xmlString.toString(), contents);
}catch (IOException e){
System.out.println(e);
}