bugfix byte size of custom types

Author: rashtao

src/main/java/com/arangodb/velocypack/VPackSlice.java

@@ -531,11 +531,11 @@ private int getByteSize(int start) {
 				size = getByteSize(start + offset) + offset;
 				break;
 			case CUSTOM:
-				if (head == 0xf4 || head == 0xf5 || head == 0xf6) {
+				if (head == (byte) 0xf4 || head == (byte) 0xf5 || head == (byte) 0xf6) {
 					size = 2 + NumberUtil.toLong(vpack, start + 1, 1);
-				} else if (head == 0xf7 || head == 0xf8 || head == 0xf9) {
+				} else if (head == (byte) 0xf7 || head == (byte) 0xf8 || head == (byte) 0xf9) {
 					size = 3 + NumberUtil.toLong(vpack, start + 1, 2);
-				} else if (head == 0xfa || head == 0xfb || head == 0xfc) {
+				} else if (head == (byte) 0xfa || head == (byte) 0xfb || head == (byte) 0xfc) {
 					size = 5 + NumberUtil.toLong(vpack, start + 1, 4);
 				} else /* if (head == 0xfd || head == 0xfe || head == 0xff) */ {
 					size = 9 + NumberUtil.toLong(vpack, start + 1, 8);

src/test/java/com/arangodb/velocypack/VPackSliceTest.java

@@ -20,8 +20,9 @@
 
 package com.arangodb.velocypack;
 
-import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.*;
+import com.arangodb.velocypack.exception.VPackException;
+import com.arangodb.velocypack.exception.VPackValueTypeException;
+import org.junit.Test;
 
 import java.math.BigInteger;
 import java.util.Arrays;
@@ -30,10 +31,8 @@
 import java.util.Iterator;
 import java.util.Map.Entry;
 
-import org.junit.Test;
-
-import com.arangodb.velocypack.exception.VPackException;
-import com.arangodb.velocypack.exception.VPackValueTypeException;
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.*;
 
 /**
  * @author Mark Vollmary
@@ -401,27 +400,28 @@ private void checkBCD(final byte[] vpack) {
 
 	@Test
 	public void isCustom() {
-		checkCustom(new byte[] { (byte) 0xf0 });
-		checkCustom(new byte[] { (byte) 0xf1 });
-		checkCustom(new byte[] { (byte) 0xf2 });
-		checkCustom(new byte[] { (byte) 0xf3 });
-		checkCustom(new byte[] { (byte) 0xf4 });
-		checkCustom(new byte[] { (byte) 0xf5 });
-		checkCustom(new byte[] { (byte) 0xf6 });
-		checkCustom(new byte[] { (byte) 0xf7 });
-		checkCustom(new byte[] { (byte) 0xf8 });
-		checkCustom(new byte[] { (byte) 0xf9 });
-		checkCustom(new byte[] { (byte) 0xfa });
-		checkCustom(new byte[] { (byte) 0xfb });
-		checkCustom(new byte[] { (byte) 0xfc });
-		checkCustom(new byte[] { (byte) 0xfd });
-		checkCustom(new byte[] { (byte) 0xfe });
-		checkCustom(new byte[] { (byte) 0xff });
-	}
-
-	private void checkCustom(final byte[] vpack) {
+		checkCustom(new byte[] { (byte) 0xf0 }, 2);
+		checkCustom(new byte[] { (byte) 0xf1 }, 3);
+		checkCustom(new byte[] { (byte) 0xf2 }, 5);
+		checkCustom(new byte[] { (byte) 0xf3 }, 9);
+		checkCustom(new byte[] { (byte) 0xf4, (byte) 0x00 }, 2);
+		checkCustom(new byte[] { (byte) 0xf5, (byte) 0x01 }, 3);
+		checkCustom(new byte[] { (byte) 0xf6, (byte) 0x02 }, 4);
+		checkCustom(new byte[] { (byte) 0xf7, (byte) 0x00, (byte) 0x00 }, 3);
+		checkCustom(new byte[] { (byte) 0xf8, (byte) 0x01, (byte) 0x00 }, 4);
+		checkCustom(new byte[] { (byte) 0xf9, (byte) 0x02, (byte) 0x00 }, 5);
+		checkCustom(new byte[] { (byte) 0xfa, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00 }, 5);
+		checkCustom(new byte[] { (byte) 0xfb, (byte) 0x01, (byte) 0x00, (byte) 0x00, (byte) 0x00 }, 6);
+		checkCustom(new byte[] { (byte) 0xfc, (byte) 0x02, (byte) 0x00, (byte) 0x00, (byte) 0x00 }, 7);
+		checkCustom(new byte[] { (byte) 0xfd, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00 }, 9);
+		checkCustom(new byte[] { (byte) 0xfe, (byte) 0x01, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00 }, 10);
+		checkCustom(new byte[] { (byte) 0xff, (byte) 0x02, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00 }, 11);
+	}
+
+	private void checkCustom(final byte[] vpack, final int expectedSize) {
 		final VPackSlice slice = new VPackSlice(vpack);
 		assertThat(slice.isCustom(), is(true));
+		assertThat(slice.getByteSize(), is(expectedSize));
 	}
 
 	@Test