diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2016-05-22 22:33:12 -0700 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2016-05-22 22:33:12 -0700 |
| commit | 267999c33a63356dd9aad0628e39548aab249a80 (patch) | |
| tree | 349c0cc279600964f7809068738ea70f34bb5216 /test/org | |
| parent | 8249d9f7dc2cd4b7bb32e8d528d387f5ce88a60d (diff) | |
| parent | 0065906b1c745eb4305469e562b9c740e694074c (diff) | |
| download | trackermap-server-267999c33a63356dd9aad0628e39548aab249a80.tar.gz trackermap-server-267999c33a63356dd9aad0628e39548aab249a80.tar.bz2 trackermap-server-267999c33a63356dd9aad0628e39548aab249a80.zip | |
Merge pull request #1963 from Abyss777/master
Store command result to position for wondex
Diffstat (limited to 'test/org')
| -rw-r--r-- | test/org/traccar/protocol/WondexFrameDecoderTest.java | 7 | ||||
| -rw-r--r-- | test/org/traccar/protocol/WondexProtocolDecoderTest.java | 40 |
2 files changed, 31 insertions, 16 deletions
diff --git a/test/org/traccar/protocol/WondexFrameDecoderTest.java b/test/org/traccar/protocol/WondexFrameDecoderTest.java index 5877452ed..2b401aa18 100644 --- a/test/org/traccar/protocol/WondexFrameDecoderTest.java +++ b/test/org/traccar/protocol/WondexFrameDecoderTest.java @@ -9,15 +9,18 @@ public class WondexFrameDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - Pt502FrameDecoder decoder = new Pt502FrameDecoder(); + WondexFrameDecoder decoder = new WondexFrameDecoder(); Assert.assertNull( - decoder.decode(null, null, binary("d0d70b0001ca9a3b"))); + decoder.decode(null, null, binary("f0d70b0001ca9a3b"))); Assert.assertEquals( binary("313034343938393630312c32303133303332333039353531352c31332e3537323737362c35322e3430303833382c302c3030302c37322c302c32"), decoder.decode(null, null, binary("313034343938393630312c32303133303332333039353531352c31332e3537323737362c35322e3430303833382c302c3030302c37322c302c320d0a"))); + Assert.assertEquals(binary("d0d70b0001ca9a3b"), + decoder.decode(null, null, binary("d0d70b0001ca9a3b"))); + } } diff --git a/test/org/traccar/protocol/WondexProtocolDecoderTest.java b/test/org/traccar/protocol/WondexProtocolDecoderTest.java index a44f7030f..bf85c71ba 100644 --- a/test/org/traccar/protocol/WondexProtocolDecoderTest.java +++ b/test/org/traccar/protocol/WondexProtocolDecoderTest.java @@ -10,41 +10,53 @@ public class WondexProtocolDecoderTest extends ProtocolTest { WondexProtocolDecoder decoder = new WondexProtocolDecoder(new WondexProtocol()); - verifyPosition(decoder, text( + verifyPosition(decoder, buffer( "2000000108,20151030145404,76.948633,43.354700,0,140,15,100,1,1325,125.4,10.5,0.0"), position("2015-10-30 14:54:04.000", true, 43.35470, 76.94863)); - verifyPosition(decoder, text( + verifyPosition(decoder, buffer( "2000000257,20151030145351,69.379976,53.283905,0,0,16,2,0,0,469.1,58.9,0.0"), position("2015-10-30 14:53:51.000", false, 53.28390, 69.37998)); - verifyPosition(decoder, text( + verifyPosition(decoder, buffer( "2000000232,20151030145206,51.166900,43.651353,0,132,11,2,0,0,0.0,0.0,0.0")); - verifyPosition(decoder, text( + verifyPosition(decoder, buffer( "2000000259,20151030145653,69.380826,53.283890,9,10,15,2,1,695,1002.6,108.2,0.0")); - - verifyPosition(decoder, text( + + verifyPosition(decoder, buffer( "1044989601,20130323074605,0.000000,90.000000,0,000,0,0,2")); - verifyPosition(decoder, text( + verifyPosition(decoder, buffer( "123456789000001,20120101123200,130.000000,60.000000,0,000,0,0,0,0")); - verifyPosition(decoder, text( + verifyPosition(decoder, buffer( "210000001,20070313170040,121.123456,12.654321,0,233,0,9,2,0.0,0,0.00,0.00,0")); - verifyPosition(decoder, text( + verifyPosition(decoder, buffer( "1044989601,20130322172647,13.572583,52.401070,22,204,49,0,2")); - verifyPosition(decoder, text( + verifyPosition(decoder, buffer( "1044989601,20130322172647,13.572583,52.401070,22,204,-49,0,2")); - - verifyPosition(decoder, text( + + verifyPosition(decoder, buffer( "3997324533,20140326074908,28.797603,47.041635,0,48,0,6,2,3.90V,0")); - - verifyPosition(decoder, text( + + verifyPosition(decoder, buffer( "2000000001,20140529213210,-63.179111,9.781493,0,0,54.0,8,2,0.0,0,0.01,0.01,0,0,0,0")); + verifyNotNull(decoder, buffer( + "$OK:VER=M7 2.003 DVB rev02c,V2")); + + verifyNotNull(decoder, buffer( + "$OK:REBOOT")); + + verifyNotNull(decoder, buffer( + "$ERR:GETLOCATION=1")); + + verifyNothing(decoder, binary( + "d0d70b0001ca9a3b")); + } } |