Basic support for writing int with BinaryStruct

test/zutil/parser/binary/BinaryStructInputStreamTest.java

@@ -31,9 +31,9 @@ import static junit.framework.TestCase.assertFalse;
 
 
 /**
- * Created by Ziver on 2016-01-28.
+ * Created by Ziver
  */
-public class BinaryStructTest {
+public class BinaryStructInputStreamTest {
     interface BinaryTestStruct extends BinaryStruct{
         void assertObj();
     }
@@ -52,7 +52,7 @@ public class BinaryStructTest {
             }
         };
 
-        BinaryStructParser.parse(struct, new byte[]{0,0,0,1, 0,0,0,2});
+        BinaryStructInputStream.parse(struct, new byte[]{0,0,0,1, 0,0,0,2});
         struct.assertObj();
     }
 
@@ -70,7 +70,7 @@ public class BinaryStructTest {
             }
         };
 
-        BinaryStructParser.parse(struct, new byte[]{0b0100_000});
+        BinaryStructInputStream.parse(struct, new byte[]{0b0100_000});
         struct.assertObj();
     }
 
@@ -81,11 +81,11 @@ public class BinaryStructTest {
             public String s1;
 
             public void assertObj(){
-                assertEquals(s1, "hello world!");
+                assertEquals("hello world!", s1);
             }
         };
 
-        BinaryStructParser.parse(struct, "hello world!".getBytes());
+        BinaryStructInputStream.parse(struct, "hello world!".getBytes());
         struct.assertObj();
     }
 
@@ -103,7 +103,7 @@ public class BinaryStructTest {
             }
         };
 
-        BinaryStructParser.parse(struct, new byte[]{0b0000_0000,0b0001_1000,0b0000_0000});
+        BinaryStructInputStream.parse(struct, new byte[]{0b0000_0000,0b0001_1000,0b0000_0000});
         struct.assertObj();
     }
 
@@ -122,7 +122,7 @@ public class BinaryStructTest {
             }
         };
 
-        BinaryStructParser.parse(struct, new byte[]{0b0000_0001,0b0001_1000,0b0000_0000});
+        BinaryStructInputStream.parse(struct, new byte[]{0b0000_0001,0b0001_1000,0b0000_0000});
         struct.assertObj();
     }
 }

test/zutil/parser/binary/BinaryStructOutputStreamTest.java

@@ -0,0 +1,89 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2015 Ziver Koc
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package zutil.parser.binary;
+
+import org.junit.Test;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+
+import static junit.framework.TestCase.assertEquals;
+import static org.junit.Assert.assertArrayEquals;
+
+
+/**
+ * Created by Ziver
+ */
+public class BinaryStructOutputStreamTest {
+
+    @Test
+    public void basicIntTest() throws IOException {
+        BinaryStruct struct = new BinaryStruct() {
+            @BinaryField(index=1, length=32)
+            public int i1 = 1;
+            @BinaryField(index=2, length=32)
+            public int i2 = 2;
+        };
+
+        byte[] data = serialize(struct);
+        assertArrayEquals(new byte[]{0,0,0,1, 0,0,0,2}, data);
+    }
+/*
+    @Test
+    public void basicBooleanTest() throws IOException {
+        BinaryStruct struct = new BinaryStruct() {
+            @BinaryField(index=1, length=1)
+            public boolean b1 = true;
+            @BinaryField(index=2, length=1)
+            public boolean b2 = false;
+        };
+
+        byte[] data = serialize(struct);
+        assertArrayEquals(new byte[]{(byte)0b1000_0000}, data);
+    }
+
+    @Test
+    public void basicStringTest(){
+        BinaryTestStruct struct = new BinaryTestStruct() {
+            @BinaryField(index=1, length=8*12)
+            public String s1;
+
+            public void assertObj(Object... expected){
+                assertEquals(s1, "hello world!");
+            }
+        };
+
+        BinaryStructParser.parse(struct, "hello world!".getBytes());
+        struct.assertObj();
+    }
+    */
+
+    private byte[] serialize(BinaryStruct struct) throws IOException {
+        ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+        BinaryStructOutputStream out = new BinaryStructOutputStream(buffer);
+        out.write(struct);
+        return buffer.toByteArray();
+    }
+}