ziver/zutil
1
0
Fork 0
Code Issues Pull requests Activity Actions

Implementation of CustomBinaryStruct Serializer done

Browse source
This commit is contained in:
Ziver Koc 2016-04-14 13:15:49 +02:00
parent 6071ad7c70
commit e41fe70951
5 changed files with 111 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

29
test/zutil/parser/binary/BinaryStructInputStreamTest.java
View file

@ -26,6 +26,10 @@ package zutil.parser.binary;
import org.junit.Test;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import static junit.framework.TestCase.assertEquals;
import static junit.framework.TestCase.assertFalse;
@ -125,4 +129,29 @@ public class BinaryStructInputStreamTest {
BinaryStructInputStream.read(struct, new byte[]{0b0000_0001,0b0001_1000,0b0000_0000});
struct.assertObj();
}
@Test
public void customBinaryField(){
BinaryTestStruct struct = new BinaryTestStruct() {
@CustomBinaryField(index=1, serializer=ByteStringSerializer.class)
public String s1;
public void assertObj(){
assertEquals("1234", s1);
}
};
BinaryStructInputStream.read(struct, new byte[]{0b0000_0001,0b0000_0010,0b0000_0011,0b0000_0100});
struct.assertObj();
}
public static class ByteStringSerializer implements BinaryFieldSerializer<String>{
public String read(InputStream in, BinaryFieldData field) throws IOException {
String ret = "";
for (int c; (c=in.read()) > 0; )
ret += c;
return ret;
}
public void write(OutputStream out, String obj, BinaryFieldData field) throws IOException {}
}
}

33
test/zutil/parser/binary/BinaryStructOutputStreamTest.java
View file

@ -26,10 +26,10 @@ package zutil.parser.binary;
import org.junit.Test;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import static junit.framework.TestCase.assertEquals;
import static org.junit.Assert.assertArrayEquals;
@ -77,20 +77,25 @@ public class BinaryStructOutputStreamTest {
byte[] data = BinaryStructOutputStream.serialize(struct);
assertArrayEquals(new byte[]{(byte)0b0100_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!");
}
@Test
public void customBinaryField() throws IOException {
BinaryStruct struct = new BinaryStruct() {
@BinaryStruct.CustomBinaryField(index=1, serializer=ByteStringSerializer.class)
public String s1 = "1234";
};
BinaryStructParser.parse(struct, "hello world!".getBytes());
struct.assertObj();
byte[] data = BinaryStructOutputStream.serialize(struct);
assertArrayEquals(new byte[]{0b0000_0001,0b0000_0010,0b0000_0011,0b0000_0100}, data);
}
public static class ByteStringSerializer implements BinaryFieldSerializer<String>{
public String read(InputStream in, BinaryFieldData field) throws IOException {
return null;
}
public void write(OutputStream out, String obj, BinaryFieldData field) throws IOException {
for (char c : obj.toCharArray())
out.write(Integer.parseInt(""+c));
}
}
*/
}