Refactor protocol unit testing

1 files changed, 4 insertions, 10 deletions

diff --git a/test/org/traccar/protocol/PiligrimProtocolDecoderTest.java b/test/org/traccar/protocol/PiligrimProtocolDecoderTest.java
index eef6cc65e..bd5c2460f 100644
--- a/test/org/traccar/protocol/PiligrimProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/PiligrimProtocolDecoderTest.java
@@ -1,14 +1,9 @@
 package org.traccar.protocol;
 
-import org.jboss.netty.buffer.ChannelBuffers;
-import org.jboss.netty.handler.codec.http.DefaultHttpRequest;
 import org.jboss.netty.handler.codec.http.HttpMethod;
-import org.jboss.netty.handler.codec.http.HttpRequest;
-import org.jboss.netty.handler.codec.http.HttpVersion;
 
-import static org.traccar.helper.DecoderVerifier.verify;
 import org.junit.Test;
-import org.traccar.helper.ChannelBufferTools;
+import org.traccar.ProtocolDecoderTest;
 
 public class PiligrimProtocolDecoderTest extends ProtocolDecoderTest {
 
@@ -17,10 +12,9 @@ public class PiligrimProtocolDecoderTest extends ProtocolDecoderTest {
 
         PiligrimProtocolDecoder decoder = new PiligrimProtocolDecoder(new PiligrimProtocol());
         
-        HttpRequest msg1 = new DefaultHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.POST, "/bingps?imei=868204005544720&csq=18&vout=00&vin=4050&dataid=00000000");
-        msg1.setContent(ChannelBuffers.wrappedBuffer(ChannelBufferTools.convertHexString(
-                "fff2200d4110061a32354f3422310062000a0005173b0000a101000300005e00fff2200d4110100932354f2b22310042000b000e173b00009f01000700006000")));
-        verify(decoder.decode(null, null, msg1));
+        verifyPositions(decoder, request(HttpMethod.POST,
+                "/bingps?imei=868204005544720&csq=18&vout=00&vin=4050&dataid=00000000",
+                binary("fff2200d4110061a32354f3422310062000a0005173b0000a101000300005e00fff2200d4110100932354f2b22310042000b000e173b00009f01000700006000")));
 
     }