aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorIvan Muratov <binakot@gmail.com>2017-10-24 14:46:09 +0300
committerIvan Muratov <binakot@gmail.com>2017-10-24 14:46:09 +0300
commit09d3cf2b5416327700ad22b652cf4a0dca09aaf2 (patch)
tree7f7cfedc2ba6366b94d7ab0f926dbfab2dd4dae2 /test
parent05bcc7359b52cad0036bcb32888b7e999a3efb25 (diff)
parentd225018f7aadefab6381d5283347bae10e153bfa (diff)
downloadtrackermap-server-09d3cf2b5416327700ad22b652cf4a0dca09aaf2.tar.gz
trackermap-server-09d3cf2b5416327700ad22b652cf4a0dca09aaf2.tar.bz2
trackermap-server-09d3cf2b5416327700ad22b652cf4a0dca09aaf2.zip
Merge branch 'arnavi4_final'
Diffstat (limited to 'test')
-rw-r--r--test/org/traccar/protocol/Arnavi4FrameDecoderTest.java43
1 files changed, 14 insertions, 29 deletions
diff --git a/test/org/traccar/protocol/Arnavi4FrameDecoderTest.java b/test/org/traccar/protocol/Arnavi4FrameDecoderTest.java
index 2203cdafc..b634f0cdc 100644
--- a/test/org/traccar/protocol/Arnavi4FrameDecoderTest.java
+++ b/test/org/traccar/protocol/Arnavi4FrameDecoderTest.java
@@ -17,14 +17,6 @@ public class Arnavi4FrameDecoderTest extends ProtocolTest {
binary(ByteOrder.LITTLE_ENDIAN, "ff22f30c45f5c90f0300"),
decoder.decode(null, null, binary(ByteOrder.LITTLE_ENDIAN, "ff22f30c45f5c90f0300")));
- Assert.assertEquals( // Valid HEADER v2 packet with IMEI
- binary(ByteOrder.LITTLE_ENDIAN, "ff23f30c45f5c90f0300"),
- decoder.decode(null, null, binary(ByteOrder.LITTLE_ENDIAN, "ff23f30c45f5c90f0300")));
-
- Assert.assertEquals( // Valid PACKAGE with answer to server on file transfer
- null,
- decoder.decode(null, null, binary(ByteOrder.LITTLE_ENDIAN, "5bfd005d")));
-
Assert.assertEquals( // Valid PACKAGE with one DATA packet
binary(ByteOrder.LITTLE_ENDIAN, "5b01012800a3175f5903513934420447221c42055402781E0900f0c5215b4e0084005c00007c005d0000a300fa37010000295d"),
decoder.decode(null, null, binary(ByteOrder.LITTLE_ENDIAN, "5b01012800a3175f5903513934420447221c42055402781E0900f0c5215b4e0084005c00007c005d0000a300fa37010000295d")));
@@ -34,31 +26,24 @@ public class Arnavi4FrameDecoderTest extends ProtocolTest {
decoder.decode(null, null, binary(ByteOrder.LITTLE_ENDIAN, "5b01012800a3175f5903513934420447221c42055402781E0900f0c5215b4e0084005c00007c005d0000a300fa3701000029012800a3175f5903513934420447221c42055402781E0900f0c5215b4e0084005c00007c005d0000a300fa37010000295d")));
Assert.assertEquals( // Valid PACKAGE with one TEXT packet.
- null,
- decoder.decode(null, null, binary(ByteOrder.LITTLE_ENDIAN, "030700e3f16b50747261636361721b")));
+ binary(ByteOrder.LITTLE_ENDIAN, "5b01030700e3f16b50747261636361721b5d"),
+ decoder.decode(null, null, binary(ByteOrder.LITTLE_ENDIAN, "5b01030700e3f16b50747261636361721b5d")));
- Assert.assertEquals( // Valid PACKAGE with one BINARY packet.
- null,
- decoder.decode(null, null, binary(ByteOrder.LITTLE_ENDIAN, "062000e3f16b5003298b5e4204cbd514420500191000080400ff021b")));
-
- }
+ Assert.assertEquals( // Valid PACKAGE with two TEXT packet.
+ binary(ByteOrder.LITTLE_ENDIAN, "5b01030700e3f16b50747261636361721b030700e3f16b50747261636361721b5d"),
+ decoder.decode(null, null, binary(ByteOrder.LITTLE_ENDIAN, "5b01030700e3f16b50747261636361721b030700e3f16b50747261636361721b5d")));
- @Test
- public void testDecodeInvalidPackets() throws Exception {
-
- Arnavi4FrameDecoder decoder = new Arnavi4FrameDecoder();
-
- Assert.assertEquals( // Invalid PACKAGE with one DATA packet (missing last byte with end sign)
- null,
- decoder.decode(null, null, binary(ByteOrder.LITTLE_ENDIAN, "5b01012800a3175f5903513934420447221c42055402781E0900f0c5215b4e0084005c00007c005d0000a300fa3701000029")));
+ Assert.assertEquals( // Valid PACKAGE with one BINARY packet.
+ binary(ByteOrder.LITTLE_ENDIAN, "5b01061400e3f16b5003298b5e4204cbd514420500191000080400ff021b5d"),
+ decoder.decode(null, null, binary(ByteOrder.LITTLE_ENDIAN, "5b01061400e3f16b5003298b5e4204cbd514420500191000080400ff021b5d")));
- Assert.assertEquals( // Invalid PACKAGE with two DATA packet (missing last 10 bytes)
- null,
- decoder.decode(null, null, binary(ByteOrder.LITTLE_ENDIAN, "5b01012800a3175f5903513934420447221c42055402781E0900f0c5215b4e0084005c00007c005d0000a300fa3701000029012800a3175f5903513934420447221c42055402781E0900f0c5215b4e0084005c00007c005d00")));
+ Assert.assertEquals( // Valid PACKAGE with two BINARY packet.
+ binary(ByteOrder.LITTLE_ENDIAN, "5b01061400e3f16b5003298b5e4204cbd514420500191000080400ff021b061400e3f16b5003298b5e4204cbd514420500191000080400ff021b5d"),
+ decoder.decode(null, null, binary(ByteOrder.LITTLE_ENDIAN, "5b01061400e3f16b5003298b5e4204cbd514420500191000080400ff021b061400e3f16b5003298b5e4204cbd514420500191000080400ff021b5d")));
- Assert.assertEquals( // Valid PACKAGE with useless extra bytes at the end
- binary(ByteOrder.LITTLE_ENDIAN, "5b01012800a3175f5903513934420447221c42055402781E0900f0c5215b4e0084005c00007c005d0000a300fa37010000295d"),
- decoder.decode(null, null, binary(ByteOrder.LITTLE_ENDIAN, "5b01012800a3175f5903513934420447221c42055402781E0900f0c5215b4e0084005c00007c005d0000a300fa37010000295d010203040506070809")));
+ Assert.assertEquals( // Valid PACKAGE with answer to server on file transfer
+ binary(ByteOrder.LITTLE_ENDIAN, "5bfd005d"),
+ decoder.decode(null, null, binary(ByteOrder.LITTLE_ENDIAN, "5bfd005d")));
}