diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2015-10-22 15:26:17 +1300 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2015-10-22 15:26:17 +1300 |
| commit | 1ca95d099df96d576a0eaddc6e42b5b41aed3e06 (patch) | |
| tree | 65ae84eb5e301317263fd72c31cc54922c71eb96 /test/org/traccar/protocol/EasyTrackProtocolDecoderTest.java | |
| parent | 122a26d2822f35b27b9cb0b217916d6b821d9654 (diff) | |
| download | trackermap-server-1ca95d099df96d576a0eaddc6e42b5b41aed3e06.tar.gz trackermap-server-1ca95d099df96d576a0eaddc6e42b5b41aed3e06.tar.bz2 trackermap-server-1ca95d099df96d576a0eaddc6e42b5b41aed3e06.zip | |
Refactor protocol unit testing
Diffstat (limited to 'test/org/traccar/protocol/EasyTrackProtocolDecoderTest.java')
| -rw-r--r-- | test/org/traccar/protocol/EasyTrackProtocolDecoderTest.java | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/test/org/traccar/protocol/EasyTrackProtocolDecoderTest.java b/test/org/traccar/protocol/EasyTrackProtocolDecoderTest.java index 37dcdec59..9e1dfce34 100644 --- a/test/org/traccar/protocol/EasyTrackProtocolDecoderTest.java +++ b/test/org/traccar/protocol/EasyTrackProtocolDecoderTest.java @@ -1,8 +1,7 @@ package org.traccar.protocol; -import static org.traccar.helper.DecoderVerifier.verify; -import static org.junit.Assert.assertNull; import org.junit.Test; +import org.traccar.ProtocolDecoderTest; public class EasyTrackProtocolDecoderTest extends ProtocolDecoderTest { @@ -11,27 +10,28 @@ public class EasyTrackProtocolDecoderTest extends ProtocolDecoderTest { EasyTrackProtocolDecoder decoder = new EasyTrackProtocolDecoder(new EasyTrackProtocol()); - assertNull(decoder.decode(null, null, "*ET,135790246811221,GZ,0001,0005")); + verifyNothing(decoder, text( + "*ET,135790246811221,GZ,0001,0005")); - verify(decoder.decode(null, null, + verifyPosition(decoder, text( "*ET,135790246811221,DW,A,0A090D,101C0D,00CF27C6,0413FA4E,0000,0000,00000000,20,4,0000,00F123")); - verify(decoder.decode(null, null, + verifyPosition(decoder, text( "*ET,135790246811221,DW,A,050915,0C2A27,00CE5954,04132263,0000,0000,01000000,20,4,0000,001254")); - verify(decoder.decode(null, null, + verifyPosition(decoder, text( "*ET,135790246811221,DW,A,0A090D,101C0D,00CF27C6,0413FA4E,0000,0000,00000000,20,4,0000,00F123,100")); - verify(decoder.decode(null, null, + verifyPosition(decoder, text( "*ET,135790246811221,DW,A,0A090D,101C0D,00CF27C6,8413FA4E,0000,0000,00000000,20,4,0000,00F123,100")); - verify(decoder.decode(null, null, + verifyPosition(decoder, text( "*ET,358155100003016,HB,A,0d081e,07381e,8038ee09,03d2e9be,004f,0000,40c00000,0f,100,0000,00037c,29")); - verify(decoder.decode(null, null, + verifyPosition(decoder, text( "*ET,358155100003016,HB,A,0d081e,073900,8038ee2f,03d2e9fd,0114,0000,40c00000,12,100,0000,00037c,32")); - verify(decoder.decode(null, null, + verifyPosition(decoder, text( "*ET,135790246811221,HB,A,050915,0C2A27,00CE5954,04132263,0000,0000,01000000,20,4,0000,00F123,100,200")); } |