aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2015-10-25 10:24:29 +1300
committerAnton Tananaev <anton.tananaev@gmail.com>2015-10-25 10:24:29 +1300
commit8fe177bd27196a3924e4ef8e835ba9dac14975c3 (patch)
treed8e182e17308f418975dd40cfeeddfc831cb3b60 /test
parent5538a83ac7eda6ad5775e582688dd0199e6c538c (diff)
downloadtrackermap-server-8fe177bd27196a3924e4ef8e835ba9dac14975c3.tar.gz
trackermap-server-8fe177bd27196a3924e4ef8e835ba9dac14975c3.tar.bz2
trackermap-server-8fe177bd27196a3924e4ef8e835ba9dac14975c3.zip
Refactor Tzone protocol decoder
Diffstat (limited to 'test')
-rw-r--r--test/org/traccar/ProtocolDecoderTest.java2
-rw-r--r--test/org/traccar/protocol/TzoneProtocolDecoderTest.java8
2 files changed, 5 insertions, 5 deletions
diff --git a/test/org/traccar/ProtocolDecoderTest.java b/test/org/traccar/ProtocolDecoderTest.java
index 03e8314d6..3eb42a0f6 100644
--- a/test/org/traccar/ProtocolDecoderTest.java
+++ b/test/org/traccar/ProtocolDecoderTest.java
@@ -143,8 +143,6 @@ public class ProtocolDecoderTest {
Assert.assertEquals("latitude", expected.getLatitude(), position.getLatitude(), 0.00001);
Assert.assertEquals("longitude", expected.getLongitude(), position.getLongitude(), 0.00001);
- verifyDecodedPosition(decodedObject);
-
}
private void verifyDecodedPosition(Object decodedObject) {
diff --git a/test/org/traccar/protocol/TzoneProtocolDecoderTest.java b/test/org/traccar/protocol/TzoneProtocolDecoderTest.java
index 470e366cb..23a36172b 100644
--- a/test/org/traccar/protocol/TzoneProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/TzoneProtocolDecoderTest.java
@@ -14,11 +14,13 @@ public class TzoneProtocolDecoderTest extends ProtocolDecoderTest {
TzoneProtocolDecoder decoder = new TzoneProtocolDecoder(new TzoneProtocol());
- verifyAttributes(decoder, binary(
- "545a00582424010b021e000008637710239476270f080b0a3228001600000000000000000000000000000000000000000000000401a00822001088c00020183701a6053800000000800000000000000000000000000000000077c9860d0a"));
+ verifyPosition(decoder, binary(
+ "545a00582424010b021e000008637710239476270f080b0a3228001600000000000000000000000000000000000000000000000401a00822001088c00020183701a6053800000000800000000000000000000000000000000077c9860d0a"),
+ position("1999-11-30 00:00:00.000", false, 0.0, 0.0));
verifyPosition(decoder, binary(
- "545A00912424010B021E000008661040203754350F061807083800160400CE5ADC041447620F0618070838000A0000060C7C0004253378370010AAC000000C37018504E500000000800000000000000000390B0A0014061113000000051200140610600014061220001000133800140610070010001473001000151100101500640010000920001000148400000000000000F2EF570D0A"));
+ "545A00912424010B021E000008661040203754350F061807083800160400CE5ADC041447620F0618070838000A0000060C7C0004253378370010AAC000000C37018504E500000000800000000000000000390B0A0014061113000000051200140610600014061220001000133800140610070010001473001000151100101500640010000920001000148400000000000000F2EF570D0A"),
+ position("2015-06-24 07:08:56.000", true, 22.53946, 114.06310));
verifyNothing(decoder, binary(
"545A009E2424010A0205000008637710225481290F010F081E33000000000010A0C000310E35000005840000000000000000000000000066140A00140612200010001511001406101000140612490014061308001015006400051400170014061012000000050200140612470000000504001406100700140612510014061260001015012000000005080014061252001406130900101501410000000506000853A40D0A"));