Rename classes

3 files changed, 13 insertions, 9 deletions

diff --git a/src/test/java/org/traccar/protocol/Arnavi4ProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/ArnaviBinaryProtocolDecoderTest.java
index 2628188b9..f2940de59 100644
--- a/src/test/java/org/traccar/protocol/Arnavi4ProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/ArnaviBinaryProtocolDecoderTest.java
@@ -3,14 +3,14 @@ package org.traccar.protocol;
 import org.junit.Test;
 import org.traccar.ProtocolTest;
 
-public class Arnavi4ProtocolDecoderTest extends ProtocolTest {
+public class ArnaviBinaryProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testHeader1Decode() throws Exception {
 
-        Arnavi4ProtocolDecoder decoder;
+        ArnaviBinaryProtocolDecoder decoder;
 
-        decoder = new Arnavi4ProtocolDecoder(new Arnavi4Protocol());
+        decoder = new ArnaviBinaryProtocolDecoder(null);
 
         verifyNull(decoder, binary(
                 "ff22f30c45f5c90f0300"));
@@ -23,9 +23,9 @@ public class Arnavi4ProtocolDecoderTest extends ProtocolTest {
     @Test
     public void testHeader2Decode() throws Exception {
 
-        Arnavi4ProtocolDecoder decoder;
+        ArnaviBinaryProtocolDecoder decoder;
 
-        decoder = new Arnavi4ProtocolDecoder(new Arnavi4Protocol());
+        decoder = new ArnaviBinaryProtocolDecoder(null);
 
         verifyNull(decoder, binary(
                 "ff23f30c45f5c90f0300"));
diff --git a/src/test/java/org/traccar/protocol/Arnavi4FrameDecoderTest.java b/src/test/java/org/traccar/protocol/ArnaviFrameDecoderTest.java
index aa3f85820..90eb20296 100644
--- a/src/test/java/org/traccar/protocol/Arnavi4FrameDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/ArnaviFrameDecoderTest.java
@@ -3,12 +3,16 @@ package org.traccar.protocol;
 import org.junit.Test;
 import org.traccar.ProtocolTest;
 
-public class Arnavi4FrameDecoderTest extends ProtocolTest {
+public class ArnaviFrameDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecodeValidPackets() throws Exception {
 
-        Arnavi4FrameDecoder decoder = new Arnavi4FrameDecoder();
+        ArnaviFrameDecoder decoder = new ArnaviFrameDecoder();
+
+        verifyFrame(
+                binary("2441562c563344492c38353136342c3231342c2d312c31392c30303030344634462c30303030303935452c30433030303030322c3836333037313031333034313631382c38393939373031353630333832353236363232462c2a3039"),
+                decoder.decode(null, null, binary("2441562c563344492c38353136342c3231342c2d312c31392c30303030344634462c30303030303935452c30433030303030322c3836333037313031333034313631382c38393939373031353630333832353236363232462c2a30390d0a")));
 
         verifyFrame(
                 binary("ff22f30c45f5c90f0300"),
diff --git a/src/test/java/org/traccar/protocol/ArnaviProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/ArnaviTextProtocolDecoderTest.java
index 6b075facc..065a28580 100644
--- a/src/test/java/org/traccar/protocol/ArnaviProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/ArnaviTextProtocolDecoderTest.java
@@ -3,12 +3,12 @@ package org.traccar.protocol;
 import org.junit.Test;
 import org.traccar.ProtocolTest;
 
-public class ArnaviProtocolDecoderTest extends ProtocolTest {
+public class ArnaviTextProtocolDecoderTest extends ProtocolTest {
 
     @Test
     public void testDecode() throws Exception {
 
-        ArnaviProtocolDecoder decoder = new ArnaviProtocolDecoder(null);
+        ArnaviTextProtocolDecoder decoder = new ArnaviTextProtocolDecoder(null);
 
         verifyPosition(decoder, text(
                 "$AV,V4,999999,12487,2277,203,65534,0,0,193,65535,65535,65535,65535,1,13,80.0,56.1,200741,5950.6773N,03029.1043E,300.0,360.0,121012,65535,65535,65535,SF*6E"));