Fix #112, BinaryEncoder DataValue now encoded as defined in the spec

Author: bjakke

src/main/java/org/opcfoundation/ua/encoding/binary/BinaryEncoder.java

@@ -2083,11 +2083,12 @@ public void putDataValue(String fieldName, DataValue v)
 		if (v.getServerPicoseconds()!=null && !v.getServerPicoseconds().equals(UnsignedShort.MIN_VALUE)) mask |= 0x20;
 
 		putSByte(null, mask);
+		// NOTE!! The order of fields differ from the "order" of the mask, see spec 1.04 Part 6 section 5.2.2.17 for DataValue encoding
 		if ((mask & 1) == 1) putVariant(null, v.getValue());
 		if ((mask & 2) == 2) putStatusCode(null, v.getStatusCode());
 		if ((mask & 4) == 4) putDateTime(null, v.getSourceTimestamp());
-		if ((mask & 8) == 8) putDateTime(null, v.getServerTimestamp());
 		if ((mask & 0x10) == 0x10) putUInt16(null, v.getSourcePicoseconds());
+		if ((mask & 8) == 8) putDateTime(null, v.getServerTimestamp());
 		if ((mask & 0x20) == 0x20) putUInt16(null, v.getServerPicoseconds());
 	}
 

src/test/java/org/opcfoundation/ua/encoding/binary/BinaryEncoderTest.java

@@ -0,0 +1,42 @@
+package org.opcfoundation.ua.encoding.binary;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+import org.opcfoundation.ua.builtintypes.DataValue;
+import org.opcfoundation.ua.builtintypes.DateTime;
+import org.opcfoundation.ua.builtintypes.StatusCode;
+import org.opcfoundation.ua.builtintypes.UnsignedShort;
+import org.opcfoundation.ua.builtintypes.Variant;
+
+public class BinaryEncoderTest {
+
+	@Test
+	public void encodeDecodeDataValue() throws Exception {
+		//For GH#112
+		//Test that encoded and then decoded DataValue are equal
+		//NOTE this should be later refactored to check the raw binary form as well
+		
+		//Setting values that force encoding, i.e. not default values that are handed by the encoding mask
+		DateTime dt = DateTime.fromMillis(100000); //some time that is not min or max
+		UnsignedShort tenPicoSeconds = UnsignedShort.valueOf(10); //100 picoseconds, something that is not 0
+		final DataValue dv = new DataValue(new Variant(Integer.valueOf(1)), StatusCode.BAD, dt, tenPicoSeconds, dt, tenPicoSeconds);
+		EncoderCalc calc = new EncoderCalc();
+		calc.putDataValue(null, dv);
+		int len = calc.length;
+		byte[] buf = new byte[len];
+		BinaryEncoder enc = new BinaryEncoder(buf);
+		enc.putDataValue(null, dv);
+		
+		//System.out.println(CryptoUtil.toHex(buf)); 
+		
+		BinaryDecoder dec = new BinaryDecoder(buf);
+		final DataValue dv2 = dec.getDataValue(null);
+		
+		//System.out.println(dv);
+		//System.out.println(dv2);
+		assertEquals(dv, dv2);
+		
+	}
+	
+}