Merged laipac and laipac kamel protocol to one

2 files changed, 26 insertions, 37 deletions

diff --git a/test/org/traccar/protocol/LaipacProtocolDecoderTest.java b/test/org/traccar/protocol/LaipacProtocolDecoderTest.java
index 787f33e65..c8a23a5a7 100644
--- a/test/org/traccar/protocol/LaipacProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/LaipacProtocolDecoderTest.java
@@ -28,8 +28,7 @@ public class LaipacProtocolDecoderTest extends ProtocolTest {
         verifyNull(decoder, text(
                 "$ECHK,MSG00002,0*5E"));
 
-        verifyPosition(decoder, text(
-                "$AVRMC,99999999,164339,A,4351.0542,N,07923.5445,W,0.29,78.66,180703,0,3.727,17,1,0,0*37"),
+        verifyPosition(decoder, text("$AVRMC,99999999,164339,A,4351.0542,N,07923.5445,W,0.29,78.66,180703,0,3.727,17,1,0,0*37"),
                 position("2003-07-18 16:43:39.000", true, 43.85090, -79.39241));
 
         verifyPosition(decoder, text(
@@ -95,6 +94,31 @@ public class LaipacProtocolDecoderTest extends ProtocolTest {
         verifyPosition(decoder, text(
                 "$AVRMC,96414215,170046,p,4310.7965,N,07652.0816,E,0.00,0.00,071016,0,4069,98,1,0,0*04"));
 
+        verifyPosition(decoder, text(
+                "$AVRMC,999999999999999,111602,r,5050.1262,N,00419.9660,E,0.00,0.00,120318,0,3843,95,1,0,0,3EE4A617,020610*47"));
+
+        verifyPosition(decoder, text(
+                "$AVRMC,358174067149865,143456,R,5050.1285,N,00420.0620,E,0.00,309.27,190318,0,3455,119,1,0,0,3EE4A617,020610*54"));
+
+        verifyPosition(decoder, text(
+                "$AVRMC,999999999999999,084514,r,5050.1314,N,00419.9719,E,0.68,306.39,120318,0,3882,84,1,0,0,3EE4A617,020610*4D"));
+
+        //Alarm button
+        verifyPosition(decoder, text(
+                "$AVRMC,358174067149865,142945,R,5050.1254,N,00420.0490,E,0.00,0.00,190318,3,3455,119,1,0,0,3EE4A617,020610*53"));
+
+        //G-Sensor
+        verifyPosition(decoder, text(
+                "$AVRMC,358174067149865,143407,R,5050.1254,N,00420.0490,E,0.00,0.00,190318,8,3455,119,1,0,0,3EE4A617,020610*52"));
+
+        //Powered off
+        verifyPosition(decoder, text(
+                "$AVRMC,358174067149865,143648,A,5050.1141,N,00420.0525,E,1.24,174.38,190318,H,3455,119,1,0,0,3EE4A617,020610*3E"));
+
+        //No network
+        verifyPosition(decoder, text(
+                "$AVRMC,358174067149865,143747,R,5050.1124,N,00420.0542,E,1.34,161.96,190318,a,3416,119,1,0,0*7D"));
+
     }
 
 }
diff --git a/test/org/traccar/protocol/LaipacSFKamelProtocolDecoderTest.java b/test/org/traccar/protocol/LaipacSFKamelProtocolDecoderTest.java
deleted file mode 100644
index 69c4243ab..000000000
--- a/test/org/traccar/protocol/LaipacSFKamelProtocolDecoderTest.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.traccar.protocol;
-
-import org.junit.Test;
-import org.traccar.ProtocolTest;
-import org.traccar.helper.Checksum;
-
-public class LaipacSFKamelProtocolDecoderTest extends ProtocolTest {
-
-    @Test
-    public void testDecode() throws Exception {
-
-        LaipacSFKamelProtocolDecoder decoder = new LaipacSFKamelProtocolDecoder(new LaipacSFKamelProtocol());
-
-        verifyPosition(decoder, text(
-                "$AVRMC,999999999999999,084514,r,5050.1314,N,00419.9719,E,0.68,306.39,120318,0,3882,84,1,0,0,3EE4A617,020610*4D"));
-
-        verifyNull(decoder, text(
-                "$AVSYS,99999999,V1.50,SN0000103,32768*15"));
-        
-        verifyNull(decoder, text(
-                "$ECHK,99999999,0*35"));
-        
-        verifyNull(decoder, text(
-                "$AVSYS,MSG00002,14406,7046811160,64*1A"));
-
-        verifyNull(decoder, text(
-                "$EAVSYS,MSG00002,8931086013104404999,,Owner,0x52014406*76"));
-
-        verifyNull(decoder, text(
-                "$ECHK,MSG00002,0*5E"));
-
-        verifyPosition(decoder, text(
-                "$AVRMC,999999999999999,111602,r,5050.1262,N,00419.9660,E,0.00,0.00,120318,0,3843,95,1,0,0,3EE4A617,020610*47"));
-    }
-}