From ccaea63b14e67ae97bef2a0c826337dc3fa4e509 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Sun, 20 Sep 2015 11:45:08 +1200 Subject: Replace XT7 decoder with Megastek --- .../protocol/MegastekProtocolDecoderTest.java | 6 ++++-- .../traccar/protocol/Xt7ProtocolDecoderTest.java | 23 ---------------------- 2 files changed, 4 insertions(+), 25 deletions(-) delete mode 100644 test/org/traccar/protocol/Xt7ProtocolDecoderTest.java (limited to 'test') diff --git a/test/org/traccar/protocol/MegastekProtocolDecoderTest.java b/test/org/traccar/protocol/MegastekProtocolDecoderTest.java index d9911f922..7c0cedb8c 100644 --- a/test/org/traccar/protocol/MegastekProtocolDecoderTest.java +++ b/test/org/traccar/protocol/MegastekProtocolDecoderTest.java @@ -1,8 +1,7 @@ package org.traccar.protocol; -import org.traccar.helper.TestIdentityManager; -import static org.traccar.helper.DecoderVerifier.verify; import org.junit.Test; +import static org.traccar.helper.DecoderVerifier.verify; public class MegastekProtocolDecoderTest extends ProtocolDecoderTest { @@ -10,6 +9,9 @@ public class MegastekProtocolDecoderTest extends ProtocolDecoderTest { public void testDecode() throws Exception { MegastekProtocolDecoder decoder = new MegastekProtocolDecoder(new MegastekProtocol()); + + verify(decoder.decode(null, null, + "STX2010101801 j$GPRMC,101053.000,A,2232.7607,N,11404.7669,E,0.00,,231110,,,A*7F,460,00,2795,0E6A,14,94,1000,0000,91,Timer;1D")); verify(decoder.decode(null, null, "STX,861001005215757,$GPRMC,180118.000,A,4241.330116,N,2321.931251,E,0.00,182.19,130915,,E,A,F,Nil-Alarms,imei:861001005215757,8,577.0,Battery=38%,0,284,03,03E8,3139;7A")); diff --git a/test/org/traccar/protocol/Xt7ProtocolDecoderTest.java b/test/org/traccar/protocol/Xt7ProtocolDecoderTest.java deleted file mode 100644 index 3ad84a0eb..000000000 --- a/test/org/traccar/protocol/Xt7ProtocolDecoderTest.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.traccar.protocol; - -import org.jboss.netty.buffer.ChannelBuffers; -import org.traccar.helper.ChannelBufferTools; -import org.traccar.helper.TestIdentityManager; -import org.jboss.netty.buffer.ChannelBufferFactory; -import org.jboss.netty.buffer.HeapChannelBufferFactory; -import static org.traccar.helper.DecoderVerifier.verify; -import org.junit.Test; - -public class Xt7ProtocolDecoderTest extends ProtocolDecoderTest { - - @Test - public void testDecode() throws Exception { - - Xt7ProtocolDecoder decoder = new Xt7ProtocolDecoder(new Xt7Protocol()); - - verify(decoder.decode(null, null, ChannelBuffers.wrappedBuffer(ChannelBufferTools.convertHexString( - "53545832303130313031383031202020202020026A244750524D432C3130313035332E3030302C412C323233322E373630372C4E2C31313430342E373636392C452C302E30302C2C3233313131302C2C2C412A37462C3436302C30302C323739352C304536412C31342C39342C313030302C303030302C39312C54696D65723B31440D0A")))); - - } - -} -- cgit v1.2.3