diff options
| author | ninioe <ninioe@gmail.com> | 2016-07-19 15:20:15 +0300 |
|---|---|---|
| committer | ninioe <ninioe@gmail.com> | 2016-07-19 15:20:15 +0300 |
| commit | 20f603076210073e122c720e21a3e8999478b11a (patch) | |
| tree | 668a50e6c55601c2420bf0f4b986ed0b194c2e32 /test/org | |
| parent | e954e95547d05a34bbd36e3aa5003f4ddaf2ccd0 (diff) | |
| parent | 00e2f8a3575855a8b863e245005b8f83b3314bfb (diff) | |
| download | trackermap-server-20f603076210073e122c720e21a3e8999478b11a.tar.gz trackermap-server-20f603076210073e122c720e21a3e8999478b11a.tar.bz2 trackermap-server-20f603076210073e122c720e21a3e8999478b11a.zip | |
Merge remote-tracking branch 'refs/remotes/tananaev/master'
Diffstat (limited to 'test/org')
4 files changed, 12 insertions, 9 deletions
diff --git a/test/org/traccar/protocol/AutoFonProtocolDecoderTest.java b/test/org/traccar/protocol/AutoFonProtocolDecoderTest.java index f84873c6e..a229695a2 100644 --- a/test/org/traccar/protocol/AutoFonProtocolDecoderTest.java +++ b/test/org/traccar/protocol/AutoFonProtocolDecoderTest.java @@ -11,13 +11,13 @@ public class AutoFonProtocolDecoderTest extends ProtocolTest { AutoFonProtocolDecoder decoder = new AutoFonProtocolDecoder(new AutoFonProtocol());
- verifyPosition(decoder, binary(
- "02080000251848470afa010262daa690013aa4046da83745f8812560df010001126a"));
-
verifyNothing(decoder, binary(
"10556103592310314825728F"));
verifyPosition(decoder, binary(
+ "02080000251848470afa010262daa690013aa4046da83745f8812560df010001126a"));
+
+ verifyPosition(decoder, binary(
"111E00000000000000000100007101010B0C020302010B0C0005A053FFFFFFFF02010B0C00276047FFFFFFFF1F5600FA000176F218C7850C0B0B0C203A033DBD46035783EF009E00320014FFFF45"));
//verifyPosition(decoder, binary(
diff --git a/test/org/traccar/protocol/Gt06ProtocolDecoderTest.java b/test/org/traccar/protocol/Gt06ProtocolDecoderTest.java index 9201caac6..3343f72e2 100644 --- a/test/org/traccar/protocol/Gt06ProtocolDecoderTest.java +++ b/test/org/traccar/protocol/Gt06ProtocolDecoderTest.java @@ -13,13 +13,13 @@ public class Gt06ProtocolDecoderTest extends ProtocolTest { verifyNothing(decoder, binary( "787805120099abec0d0a")); - verifyAttributes(decoder, binary( - "797900089400000002e852d70d0a")); - verifyNothing(decoder, binary( "78780D01086471700328358100093F040D0A")); verifyAttributes(decoder, binary( + "797900089400000002e852d70d0a")); + + verifyAttributes(decoder, binary( "7979000794050000c9b63e0d0a")); verifyPosition(decoder, binary( diff --git a/test/org/traccar/protocol/NavisProtocolDecoderTest.java b/test/org/traccar/protocol/NavisProtocolDecoderTest.java index 116984b52..4b612e941 100644 --- a/test/org/traccar/protocol/NavisProtocolDecoderTest.java +++ b/test/org/traccar/protocol/NavisProtocolDecoderTest.java @@ -13,13 +13,13 @@ public class NavisProtocolDecoderTest extends ProtocolTest { NavisProtocolDecoder decoder = new NavisProtocolDecoder(new NavisProtocol()); - verifyPositions(decoder, binary(ByteOrder.LITTLE_ENDIAN, - "404e544300000000040000005a00c6812a3e410125e3a60700011705071503011030210c0000fa200910e6000000000000000000000001082106150010ae97643f88a39f3f0000000090001fcc6c450000000000000000000000000000000000000000000000f6808080")); - verifyNothing(decoder, binary(ByteOrder.LITTLE_ENDIAN, "404E5443010000007B000000130044342A3E533A383631373835303035323035303739")); verifyPositions(decoder, binary(ByteOrder.LITTLE_ENDIAN, + "404e544300000000040000005a00c6812a3e410125e3a60700011705071503011030210c0000fa200910e6000000000000000000000001082106150010ae97643f88a39f3f0000000090001fcc6c450000000000000000000000000000000000000000000000f6808080")); + + verifyPositions(decoder, binary(ByteOrder.LITTLE_ENDIAN, "404e544301000000000000005a002e6c2a3e410125d7540100001512233a0b0a0f08026300000a000b000b00020000000000000000000c12233b0b0a0f03fd6d3f0fde603f00000000ba0051e0c845000000000000000000000000000000000000000000000080808080")); verifyPositions(decoder, binary(ByteOrder.LITTLE_ENDIAN, diff --git a/test/org/traccar/protocol/Tk103ProtocolDecoderTest.java b/test/org/traccar/protocol/Tk103ProtocolDecoderTest.java index b64f1ae26..bd54a4ade 100644 --- a/test/org/traccar/protocol/Tk103ProtocolDecoderTest.java +++ b/test/org/traccar/protocol/Tk103ProtocolDecoderTest.java @@ -11,6 +11,9 @@ public class Tk103ProtocolDecoderTest extends ProtocolTest { Tk103ProtocolDecoder decoder = new Tk103ProtocolDecoder(new Tk103Protocol()); verifyAttributes(decoder, text( + "(013632651491,ZC20,180716,144222,6,392,65535,255")); + + verifyAttributes(decoder, text( "(087072009461BR00000007V0000.0000N00000.0000E000.00014039900000000L00000000")); verifyPosition(decoder, text( |