Combine decoder and encoder test utils

111 files changed, 246 insertions, 346 deletions

diff --git a/test/org/traccar/ProtocolEncoderTest.java b/test/org/traccar/ProtocolEncoderTest.java
deleted file mode 100644
index e8b5bb4eb..000000000
--- a/test/org/traccar/ProtocolEncoderTest.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package org.traccar;
-
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBuffers;
-import org.junit.Assert;
-import org.traccar.model.Command;
-
-import javax.xml.bind.DatatypeConverter;
-import java.nio.ByteOrder;
-import java.nio.charset.Charset;
-
-public class ProtocolEncoderTest {
-
-    private String concatenateStrings(String... strings) {
-        StringBuilder builder = new StringBuilder();
-        for (String s : strings) {
-            builder.append(s);
-        }
-        return builder.toString();
-    }
-
-    protected ChannelBuffer binary(String... data) {
-        return binary(ByteOrder.BIG_ENDIAN, data);
-    }
-
-    protected ChannelBuffer binary(ByteOrder endianness, String... data) {
-        return ChannelBuffers.wrappedBuffer(
-                endianness, DatatypeConverter.parseHexBinary(concatenateStrings(data)));
-    }
-
-    protected String text(String... data) {
-        return concatenateStrings(data);
-    }
-
-    protected ChannelBuffer buffer(String... data) {
-        return ChannelBuffers.copiedBuffer(concatenateStrings(data), Charset.defaultCharset());
-    }
-
-    protected void verifyCommand(
-            BaseProtocolEncoder encoder, Command command, ChannelBuffer expected) throws Exception {
-        verifyDecodedCommand(encoder.encodeCommand(command), expected);
-    }
-
-    private void verifyDecodedCommand(Object decodedObject, ChannelBuffer expected) {
-
-        Assert.assertNotNull("command is null", decodedObject);
-        Assert.assertTrue("not a buffer", decodedObject instanceof ChannelBuffer);
-        Assert.assertEquals(ChannelBuffers.hexDump(expected), ChannelBuffers.hexDump((ChannelBuffer) decodedObject));
-
-    }
-
-}
diff --git a/test/org/traccar/ProtocolDecoderTest.java b/test/org/traccar/ProtocolTest.java
index 5d2acdda1..75c12b171 100644
--- a/test/org/traccar/ProtocolDecoderTest.java
+++ b/test/org/traccar/ProtocolTest.java
@@ -7,6 +7,7 @@ import org.jboss.netty.handler.codec.http.HttpMethod;
 import org.jboss.netty.handler.codec.http.HttpVersion;
 import org.junit.Assert;
 import org.traccar.database.IdentityManager;
+import org.traccar.model.Command;
 import org.traccar.model.Device;
 import org.traccar.model.Event;
 import org.traccar.model.Position;
@@ -22,7 +23,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.TimeZone;
 
