Improve unit test verification

1 files changed, 23 insertions, 22 deletions

diff --git a/test/org/traccar/protocol/H02ProtocolDecoderTest.java b/test/org/traccar/protocol/H02ProtocolDecoderTest.java
index 3b4233752..3ad601cc9 100644
--- a/test/org/traccar/protocol/H02ProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/H02ProtocolDecoderTest.java
@@ -1,8 +1,9 @@
 package org.traccar.protocol;
 
+import org.traccar.helper.TestDataManager;
 import java.nio.charset.Charset;
 import org.jboss.netty.buffer.ChannelBuffers;
-import static org.junit.Assert.assertNotNull;
+import static org.traccar.helper.DecoderVerifier.verify;
 import static org.junit.Assert.assertNull;
 import org.junit.Test;
 import org.traccar.helper.ChannelBufferTools;
@@ -18,68 +19,68 @@ public class H02ProtocolDecoderTest {
         assertNull(decoder.decode(null, null, ChannelBuffers.copiedBuffer(
                 "*HQ,353588020068342,V1,000000,V,0.0000,0,0.0000,0,0.00,0.00,000000,ffffffff,000106,000002,000203,004c87,16#", Charset.defaultCharset())));
 
-        assertNotNull(decoder.decode(null, null, ChannelBuffers.copiedBuffer(
+        verify(decoder.decode(null, null, ChannelBuffers.copiedBuffer(
                 "*HQ,3800008786,V1,062507,V,3048.2437,N,03058.5617,E,000.00,000,250413,FFFFFBFF#", Charset.defaultCharset())));
         
-        assertNotNull(decoder.decode(null, null, ChannelBuffers.copiedBuffer(
+        verify(decoder.decode(null, null, ChannelBuffers.copiedBuffer(
                 "*HQ,4300256455,V1,111817,A,1935.5128,N,04656.3243,E,0.00,100,170913,FFE7FBFF#", Charset.defaultCharset())));
 
-        assertNotNull(decoder.decode(null, null, ChannelBuffers.copiedBuffer(
+        verify(decoder.decode(null, null, ChannelBuffers.copiedBuffer(
                 "*HQ,123456789012345,V1,155850,A,5214.5346,N,2117.4683,E,0.00,270.90,131012,ffffffff,000000,000000,000000,000000#", Charset.defaultCharset())));
         
-        assertNotNull(decoder.decode(null, null, ChannelBuffers.copiedBuffer(
+        verify(decoder.decode(null, null, ChannelBuffers.copiedBuffer(
                 "*HQ,353588010001689,V1,221116,A,1548.8220,S,4753.1679,W,0.00,0.00,300413,ffffffff,0002d4,000004,0001cd,000047#", Charset.defaultCharset())));
 
-        assertNotNull(decoder.decode(null, null, ChannelBuffers.copiedBuffer(
+        verify(decoder.decode(null, null, ChannelBuffers.copiedBuffer(
                 "*HQ,354188045498669,V1,195200,A,701.8915,S,3450.3399,W,0.00,205.70,050213,ffffffff,000243,000000,000000#", Charset.defaultCharset())));
         
-        assertNotNull(decoder.decode(null, null, ChannelBuffers.copiedBuffer(
+        verify(decoder.decode(null, null, ChannelBuffers.copiedBuffer(
                 "*HQ,2705171109,V1,213324,A,5002.5849,N,01433.7822,E,0.00,000,140613,FFFFFFFF#", Charset.defaultCharset())));
         
-        assertNotNull(decoder.decode(null, null, ChannelBuffers.copiedBuffer(
+        verify(decoder.decode(null, null, ChannelBuffers.copiedBuffer(
                 "*TH,2020916012,V1,050316,A,2212.8745,N,11346.6574,E,14.28,028,220902,FFFFFBFF#", Charset.defaultCharset())));
         
-        assertNotNull(decoder.decode(null, null, ChannelBuffers.copiedBuffer(
+        verify(decoder.decode(null, null, ChannelBuffers.copiedBuffer(
                 "*TH,2020916012,V4,S17,130305,050316,A,2212.8745,N,11346.6574,E,14.28,028,220902,FFFFFBFF#", Charset.defaultCharset())));
         
-        assertNotNull(decoder.decode(null, null, ChannelBuffers.copiedBuffer(
+        verify(decoder.decode(null, null, ChannelBuffers.copiedBuffer(
                 "*TH,2020916012,V4,S14,100,10,1,3,130305,050316,A,2212.8745,N,11346.6574,E,14.28,028,220902,FFFFFBFF#", Charset.defaultCharset())));
         
-        assertNotNull(decoder.decode(null, null, ChannelBuffers.copiedBuffer(
+        verify(decoder.decode(null, null, ChannelBuffers.copiedBuffer(
                 "*TH,2020916012,V4,S20,ERROR,130305,050316,A,2212.8745,N,11346.6574,E,14.28,028,220902,FFFFFBFF#", Charset.defaultCharset())));
         
-        assertNotNull(decoder.decode(null, null, ChannelBuffers.copiedBuffer(
+        verify(decoder.decode(null, null, ChannelBuffers.copiedBuffer(
                 "*TH,2020916012,V4,S20,DONE,130305,050316,A,2212.8745,N,11346.6574,E,14.28,028,220902,F7FFFBFF#", Charset.defaultCharset())));
         
-        assertNotNull(decoder.decode(null, null, ChannelBuffers.copiedBuffer(
+        verify(decoder.decode(null, null, ChannelBuffers.copiedBuffer(
                 "*TH,2020916012,V4,R8,ERROR,130305,050316,A,2212.8745,N,11346.6574,E,14.28,028,220902,FFFFFBFF#", Charset.defaultCharset())));
         
-        assertNotNull(decoder.decode(null, null, ChannelBuffers.copiedBuffer(
+        verify(decoder.decode(null, null, ChannelBuffers.copiedBuffer(
                 "*TH,2020916012,V4,S23,165.165.33.250:8800,130305,050316,A,2212.8745,N,11346.6574,E,14.28,028,220902,FFFFFBFF#", Charset.defaultCharset())));
         
-        assertNotNull(decoder.decode(null, null, ChannelBuffers.copiedBuffer(
+        verify(decoder.decode(null, null, ChannelBuffers.copiedBuffer(
                 "*TH,2020916012,V4,S24,thit.gd,130305,050316,A,2212.8745,N,11346.6574,E,14.28,028,220902,FFFFFBFF#", Charset.defaultCharset())));
         
-        assertNotNull(decoder.decode(null, null, ChannelBuffers.copiedBuffer(
+        verify(decoder.decode(null, null, ChannelBuffers.copiedBuffer(
                 "*TH,2020916012,V4,S1,OK,pass_word,130305,050316,A,2212.8745,N,11346.6574,E,14.28,028,220902,FFFFFBFD#", Charset.defaultCharset())));
         
-        assertNotNull(decoder.decode(null, null, ChannelBuffers.copiedBuffer(
+        verify(decoder.decode(null, null, ChannelBuffers.copiedBuffer(
                 "*HQ,353588020068342,V1,062840,A,5241.1249,N,954.9490,E,0.00,0.00,231013,ffffffff,000106,000002,000203,004c87,24#", Charset.defaultCharset())));
 
-        assertNotNull(decoder.decode(null, null, ChannelBuffers.copiedBuffer(
+        verify(decoder.decode(null, null, ChannelBuffers.copiedBuffer(
                 "*HQ,353505220903211,V1,075228,A,5227.5039,N,01032.8443,E,0.00,0,231013,FFFBFFFF,106,14, 201,2173#", Charset.defaultCharset())));
 
-        assertNotNull(decoder.decode(null, null, ChannelBuffers.copiedBuffer(
+        verify(decoder.decode(null, null, ChannelBuffers.copiedBuffer(
                 "*HQ,353505220903211,V1,140817,A,5239.3538,N,01003.5292,E,21.03,312,221013,FFFBFFFF,106,14, 203,1cd#", Charset.defaultCharset())));
         
         int[] buf1 = {0x24,0x27,0x05,0x17,0x11,0x09,0x21,0x33,0x39,0x14,0x06,0x13,0x50,0x02,0x58,0x49,0x00,0x01,0x43,0x37,0x82,0x2e,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0x00,0x00};
-        assertNotNull(decoder.decode(null, null, ChannelBuffers.wrappedBuffer(ChannelBufferTools.convertArray(buf1))));
+        verify(decoder.decode(null, null, ChannelBuffers.wrappedBuffer(ChannelBufferTools.convertArray(buf1))));
         
         int[] buf2 = {0x24,0x27,0x05,0x17,0x11,0x09,0x21,0x34,0x09,0x14,0x06,0x13,0x50,0x02,0x58,0x49,0x00,0x01,0x43,0x37,0x82,0x2e,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0x00,0x00};
-        assertNotNull(decoder.decode(null, null, ChannelBuffers.wrappedBuffer(ChannelBufferTools.convertArray(buf2))));
+        verify(decoder.decode(null, null, ChannelBuffers.wrappedBuffer(ChannelBufferTools.convertArray(buf2))));
         
         int[] buf3 = {0x24,0x10,0x30,0x73,0x10,0x01,0x05,0x03,0x16,0x22,0x09,0x02,0x22,0x12,0x87,0x45,0x00,0x11,0x34,0x66,0x57,0x4C,0x01,0x40,0x28,0xff,0xff,0xfb,0xff,0xff,0x00,0x00};
-        assertNotNull(decoder.decode(null, null, ChannelBuffers.wrappedBuffer(ChannelBufferTools.convertArray(buf3))));
+        verify(decoder.decode(null, null, ChannelBuffers.wrappedBuffer(ChannelBufferTools.convertArray(buf3))));
         
     }