diff options
author | Ivan Muratov <binakot@gmail.com> | 2017-07-14 09:36:06 +0300 |
---|---|---|
committer | Ivan Muratov <binakot@gmail.com> | 2017-07-14 09:36:06 +0300 |
commit | 01ec19f81270e38451e6a8b898abb22d6a2a3994 (patch) | |
tree | 19a68cd6de1909a92974655947819d0fafbda575 /test/org | |
parent | a2376cf6354a94c8bd8c8e13c4e78936d4f2ae97 (diff) | |
parent | a71dd10a966b491c64232180a2075450f0a258db (diff) | |
download | trackermap-server-01ec19f81270e38451e6a8b898abb22d6a2a3994.tar.gz trackermap-server-01ec19f81270e38451e6a8b898abb22d6a2a3994.tar.bz2 trackermap-server-01ec19f81270e38451e6a8b898abb22d6a2a3994.zip |
Merge branch 'arnavi4_remarks'
Diffstat (limited to 'test/org')
-rw-r--r-- | test/org/traccar/helper/ChecksumTest.java | 7 | ||||
-rw-r--r-- | test/org/traccar/protocol/Arnavi4FrameDecoderTest.java | 3 | ||||
-rw-r--r-- | test/org/traccar/protocol/Arnavi4ProtocolDecoderTest.java | 11 |
3 files changed, 10 insertions, 11 deletions
diff --git a/test/org/traccar/helper/ChecksumTest.java b/test/org/traccar/helper/ChecksumTest.java index 737b65c62..c7c5031df 100644 --- a/test/org/traccar/helper/ChecksumTest.java +++ b/test/org/traccar/helper/ChecksumTest.java @@ -4,7 +4,6 @@ import org.jboss.netty.buffer.ChannelBuffer; import org.jboss.netty.buffer.ChannelBuffers; import org.junit.Assert; import org.junit.Test; -import org.traccar.protocol.Arnavi4ProtocolDecoder; import java.nio.charset.StandardCharsets; @@ -31,9 +30,9 @@ public class ChecksumTest { @Test public void testModulo256() { - Assert.assertEquals(0x00, Checksum.modulo256((byte)0x00)); - Assert.assertEquals(0x00, Checksum.modulo256((byte)0x00, (byte)0x00, (byte)0x00)); - Assert.assertEquals(0x06, Checksum.modulo256((byte)0x01, (byte)0x02, (byte)0x03)); + Assert.assertEquals(0x00, Checksum.modulo256(new byte[] {0x00})); + Assert.assertEquals(0x00, Checksum.modulo256(new byte[] {0x00, 0x00, 0x00})); + Assert.assertEquals(0x06, Checksum.modulo256(new byte[] {0x01, 0x02, 0x03})); } } diff --git a/test/org/traccar/protocol/Arnavi4FrameDecoderTest.java b/test/org/traccar/protocol/Arnavi4FrameDecoderTest.java index 08abd3835..0b502bc36 100644 --- a/test/org/traccar/protocol/Arnavi4FrameDecoderTest.java +++ b/test/org/traccar/protocol/Arnavi4FrameDecoderTest.java @@ -6,9 +6,6 @@ import org.traccar.ProtocolTest; import java.nio.ByteOrder; -/** - * Created by Ivan Muratov @binakot on 13.07.2017. - */ public class Arnavi4FrameDecoderTest extends ProtocolTest { @Test diff --git a/test/org/traccar/protocol/Arnavi4ProtocolDecoderTest.java b/test/org/traccar/protocol/Arnavi4ProtocolDecoderTest.java index 2395572a1..d789b1c9c 100644 --- a/test/org/traccar/protocol/Arnavi4ProtocolDecoderTest.java +++ b/test/org/traccar/protocol/Arnavi4ProtocolDecoderTest.java @@ -5,13 +5,10 @@ import org.traccar.ProtocolTest; import java.nio.ByteOrder; -/** - * Created by Ivan Muratov @binakot on 11.07.2017. - */ public class Arnavi4ProtocolDecoderTest extends ProtocolTest { @Test - public void testDecode() throws Exception { + public void testHeader1Decode() throws Exception { Arnavi4ProtocolDecoder decoder; @@ -23,6 +20,12 @@ public class Arnavi4ProtocolDecoderTest extends ProtocolTest { verifyPositions(decoder, binary(ByteOrder.LITTLE_ENDIAN, // Valid PACKAGE packet with one DATA packet "5b01012800a3175f5903513934420447221c42055402781E0900f0c5215b4e0084005c00007c005d0000a300fa37010000295d"), position("2017-07-07 05:09:55.000", true, 45.05597, 39.03347)); + } + + @Test + public void testHeader2Decode() throws Exception { + + Arnavi4ProtocolDecoder decoder; decoder = new Arnavi4ProtocolDecoder(new Arnavi4Protocol()); |