3 files changed, 22 insertions, 42 deletions
diff --git a/test/org/traccar/helper/BcdUtilTest.java b/test/org/traccar/helper/BcdUtilTest.java
index e97aad09f..86a32f725 100644
--- a/test/org/traccar/helper/BcdUtilTest.java
+++ b/test/org/traccar/helper/BcdUtilTest.java
@@ -1,6 +1,6 @@
 package org.traccar.helper;
 
-import org.jboss.netty.buffer.ChannelBuffers;
+import io.netty.buffer.Unpooled;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
@@ -10,16 +10,14 @@ public class BcdUtilTest {
     @Test
     public void testReadInteger() {
         byte[] buf = {0x01, (byte) 0x90, 0x34};
-        int result = BcdUtil.readInteger(
-                ChannelBuffers.wrappedBuffer(buf), 5);
+        int result = BcdUtil.readInteger(Unpooled.wrappedBuffer(buf), 5);
         assertEquals(1903, result);
     }
 
     @Test
     public void testReadCoordinate() {
         byte[] buf = {0x03, (byte) 0x85, 0x22, 0x59, 0x34};
-        double result = BcdUtil.readCoordinate(
-                ChannelBuffers.wrappedBuffer(buf));
+        double result = BcdUtil.readCoordinate(Unpooled.wrappedBuffer(buf));
         assertEquals(38.870989, result, 0.00001);
     }
 
diff --git a/test/org/traccar/helper/ChecksumTest.java b/test/org/traccar/helper/ChecksumTest.java
index a7c66a2a2..5737b9ff5 100644
--- a/test/org/traccar/helper/ChecksumTest.java
+++ b/test/org/traccar/helper/ChecksumTest.java
@@ -1,7 +1,7 @@
 package org.traccar.helper;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBuffers;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
 import org.junit.Test;
 
 import java.nio.charset.StandardCharsets;
@@ -11,18 +11,25 @@ import static org.junit.Assert.assertEquals;
 public class ChecksumTest {
 
     @Test
+    public void testCrc8() {
+        ByteBuf buf = Unpooled.copiedBuffer("123456789", StandardCharsets.US_ASCII);
+
+        assertEquals(0xF7, Checksum.crc8(Checksum.CRC8_EGTS, buf.nioBuffer()));
+        assertEquals(0xD0, Checksum.crc8(Checksum.CRC8_ROHC, buf.nioBuffer()));
+    }
+
+    @Test
     public void testCrc16() {
-        ChannelBuffer buf = ChannelBuffers.copiedBuffer("123456789", StandardCharsets.US_ASCII);
-
-        assertEquals(0x906e, Checksum.crc16(Checksum.CRC16_X25, buf.toByteBuffer()));
-        assertEquals(0x29b1, Checksum.crc16(Checksum.CRC16_CCITT_FALSE, buf.toByteBuffer()));
-        assertEquals(0x2189, Checksum.crc16(Checksum.CRC16_KERMIT, buf.toByteBuffer()));
-        assertEquals(0x31c3, Checksum.crc16(Checksum.CRC16_XMODEM, buf.toByteBuffer()));
-        assertEquals(0xe5cc, Checksum.crc16(Checksum.CRC16_AUG_CCITT, buf.toByteBuffer()));
-        assertEquals(0xd64e, Checksum.crc16(Checksum.CRC16_GENIBUS, buf.toByteBuffer()));
-        assertEquals(0x6f91, Checksum.crc16(Checksum.CRC16_MCRF4XX, buf.toByteBuffer()));
+        ByteBuf buf = Unpooled.copiedBuffer("123456789", StandardCharsets.US_ASCII);
+
+        assertEquals(0xBB3D, Checksum.crc16(Checksum.CRC16_IBM, buf.nioBuffer()));
+        assertEquals(0x4B37, Checksum.crc16(Checksum.CRC16_MODBUS, buf.nioBuffer()));
+        assertEquals(0x906e, Checksum.crc16(Checksum.CRC16_X25, buf.nioBuffer()));
+        assertEquals(0x29b1, Checksum.crc16(Checksum.CRC16_CCITT_FALSE, buf.nioBuffer()));
+        assertEquals(0x2189, Checksum.crc16(Checksum.CRC16_KERMIT, buf.nioBuffer()));
+        assertEquals(0x31c3, Checksum.crc16(Checksum.CRC16_XMODEM, buf.nioBuffer()));
     }
-    
+
     @Test
     public void testLuhn() {
         assertEquals(7, Checksum.luhn(12345678901234L));
diff --git a/test/org/traccar/helper/StringFinderTest.java b/test/org/traccar/helper/StringFinderTest.java
deleted file mode 100644
index f35f9a759..000000000
--- a/test/org/traccar/helper/StringFinderTest.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package org.traccar.helper;
-
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBuffers;
-import org.junit.Test;
-
-import java.nio.charset.StandardCharsets;
-
-import static org.junit.Assert.assertEquals;
-
-public class StringFinderTest {
-    
-    @Test
-    public void testFind() {
-
-        ChannelBuffer buf = ChannelBuffers.copiedBuffer("hello world", StandardCharsets.US_ASCII);
-
-        assertEquals(-1, buf.indexOf(0, buf.writerIndex(), new StringFinder("bar")));
-        assertEquals(6, buf.indexOf(0, buf.writerIndex(), new StringFinder("world")));
-        assertEquals(-1, buf.indexOf(0, buf.writerIndex(), new StringFinder("worlds")));
-        assertEquals(0, buf.indexOf(0, buf.writerIndex(), new StringFinder("hell")));
-
-    }
-
-}