From 663231ec30ed41d60ef352e89ea61e9eb2b735c2 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Sat, 9 Jan 2016 11:34:42 +1300
Subject: Merge AutoFon and AutoFon45 protocols

---
 .../protocol/AutoFon45ProtocolDecoderTest.java     | 25 ----------------------
 .../protocol/AutoFonProtocolDecoderTest.java       | 13 +++++++++++
 2 files changed, 13 insertions(+), 25 deletions(-)
 delete mode 100644 test/org/traccar/protocol/AutoFon45ProtocolDecoderTest.java

(limited to 'test/org')

diff --git a/test/org/traccar/protocol/AutoFon45ProtocolDecoderTest.java b/test/org/traccar/protocol/AutoFon45ProtocolDecoderTest.java
deleted file mode 100644
index 2b4154b27..000000000
--- a/test/org/traccar/protocol/AutoFon45ProtocolDecoderTest.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package org.traccar.protocol;
-
-import org.junit.Test;
-import org.traccar.ProtocolTest;
-
-
-public class AutoFon45ProtocolDecoderTest extends ProtocolTest {
-    @Test
-    public void testDecode() throws Exception {
-        AutoFon45ProtocolDecoder decoder = new AutoFon45ProtocolDecoder(new AutoFon45Protocol());
-
-        verifyNothing(decoder, binary(
-                "41035151305289931441139602662095148807"));
-
-        verifyNothing(decoder, binary(
-                "41032125656985547543619173484002123481"));
-
-        verifyPosition(decoder, binary(
-                "023E00001E004D411EFA01772F185285009C48041F1E366C2961380F26B10B00911C"),
-                position("2010-01-27 04:00:08.000", true, 54.73838, 56.10343));
-
-        verifyPosition(decoder, binary(
-                "023E00001E004D411EFA01772F185285009C48041F1E366C2961380F26B10B00911C"));
-    }
-}
diff --git a/test/org/traccar/protocol/AutoFonProtocolDecoderTest.java b/test/org/traccar/protocol/AutoFonProtocolDecoderTest.java
index 5c2e52d09..4a0a42a7b 100644
--- a/test/org/traccar/protocol/AutoFonProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/AutoFonProtocolDecoderTest.java
@@ -20,6 +20,19 @@ public class AutoFonProtocolDecoderTest extends ProtocolTest {
         //verifyPosition(decoder, binary(
         //        "12060000007501010B0C00089CFFFFFFFFFFFFFFFFFF0000000000000000000000000000000000000003E7FFFF02007601010B0C00269CFFFFFFFFFFFFFFFFFF0000000000000000000000000000000000000003E7FFFF4A007601010B0C01089CFFFFFFFFFFFFFFFFFF0000000000000000000000000000000000000003E7FFFF04007501010B0C01269CFFFFFFFFFFFFFFFFFF0000000000000000000000000000000000000003E7FFFF80007601010B0C02089CFFFFFFFFFFFFFFFFFF0000000000000000000000000000000000000003E7FFFFA6007501010B0C02231F5600FA000176F218C70000000000000000000000000000000000000003E7FFFF9629"));
 
+        verifyNothing(decoder, binary(
+                "41035151305289931441139602662095148807"));
+
+        verifyNothing(decoder, binary(
+                "41032125656985547543619173484002123481"));
+
+        verifyPosition(decoder, binary(
+                "023E00001E004D411EFA01772F185285009C48041F1E366C2961380F26B10B00911C"),
+                position("2010-01-27 04:00:08.000", true, 54.73838, 56.10343));
+
+        verifyPosition(decoder, binary(
+                "023E00001E004D411EFA01772F185285009C48041F1E366C2961380F26B10B00911C"));
+
     }
 
 }
-- 
cgit v1.2.3