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

some refactoring and bugfixes

Browse source
This commit is contained in:
Ziver Koc 2016-02-02 17:06:06 +01:00
parent 4d31e66ebd
commit 63f191db4c
4 changed files with 56 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

18
test/zutil/test/BinaryStructTest.java
View file

@ -65,4 +65,22 @@ public class BinaryStructTest {
BinaryStructParser.parse(struct, "hello world!".getBytes());
struct.assertObj();
}
@Test
public void nonLinedLength(){
BinaryTestStruct struct = new BinaryTestStruct() {
@BinaryField(index=1, length=12)
public int i1;
@BinaryField(index=2, length=12)
public int i2;
public void assertObj(){
assertEquals(17, i1);
assertEquals(2048, i2);
}
};
BinaryStructParser.parse(struct, new byte[]{0b0000_0001,0b0001_1000,0b0000_0000});
struct.assertObj();
}
}

12
test/zutil/test/ByteUtilTest.java
View file

@ -12,13 +12,13 @@ public class ByteUtilTest {
@Test
public void getBits(){
assertEquals(1, ByteUtil.getBits((byte)0b1000_0000, 7, 1));
assertEquals(1, ByteUtil.getBits((byte)0b0001_0000, 4, 1));
assertEquals(1, ByteUtil.getBits((byte)0b0000_0001, 0, 1));
public void getShiftedBits(){
assertEquals(1, ByteUtil.getShiftedBits((byte)0b1000_0000, 7, 1));
assertEquals(1, ByteUtil.getShiftedBits((byte)0b0001_0000, 4, 1));
assertEquals(1, ByteUtil.getShiftedBits((byte)0b0000_0001, 0, 1));
assertEquals(3, ByteUtil.getBits((byte)0b0110_0000, 6, 2));
assertEquals(3, ByteUtil.getShiftedBits((byte)0b0110_0000, 6, 2));
assertEquals((byte)0xFF, ByteUtil.getBits((byte)0b1111_1111, 7, 8));
assertEquals((byte)0xFF, ByteUtil.getShiftedBits((byte)0b1111_1111, 7, 8));
}
}