From 2bf8597601c9ab2d9569a7cd63c5bf351ce44763 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Fri, 6 Nov 2015 16:22:23 +1300 Subject: Replace EV603 decoder with MiniFinder --- .../traccar/protocol/Ev603ProtocolDecoderTest.java | 39 ---------------------- .../protocol/MiniFinderProtocolDecoderTest.java | 24 +++++++++++++ 2 files changed, 24 insertions(+), 39 deletions(-) delete mode 100644 test/org/traccar/protocol/Ev603ProtocolDecoderTest.java (limited to 'test/org') diff --git a/test/org/traccar/protocol/Ev603ProtocolDecoderTest.java b/test/org/traccar/protocol/Ev603ProtocolDecoderTest.java deleted file mode 100644 index a843fcf21..000000000 --- a/test/org/traccar/protocol/Ev603ProtocolDecoderTest.java +++ /dev/null @@ -1,39 +0,0 @@ -package org.traccar.protocol; - -import org.junit.Test; -import org.traccar.ProtocolDecoderTest; - -public class Ev603ProtocolDecoderTest extends ProtocolDecoderTest { - - @Test - public void testDecode() throws Exception { - - Ev603ProtocolDecoder decoder = new Ev603ProtocolDecoder(new Ev603Protocol()); - - verifyNothing(decoder, text( - "!1,123456789012345")); - - verifyNothing(decoder, text( - "!5,17,V")); - - verifyNothing(decoder, text( - "!1,860719027585011")); - - verifyPosition(decoder, text( - "!A,26/10/12,00:28:41,7.770385,-72.215706,0.0,25101,0")); - - verifyPosition(decoder, text( - "!A,01/12/10,13:25:35,22.641724,114.023666,000.1,281.6,0")); - - verifyPosition(decoder, text( - "!D,08/07/15,04:01:32,40.428257,-3.704808,0,0,170001,701.7,22,5,14,0")); - - verifyPosition(decoder, text( - "!D,08/07/15,04:55:13,40.428257,-3.704932,0,0,180001,680.0,8,8,13,0")); - - verifyPosition(decoder, text( - "!D,08/07/15,02:01:32,40.428230,-3.704950,4,170,170001,682.7,43,6,13,0")); - - } - -} diff --git a/test/org/traccar/protocol/MiniFinderProtocolDecoderTest.java b/test/org/traccar/protocol/MiniFinderProtocolDecoderTest.java index dae9e6bc9..04e5c1172 100644 --- a/test/org/traccar/protocol/MiniFinderProtocolDecoderTest.java +++ b/test/org/traccar/protocol/MiniFinderProtocolDecoderTest.java @@ -10,6 +10,30 @@ public class MiniFinderProtocolDecoderTest extends ProtocolDecoderTest { MiniFinderProtocolDecoder decoder = new MiniFinderProtocolDecoder(new MiniFinderProtocol()); + verifyNothing(decoder, text( + "!1,123456789012345")); + + verifyNothing(decoder, text( + "!5,17,V")); + + verifyNothing(decoder, text( + "!1,860719027585011")); + + verifyPosition(decoder, text( + "!A,26/10/12,00:28:41,7.770385,-72.215706,0.0,25101,0")); + + verifyPosition(decoder, text( + "!A,01/12/10,13:25:35,22.641724,114.023666,000.1,281.6,0")); + + verifyPosition(decoder, text( + "!D,08/07/15,04:01:32,40.428257,-3.704808,0,0,170001,701.7,22,5,14,0")); + + verifyPosition(decoder, text( + "!D,08/07/15,04:55:13,40.428257,-3.704932,0,0,180001,680.0,8,8,13,0")); + + verifyPosition(decoder, text( + "!D,08/07/15,02:01:32,40.428230,-3.704950,4,170,170001,682.7,43,6,13,0")); + verifyNothing(decoder, text( "!1,860719020212696")); -- cgit v1.2.3