Fix unit tests

2 files changed, 33 insertions, 38 deletions

diff --git a/src/test/java/org/traccar/protocol/Arnavi4FrameDecoderTest.java b/src/test/java/org/traccar/protocol/Arnavi4FrameDecoderTest.java
index ef14b3427..aa3f85820 100644
--- a/src/test/java/org/traccar/protocol/Arnavi4FrameDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/Arnavi4FrameDecoderTest.java
@@ -1,50 +1,47 @@
 package org.traccar.protocol;
 
-import org.junit.Assert;
 import org.junit.Test;
 import org.traccar.ProtocolTest;
 
-import java.nio.ByteOrder;
-
 public class Arnavi4FrameDecoderTest extends ProtocolTest {
 
-    /*@Test
+    @Test
     public void testDecodeValidPackets() throws Exception {
 
         Arnavi4FrameDecoder decoder = new Arnavi4FrameDecoder();
 
-        Assert.assertEquals( // Valid HEADER v1 packet with IMEI
-                binary(ByteOrder.LITTLE_ENDIAN, "ff22f30c45f5c90f0300"),
-                decoder.decode(null, null, binary(ByteOrder.LITTLE_ENDIAN, "ff22f30c45f5c90f0300")));
+        verifyFrame(
+                binary("ff22f30c45f5c90f0300"),
+                decoder.decode(null, null, binary("ff22f30c45f5c90f0300")));
 
-        Assert.assertEquals( // Valid PACKAGE with one DATA packet
-                binary(ByteOrder.LITTLE_ENDIAN, "5b01012800a3175f5903513934420447221c42055402781E0900f0c5215b4e0084005c00007c005d0000a300fa37010000295d"),
-                decoder.decode(null, null, binary(ByteOrder.LITTLE_ENDIAN, "5b01012800a3175f5903513934420447221c42055402781E0900f0c5215b4e0084005c00007c005d0000a300fa37010000295d")));
+        verifyFrame(
+                binary("5b01012800a3175f5903513934420447221c42055402781E0900f0c5215b4e0084005c00007c005d0000a300fa37010000295d"),
+                decoder.decode(null, null, binary("5b01012800a3175f5903513934420447221c42055402781E0900f0c5215b4e0084005c00007c005d0000a300fa37010000295d")));
 
-        Assert.assertEquals( // Valid PACKAGE with two DATA packet
-                binary(ByteOrder.LITTLE_ENDIAN, "5b01012800a3175f5903513934420447221c42055402781E0900f0c5215b4e0084005c00007c005d0000a300fa3701000029012800a3175f5903513934420447221c42055402781E0900f0c5215b4e0084005c00007c005d0000a300fa37010000295d"),
-                decoder.decode(null, null, binary(ByteOrder.LITTLE_ENDIAN, "5b01012800a3175f5903513934420447221c42055402781E0900f0c5215b4e0084005c00007c005d0000a300fa3701000029012800a3175f5903513934420447221c42055402781E0900f0c5215b4e0084005c00007c005d0000a300fa37010000295d")));
+        verifyFrame(
+                binary("5b01012800a3175f5903513934420447221c42055402781E0900f0c5215b4e0084005c00007c005d0000a300fa3701000029012800a3175f5903513934420447221c42055402781E0900f0c5215b4e0084005c00007c005d0000a300fa37010000295d"),
+                decoder.decode(null, null, binary("5b01012800a3175f5903513934420447221c42055402781E0900f0c5215b4e0084005c00007c005d0000a300fa3701000029012800a3175f5903513934420447221c42055402781E0900f0c5215b4e0084005c00007c005d0000a300fa37010000295d")));
 
-        Assert.assertEquals( // Valid PACKAGE with one TEXT packet.
-                binary(ByteOrder.LITTLE_ENDIAN, "5b01030700e3f16b50747261636361721b5d"),
-                decoder.decode(null, null, binary(ByteOrder.LITTLE_ENDIAN, "5b01030700e3f16b50747261636361721b5d")));
+        verifyFrame(
+                binary("5b01030700e3f16b50747261636361721b5d"),
+                decoder.decode(null, null, binary("5b01030700e3f16b50747261636361721b5d")));
 
-        Assert.assertEquals( // Valid PACKAGE with two TEXT packet.
-                binary(ByteOrder.LITTLE_ENDIAN, "5b01030700e3f16b50747261636361721b030700e3f16b50747261636361721b5d"),
-                decoder.decode(null, null, binary(ByteOrder.LITTLE_ENDIAN, "5b01030700e3f16b50747261636361721b030700e3f16b50747261636361721b5d")));
+        verifyFrame(
+                binary("5b01030700e3f16b50747261636361721b030700e3f16b50747261636361721b5d"),
+                decoder.decode(null, null, binary("5b01030700e3f16b50747261636361721b030700e3f16b50747261636361721b5d")));
 
-        Assert.assertEquals( // Valid PACKAGE with one BINARY packet.
-                binary(ByteOrder.LITTLE_ENDIAN, "5b01061400e3f16b5003298b5e4204cbd514420500191000080400ff021b5d"),
-                decoder.decode(null, null, binary(ByteOrder.LITTLE_ENDIAN, "5b01061400e3f16b5003298b5e4204cbd514420500191000080400ff021b5d")));
+        verifyFrame(
+                binary("5b01061400e3f16b5003298b5e4204cbd514420500191000080400ff021b5d"),
+                decoder.decode(null, null, binary("5b01061400e3f16b5003298b5e4204cbd514420500191000080400ff021b5d")));
 
-        Assert.assertEquals( // Valid PACKAGE with two BINARY packet.
-                binary(ByteOrder.LITTLE_ENDIAN, "5b01061400e3f16b5003298b5e4204cbd514420500191000080400ff021b061400e3f16b5003298b5e4204cbd514420500191000080400ff021b5d"),
-                decoder.decode(null, null, binary(ByteOrder.LITTLE_ENDIAN, "5b01061400e3f16b5003298b5e4204cbd514420500191000080400ff021b061400e3f16b5003298b5e4204cbd514420500191000080400ff021b5d")));
+        verifyFrame(
+                binary("5b01061400e3f16b5003298b5e4204cbd514420500191000080400ff021b061400e3f16b5003298b5e4204cbd514420500191000080400ff021b5d"),
+                decoder.decode(null, null, binary("5b01061400e3f16b5003298b5e4204cbd514420500191000080400ff021b061400e3f16b5003298b5e4204cbd514420500191000080400ff021b5d")));
 
-        Assert.assertEquals( // Valid PACKAGE with answer to server on file transfer
-                binary(ByteOrder.LITTLE_ENDIAN, "5bfd005d"),
-                decoder.decode(null, null, binary(ByteOrder.LITTLE_ENDIAN, "5bfd005d")));
+        verifyFrame(
+                binary("5bfd005d"),
+                decoder.decode(null, null, binary("5bfd005d")));
 
-    }*/
+    }
 
