From 390045cb48f28668942328f587e176166cb831a2 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Tue, 12 Jan 2016 20:39:41 +1300 Subject: Fix Navis protocol frame decoder --- test/org/traccar/protocol/NvsFrameDecoderTest.java | 24 ++++++++++++++++++++++ .../traccar/protocol/NvsProtocolDecoderTest.java | 6 ++++++ 2 files changed, 30 insertions(+) create mode 100644 test/org/traccar/protocol/NvsFrameDecoderTest.java (limited to 'test') diff --git a/test/org/traccar/protocol/NvsFrameDecoderTest.java b/test/org/traccar/protocol/NvsFrameDecoderTest.java new file mode 100644 index 000000000..54dc0fbdd --- /dev/null +++ b/test/org/traccar/protocol/NvsFrameDecoderTest.java @@ -0,0 +1,24 @@ +package org.traccar.protocol; + +import org.junit.Assert; +import org.junit.Test; +import org.traccar.ProtocolTest; + +public class NvsFrameDecoderTest extends ProtocolTest { + + @Test + public void testDecode() throws Exception { + + NvsFrameDecoder decoder = new NvsFrameDecoder(); + + Assert.assertEquals( + binary("0012333537303430303630303137383234312e38"), + decoder.decode(null, null, binary("0012333537303430303630303137383234312e38"))); + + Assert.assertEquals( + binary("cccccccc0073000144b9ddf2aca002015694823d1f165d80902139a44f00aa001e1400000103000a080115001a001d001e0141004001f00065001301061600001700001800004231da430000440000085000000000480000000049000000004a0000000047ffffffff6900000004c700000000e10000000100954a"), + decoder.decode(null, null, binary("cccccccc0073000144b9ddf2aca002015694823d1f165d80902139a44f00aa001e1400000103000a080115001a001d001e0141004001f00065001301061600001700001800004231da430000440000085000000000480000000049000000004a0000000047ffffffff6900000004c700000000e10000000100954a"))); + + } + +} diff --git a/test/org/traccar/protocol/NvsProtocolDecoderTest.java b/test/org/traccar/protocol/NvsProtocolDecoderTest.java index eade8feaa..fef610fff 100644 --- a/test/org/traccar/protocol/NvsProtocolDecoderTest.java +++ b/test/org/traccar/protocol/NvsProtocolDecoderTest.java @@ -16,9 +16,15 @@ public class NvsProtocolDecoderTest extends ProtocolTest { verifyNothing(decoder, binary( "0012313233343536373839303132333435312E31")); + verifyPositions(decoder, binary( + "cccccccc0073000144b9ddf2aca002015694823d1f165d80902139a44f00aa001e1400000103000a080115001a001d001e0141004001f00065001301061600001700001800004231da430000440000085000000000480000000049000000004a0000000047ffffffff6900000004c700000000e10000000100954a")); + verifyPositions(decoder, binary( "CCCCCCCC00FE00007048860DDF79020446a6f1ce010f14f650209cca80006f00d6040004010300030101150316030001460000015d0046a6f1dc0d0f14ffe0209cc580006e00c7050001010300030101150316010001460000015e0046a6f1ea0e0f150f00209cd20000950108040000010300030101150016030001460000015d0046a6f1ff0b0f150a50209cccc000930068040000010300030101150016030001460000015b006123")); + verifyPositions(decoder, binary( + "cccccccc0217000144b9ddf2aca002055683f72b01165d80632139a3c800ab00ce0a00000403000a080115bf1a001d001e0141004001f00065011301061600001700001800004231a9430000440000085000000000480000000049000000004a0000000047ffffffff69000000b7c700000000e100000001005683f74901165d80632139a3c800ab012a0a00000403000a080115bf1a001d001e0141004001f00065011301061600001700001800004231a9430000440000085000000000480000000049000000004a0000000047ffffffff69000000b8c700000000e100000001005683f76801165d80632139a3c800ab00590a00000403000a080115bf1a001d001e0141004001f00065011301061600001700001800004231a9430000440000085000000000480000000049000000004a0000000047ffffffff69000000b9c700000000e100000001005683f78601165d80632139a3c800ab00c80a00000403000a080115bf1a001d001e0141004001f00065011301061600001700001800004231a9430000440000085000000000480000000049000000004a0000000047ffffffff69000000bac700000000e100000001005683f7a401165d80632139a3c800ab01310a00000403000a080115bf1a001d001e0141004001f00065011301061600001700001800004231a9430000440000085000000000480000000049000000004a0000000047ffffffff69000000bbc700000000e100000001001d72")); + } } -- cgit v1.2.3