From b18d80471dd99381df631a9754421a3e63e21cb4 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Mon, 29 Jun 2015 13:27:58 +1200 Subject: Combine Syrus and Taip protocols --- .../traccar/protocol/SyrusProtocolDecoderTest.java | 41 ---------------------- .../traccar/protocol/TaipProtocolDecoderTest.java | 40 +++++++++++++++++++++ 2 files changed, 40 insertions(+), 41 deletions(-) delete mode 100644 test/org/traccar/protocol/SyrusProtocolDecoderTest.java create mode 100644 test/org/traccar/protocol/TaipProtocolDecoderTest.java (limited to 'test/org') diff --git a/test/org/traccar/protocol/SyrusProtocolDecoderTest.java b/test/org/traccar/protocol/SyrusProtocolDecoderTest.java deleted file mode 100644 index e7ede632b..000000000 --- a/test/org/traccar/protocol/SyrusProtocolDecoderTest.java +++ /dev/null @@ -1,41 +0,0 @@ -package org.traccar.protocol; - -import static org.junit.Assert.assertNotNull; -import org.traccar.helper.TestDataManager; -import static org.traccar.helper.DecoderVerifier.verify; -import org.junit.Test; - -public class SyrusProtocolDecoderTest extends ProtocolDecoderTest { - - @Test - public void testDecode() throws Exception { - - SyrusProtocolDecoder decoder = new SyrusProtocolDecoder(new SyrusProtocol(), false); - - verify(decoder.decode(null, null, - ">RGP230615010248-2682523-065236820000003007F4101;ID=0005;#0002;*2A<")); - - verify(decoder.decode(null, null, - ">RGP190805211932-3457215-058493640000000FFBF0300;ID=8251;#2122;*54<")); - - assertNotNull(decoder.decode(null, null, - ">RPV00000+3739438-1220384601512612;ID=1234;*7F")); - - verify(decoder.decode(null, null, - "\r\n>REV691615354941+3570173+1397742703203212;ID=Test")); - - verify(decoder.decode(null, null, - ">REV481599462982+2578391-0802945201228512;ID=Test")); - - verify(decoder.decode(null, null, - ">REV131756153215+3359479-0075299001031332;VO=10568798;IO=310;SV=10;BL=4190;CV09=0;AD=0;AL=+47;ID=356612021059680")); - - assertNotNull(decoder.decode(null, null, - ">RPV02138+4555512-0735478000000032;ID=1005;*76<")); - - assertNotNull(decoder.decode(null, null, - ">RPV19105+4538405-0739518900000012;ID=9999;*7A<\r\n")); - - } - -} diff --git a/test/org/traccar/protocol/TaipProtocolDecoderTest.java b/test/org/traccar/protocol/TaipProtocolDecoderTest.java new file mode 100644 index 000000000..78ccd4c7f --- /dev/null +++ b/test/org/traccar/protocol/TaipProtocolDecoderTest.java @@ -0,0 +1,40 @@ +package org.traccar.protocol; + +import static org.junit.Assert.assertNotNull; +import static org.traccar.helper.DecoderVerifier.verify; +import org.junit.Test; + +public class TaipProtocolDecoderTest extends ProtocolDecoderTest { + + @Test + public void testDecode() throws Exception { + + TaipProtocolDecoder decoder = new TaipProtocolDecoder(new TaipProtocol(), false); + + verify(decoder.decode(null, null, + ">RGP230615010248-2682523-065236820000003007F4101;ID=0005;#0002;*2A<")); + + verify(decoder.decode(null, null, + ">RGP190805211932-3457215-058493640000000FFBF0300;ID=8251;#2122;*54<")); + + assertNotNull(decoder.decode(null, null, + ">RPV00000+3739438-1220384601512612;ID=1234;*7F")); + + verify(decoder.decode(null, null, + "\r\n>REV691615354941+3570173+1397742703203212;ID=Test")); + + verify(decoder.decode(null, null, + ">REV481599462982+2578391-0802945201228512;ID=Test")); + + verify(decoder.decode(null, null, + ">REV131756153215+3359479-0075299001031332;VO=10568798;IO=310;SV=10;BL=4190;CV09=0;AD=0;AL=+47;ID=356612021059680")); + + assertNotNull(decoder.decode(null, null, + ">RPV02138+4555512-0735478000000032;ID=1005;*76<")); + + assertNotNull(decoder.decode(null, null, + ">RPV19105+4538405-0739518900000012;ID=9999;*7A<\r\n")); + + } + +} -- cgit v1.2.3