From 1ca95d099df96d576a0eaddc6e42b5b41aed3e06 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Thu, 22 Oct 2015 15:26:17 +1300 Subject: Refactor protocol unit testing --- .../traccar/protocol/Tk102ProtocolDecoderTest.java | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'test/org/traccar/protocol/Tk102ProtocolDecoderTest.java') diff --git a/test/org/traccar/protocol/Tk102ProtocolDecoderTest.java b/test/org/traccar/protocol/Tk102ProtocolDecoderTest.java index d25b33439..fd8033902 100644 --- a/test/org/traccar/protocol/Tk102ProtocolDecoderTest.java +++ b/test/org/traccar/protocol/Tk102ProtocolDecoderTest.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 Tk102ProtocolDecoderTest extends ProtocolDecoderTest { @@ -11,30 +10,30 @@ public class Tk102ProtocolDecoderTest extends ProtocolDecoderTest { Tk102ProtocolDecoder decoder = new Tk102ProtocolDecoder(new Tk102Protocol()); - assertNull(decoder.decode(null, null, "")); + verifyNothing(decoder, text( "")); - assertNull(decoder.decode(null, null, + verifyNothing(decoder, text( "[!0000000081r(353327023367238,TK102-W998_01_V1.1.001_130219,255,001,255,001,0,100,100,0,internet,0000,0000,0,0,255,0,4,1,11,00)")); - assertNull(decoder.decode(null, null, + verifyNothing(decoder, text( "[L0000001323N(GSM,0,0,07410001,20120101162600,404,010,9261,130,0,2353,130,35,9263,130,33,1)")); - assertNull(decoder.decode(null, null, + verifyNothing(decoder, text( "[%0000000082\u001d(100100000000000600-30-65535)")); - assertNull(decoder.decode(null, null, + verifyNothing(decoder, text( "[#0000000004\u0018(062100000000000600-0-0)")); - verify(decoder.decode(null, null, + verifyPosition(decoder, text( "[=00000000836(ITV013939A4913.8317N02824.9241E000.90018031310010000)")); - verify(decoder.decode(null, null, + verifyPosition(decoder, text( "[=00000000366(ITV012209A4913.8281N02824.9258E000.32018031310010000)")); - verify(decoder.decode(null, null, + verifyPosition(decoder, text( "[;00000000106(ONE200834A5952.8114N01046.0832E003.93212071305010000)")); - verify(decoder.decode(null, null, + verifyPosition(decoder, text( "[\u00930000000000F(ITV153047A1534.0805N03233.0888E000.00029041500000400&Wsz-wl001&B0000)]")); } -- cgit v1.2.3