-public class ProtocolDecoderTest {
+public class ProtocolTest {
 
     static {
         Context.init(new IdentityManager() {
@@ -213,4 +214,17 @@ public class ProtocolDecoderTest {
         Assert.assertTrue("value too high", number <= max);
     }
 
+    protected void verifyCommand(
+            BaseProtocolEncoder encoder, Command command, ChannelBuffer expected) throws Exception {
+        verifyDecodedCommand(encoder.encodeCommand(command), expected);
+    }
+
+    private void verifyDecodedCommand(Object decodedObject, ChannelBuffer expected) {
+
+        Assert.assertNotNull("command is null", decodedObject);
+        Assert.assertTrue("not a buffer", decodedObject instanceof ChannelBuffer);
+        Assert.assertEquals(ChannelBuffers.hexDump(expected), ChannelBuffers.hexDump((ChannelBuffer) decodedObject));
+
+    }
+
 }
diff --git a/test/org/traccar/protocol/AdmProtocolDecoderTest.java b/test/org/traccar/protocol/AdmProtocolDecoderTest.java
index 125d7bdd8..587486dfa 100644
--- a/test/org/traccar/protocol/AdmProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/AdmProtocolDecoderTest.java
@@ -1,11 +1,11 @@
 package org.traccar.protocol;
 
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
+import org.traccar.ProtocolTest;
 
 import java.nio.ByteOrder;
 
-public class AdmProtocolDecoderTest extends ProtocolDecoderTest {
+public class AdmProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/ApelProtocolDecoderTest.java b/test/org/traccar/protocol/ApelProtocolDecoderTest.java
index e65b180d4..ffb4b9c17 100644
--- a/test/org/traccar/protocol/ApelProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/ApelProtocolDecoderTest.java
@@ -1,9 +1,9 @@
 package org.traccar.protocol;
 
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
+import org.traccar.ProtocolTest;
 
-public class ApelProtocolDecoderTest extends ProtocolDecoderTest {
+public class ApelProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/AplicomProtocolDecoderTest.java b/test/org/traccar/protocol/AplicomProtocolDecoderTest.java
index d503e0201..103718941 100644
--- a/test/org/traccar/protocol/AplicomProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/AplicomProtocolDecoderTest.java
@@ -1,9 +1,9 @@
 package org.traccar.protocol;

 

 import org.junit.Test;

-import org.traccar.ProtocolDecoderTest;

+import org.traccar.ProtocolTest;

 

-public class AplicomProtocolDecoderTest extends ProtocolDecoderTest {

+public class AplicomProtocolDecoderTest extends ProtocolTest {

 

     @Test

     public void testDecode() throws Exception {

diff --git a/test/org/traccar/protocol/AquilaProtocolDecoderTest.java b/test/org/traccar/protocol/AquilaProtocolDecoderTest.java
index b906bfe98..ed6e5d725 100644
--- a/test/org/traccar/protocol/AquilaProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/AquilaProtocolDecoderTest.java
@@ -1,9 +1,9 @@
 package org.traccar.protocol;
 
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
+import org.traccar.ProtocolTest;
 
-public class AquilaProtocolDecoderTest extends ProtocolDecoderTest {
+public class AquilaProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/Ardi01ProtocolDecoderTest.java b/test/org/traccar/protocol/Ardi01ProtocolDecoderTest.java
index 717dfd958..9a05e12d2 100644
--- a/test/org/traccar/protocol/Ardi01ProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/Ardi01ProtocolDecoderTest.java
@@ -1,9 +1,9 @@
 package org.traccar.protocol;
 
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
+import org.traccar.ProtocolTest;
 
-public class Ardi01ProtocolDecoderTest extends ProtocolDecoderTest {
+public class Ardi01ProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/AtrackProtocolDecoderTest.java b/test/org/traccar/protocol/AtrackProtocolDecoderTest.java
index 72c54f1e6..904f9570b 100644
--- a/test/org/traccar/protocol/AtrackProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/AtrackProtocolDecoderTest.java
@@ -1,9 +1,9 @@
 package org.traccar.protocol;
 
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
+import org.traccar.ProtocolTest;
 
-public class AtrackProtocolDecoderTest extends ProtocolDecoderTest {
+public class AtrackProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/AutoFon45ProtocolDecoderTest.java b/test/org/traccar/protocol/AutoFon45ProtocolDecoderTest.java
index f739c6709..2b4154b27 100644
--- a/test/org/traccar/protocol/AutoFon45ProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/AutoFon45ProtocolDecoderTest.java
@@ -1,12 +1,10 @@
 package org.traccar.protocol;
 
-import org.jboss.netty.buffer.ChannelBuffers;
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
-import org.traccar.helper.ChannelBufferTools;
+import org.traccar.ProtocolTest;
 
 
-public class AutoFon45ProtocolDecoderTest extends ProtocolDecoderTest {
+public class AutoFon45ProtocolDecoderTest extends ProtocolTest {
     @Test
     public void testDecode() throws Exception {
         AutoFon45ProtocolDecoder decoder = new AutoFon45ProtocolDecoder(new AutoFon45Protocol());
diff --git a/test/org/traccar/protocol/AutoFonProtocolDecoderTest.java b/test/org/traccar/protocol/AutoFonProtocolDecoderTest.java
index 0ae3950ce..5c2e52d09 100644
--- a/test/org/traccar/protocol/AutoFonProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/AutoFonProtocolDecoderTest.java
@@ -1,12 +1,10 @@
 package org.traccar.protocol;

 

-import org.jboss.netty.buffer.ChannelBuffers;

 import org.junit.Test;

-import org.traccar.ProtocolDecoderTest;

-import org.traccar.helper.ChannelBufferTools;

+import org.traccar.ProtocolTest;

 

 

-public class AutoFonProtocolDecoderTest extends ProtocolDecoderTest {

+public class AutoFonProtocolDecoderTest extends ProtocolTest {

 

     @Test

     public void testDecode() throws Exception {

diff --git a/test/org/traccar/protocol/Avl301ProtocolDecoderTest.java b/test/org/traccar/protocol/Avl301ProtocolDecoderTest.java
index b8f09bb35..9a849a7e2 100644
--- a/test/org/traccar/protocol/Avl301ProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/Avl301ProtocolDecoderTest.java
@@ -1,12 +1,10 @@
 package org.traccar.protocol;
 
-import org.jboss.netty.buffer.ChannelBuffers;
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
-import org.traccar.helper.ChannelBufferTools;
+import org.traccar.ProtocolTest;
 
 
-public class Avl301ProtocolDecoderTest extends ProtocolDecoderTest {
+public class Avl301ProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/BceProtocolDecoderTest.java b/test/org/traccar/protocol/BceProtocolDecoderTest.java
index 1718ad3f4..5e9bef2b4 100644
--- a/test/org/traccar/protocol/BceProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/BceProtocolDecoderTest.java
@@ -2,12 +2,10 @@ package org.traccar.protocol;
 
 import java.nio.ByteOrder;
 
-import org.jboss.netty.buffer.ChannelBuffers;
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
-import org.traccar.helper.ChannelBufferTools;
+import org.traccar.ProtocolTest;
 
-public class BceProtocolDecoderTest extends ProtocolDecoderTest {
+public class BceProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/BlackKiteProtocolDecoderTest.java b/test/org/traccar/protocol/BlackKiteProtocolDecoderTest.java
index 0da04177a..727e85b37 100644
--- a/test/org/traccar/protocol/BlackKiteProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/BlackKiteProtocolDecoderTest.java
@@ -1,12 +1,11 @@
 package org.traccar.protocol;
 
 import java.nio.ByteOrder;
-import org.jboss.netty.buffer.ChannelBuffers;
+
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
-import org.traccar.helper.ChannelBufferTools;
+import org.traccar.ProtocolTest;
 
-public class BlackKiteProtocolDecoderTest extends ProtocolDecoderTest {
+public class BlackKiteProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/BoxProtocolDecoderTest.java b/test/org/traccar/protocol/BoxProtocolDecoderTest.java
index 86013e9f8..58ddc74ac 100644
--- a/test/org/traccar/protocol/BoxProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/BoxProtocolDecoderTest.java
@@ -2,9 +2,9 @@ package org.traccar.protocol;
 
 
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
+import org.traccar.ProtocolTest;
 
-public class BoxProtocolDecoderTest extends ProtocolDecoderTest {
+public class BoxProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/CalAmpProtocolDecoderTest.java b/test/org/traccar/protocol/CalAmpProtocolDecoderTest.java
index c2acbe5b9..247454de3 100644
--- a/test/org/traccar/protocol/CalAmpProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/CalAmpProtocolDecoderTest.java
@@ -1,11 +1,9 @@
 package org.traccar.protocol;
 
-import org.jboss.netty.buffer.ChannelBuffers;
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
-import org.traccar.helper.ChannelBufferTools;
+import org.traccar.ProtocolTest;
 
-public class CalAmpProtocolDecoderTest extends ProtocolDecoderTest {
+public class CalAmpProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/CarTrackProtocolDecoderTest.java b/test/org/traccar/protocol/CarTrackProtocolDecoderTest.java
index a23dea444..8fd7dad47 100644
--- a/test/org/traccar/protocol/CarTrackProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/CarTrackProtocolDecoderTest.java
@@ -1,9 +1,9 @@
 package org.traccar.protocol;
 
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
+import org.traccar.ProtocolTest;
 
-public class CarTrackProtocolDecoderTest extends ProtocolDecoderTest {
+public class CarTrackProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/CarscopProtocolDecoderTest.java b/test/org/traccar/protocol/CarscopProtocolDecoderTest.java
index 5723ca843..e2ac62e0b 100644
--- a/test/org/traccar/protocol/CarscopProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/CarscopProtocolDecoderTest.java
@@ -1,9 +1,9 @@
 package org.traccar.protocol;
 
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
+import org.traccar.ProtocolTest;
 
-public class CarscopProtocolDecoderTest extends ProtocolDecoderTest {
+public class CarscopProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/CastelProtocolDecoderTest.java b/test/org/traccar/protocol/CastelProtocolDecoderTest.java
index 49fa5b0be..fbacfb94e 100644
--- a/test/org/traccar/protocol/CastelProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/CastelProtocolDecoderTest.java
@@ -1,12 +1,11 @@
 package org.traccar.protocol;
 
 import java.nio.ByteOrder;
-import org.jboss.netty.buffer.ChannelBuffers;
+
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
-import org.traccar.helper.ChannelBufferTools;
+import org.traccar.ProtocolTest;
 
-public class CastelProtocolDecoderTest extends ProtocolDecoderTest {
+public class CastelProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/CellocatorProtocolDecoderTest.java b/test/org/traccar/protocol/CellocatorProtocolDecoderTest.java
index e90d185d0..fe03bc3d5 100644
--- a/test/org/traccar/protocol/CellocatorProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/CellocatorProtocolDecoderTest.java
@@ -1,12 +1,11 @@
 package org.traccar.protocol;
 
 import java.nio.ByteOrder;
-import org.jboss.netty.buffer.ChannelBuffers;
+
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
-import org.traccar.helper.ChannelBufferTools;
+import org.traccar.ProtocolTest;
 
-public class CellocatorProtocolDecoderTest extends ProtocolDecoderTest {
+public class CellocatorProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/CityeasyProtocolDecoderTest.java b/test/org/traccar/protocol/CityeasyProtocolDecoderTest.java
index 7f39e5dd6..719703914 100644
--- a/test/org/traccar/protocol/CityeasyProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/CityeasyProtocolDecoderTest.java
@@ -1,12 +1,10 @@
 package org.traccar.protocol;
 
-import org.jboss.netty.buffer.ChannelBuffers;
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
-import org.traccar.helper.ChannelBufferTools;
+import org.traccar.ProtocolTest;
 
 
-public class CityeasyProtocolDecoderTest extends ProtocolDecoderTest {
+public class CityeasyProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/CityeasyProtocolEncoderTest.java b/test/org/traccar/protocol/CityeasyProtocolEncoderTest.java
index 19efb7af4..4ef3c48ef 100644
--- a/test/org/traccar/protocol/CityeasyProtocolEncoderTest.java
+++ b/test/org/traccar/protocol/CityeasyProtocolEncoderTest.java
@@ -3,12 +3,13 @@ package org.traccar.protocol;
 import org.jboss.netty.buffer.ChannelBuffers;
 import org.junit.Assert;
 import org.junit.Test;
+import org.traccar.ProtocolTest;
 import org.traccar.helper.ChannelBufferTools;
 import org.traccar.model.Command;
 
 import javax.xml.bind.DatatypeConverter;
 
-public class CityeasyProtocolEncoderTest {
+public class CityeasyProtocolEncoderTest extends ProtocolTest {
 
     @Test
     public void testEncode() throws Exception {
@@ -20,8 +21,7 @@ public class CityeasyProtocolEncoderTest {
         command.setType(Command.TYPE_SET_TIMEZONE);
         command.set(Command.KEY_TIMEZONE, 6 * 3600);
 
-        Assert.assertEquals(encoder.encodeCommand(command), ChannelBuffers.wrappedBuffer(
-                DatatypeConverter.parseHexBinary("5353001100080001680000000B60820D0A")));
+        verifyCommand(encoder, command, binary("5353001100080001680000000B60820D0A"));
 
     }
 
diff --git a/test/org/traccar/protocol/EasyTrackProtocolDecoderTest.java b/test/org/traccar/protocol/EasyTrackProtocolDecoderTest.java
index f926bdee3..1e84dcfaf 100644
--- a/test/org/traccar/protocol/EasyTrackProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/EasyTrackProtocolDecoderTest.java
@@ -1,9 +1,9 @@
 package org.traccar.protocol;
 
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
+import org.traccar.ProtocolTest;
 
-public class EasyTrackProtocolDecoderTest extends ProtocolDecoderTest {
+public class EasyTrackProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/EelinkProtocolDecoderTest.java b/test/org/traccar/protocol/EelinkProtocolDecoderTest.java
index 2af9d2453..d1d4c4e9e 100644
--- a/test/org/traccar/protocol/EelinkProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/EelinkProtocolDecoderTest.java
@@ -1,11 +1,9 @@
 package org.traccar.protocol;
 
-import org.jboss.netty.buffer.ChannelBuffers;
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
-import org.traccar.helper.ChannelBufferTools;
+import org.traccar.ProtocolTest;
 
-public class EelinkProtocolDecoderTest extends ProtocolDecoderTest {
+public class EelinkProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/EnforaProtocolDecoderTest.java b/test/org/traccar/protocol/EnforaProtocolDecoderTest.java
index 0333d57e9..f247a0470 100644
--- a/test/org/traccar/protocol/EnforaProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/EnforaProtocolDecoderTest.java
@@ -1,9 +1,9 @@
 package org.traccar.protocol;
 
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
+import org.traccar.ProtocolTest;
 
-public class EnforaProtocolDecoderTest extends ProtocolDecoderTest {
+public class EnforaProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/FlextrackProtocolDecoderTest.java b/test/org/traccar/protocol/FlextrackProtocolDecoderTest.java
index d7c773b01..0f93e9508 100644
--- a/test/org/traccar/protocol/FlextrackProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/FlextrackProtocolDecoderTest.java
@@ -1,10 +1,10 @@
 package org.traccar.protocol;
 
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
+import org.traccar.ProtocolTest;
 
 
-public class FlextrackProtocolDecoderTest extends ProtocolDecoderTest {
+public class FlextrackProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/FreedomProtocolDecoderTest.java b/test/org/traccar/protocol/FreedomProtocolDecoderTest.java
index fe86da082..40cf43326 100644
--- a/test/org/traccar/protocol/FreedomProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/FreedomProtocolDecoderTest.java
@@ -1,9 +1,9 @@
 package org.traccar.protocol;
 
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
+import org.traccar.ProtocolTest;
 
-public class FreedomProtocolDecoderTest extends ProtocolDecoderTest {
+public class FreedomProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/GalileoProtocolDecoderTest.java b/test/org/traccar/protocol/GalileoProtocolDecoderTest.java
index c57e70ee9..d396627b5 100644
--- a/test/org/traccar/protocol/GalileoProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/GalileoProtocolDecoderTest.java
@@ -1,12 +1,11 @@
 package org.traccar.protocol;
 
 import java.nio.ByteOrder;
-import org.jboss.netty.buffer.ChannelBuffers;
+
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
-import org.traccar.helper.ChannelBufferTools;
+import org.traccar.ProtocolTest;
 
-public class GalileoProtocolDecoderTest extends ProtocolDecoderTest {
+public class GalileoProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/GatorProtocolDecoderTest.java b/test/org/traccar/protocol/GatorProtocolDecoderTest.java
index c19718be3..0c370bae4 100644
--- a/test/org/traccar/protocol/GatorProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/GatorProtocolDecoderTest.java
@@ -1,12 +1,10 @@
 package org.traccar.protocol;
 
-import org.jboss.netty.buffer.ChannelBuffers;
 import org.junit.Assert;
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
-import org.traccar.helper.ChannelBufferTools;
+import org.traccar.ProtocolTest;
 
-public class GatorProtocolDecoderTest extends ProtocolDecoderTest {
+public class GatorProtocolDecoderTest extends ProtocolTest {
     
     @Test
     public void testDecodeId() {
diff --git a/test/org/traccar/protocol/Gl100ProtocolDecoderTest.java b/test/org/traccar/protocol/Gl100ProtocolDecoderTest.java
index f9fccd187..f86cab503 100644
--- a/test/org/traccar/protocol/Gl100ProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/Gl100ProtocolDecoderTest.java
@@ -2,9 +2,9 @@ package org.traccar.protocol;
 
 
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
+import org.traccar.ProtocolTest;
 
-public class Gl100ProtocolDecoderTest extends ProtocolDecoderTest {
+public class Gl100ProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/Gl200ProtocolDecoderTest.java b/test/org/traccar/protocol/Gl200ProtocolDecoderTest.java
index 1f5242b9c..cba40ddb7 100644
--- a/test/org/traccar/protocol/Gl200ProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/Gl200ProtocolDecoderTest.java
@@ -1,9 +1,9 @@
 package org.traccar.protocol;
 
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
+import org.traccar.ProtocolTest;
 
-public class Gl200ProtocolDecoderTest extends ProtocolDecoderTest {
+public class Gl200ProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/GlobalSatProtocolDecoderTest.java b/test/org/traccar/protocol/GlobalSatProtocolDecoderTest.java
index 3a6e04a3d..9f66fee1f 100644
--- a/test/org/traccar/protocol/GlobalSatProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/GlobalSatProtocolDecoderTest.java
@@ -1,9 +1,9 @@
 package org.traccar.protocol;
 
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
+import org.traccar.ProtocolTest;
 
-public class GlobalSatProtocolDecoderTest extends ProtocolDecoderTest {
+public class GlobalSatProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/GoSafeProtocolDecoderTest.java b/test/org/traccar/protocol/GoSafeProtocolDecoderTest.java
index 6f3d4be69..4f6547070 100644
--- a/test/org/traccar/protocol/GoSafeProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/GoSafeProtocolDecoderTest.java
@@ -1,9 +1,9 @@
 package org.traccar.protocol;
 
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
+import org.traccar.ProtocolTest;
 
-public class GoSafeProtocolDecoderTest extends ProtocolDecoderTest {
+public class GoSafeProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/GotopProtocolDecoderTest.java b/test/org/traccar/protocol/GotopProtocolDecoderTest.java
index abc967076..ad894f4d1 100644
--- a/test/org/traccar/protocol/GotopProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/GotopProtocolDecoderTest.java
@@ -1,9 +1,9 @@
 package org.traccar.protocol;
 
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
+import org.traccar.ProtocolTest;
 
-public class GotopProtocolDecoderTest extends ProtocolDecoderTest {
+public class GotopProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/Gps103ProtocolDecoderTest.java b/test/org/traccar/protocol/Gps103ProtocolDecoderTest.java
index 8ee080560..e53f701ff 100644
--- a/test/org/traccar/protocol/Gps103ProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/Gps103ProtocolDecoderTest.java
@@ -1,9 +1,9 @@
 package org.traccar.protocol;
 
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
+import org.traccar.ProtocolTest;
 
-public class Gps103ProtocolDecoderTest extends ProtocolDecoderTest {
+public class Gps103ProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/Gps103ProtocolEncoderTest.java b/test/org/traccar/protocol/Gps103ProtocolEncoderTest.java
index 019c92523..f8652bc9a 100644
--- a/test/org/traccar/protocol/Gps103ProtocolEncoderTest.java
+++ b/test/org/traccar/protocol/Gps103ProtocolEncoderTest.java
@@ -2,9 +2,10 @@ package org.traccar.protocol;
 
 import org.junit.Assert;
 import org.junit.Test;
+import org.traccar.ProtocolTest;
 import org.traccar.model.Command;
 
-public class Gps103ProtocolEncoderTest {
+public class Gps103ProtocolEncoderTest extends ProtocolTest {
 
     @Test
     public void testEncode() throws Exception {
diff --git a/test/org/traccar/protocol/GpsGateProtocolDecoderTest.java b/test/org/traccar/protocol/GpsGateProtocolDecoderTest.java
index 2d21f53c9..c4ed38656 100644
--- a/test/org/traccar/protocol/GpsGateProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/GpsGateProtocolDecoderTest.java
@@ -1,9 +1,9 @@
 package org.traccar.protocol;
 
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
+import org.traccar.ProtocolTest;
 
-public class GpsGateProtocolDecoderTest extends ProtocolDecoderTest {
+public class GpsGateProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/GpsMarkerProtocolDecoderTest.java b/test/org/traccar/protocol/GpsMarkerProtocolDecoderTest.java
index fc3116577..a8888c48c 100644
--- a/test/org/traccar/protocol/GpsMarkerProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/GpsMarkerProtocolDecoderTest.java
@@ -1,10 +1,10 @@
 package org.traccar.protocol;
 
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
+import org.traccar.ProtocolTest;
 
 
-public class GpsMarkerProtocolDecoderTest extends ProtocolDecoderTest {
+public class GpsMarkerProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/GpsmtaProtocolDecoderTest.java b/test/org/traccar/protocol/GpsmtaProtocolDecoderTest.java
index 8d7b6ab0f..316003757 100644
--- a/test/org/traccar/protocol/GpsmtaProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/GpsmtaProtocolDecoderTest.java
@@ -1,9 +1,9 @@
 package org.traccar.protocol;
 
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
+import org.traccar.ProtocolTest;
 
-public class GpsmtaProtocolDecoderTest extends ProtocolDecoderTest {
+public class GpsmtaProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/Gt02ProtocolDecoderTest.java b/test/org/traccar/protocol/Gt02ProtocolDecoderTest.java
index 052187c1d..c094c75cc 100644
--- a/test/org/traccar/protocol/Gt02ProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/Gt02ProtocolDecoderTest.java
@@ -1,9 +1,9 @@
 package org.traccar.protocol;
 
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
+import org.traccar.ProtocolTest;
 
-public class Gt02ProtocolDecoderTest extends ProtocolDecoderTest {
+public class Gt02ProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/Gt06ProtocolDecoderTest.java b/test/org/traccar/protocol/Gt06ProtocolDecoderTest.java
index 0de82db32..c2a2cfce3 100644
--- a/test/org/traccar/protocol/Gt06ProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/Gt06ProtocolDecoderTest.java
@@ -1,9 +1,9 @@
 package org.traccar.protocol;
 
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
+import org.traccar.ProtocolTest;
 
-public class Gt06ProtocolDecoderTest extends ProtocolDecoderTest {
+public class Gt06ProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/Gt06ProtocolEncoderTest.java b/test/org/traccar/protocol/Gt06ProtocolEncoderTest.java
index eff1942d1..71657c366 100644
--- a/test/org/traccar/protocol/Gt06ProtocolEncoderTest.java
+++ b/test/org/traccar/protocol/Gt06ProtocolEncoderTest.java
@@ -3,12 +3,13 @@ package org.traccar.protocol;
 import org.jboss.netty.buffer.ChannelBuffers;
 import org.junit.Assert;
 import org.junit.Test;
+import org.traccar.ProtocolTest;
 import org.traccar.helper.ChannelBufferTools;
 import org.traccar.model.Command;
 
 import javax.xml.bind.DatatypeConverter;
 
-public class Gt06ProtocolEncoderTest {
+public class Gt06ProtocolEncoderTest extends ProtocolTest {
 
     @Test
     public void testEncode() throws Exception {
@@ -19,8 +20,7 @@ public class Gt06ProtocolEncoderTest {
         command.setDeviceId(1);
         command.setType(Command.TYPE_ENGINE_STOP);
 
-        Assert.assertEquals(encoder.encodeCommand(command), ChannelBuffers.wrappedBuffer(
-                DatatypeConverter.parseHexBinary("787812800c0000000052656c61792c312300009dee0d0a")));
+        verifyCommand(encoder, command, binary("787812800c0000000052656c61792c312300009dee0d0a"));
 
     }
 
diff --git a/test/org/traccar/protocol/H02FrameDecoderTest.java b/test/org/traccar/protocol/H02FrameDecoderTest.java
index 967aff027..e8b045048 100644
--- a/test/org/traccar/protocol/H02FrameDecoderTest.java
+++ b/test/org/traccar/protocol/H02FrameDecoderTest.java
@@ -1,12 +1,10 @@
 package org.traccar.protocol;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBuffers;
 import org.junit.Assert;
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
+import org.traccar.ProtocolTest;
 
-public class H02FrameDecoderTest extends ProtocolDecoderTest {
+public class H02FrameDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/H02ProtocolDecoderTest.java b/test/org/traccar/protocol/H02ProtocolDecoderTest.java
index 6f7f6462d..cc4c47e66 100644
--- a/test/org/traccar/protocol/H02ProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/H02ProtocolDecoderTest.java
@@ -1,10 +1,9 @@
 package org.traccar.protocol;
 
-import org.jboss.netty.buffer.ChannelBuffers;
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
+import org.traccar.ProtocolTest;
 
-public class H02ProtocolDecoderTest extends ProtocolDecoderTest {
+public class H02ProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/HaicomProtocolDecoderTest.java b/test/org/traccar/protocol/HaicomProtocolDecoderTest.java
index f8a35499a..785366328 100644
--- a/test/org/traccar/protocol/HaicomProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/HaicomProtocolDecoderTest.java
@@ -1,9 +1,9 @@
 package org.traccar.protocol;
 
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
+import org.traccar.ProtocolTest;
 
-public class HaicomProtocolDecoderTest extends ProtocolDecoderTest {
+public class HaicomProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/HuabaoFrameDecoderTest.java b/test/org/traccar/protocol/HuabaoFrameDecoderTest.java
index 923096f50..ad828bdb4 100644
--- a/test/org/traccar/protocol/HuabaoFrameDecoderTest.java
+++ b/test/org/traccar/protocol/HuabaoFrameDecoderTest.java
@@ -2,9 +2,9 @@ package org.traccar.protocol;
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
+import org.traccar.ProtocolTest;
 
-public class HuabaoFrameDecoderTest extends ProtocolDecoderTest {
+public class HuabaoFrameDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/HuabaoProtocolDecoderTest.java b/test/org/traccar/protocol/HuabaoProtocolDecoderTest.java
index b24b844d9..f4a2afea8 100644
--- a/test/org/traccar/protocol/HuabaoProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/HuabaoProtocolDecoderTest.java
@@ -1,9 +1,9 @@
 package org.traccar.protocol;
 
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
+import org.traccar.ProtocolTest;
 
-public class HuabaoProtocolDecoderTest extends ProtocolDecoderTest {
+public class HuabaoProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/IntellitracProtocolDecoderTest.java b/test/org/traccar/protocol/IntellitracProtocolDecoderTest.java
index 23d7fb48a..2540fd986 100644
--- a/test/org/traccar/protocol/IntellitracProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/IntellitracProtocolDecoderTest.java
@@ -1,9 +1,9 @@
 package org.traccar.protocol;
 
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
+import org.traccar.ProtocolTest;
 
-public class IntellitracProtocolDecoderTest extends ProtocolDecoderTest {
+public class IntellitracProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/Jt600FrameDecoderTest.java b/test/org/traccar/protocol/Jt600FrameDecoderTest.java
index d4b124db7..ccfbcf0d0 100644
--- a/test/org/traccar/protocol/Jt600FrameDecoderTest.java
+++ b/test/org/traccar/protocol/Jt600FrameDecoderTest.java
@@ -2,9 +2,9 @@ package org.traccar.protocol;
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
+import org.traccar.ProtocolTest;
 
-public class Jt600FrameDecoderTest extends ProtocolDecoderTest {
+public class Jt600FrameDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/Jt600ProtocolDecoderTest.java b/test/org/traccar/protocol/Jt600ProtocolDecoderTest.java
index bcd87f9fb..3969e8b2c 100644
--- a/test/org/traccar/protocol/Jt600ProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/Jt600ProtocolDecoderTest.java
@@ -1,13 +1,10 @@
 package org.traccar.protocol;
 
-import org.traccar.ProtocolDecoderTest;
-import org.traccar.helper.ChannelBufferTools;
+import org.traccar.ProtocolTest;
 
-import java.nio.charset.Charset;
-import org.jboss.netty.buffer.ChannelBuffers;
 import org.junit.Test;
 
-public class Jt600ProtocolDecoderTest extends ProtocolDecoderTest {
+public class Jt600ProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/KhdProtocolDecoderTest.java b/test/org/traccar/protocol/KhdProtocolDecoderTest.java
index ec013f619..c58600bed 100644
--- a/test/org/traccar/protocol/KhdProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/KhdProtocolDecoderTest.java
@@ -1,12 +1,9 @@
 package org.traccar.protocol;
 
-import org.jboss.netty.buffer.ChannelBuffers;
-
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
-import org.traccar.helper.ChannelBufferTools;
+import org.traccar.ProtocolTest;
 
-public class KhdProtocolDecoderTest extends ProtocolDecoderTest {
+public class KhdProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/KhdProtocolEncoderTest.java b/test/org/traccar/protocol/KhdProtocolEncoderTest.java
index 2a3fb524b..e453deaf5 100644
--- a/test/org/traccar/protocol/KhdProtocolEncoderTest.java
+++ b/test/org/traccar/protocol/KhdProtocolEncoderTest.java
@@ -3,12 +3,13 @@ package org.traccar.protocol;
 import org.jboss.netty.buffer.ChannelBuffers;
 import org.junit.Assert;
 import org.junit.Test;
+import org.traccar.ProtocolTest;
 import org.traccar.helper.ChannelBufferTools;
 import org.traccar.model.Command;
 
 import javax.xml.bind.DatatypeConverter;
 
-public class KhdProtocolEncoderTest {
+public class KhdProtocolEncoderTest extends ProtocolTest {
 
     @Test
     public void testEncode() throws Exception {
@@ -19,8 +20,7 @@ public class KhdProtocolEncoderTest {
         command.setDeviceId(1);
         command.setType(Command.TYPE_ENGINE_STOP);
 
-        Assert.assertEquals(encoder.encodeCommand(command), ChannelBuffers.wrappedBuffer(
-                DatatypeConverter.parseHexBinary("2929390006000000003F0D")));
+        verifyCommand(encoder, command, binary("2929390006000000003F0D"));
 
     }
 
diff --git a/test/org/traccar/protocol/LaipacProtocolDecoderTest.java b/test/org/traccar/protocol/LaipacProtocolDecoderTest.java
index c164652ee..23477b186 100644
--- a/test/org/traccar/protocol/LaipacProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/LaipacProtocolDecoderTest.java
@@ -1,9 +1,9 @@
 package org.traccar.protocol;
 
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
+import org.traccar.ProtocolTest;
 
-public class LaipacProtocolDecoderTest extends ProtocolDecoderTest {
+public class LaipacProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/M2mProtocolDecoderTest.java b/test/org/traccar/protocol/M2mProtocolDecoderTest.java
index 0f2c3c370..b2c6d91d8 100644
--- a/test/org/traccar/protocol/M2mProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/M2mProtocolDecoderTest.java
@@ -1,12 +1,9 @@
 package org.traccar.protocol;
 
-import org.jboss.netty.buffer.ChannelBuffers;
-
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
-import org.traccar.helper.ChannelBufferTools;
+import org.traccar.ProtocolTest;
 
-public class M2mProtocolDecoderTest extends ProtocolDecoderTest {
+public class M2mProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/ManPowerProtocolDecoderTest.java b/test/org/traccar/protocol/ManPowerProtocolDecoderTest.java
index debb6b55b..5c2430954 100644
--- a/test/org/traccar/protocol/ManPowerProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/ManPowerProtocolDecoderTest.java
@@ -1,9 +1,9 @@
 package org.traccar.protocol;
 
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
+import org.traccar.ProtocolTest;
 
-public class ManPowerProtocolDecoderTest extends ProtocolDecoderTest {
+public class ManPowerProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/MegastekProtocolDecoderTest.java b/test/org/traccar/protocol/MegastekProtocolDecoderTest.java
index 9046b3928..27215d8eb 100644
--- a/test/org/traccar/protocol/MegastekProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/MegastekProtocolDecoderTest.java
@@ -1,9 +1,9 @@
 package org.traccar.protocol;
 
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
+import org.traccar.ProtocolTest;
 
-public class MegastekProtocolDecoderTest extends ProtocolDecoderTest {
+public class MegastekProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/MeiligaoFrameDecoderTest.java b/test/org/traccar/protocol/MeiligaoFrameDecoderTest.java
index 639f140ea..9b02b646c 100644
--- a/test/org/traccar/protocol/MeiligaoFrameDecoderTest.java
+++ b/test/org/traccar/protocol/MeiligaoFrameDecoderTest.java
@@ -1,12 +1,10 @@
 package org.traccar.protocol;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBuffers;
 import org.junit.Assert;
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
+import org.traccar.ProtocolTest;
 
-public class MeiligaoFrameDecoderTest extends ProtocolDecoderTest {
+public class MeiligaoFrameDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/MeiligaoProtocolDecoderTest.java b/test/org/traccar/protocol/MeiligaoProtocolDecoderTest.java
index 0c3c570f5..acb718ba7 100644
--- a/test/org/traccar/protocol/MeiligaoProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/MeiligaoProtocolDecoderTest.java
@@ -1,11 +1,9 @@
 package org.traccar.protocol;
 
-import org.jboss.netty.buffer.ChannelBuffers;
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
-import org.traccar.helper.ChannelBufferTools;
+import org.traccar.ProtocolTest;
 
-public class MeiligaoProtocolDecoderTest extends ProtocolDecoderTest {
+public class MeiligaoProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/MeiligaoProtocolEncoderTest.java b/test/org/traccar/protocol/MeiligaoProtocolEncoderTest.java
index b4a8b9f02..adcd9da15 100644
--- a/test/org/traccar/protocol/MeiligaoProtocolEncoderTest.java
+++ b/test/org/traccar/protocol/MeiligaoProtocolEncoderTest.java
@@ -1,10 +1,10 @@
 package org.traccar.protocol;
 
 import org.junit.Test;
-import org.traccar.ProtocolEncoderTest;
+import org.traccar.ProtocolTest;
 import org.traccar.model.Command;
 
-public class MeiligaoProtocolEncoderTest extends ProtocolEncoderTest {
+public class MeiligaoProtocolEncoderTest extends ProtocolTest {
 
     @Test
     public void testEncode() throws Exception {
diff --git a/test/org/traccar/protocol/MeitrackFrameDecoderTest.java b/test/org/traccar/protocol/MeitrackFrameDecoderTest.java
index 29d1b6148..d86e532c3 100644
--- a/test/org/traccar/protocol/MeitrackFrameDecoderTest.java
+++ b/test/org/traccar/protocol/MeitrackFrameDecoderTest.java
@@ -1,12 +1,10 @@
 package org.traccar.protocol;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBuffers;
 import org.junit.Assert;
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
+import org.traccar.ProtocolTest;
 
-public class MeitrackFrameDecoderTest extends ProtocolDecoderTest {
+public class MeitrackFrameDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/MeitrackProtocolDecoderTest.java b/test/org/traccar/protocol/MeitrackProtocolDecoderTest.java
index 88d11d551..dcefb1637 100644
--- a/test/org/traccar/protocol/MeitrackProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/MeitrackProtocolDecoderTest.java
@@ -2,9 +2,9 @@ package org.traccar.protocol;
 
 import java.nio.ByteOrder;
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
+import org.traccar.ProtocolTest;
 
-public class MeitrackProtocolDecoderTest extends ProtocolDecoderTest {
+public class MeitrackProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/MiniFinderProtocolDecoderTest.java b/test/org/traccar/protocol/MiniFinderProtocolDecoderTest.java
index 04e5c1172..46d01ac01 100644
--- a/test/org/traccar/protocol/MiniFinderProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/MiniFinderProtocolDecoderTest.java
@@ -1,9 +1,9 @@
 package org.traccar.protocol;
 
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
+import org.traccar.ProtocolTest;
 
-public class MiniFinderProtocolDecoderTest extends ProtocolDecoderTest {
+public class MiniFinderProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/MtxProtocolDecoderTest.java b/test/org/traccar/protocol/MtxProtocolDecoderTest.java
index 0cd0400c2..56def34e5 100644
--- a/test/org/traccar/protocol/MtxProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/MtxProtocolDecoderTest.java
@@ -1,9 +1,9 @@
 package org.traccar.protocol;
 
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
+import org.traccar.ProtocolTest;
 
-public class MtxProtocolDecoderTest extends ProtocolDecoderTest {
+public class MtxProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/MxtProtocolDecoderTest.java b/test/org/traccar/protocol/MxtProtocolDecoderTest.java
index 454e57087..37373c8de 100644
--- a/test/org/traccar/protocol/MxtProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/MxtProtocolDecoderTest.java
@@ -1,12 +1,11 @@
 package org.traccar.protocol;
 
 import java.nio.ByteOrder;
-import org.jboss.netty.buffer.ChannelBuffers;
+
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
-import org.traccar.helper.ChannelBufferTools;
+import org.traccar.ProtocolTest;
 
-public class MxtProtocolDecoderTest extends ProtocolDecoderTest {
+public class MxtProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/NavigilProtocolDecoderTest.java b/test/org/traccar/protocol/NavigilProtocolDecoderTest.java
index 09883411e..eaddadf75 100644
--- a/test/org/traccar/protocol/NavigilProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/NavigilProtocolDecoderTest.java
@@ -1,12 +1,11 @@
 package org.traccar.protocol;
 
 import java.nio.ByteOrder;
-import org.jboss.netty.buffer.ChannelBuffers;
+
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
-import org.traccar.helper.ChannelBufferTools;
+import org.traccar.ProtocolTest;
 
-public class NavigilProtocolDecoderTest extends ProtocolDecoderTest {
+public class NavigilProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/NavisProtocolDecoderTest.java b/test/org/traccar/protocol/NavisProtocolDecoderTest.java
index 51e3ec94a..02de572df 100644
--- a/test/org/traccar/protocol/NavisProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/NavisProtocolDecoderTest.java
@@ -1,14 +1,12 @@
 package org.traccar.protocol;
 
-import org.traccar.ProtocolDecoderTest;
-import org.traccar.helper.ChannelBufferTools;
+import org.traccar.ProtocolTest;
 
 import java.nio.ByteOrder;
-import org.jboss.netty.buffer.ChannelBuffers;
 
 import org.junit.Test;
 
-public class NavisProtocolDecoderTest extends ProtocolDecoderTest {
+public class NavisProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/NoranProtocolDecoderTest.java b/test/org/traccar/protocol/NoranProtocolDecoderTest.java
index b3e454f6a..de3a6c24f 100644
--- a/test/org/traccar/protocol/NoranProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/NoranProtocolDecoderTest.java
@@ -1,12 +1,11 @@
 package org.traccar.protocol;
 
 import java.nio.ByteOrder;
-import org.jboss.netty.buffer.ChannelBuffers;
+
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
-import org.traccar.helper.ChannelBufferTools;
+import org.traccar.ProtocolTest;
 
-public class NoranProtocolDecoderTest extends ProtocolDecoderTest {
+public class NoranProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/OrionProtocolDecoderTest.java b/test/org/traccar/protocol/OrionProtocolDecoderTest.java
index fd0c74746..0d0f89af8 100644
--- a/test/org/traccar/protocol/OrionProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/OrionProtocolDecoderTest.java
@@ -1,12 +1,11 @@
 package org.traccar.protocol;
 
 import java.nio.ByteOrder;
-import org.jboss.netty.buffer.ChannelBuffers;
+
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
-import org.traccar.helper.ChannelBufferTools;
+import org.traccar.ProtocolTest;
 
-public class OrionProtocolDecoderTest extends ProtocolDecoderTest {
+public class OrionProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/OsmAndProtocolDecoderTest.java b/test/org/traccar/protocol/OsmAndProtocolDecoderTest.java
index 5c9d9079a..6f895265d 100644
--- a/test/org/traccar/protocol/OsmAndProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/OsmAndProtocolDecoderTest.java
@@ -1,9 +1,9 @@
 package org.traccar.protocol;
 
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
+import org.traccar.ProtocolTest;
 
-public class OsmAndProtocolDecoderTest extends ProtocolDecoderTest {
+public class OsmAndProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/PiligrimProtocolDecoderTest.java b/test/org/traccar/protocol/PiligrimProtocolDecoderTest.java
index bd5c2460f..d0fbd346f 100644
--- a/test/org/traccar/protocol/PiligrimProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/PiligrimProtocolDecoderTest.java
@@ -3,9 +3,9 @@ package org.traccar.protocol;
 import org.jboss.netty.handler.codec.http.HttpMethod;
 
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
+import org.traccar.ProtocolTest;
 
-public class PiligrimProtocolDecoderTest extends ProtocolDecoderTest {
+public class PiligrimProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/ProgressProtocolDecoderTest.java b/test/org/traccar/protocol/ProgressProtocolDecoderTest.java
index 26c54b974..3a326513b 100644
--- a/test/org/traccar/protocol/ProgressProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/ProgressProtocolDecoderTest.java
@@ -1,14 +1,12 @@
 package org.traccar.protocol;
 
-import org.jboss.netty.buffer.ChannelBuffers;
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
-import org.traccar.helper.ChannelBufferTools;
+import org.traccar.ProtocolTest;
 
 import java.nio.ByteOrder;
 
 
-public class ProgressProtocolDecoderTest extends ProtocolDecoderTest {
+public class ProgressProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/Pt3000ProtocolDecoderTest.java b/test/org/traccar/protocol/Pt3000ProtocolDecoderTest.java
index 7c01d6022..664c986af 100644
--- a/test/org/traccar/protocol/Pt3000ProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/Pt3000ProtocolDecoderTest.java
@@ -1,9 +1,9 @@
 package org.traccar.protocol;
 
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
+import org.traccar.ProtocolTest;
 
-public class Pt3000ProtocolDecoderTest extends ProtocolDecoderTest {
+public class Pt3000ProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/Pt502FrameDecoderTest.java b/test/org/traccar/protocol/Pt502FrameDecoderTest.java
index 54bff5484..34fdf9bb9 100644
--- a/test/org/traccar/protocol/Pt502FrameDecoderTest.java
+++ b/test/org/traccar/protocol/Pt502FrameDecoderTest.java
@@ -2,11 +2,11 @@ package org.traccar.protocol;
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
+import org.traccar.ProtocolTest;
 
 import java.nio.ByteOrder;
 
-public class Pt502FrameDecoderTest extends ProtocolDecoderTest {
+public class Pt502FrameDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/Pt502ProtocolDecoderTest.java b/test/org/traccar/protocol/Pt502ProtocolDecoderTest.java
index a811de3ce..efe540ec7 100644
--- a/test/org/traccar/protocol/Pt502ProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/Pt502ProtocolDecoderTest.java
@@ -1,9 +1,9 @@
 package org.traccar.protocol;
 
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
+import org.traccar.ProtocolTest;
 
-public class Pt502ProtocolDecoderTest extends ProtocolDecoderTest {
+public class Pt502ProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/RitiProtocolDecoderTest.java b/test/org/traccar/protocol/RitiProtocolDecoderTest.java
index a6b9c159a..f7d8fea91 100644
--- a/test/org/traccar/protocol/RitiProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/RitiProtocolDecoderTest.java
@@ -1,12 +1,11 @@
 package org.traccar.protocol;
 
 import java.nio.ByteOrder;
-import org.jboss.netty.buffer.ChannelBuffers;
+
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
-import org.traccar.helper.ChannelBufferTools;
+import org.traccar.ProtocolTest;
 
-public class RitiProtocolDecoderTest extends ProtocolDecoderTest {
+public class RitiProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/RuptelaProtocolDecoderTest.java b/test/org/traccar/protocol/RuptelaProtocolDecoderTest.java
index 89e71a938..902752811 100644
--- a/test/org/traccar/protocol/RuptelaProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/RuptelaProtocolDecoderTest.java
@@ -1,11 +1,9 @@
 package org.traccar.protocol;
 
-import org.jboss.netty.buffer.ChannelBuffers;
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
-import org.traccar.helper.ChannelBufferTools;
+import org.traccar.ProtocolTest;
 
-public class RuptelaProtocolDecoderTest extends ProtocolDecoderTest {
+public class RuptelaProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/SanavProtocolDecoderTest.java b/test/org/traccar/protocol/SanavProtocolDecoderTest.java
index cd254abdd..be7b3bbf4 100644
--- a/test/org/traccar/protocol/SanavProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/SanavProtocolDecoderTest.java
@@ -1,9 +1,9 @@
 package org.traccar.protocol;
 
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
+import org.traccar.ProtocolTest;
 
-public class SanavProtocolDecoderTest extends ProtocolDecoderTest {
+public class SanavProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/SkypatrolProtocolDecoderTest.java b/test/org/traccar/protocol/SkypatrolProtocolDecoderTest.java
index d3a9de340..deb4a067a 100644
--- a/test/org/traccar/protocol/SkypatrolProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/SkypatrolProtocolDecoderTest.java
@@ -1,11 +1,9 @@
 package org.traccar.protocol;
 
-import org.jboss.netty.buffer.ChannelBuffers;
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
-import org.traccar.helper.ChannelBufferTools;
+import org.traccar.ProtocolTest;
 
-public class SkypatrolProtocolDecoderTest extends ProtocolDecoderTest {
+public class SkypatrolProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/Stl060ProtocolDecoderTest.java b/test/org/traccar/protocol/Stl060ProtocolDecoderTest.java
index 3af99374d..e2fd2a075 100644
--- a/test/org/traccar/protocol/Stl060ProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/Stl060ProtocolDecoderTest.java
@@ -1,9 +1,9 @@
 package org.traccar.protocol;
 
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
+import org.traccar.ProtocolTest;
 
-public class Stl060ProtocolDecoderTest extends ProtocolDecoderTest {
+public class Stl060ProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/SuntechProtocolDecoderTest.java b/test/org/traccar/protocol/SuntechProtocolDecoderTest.java
index d0987f289..41d09bad8 100644
--- a/test/org/traccar/protocol/SuntechProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/SuntechProtocolDecoderTest.java
@@ -1,9 +1,9 @@
 package org.traccar.protocol;
 
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
+import org.traccar.ProtocolTest;
 
-public class SuntechProtocolDecoderTest extends ProtocolDecoderTest {
+public class SuntechProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/T55ProtocolDecoderTest.java b/test/org/traccar/protocol/T55ProtocolDecoderTest.java
index b7adee89b..20d30ce73 100644
--- a/test/org/traccar/protocol/T55ProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/T55ProtocolDecoderTest.java
@@ -1,9 +1,9 @@
 package org.traccar.protocol;
 
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
+import org.traccar.ProtocolTest;
 
-public class T55ProtocolDecoderTest extends ProtocolDecoderTest {
+public class T55ProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/T800xProtocolDecoderTest.java b/test/org/traccar/protocol/T800xProtocolDecoderTest.java
index 56efa5a92..7cbf62ea8 100644
--- a/test/org/traccar/protocol/T800xProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/T800xProtocolDecoderTest.java
@@ -1,9 +1,9 @@
 package org.traccar.protocol;
 
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
+import org.traccar.ProtocolTest;
 
-public class T800xProtocolDecoderTest extends ProtocolDecoderTest {
+public class T800xProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/TaipProtocolDecoderTest.java b/test/org/traccar/protocol/TaipProtocolDecoderTest.java
index d0e800ec1..e64513ac5 100644
--- a/test/org/traccar/protocol/TaipProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/TaipProtocolDecoderTest.java
@@ -1,9 +1,9 @@
 package org.traccar.protocol;
 
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
+import org.traccar.ProtocolTest;
 
-public class TaipProtocolDecoderTest extends ProtocolDecoderTest {
+public class TaipProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/TelikProtocolDecoderTest.java b/test/org/traccar/protocol/TelikProtocolDecoderTest.java
index 49ea41165..180ab1b3d 100644
--- a/test/org/traccar/protocol/TelikProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/TelikProtocolDecoderTest.java
@@ -1,9 +1,9 @@
 package org.traccar.protocol;
 
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
+import org.traccar.ProtocolTest;
 
-public class TelikProtocolDecoderTest extends ProtocolDecoderTest {
+public class TelikProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/TeltonikaProtocolDecoderTest.java b/test/org/traccar/protocol/TeltonikaProtocolDecoderTest.java
index 9e3c9a377..afedf7489 100644
--- a/test/org/traccar/protocol/TeltonikaProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/TeltonikaProtocolDecoderTest.java
@@ -1,12 +1,9 @@
 package org.traccar.protocol;
 
-import org.jboss.netty.buffer.ChannelBuffers;
-
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
-import org.traccar.helper.ChannelBufferTools;
+import org.traccar.ProtocolTest;
 
-public class TeltonikaProtocolDecoderTest extends ProtocolDecoderTest {
+public class TeltonikaProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/Tk102ProtocolDecoderTest.java b/test/org/traccar/protocol/Tk102ProtocolDecoderTest.java
index 7d34d8383..501466eeb 100644
--- a/test/org/traccar/protocol/Tk102ProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/Tk102ProtocolDecoderTest.java
@@ -1,9 +1,9 @@
 package org.traccar.protocol;
 
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
+import org.traccar.ProtocolTest;
 
-public class Tk102ProtocolDecoderTest extends ProtocolDecoderTest {
+public class Tk102ProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/Tk103ProtocolDecoderTest.java b/test/org/traccar/protocol/Tk103ProtocolDecoderTest.java
index c05d546ff..408902829 100644
--- a/test/org/traccar/protocol/Tk103ProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/Tk103ProtocolDecoderTest.java
@@ -1,9 +1,9 @@
 package org.traccar.protocol;
 
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
+import org.traccar.ProtocolTest;
 
-public class Tk103ProtocolDecoderTest extends ProtocolDecoderTest {
+public class Tk103ProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/Tlt2hProtocolDecoderTest.java b/test/org/traccar/protocol/Tlt2hProtocolDecoderTest.java
index 70515cf00..438dc057c 100644
--- a/test/org/traccar/protocol/Tlt2hProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/Tlt2hProtocolDecoderTest.java
@@ -1,9 +1,9 @@
 package org.traccar.protocol;
 
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
+import org.traccar.ProtocolTest;
 
-public class Tlt2hProtocolDecoderTest extends ProtocolDecoderTest {
+public class Tlt2hProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/TopflytechProtocolDecoderTest.java b/test/org/traccar/protocol/TopflytechProtocolDecoderTest.java
index 8862befe4..3e0f4e562 100644
--- a/test/org/traccar/protocol/TopflytechProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/TopflytechProtocolDecoderTest.java
@@ -1,9 +1,9 @@
 package org.traccar.protocol;
 
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
+import org.traccar.ProtocolTest;
 
-public class TopflytechProtocolDecoderTest extends ProtocolDecoderTest {
+public class TopflytechProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/TotemFrameDecoderTest.java b/test/org/traccar/protocol/TotemFrameDecoderTest.java
index 4979f430a..2032dbc38 100644
--- a/test/org/traccar/protocol/TotemFrameDecoderTest.java
+++ b/test/org/traccar/protocol/TotemFrameDecoderTest.java
@@ -2,9 +2,9 @@ package org.traccar.protocol;
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
+import org.traccar.ProtocolTest;
 
-public class TotemFrameDecoderTest extends ProtocolDecoderTest {
+public class TotemFrameDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/TotemProtocolDecoderTest.java b/test/org/traccar/protocol/TotemProtocolDecoderTest.java
index 373fbd6d1..9fb014b87 100644
--- a/test/org/traccar/protocol/TotemProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/TotemProtocolDecoderTest.java
@@ -1,9 +1,9 @@
 package org.traccar.protocol;
 
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
+import org.traccar.ProtocolTest;
 
-public class TotemProtocolDecoderTest extends ProtocolDecoderTest {
+public class TotemProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/TotemProtocolEncoderTest.java b/test/org/traccar/protocol/TotemProtocolEncoderTest.java
index e228ca5a5..436407593 100644
--- a/test/org/traccar/protocol/TotemProtocolEncoderTest.java
+++ b/test/org/traccar/protocol/TotemProtocolEncoderTest.java
@@ -17,9 +17,10 @@ package org.traccar.protocol;
 
 import org.junit.Assert;
 import org.junit.Test;
+import org.traccar.ProtocolTest;
 import org.traccar.model.Command;
 
-public class TotemProtocolEncoderTest {
+public class TotemProtocolEncoderTest extends ProtocolTest {
     @Test
     public void testEncode() throws Exception {
 
diff --git a/test/org/traccar/protocol/Tr20ProtocolDecoderTest.java b/test/org/traccar/protocol/Tr20ProtocolDecoderTest.java
index 11d7847c2..b4c134754 100644
--- a/test/org/traccar/protocol/Tr20ProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/Tr20ProtocolDecoderTest.java
@@ -1,9 +1,9 @@
 package org.traccar.protocol;
 
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
+import org.traccar.ProtocolTest;
 
-public class Tr20ProtocolDecoderTest extends ProtocolDecoderTest {
+public class Tr20ProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/Tr900ProtocolDecoderTest.java b/test/org/traccar/protocol/Tr900ProtocolDecoderTest.java
index ddcacba1c..326583178 100644
--- a/test/org/traccar/protocol/Tr900ProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/Tr900ProtocolDecoderTest.java
@@ -1,9 +1,9 @@
 package org.traccar.protocol;
 
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
+import org.traccar.ProtocolTest;
 
-public class Tr900ProtocolDecoderTest extends ProtocolDecoderTest {
+public class Tr900ProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/TrackboxProtocolDecoderTest.java b/test/org/traccar/protocol/TrackboxProtocolDecoderTest.java
index 697c1ff66..33e08b0c1 100644
--- a/test/org/traccar/protocol/TrackboxProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/TrackboxProtocolDecoderTest.java
@@ -1,9 +1,9 @@
 package org.traccar.protocol;
 
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
+import org.traccar.ProtocolTest;
 
-public class TrackboxProtocolDecoderTest extends ProtocolDecoderTest {
+public class TrackboxProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/TramigoProtocolDecoderTest.java b/test/org/traccar/protocol/TramigoProtocolDecoderTest.java
index 35c3816a6..6da6bce7d 100644
--- a/test/org/traccar/protocol/TramigoProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/TramigoProtocolDecoderTest.java
@@ -1,12 +1,11 @@
 package org.traccar.protocol;
 
 import java.nio.ByteOrder;
-import org.jboss.netty.buffer.ChannelBuffers;
+
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
-import org.traccar.helper.ChannelBufferTools;
+import org.traccar.ProtocolTest;
 
-public class TramigoProtocolDecoderTest extends ProtocolDecoderTest {
+public class TramigoProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/TrvProtocolDecoderTest.java b/test/org/traccar/protocol/TrvProtocolDecoderTest.java
index a8e9fdb04..5a0160cab 100644
--- a/test/org/traccar/protocol/TrvProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/TrvProtocolDecoderTest.java
@@ -1,9 +1,9 @@
 package org.traccar.protocol;
 
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
+import org.traccar.ProtocolTest;
 
-public class TrvProtocolDecoderTest extends ProtocolDecoderTest {
+public class TrvProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/TytanProtocolDecoderTest.java b/test/org/traccar/protocol/TytanProtocolDecoderTest.java
index bfbc01f52..8600960c6 100644
--- a/test/org/traccar/protocol/TytanProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/TytanProtocolDecoderTest.java
@@ -1,11 +1,9 @@
 package org.traccar.protocol;
 
-import org.jboss.netty.buffer.ChannelBuffers;
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
-import org.traccar.helper.ChannelBufferTools;
+import org.traccar.ProtocolTest;
 
-public class TytanProtocolDecoderTest extends ProtocolDecoderTest {
+public class TytanProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/TzoneProtocolDecoderTest.java b/test/org/traccar/protocol/TzoneProtocolDecoderTest.java
index 23a36172b..8d60bdfe4 100644
--- a/test/org/traccar/protocol/TzoneProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/TzoneProtocolDecoderTest.java
@@ -1,13 +1,10 @@
 package org.traccar.protocol;
 
-import org.jboss.netty.buffer.ChannelBuffers;
-
 import static org.junit.Assert.assertNotNull;
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
-import org.traccar.helper.ChannelBufferTools;
+import org.traccar.ProtocolTest;
 
-public class TzoneProtocolDecoderTest extends ProtocolDecoderTest {
+public class TzoneProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/UlbotechFrameDecoderTest.java b/test/org/traccar/protocol/UlbotechFrameDecoderTest.java
index 76e4f799d..baf151659 100644
--- a/test/org/traccar/protocol/UlbotechFrameDecoderTest.java
+++ b/test/org/traccar/protocol/UlbotechFrameDecoderTest.java
@@ -2,9 +2,9 @@ package org.traccar.protocol;
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
+import org.traccar.ProtocolTest;
 
-public class UlbotechFrameDecoderTest extends ProtocolDecoderTest {
+public class UlbotechFrameDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/UlbotechProtocolDecoderTest.java b/test/org/traccar/protocol/UlbotechProtocolDecoderTest.java
index 4dd061f1c..1fb515315 100644
--- a/test/org/traccar/protocol/UlbotechProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/UlbotechProtocolDecoderTest.java
@@ -1,11 +1,9 @@
 package org.traccar.protocol;
 
-import org.jboss.netty.buffer.ChannelBuffers;
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
-import org.traccar.helper.ChannelBufferTools;
+import org.traccar.ProtocolTest;
 
-public class UlbotechProtocolDecoderTest extends ProtocolDecoderTest {
+public class UlbotechProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/V680ProtocolDecoderTest.java b/test/org/traccar/protocol/V680ProtocolDecoderTest.java
index e3c0548ce..42c331cde 100644
--- a/test/org/traccar/protocol/V680ProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/V680ProtocolDecoderTest.java
@@ -1,9 +1,9 @@
 package org.traccar.protocol;
 
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
+import org.traccar.ProtocolTest;
 
-public class V680ProtocolDecoderTest extends ProtocolDecoderTest {
+public class V680ProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/VisiontekProtocolDecoderTest.java b/test/org/traccar/protocol/VisiontekProtocolDecoderTest.java
index 8b817f618..613dd5311 100644
--- a/test/org/traccar/protocol/VisiontekProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/VisiontekProtocolDecoderTest.java
@@ -1,9 +1,9 @@
 package org.traccar.protocol;
 
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
+import org.traccar.ProtocolTest;
 
-public class VisiontekProtocolDecoderTest extends ProtocolDecoderTest {
+public class VisiontekProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/WatchProtocolDecoderTest.java b/test/org/traccar/protocol/WatchProtocolDecoderTest.java
index 16074d36f..993148477 100644
--- a/test/org/traccar/protocol/WatchProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/WatchProtocolDecoderTest.java
@@ -1,9 +1,9 @@
 package org.traccar.protocol;
 
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
+import org.traccar.ProtocolTest;
 
-public class WatchProtocolDecoderTest extends ProtocolDecoderTest {
+public class WatchProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/WialonProtocolDecoderTest.java b/test/org/traccar/protocol/WialonProtocolDecoderTest.java
index 5c3863a5e..dd5ffd3a1 100644
--- a/test/org/traccar/protocol/WialonProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/WialonProtocolDecoderTest.java
@@ -1,9 +1,9 @@
 package org.traccar.protocol;
 
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
+import org.traccar.ProtocolTest;
 
-public class WialonProtocolDecoderTest extends ProtocolDecoderTest {
+public class WialonProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/WondexFrameDecoderTest.java b/test/org/traccar/protocol/WondexFrameDecoderTest.java
index 54df4c41b..5877452ed 100644
--- a/test/org/traccar/protocol/WondexFrameDecoderTest.java
+++ b/test/org/traccar/protocol/WondexFrameDecoderTest.java
@@ -2,11 +2,9 @@ package org.traccar.protocol;
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
+import org.traccar.ProtocolTest;
 
-import java.nio.ByteOrder;
-
-public class WondexFrameDecoderTest extends ProtocolDecoderTest {
+public class WondexFrameDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/WondexProtocolDecoderTest.java b/test/org/traccar/protocol/WondexProtocolDecoderTest.java
index e5685033c..a44f7030f 100644
--- a/test/org/traccar/protocol/WondexProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/WondexProtocolDecoderTest.java
@@ -1,9 +1,9 @@
 package org.traccar.protocol;
 
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
+import org.traccar.ProtocolTest;
 
-public class WondexProtocolDecoderTest extends ProtocolDecoderTest {
+public class WondexProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/XexunFrameDecoderTest.java b/test/org/traccar/protocol/XexunFrameDecoderTest.java
index 532554225..5627623ba 100644
--- a/test/org/traccar/protocol/XexunFrameDecoderTest.java
+++ b/test/org/traccar/protocol/XexunFrameDecoderTest.java
@@ -2,9 +2,9 @@ package org.traccar.protocol;
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
+import org.traccar.ProtocolTest;
 
-public class XexunFrameDecoderTest extends ProtocolDecoderTest {
+public class XexunFrameDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/XexunProtocolDecoderTest.java b/test/org/traccar/protocol/XexunProtocolDecoderTest.java
index db112f1ea..27574ddce 100644
--- a/test/org/traccar/protocol/XexunProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/XexunProtocolDecoderTest.java
@@ -2,9 +2,9 @@ package org.traccar.protocol;
 
 
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
+import org.traccar.ProtocolTest;
 
-public class XexunProtocolDecoderTest extends ProtocolDecoderTest {
+public class XexunProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/XirgoProtocolDecoderTest.java b/test/org/traccar/protocol/XirgoProtocolDecoderTest.java
index 8bad0ff6a..13cca0a82 100644
--- a/test/org/traccar/protocol/XirgoProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/XirgoProtocolDecoderTest.java
@@ -1,9 +1,9 @@
 package org.traccar.protocol;
 
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
+import org.traccar.ProtocolTest;
 
-public class XirgoProtocolDecoderTest extends ProtocolDecoderTest {
+public class XirgoProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/Xt013ProtocolDecoderTest.java b/test/org/traccar/protocol/Xt013ProtocolDecoderTest.java
index 569f2b8f2..da1f72170 100644
--- a/test/org/traccar/protocol/Xt013ProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/Xt013ProtocolDecoderTest.java
@@ -1,9 +1,9 @@
 package org.traccar.protocol;
 
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
+import org.traccar.ProtocolTest;
 
-public class Xt013ProtocolDecoderTest extends ProtocolDecoderTest {
+public class Xt013ProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
diff --git a/test/org/traccar/protocol/YwtProtocolDecoderTest.java b/test/org/traccar/protocol/YwtProtocolDecoderTest.java
index dbad1f022..f79e8a49b 100644
--- a/test/org/traccar/protocol/YwtProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/YwtProtocolDecoderTest.java
@@ -1,9 +1,9 @@
 package org.traccar.protocol;
 
 import org.junit.Test;
-import org.traccar.ProtocolDecoderTest;
+import org.traccar.ProtocolTest;
 
-public class YwtProtocolDecoderTest extends ProtocolDecoderTest {
+public class YwtProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {