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

added decoders for avg wind, course wind and mark rounding

Browse Source 
-refactered networking test file structure
-added average wind decoder
-added course wind decoder
-added mark rounding decoder
-updated boat location decoder
-added true wind direction to the boatLocationMessage class
-added true wind direction to raceVisionByteEncoder method for boat location

#story[778, 782]
This commit is contained in:
hba56
2017-04-23 10:51:10 +12:00
parent 43d087c764
commit 615115160d
9 changed files with 206 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/BinaryMessageDecoderTest.java → src/test/java/seng302/Networking/BinaryMessageDecoderTest.java
+4 -2
View File
@@ -1,3 +1,5 @@
package seng302.Networking;
import org.junit.Assert;
import org.junit.Test;
import seng302.Networking.*;
@@ -16,7 +18,7 @@ public class BinaryMessageDecoderTest {
try{
StringBuilder xmlString;
BufferedReader br = new BufferedReader(new InputStreamReader(
this.getClass().getResourceAsStream(("raceXML/Regatta.xml"))));
this.getClass().getResourceAsStream(("../../raceXML/Regatta.xml"))));
String line;
xmlString = new StringBuilder();
while((line=br.readLine())!= null){
@@ -44,7 +46,7 @@ public class BinaryMessageDecoderTest {
XMLMessageDecoder decoderXML = new XMLMessageDecoder(testDecoder.getMessage());
decoderXML.decode();
//tests from XMLMessageDecoderTest to make sure the file is still good
//tests from seng302.Networking.MessageDecoders.XMLMessageDecoderTest to make sure the file is still good
Assert.assertEquals((byte)1, decoderXML.getMessageVersionNumber());
Assert.assertEquals((short)1, decoderXML.getAckNumber());
Assert.assertEquals(time, decoderXML.getTimeStamp());
src/test/java/XMLMessageDecoderTest.java → src/test/java/seng302/Networking/MessageDecoders/XMLMessageDecoderTest.java
+3 -1
View File
@@ -1,3 +1,5 @@
package seng302.Networking.MessageDecoders;
import org.junit.Assert;
import org.junit.Test;
import seng302.Networking.MessageDecoders.XMLMessageDecoder;
@@ -16,7 +18,7 @@ public class XMLMessageDecoderTest {
try{
StringBuilder xmlString;
BufferedReader br = new BufferedReader(new InputStreamReader(
this.getClass().getResourceAsStream(("raceXML/Regatta.xml"))));
this.getClass().getResourceAsStream(("../../../raceXML/Regatta.xml"))));
String line;
xmlString = new StringBuilder();
while((line=br.readLine())!= null){
src/test/java/XMLMessageEncoderTest.java → src/test/java/seng302/Networking/XMLMessageEncoderTest.java
+4 -2
View File
@@ -1,3 +1,5 @@
package seng302.Networking;
import org.junit.Assert;
import org.junit.Test;
import seng302.Networking.XMLMessageEncoder;
@@ -13,7 +15,7 @@ public class XMLMessageEncoderTest {
StringBuilder xmlString;
try{
BufferedReader br = new BufferedReader(new InputStreamReader(
this.getClass().getResourceAsStream(("raceXML/Regatta.xml"))));
this.getClass().getResourceAsStream(("../../raceXML/Regatta.xml"))));
String line;
xmlString = new StringBuilder();
while((line=br.readLine())!= null){
@@ -35,7 +37,7 @@ public class XMLMessageEncoderTest {
StringBuilder xmlString;
try{
BufferedReader br = new BufferedReader(new InputStreamReader(
this.getClass().getResourceAsStream(("raceXML/Regatta.xml"))));
this.getClass().getResourceAsStream(("../../raceXML/Regatta.xml"))));
String line;
xmlString = new StringBuilder();
while((line=br.readLine())!= null){