diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2016-08-26 02:29:51 +1200 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2016-08-26 02:29:51 +1200 |
| commit | ce60f22e4fde1cd0645371291b2bf7016856f78b (patch) | |
| tree | 4a8ab3eaaf2aef9cefc20c429023e67f731ecafb /test | |
| parent | dd07064905c4a25f92cbe105346783bedd75a320 (diff) | |
| download | traccar-server-ce60f22e4fde1cd0645371291b2bf7016856f78b.tar.gz traccar-server-ce60f22e4fde1cd0645371291b2bf7016856f78b.tar.bz2 traccar-server-ce60f22e4fde1cd0645371291b2bf7016856f78b.zip | |
Better detection of Xirgo format
Diffstat (limited to 'test')
| -rw-r--r-- | test/org/traccar/protocol/XirgoProtocolDecoderTest.java | 30 |
1 files changed, 23 insertions, 7 deletions
diff --git a/test/org/traccar/protocol/XirgoProtocolDecoderTest.java b/test/org/traccar/protocol/XirgoProtocolDecoderTest.java index 0d7087a93..82076d7eb 100644 --- a/test/org/traccar/protocol/XirgoProtocolDecoderTest.java +++ b/test/org/traccar/protocol/XirgoProtocolDecoderTest.java @@ -6,24 +6,20 @@ import org.traccar.ProtocolTest; public class XirgoProtocolDecoderTest extends ProtocolTest { @Test - public void testDecode() throws Exception { + public void testDecodeNew() throws Exception { XirgoProtocolDecoder decoder = new XirgoProtocolDecoder(new XirgoProtocol()); verifyPosition(decoder, text( - "$$354660046140722,6001,2013/01/22,15:36:18,25.80907,-80.32531,7.1,19,165.2,11,0.8,11.1,17,1,1,3.9,2##"), - position("2013-01-22 15:36:18.000", true, 25.80907, -80.32531)); + "$$355922061611345,6001,2016/08/25,20:10:51,51.13042,-114.22752,1197,44.7,0.0,0.0,2622,27,12,0.8,1,0.0,13.9,24,1,0,0.0,-70,-809,688##")); verifyPosition(decoder, text( - "$$357207059646786,4003,2015/05/19,15:54:56,-20.21422,-70.14927,37.5,1.8,0.0,11,0.8,12.9,31,297,1,0,0.0,0.0,0,1,1,1##")); + "$$355922061611345,6001,2016/08/25,20:10:38,51.12948,-114.22637,1203,34.8,0.0,0.0,1377,215,12,0.8,1,0.0,13.8,28,1,0,0.0,-309,-566,754##")); verifyPosition(decoder, text( "$$354898045650537,6031,2015/02/26,15:47:26,33.42552,-112.30308,287.8,0,0,0,0,0.0,7,1.2,2,0.0,12.2,22,1,0,82.3")); verifyPosition(decoder, text( - "$$357207059646786,4003,2015/05/19,15:55:27,-20.21421,-70.14920,33.6,0.4,0.0,11,0.8,12.9,31,297,1,0,0.0,0.0,0,1,1,1##")); - - verifyPosition(decoder, text( "$$355922060162167,6015,2016/04/21,17:26:52,39.83267,-76.66139,230,0.0,0.0,0.0,779,0,8,1.2,0,0.0,13.0,19,1,1C4BJWDG4GL191009,X0z1-1137CD1,0402,3GATT,0,83.9,-70,-715,738##")); verifyPosition(decoder, text( @@ -31,4 +27,24 @@ public class XirgoProtocolDecoderTest extends ProtocolTest { } + @Test + public void testDecodeOld() throws Exception { + + XirgoProtocolDecoder decoder = new XirgoProtocolDecoder(new XirgoProtocol()); + + verifyPosition(decoder, text( + "$$354660046140722,6001,2013/01/22,15:36:18,25.80907,-80.32531,7.1,19,165.2,11,0.8,11.1,17,1,1,3.9,2##"), + position("2013-01-22 15:36:18.000", true, 25.80907, -80.32531)); + + verifyPosition(decoder, text( + "$$357207059646786,4003,2015/05/19,15:54:56,-20.21422,-70.14927,37.5,1.8,0.0,11,0.8,12.9,31,297,1,0,0.0,0.0,0,1,1,1##")); + + verifyPosition(decoder, text( + "$$354898045650537,6031,2015/02/26,15:47:26,33.42552,-112.30308,287.8,0,0,0,0,0.0,7,1.2,2,0.0,12.2,22,1,0,82.3")); + + verifyPosition(decoder, text( + "$$357207059646786,4003,2015/05/19,15:55:27,-20.21421,-70.14920,33.6,0.4,0.0,11,0.8,12.9,31,297,1,0,0.0,0.0,0,1,1,1##")); + + } + } |