diff options
| author | Parveen Kumar Yadav <parveenkumardeeva@gmail.com> | 2018-04-13 10:47:42 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-13 10:47:42 +0530 |
| commit | d448823edd0e8a7833c79b980cfe9778b849843a (patch) | |
| tree | 50ad1ab51b93915cff422a1834baa5a2c579fce8 /test/org/traccar/ProtocolTest.java | |
| parent | 2c8392a0e16044905d983da56ab0919eadbb3858 (diff) | |
| parent | 617393cf9f052298f7fb35f0c58138c87a6dd5c3 (diff) | |
| download | trackermap-server-d448823edd0e8a7833c79b980cfe9778b849843a.tar.gz trackermap-server-d448823edd0e8a7833c79b980cfe9778b849843a.tar.bz2 trackermap-server-d448823edd0e8a7833c79b980cfe9778b849843a.zip | |
Merge pull request #1 from traccar/master
Bringing Fork Up to Date
Diffstat (limited to 'test/org/traccar/ProtocolTest.java')
| -rw-r--r-- | test/org/traccar/ProtocolTest.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/org/traccar/ProtocolTest.java b/test/org/traccar/ProtocolTest.java index e67b53aa8..75a98000b 100644 --- a/test/org/traccar/ProtocolTest.java +++ b/test/org/traccar/ProtocolTest.java @@ -5,11 +5,11 @@ 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.HttpVersion; +import org.traccar.helper.DataConverter; import org.traccar.model.CellTower; import org.traccar.model.Command; import org.traccar.model.Position; -import javax.xml.bind.DatatypeConverter; import java.nio.ByteOrder; import java.nio.charset.StandardCharsets; import java.text.DateFormat; @@ -56,7 +56,7 @@ public class ProtocolTest extends BaseTest { protected ChannelBuffer binary(ByteOrder endianness, String... data) { return ChannelBuffers.wrappedBuffer( - endianness, DatatypeConverter.parseHexBinary(concatenateStrings(data))); + endianness, DataConverter.parseHex(concatenateStrings(data))); } protected String text(String... data) { |