-}
\ No newline at end of file
+}
diff --git a/src/test/java/org/traccar/protocol/Arnavi4ProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/Arnavi4ProtocolDecoderTest.java
index 191d69a42..2628188b9 100644
--- a/src/test/java/org/traccar/protocol/Arnavi4ProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/Arnavi4ProtocolDecoderTest.java
@@ -3,21 +3,19 @@ package org.traccar.protocol;
 import org.junit.Test;
 import org.traccar.ProtocolTest;
 
-import java.nio.ByteOrder;
-
 public class Arnavi4ProtocolDecoderTest extends ProtocolTest {
 
-    /*@Test
+    @Test
     public void testHeader1Decode() throws Exception {
 
         Arnavi4ProtocolDecoder decoder;
 
         decoder = new Arnavi4ProtocolDecoder(new Arnavi4Protocol());
 
-        verifyNull(decoder, binary(ByteOrder.LITTLE_ENDIAN, // Valid HEADER v1 packet with IMEI
+        verifyNull(decoder, binary(
                 "ff22f30c45f5c90f0300"));
 
-        verifyPositions(decoder, binary(ByteOrder.LITTLE_ENDIAN, // Valid PACKAGE packet with one DATA packet
+        verifyPositions(decoder, binary(
                 "5b01012800a3175f5903513934420447221c42055402781E0900f0c5215b4e0084005c00007c005d0000a300fa37010000295d"),
                 position("2017-07-07 05:09:55.000", true, 45.05597, 39.03347));
     }
@@ -29,12 +27,12 @@ public class Arnavi4ProtocolDecoderTest extends ProtocolTest {
 
         decoder = new Arnavi4ProtocolDecoder(new Arnavi4Protocol());
 
-        verifyNull(decoder, binary(ByteOrder.LITTLE_ENDIAN, // Valid HEADER v2 packet with IMEI
+        verifyNull(decoder, binary(
                 "ff23f30c45f5c90f0300"));
 
-        verifyPositions(decoder, binary(ByteOrder.LITTLE_ENDIAN, // Valid PACKAGE packet with two DATA packet
+        verifyPositions(decoder, binary(
                 "5b01012800a3175f5903513934420447221c42055402781E0900f0c5215b4e0084005c00007c005d0000a300fa3701000029012800a3175f5903513934420447221c42055402781E0900f0c5215b4e0084005c00007c005d0000a300fa37010000295d"),
                 position("2017-07-07 05:09:55.000", true, 45.05597, 39.03347));
-    }*/
+    }
 
 }