aboutsummaryrefslogtreecommitdiff
path: root/test/org
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2015-10-27 10:56:05 +1300
committerAnton Tananaev <anton.tananaev@gmail.com>2015-10-27 10:56:05 +1300
commit52f6ed7567fc11babf831401ac9744f9ebd7c735 (patch)
treef355fae03a740567387869262ffe89661afa7872 /test/org
parent622706ec1c8e2a78dae161a1db64b09247efbfd9 (diff)
downloadtrackermap-server-52f6ed7567fc11babf831401ac9744f9ebd7c735.tar.gz
trackermap-server-52f6ed7567fc11babf831401ac9744f9ebd7c735.tar.bz2
trackermap-server-52f6ed7567fc11babf831401ac9744f9ebd7c735.zip
Refactor Visiontek protocol decoder
Diffstat (limited to 'test/org')
-rw-r--r--test/org/traccar/ProtocolDecoderTest.java4
-rw-r--r--test/org/traccar/protocol/VisiontekProtocolDecoderTest.java11
2 files changed, 11 insertions, 4 deletions
diff --git a/test/org/traccar/ProtocolDecoderTest.java b/test/org/traccar/ProtocolDecoderTest.java
index d91675f10..ed06cf1fb 100644
--- a/test/org/traccar/ProtocolDecoderTest.java
+++ b/test/org/traccar/ProtocolDecoderTest.java
@@ -148,8 +148,8 @@ public class ProtocolDecoderTest {
private void verifyDecodedPosition(Object decodedObject) {
- Assert.assertNotNull(decodedObject);
- Assert.assertTrue(decodedObject instanceof Position);
+ Assert.assertNotNull("position is null", decodedObject);
+ Assert.assertTrue("not a position", decodedObject instanceof Position);
Position position = (Position) decodedObject;
diff --git a/test/org/traccar/protocol/VisiontekProtocolDecoderTest.java b/test/org/traccar/protocol/VisiontekProtocolDecoderTest.java
index ad637256e..3a31d3c28 100644
--- a/test/org/traccar/protocol/VisiontekProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/VisiontekProtocolDecoderTest.java
@@ -9,12 +9,19 @@ public class VisiontekProtocolDecoderTest extends ProtocolDecoderTest {
public void testDecode() throws Exception {
VisiontekProtocolDecoder decoder = new VisiontekProtocolDecoder(new VisiontekProtocol());
-
+
+ /*verifyPosition(decoder, text(
+ "$1,VMC,358072044271838,26,10,15,10,43,20,17.066418N,080.395667E,000.0,285,00.8,0074,6390,0,0,0,0,0,0,0,0,00.00,00.00,00,00,0000,12.7,4.0,24,10,0000000000000,A,0"));
+
+ verifyPosition(decoder, text(
+ "$1,VMC,358072044271838,25,10,15,09,19,40,00.0000000,000.0000000,000.0,000,00.0,0000,6070,0,0,0,0,0,0,0,0,00.00,00.00,00,00,0000,12.5,4.0,99,00,0000000000000,V,0"));*/
+
//verifyPosition(decoder, text(
// "$1,AP116,05,06,15,11,48,32,1725.0460N,07824.5289E,0617,07,0,030,2091,0,0,0,1,1,1,1,20,00.0000,00.3820,00.0000,VAJRA V1.00,A#"));
verifyPosition(decoder, text(
- "$1,AP09BU9397,861785006462448,20,06,14,15,03,28,17267339N,078279407E,060.0,073,0550,11,0,1,0,0,1,1,26,A,0000000000"));
+ "$1,AP09BU9397,861785006462448,20,06,14,15,03,28,17267339N,078279407E,060.0,073,0550,11,0,1,0,0,1,1,26,A,0000000000"),
+ position("2014-06-20 15:03:28.000", true, 17.44556, 78.46567));
verifyNothing(decoder, text(
"$1,AP09BU9397,861785006462448,20,06,14,15,03,28,000000000,0000000000,000.0,000,0000,00,0,1,0,0,1,1,24,V,0000000000"));