From 3971b656af48b25a54ab9d486773dd9e6739e0ac Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Wed, 28 Oct 2015 14:20:10 +1300 Subject: Refactor Freedom protocol decoder --- test/org/traccar/ProtocolDecoderTest.java | 4 ++-- test/org/traccar/protocol/FreedomProtocolDecoderTest.java | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'test') diff --git a/test/org/traccar/ProtocolDecoderTest.java b/test/org/traccar/ProtocolDecoderTest.java index 61c333d67..e6d5270e8 100644 --- a/test/org/traccar/ProtocolDecoderTest.java +++ b/test/org/traccar/ProtocolDecoderTest.java @@ -140,8 +140,8 @@ public class ProtocolDecoderTest { private void verifyDecodedPosition(Object decodedObject, Position expected) { - 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/FreedomProtocolDecoderTest.java b/test/org/traccar/protocol/FreedomProtocolDecoderTest.java index 521fe20ab..fe86da082 100644 --- a/test/org/traccar/protocol/FreedomProtocolDecoderTest.java +++ b/test/org/traccar/protocol/FreedomProtocolDecoderTest.java @@ -10,9 +10,13 @@ public class FreedomProtocolDecoderTest extends ProtocolDecoderTest { FreedomProtocolDecoder decoder = new FreedomProtocolDecoder(new FreedomProtocol()); + verifyPosition(decoder, text( + "IMEI,353358011714362,2014/05/22, 20:49:32, N, Lat:4725.9624, E, Lon:01912.5483, Spd:5.05"), + position("2014-05-22 20:49:32.000", true, 47.43271, 19.20914)); + verifyPosition(decoder, text( "IMEI,353358011714362,2014/05/22, 20:49:32, N, Lat:4725.9624, E, Lon:01912.5483, Spd:5.05")); - + } } -- cgit v1.2.3