diff options
author | Anton Tananaev <anton.tananaev@gmail.com> | 2021-06-24 11:32:20 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-06-24 11:32:20 -0700 |
commit | cd2f5a5a65e9f5068995831277c37b45df2a20f4 (patch) | |
tree | 0d79883b808dd2705acb31310638f5cb424083fb /src/test/java | |
parent | 229a96994136ad468264f8a084748c4fc17d35f1 (diff) | |
parent | a7aca62f89a69711ff489dbd7753be005e968aec (diff) | |
download | traccar-server-cd2f5a5a65e9f5068995831277c37b45df2a20f4.tar.gz traccar-server-cd2f5a5a65e9f5068995831277c37b45df2a20f4.tar.bz2 traccar-server-cd2f5a5a65e9f5068995831277c37b45df2a20f4.zip |
Merge pull request #4706 from Elsensee/megastek-fixes
Improve compatibility with megastek devices
Diffstat (limited to 'src/test/java')
-rw-r--r-- | src/test/java/org/traccar/protocol/MegastekFrameDecoderTest.java | 4 | ||||
-rw-r--r-- | src/test/java/org/traccar/protocol/MegastekProtocolDecoderTest.java | 6 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/test/java/org/traccar/protocol/MegastekFrameDecoderTest.java b/src/test/java/org/traccar/protocol/MegastekFrameDecoderTest.java index f1650b1b2..19e5cb0ab 100644 --- a/src/test/java/org/traccar/protocol/MegastekFrameDecoderTest.java +++ b/src/test/java/org/traccar/protocol/MegastekFrameDecoderTest.java @@ -22,6 +22,10 @@ public class MegastekFrameDecoderTest extends ProtocolTest { binary("53545832363034373520202020202020202020024f244750524d432c3133313131302e30302c562c2c2c2c2c2c2c3036303931332c2c2c4e2a37362c3232322c30312c383135412c443435352c31312c39372c303030302c303030312c302c54696d65723b3735"), decoder.decode(null, null, binary("53545832363034373520202020202020202020024f244750524d432c3133313131302e30302c562c2c2c2c2c2c2c3036303931332c2c2c4e2a37362c3232322c30312c383135412c443435352c31312c39372c303030302c303030312c302c54696d65723b37350d0a"))); + verifyFrame( + binary("636d643d6169643b757365723d2a2a2a3b7077643d2a2a2a3b6c61743d33382e35353239353338333b6c6f6e3d32312e30353337343530303b706163633d31303030"), + decoder.decode(null, null, binary("636d643d6169643b757365723d2a2a2a3b7077643d2a2a2a3b6c61743d33382e35353239353338333b6c6f6e3d32312e30353337343530303b706163633d313030300a"))); + } } diff --git a/src/test/java/org/traccar/protocol/MegastekProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/MegastekProtocolDecoderTest.java index 3c8377b51..83d62e766 100644 --- a/src/test/java/org/traccar/protocol/MegastekProtocolDecoderTest.java +++ b/src/test/java/org/traccar/protocol/MegastekProtocolDecoderTest.java @@ -10,6 +10,12 @@ public class MegastekProtocolDecoderTest extends ProtocolTest { public void testDecode() throws Exception { var decoder = new MegastekProtocolDecoder(null); + + verifyPosition(decoder, text( + "$MGV002,860719020193193,,S,070521,160748,V,2255.09165,N,11404.01322,E,00,00,00,,,,,,,,,,,,,,,,,,,10,015,Restart;!")); + + verifyPosition(decoder, text( + "$MGV002,860719020193193,,R,070621,115717,V,2255.09165,N,11404.01322,E,00,00,00,99.9,,,,,460,07,262C,0F54,20,,,,,,,,,10,039,Timer;!")); verifyPosition(decoder, text( "0132$MGV002,869152024261561,,S,310818,133945,V,3814.35442,N,02144.50662,E,00,00,00,99.9,,,44.2,,202,10,,,13,0,0,0,0,90,,,,11,100,Timer;!")); |