From 644c5ab6ea7d0a515fb4f9ffea35e6f8589e15c8 Mon Sep 17 00:00:00 2001
From: Ziver Koc <ziver@koc.se>
Date: Mon, 1 Feb 2016 17:52:41 +0100
Subject: [PATCH] Added more testcases

---
 .../parser/binary/BinaryStructParser.java     |  3 +-
 test/zutil/test/BinaryStructTest.java         | 35 ++++++++++++++++++-
 2 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/src/zutil/parser/binary/BinaryStructParser.java b/src/zutil/parser/binary/BinaryStructParser.java
index 8c963ae..1c4f0b9 100755
--- a/src/zutil/parser/binary/BinaryStructParser.java
+++ b/src/zutil/parser/binary/BinaryStructParser.java
@@ -14,12 +14,13 @@ import zutil.parser.binary.BinaryStruct.*;
  */
 public class BinaryStructParser {
 
-    public static void parse(BinaryStruct struct, byte[] data) {
+    public static int parse(BinaryStruct struct, byte[] data) {
         List<BinaryFieldData> structDataList = getStructDataList(struct.getClass());
         int bitOffset = 0;
         for (BinaryFieldData field : structDataList){
             bitOffset += field.setValue(struct, data, bitOffset);
         }
+        return bitOffset;
     }
 
 
diff --git a/test/zutil/test/BinaryStructTest.java b/test/zutil/test/BinaryStructTest.java
index 5781ae8..680c079 100755
--- a/test/zutil/test/BinaryStructTest.java
+++ b/test/zutil/test/BinaryStructTest.java
@@ -16,7 +16,7 @@ public class BinaryStructTest {
     }
 
     @Test
-    public void basicTest(){
+    public void basicIntTest(){
         BinaryTestStruct struct = new BinaryTestStruct() {
             @BinaryField(index=1, length=32)
             public int i1;
@@ -32,4 +32,37 @@ public class BinaryStructTest {
         BinaryStructParser.parse(struct, new byte[]{0,0,0,1, 0,0,0,2});
         struct.assertObj();
     }
+
+    @Test
+    public void basicBooleanTest(){
+        BinaryTestStruct struct = new BinaryTestStruct() {
+            @BinaryField(index=1, length=1)
+            public boolean b1;
+            @BinaryField(index=2, length=1)
+            public boolean b2;
+
+            public void assertObj(){
+                assertFalse(b1);
+                assertFalse(b2);
+            }
+        };
+
+        BinaryStructParser.parse(struct, new byte[]{0b0100_000});
+        struct.assertObj();
+    }
+
+    @Test
+    public void basicStringTest(){
+        BinaryTestStruct struct = new BinaryTestStruct() {
+            @BinaryField(index=1, length=8*12)
+            public String s1;
+
+            public void assertObj(){
+                assertEquals(s1, "hello world!");
+            }
+        };
+
+        BinaryStructParser.parse(struct, "hello world!".getBytes());
+        struct.assertObj();
+    }
 }