updated encoder and decoder with test for decoder

-added binary message decoder test
-updated binary message encoder
-updated binary message decoder
-added enum for message type

#story[778, 782]

src/test/java/BinaryMessageDecoderTest.java

@@ -1,9 +1,6 @@
 import org.junit.Assert;
 import org.junit.Test;
-import seng302.Networking.BinaryMesageEncoder;
-import seng302.Networking.BinaryMessageDecoder;
-import seng302.Networking.XMLMessageDecoder;
-import seng302.Networking.XMLMessageEncoder;
+import seng302.Networking.*;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -29,11 +26,32 @@ public class BinaryMessageDecoderTest {
 
             byte[] encodedMessage = testEncoder.encode();
 
-            BinaryMesageEncoder testMessage = new BinaryMesageEncoder((byte)26, time, 1, (short)encodedMessage.length, encodedMessage);
+            BinaryMesageEncoder testMessage = new BinaryMesageEncoder(MessageType.XMLMESSAGE, time, 1, (short)encodedMessage.length, encodedMessage);
 
             BinaryMessageDecoder testDecoder = new BinaryMessageDecoder(testMessage.getFullMessage());
             testDecoder.decode();
 
+            //message length
+            Assert.assertEquals((short) encodedMessage.length,testDecoder.getMessageLength());
+            //time stamp
+            Assert.assertEquals(time,testDecoder.getTimeStamp());
+            //source ID
+            Assert.assertEquals((short) 1, testDecoder.getSourceID());
+            //message type
+            Assert.assertEquals(26, testDecoder.getMessageType());
+
+            XMLMessageDecoder decoderXML = new XMLMessageDecoder(testDecoder.getMessage());
+            decoderXML.decode();
+
+            //tests from 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());
+            Assert.assertEquals((byte)7, decoderXML.getXmlMsgSubType());
+            Assert.assertEquals((short)1, decoderXML.getSequenceNumber());
+            Assert.assertEquals((short)xmlString.length(), decoderXML.getXmlMsgLength());
+            Assert.assertEquals(xmlString.toString(), decoderXML.getXmlMessage());
+
         }catch (IOException e){
             System.out.println(e);
         }