From fbdd359d223579173b4e0076563df296f5492e3c Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Mon, 26 Oct 2015 12:54:56 +1300
Subject: Rename hex conversion methods

---
 test/org/traccar/ProtocolDecoderTest.java                  | 2 +-
 test/org/traccar/helper/ChannelBufferToolsTest.java        | 8 +++-----
 test/org/traccar/protocol/CityeasyProtocolEncoderTest.java | 2 +-
 test/org/traccar/protocol/Gt06ProtocolEncoderTest.java     | 2 +-
 test/org/traccar/protocol/KhdProtocolEncoderTest.java      | 2 +-
 5 files changed, 7 insertions(+), 9 deletions(-)

(limited to 'test/org')

diff --git a/test/org/traccar/ProtocolDecoderTest.java b/test/org/traccar/ProtocolDecoderTest.java
index 3eb42a0f6..992ade8f8 100644
--- a/test/org/traccar/ProtocolDecoderTest.java
+++ b/test/org/traccar/ProtocolDecoderTest.java
@@ -104,7 +104,7 @@ public class ProtocolDecoderTest {
 
     protected ChannelBuffer binary(ByteOrder endianness, String... data) {
         return ChannelBuffers.wrappedBuffer(
-                endianness, ChannelBufferTools.convertHexString(concatenateStrings(data)));
+                endianness, ChannelBufferTools.hexToBytes(concatenateStrings(data)));
     }
 
     protected String text(String... data) {
diff --git a/test/org/traccar/helper/ChannelBufferToolsTest.java b/test/org/traccar/helper/ChannelBufferToolsTest.java
index 3d065a8d7..d34dfe9f7 100644
--- a/test/org/traccar/helper/ChannelBufferToolsTest.java
+++ b/test/org/traccar/helper/ChannelBufferToolsTest.java
@@ -1,9 +1,7 @@
 package org.traccar.helper;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBufferFactory;
 import org.jboss.netty.buffer.ChannelBuffers;
-import org.jboss.netty.buffer.HeapChannelBufferFactory;
+
 import static org.junit.Assert.*;
 import org.junit.Test;
 
@@ -30,12 +28,12 @@ public class ChannelBufferToolsTest {
 
     @Test
     public void convertHexStringTest() {
-        assertArrayEquals(new byte[] {0x12, 0x34}, ChannelBufferTools.convertHexString("1234"));
+        assertArrayEquals(new byte[] {0x12, 0x34}, ChannelBufferTools.hexToBytes("1234"));
     }
 
     @Test
     public void convertHexByteArray() {
-        assertEquals("1234", ChannelBufferTools.convertByteArray(new byte[] {0x12, 0x34}));
+        assertEquals("1234", ChannelBufferTools.bytesToHex(new byte[]{0x12, 0x34}));
     }
 
 }
diff --git a/test/org/traccar/protocol/CityeasyProtocolEncoderTest.java b/test/org/traccar/protocol/CityeasyProtocolEncoderTest.java
index 4d94e9c69..e2bfbb19a 100644
--- a/test/org/traccar/protocol/CityeasyProtocolEncoderTest.java
+++ b/test/org/traccar/protocol/CityeasyProtocolEncoderTest.java
@@ -18,7 +18,7 @@ public class CityeasyProtocolEncoderTest {
         command.setType(Command.TYPE_SET_TIMEZONE);
         command.set(Command.KEY_TIMEZONE, 6 * 3600);
 
-        Assert.assertEquals(encoder.encodeCommand(command), ChannelBuffers.wrappedBuffer(ChannelBufferTools.convertHexString(
+        Assert.assertEquals(encoder.encodeCommand(command), ChannelBuffers.wrappedBuffer(ChannelBufferTools.hexToBytes(
                 "5353001100080001680000000B60820D0A")));
 
     }
diff --git a/test/org/traccar/protocol/Gt06ProtocolEncoderTest.java b/test/org/traccar/protocol/Gt06ProtocolEncoderTest.java
index 7f616d9df..1041e65af 100644
--- a/test/org/traccar/protocol/Gt06ProtocolEncoderTest.java
+++ b/test/org/traccar/protocol/Gt06ProtocolEncoderTest.java
@@ -17,7 +17,7 @@ public class Gt06ProtocolEncoderTest {
         command.setDeviceId(1);
         command.setType(Command.TYPE_ENGINE_STOP);
 
-        Assert.assertEquals(encoder.encodeCommand(command), ChannelBuffers.wrappedBuffer(ChannelBufferTools.convertHexString(
+        Assert.assertEquals(encoder.encodeCommand(command), ChannelBuffers.wrappedBuffer(ChannelBufferTools.hexToBytes(
                 "787812800c0000000052656c61792c312300009dee0d0a")));
 
     }
diff --git a/test/org/traccar/protocol/KhdProtocolEncoderTest.java b/test/org/traccar/protocol/KhdProtocolEncoderTest.java
index ec620aa60..872997d7f 100644
--- a/test/org/traccar/protocol/KhdProtocolEncoderTest.java
+++ b/test/org/traccar/protocol/KhdProtocolEncoderTest.java
@@ -17,7 +17,7 @@ public class KhdProtocolEncoderTest {
         command.setDeviceId(1);
         command.setType(Command.TYPE_ENGINE_STOP);
 
-        Assert.assertEquals(encoder.encodeCommand(command), ChannelBuffers.wrappedBuffer(ChannelBufferTools.convertHexString(
+        Assert.assertEquals(encoder.encodeCommand(command), ChannelBuffers.wrappedBuffer(ChannelBufferTools.hexToBytes(
                 "2929390006000000003F0D")));
 
     }
-- 
cgit v1.2.3