Refactor protocol unit testing

1 files changed, 5 insertions, 6 deletions

diff --git a/test/org/traccar/protocol/NavigilProtocolDecoderTest.java b/test/org/traccar/protocol/NavigilProtocolDecoderTest.java
index 3ad29e474..09883411e 100644
--- a/test/org/traccar/protocol/NavigilProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/NavigilProtocolDecoderTest.java
@@ -2,10 +2,9 @@ package org.traccar.protocol;
 
 import java.nio.ByteOrder;
 import org.jboss.netty.buffer.ChannelBuffers;
-import static org.junit.Assert.assertNull;
 import org.junit.Test;
+import org.traccar.ProtocolDecoderTest;
 import org.traccar.helper.ChannelBufferTools;
-import static org.traccar.helper.DecoderVerifier.verify;
 
 public class NavigilProtocolDecoderTest extends ProtocolDecoderTest {
 
@@ -14,11 +13,11 @@ public class NavigilProtocolDecoderTest extends ProtocolDecoderTest {
 
         NavigilProtocolDecoder decoder = new NavigilProtocolDecoder(new NavigilProtocol());
 
-        assertNull(decoder.decode(null, null, ChannelBuffers.wrappedBuffer(ByteOrder.LITTLE_ENDIAN, ChannelBufferTools.convertHexString(
-                "01004300040020000000f60203080200e7cd0f510c0000003b00000000000000"))));
+        verifyNothing(decoder, binary(ByteOrder.LITTLE_ENDIAN,
+                "01004300040020000000f60203080200e7cd0f510c0000003b00000000000000"));
 
-        verify(decoder.decode(null, null, ChannelBuffers.wrappedBuffer(ByteOrder.LITTLE_ENDIAN, ChannelBufferTools.convertHexString(
-                "0100b3000f0024000000f4a803080200ca0c1151ef8885f0b82e6d130400c00403000000"))));
+        verifyPosition(decoder, binary(ByteOrder.LITTLE_ENDIAN,
+                "0100b3000f0024000000f4a803080200ca0c1151ef8885f0b82e6d130400c00403000000"));
 
     }