From c5bfaf57bb0423c8e5af757c15abd3b3e729dce6 Mon Sep 17 00:00:00 2001
From: Jesse Hills <jesserockz@gmail.com>
Date: Thu, 1 Aug 2019 09:19:22 +1200
Subject: Add simple unit test

---
 .../traccar/protocol/LeafSpyProtocolDecoder.java    | 20 +++++++++++---------
 .../protocol/LeafSpyProtocolDecoderTest.java        | 21 +++++++++++++++++++++
 2 files changed, 32 insertions(+), 9 deletions(-)
 create mode 100644 src/test/java/org/traccar/protocol/LeafSpyProtocolDecoderTest.java

diff --git a/src/main/java/org/traccar/protocol/LeafSpyProtocolDecoder.java b/src/main/java/org/traccar/protocol/LeafSpyProtocolDecoder.java
index 17824177c..47c37a68b 100644
--- a/src/main/java/org/traccar/protocol/LeafSpyProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/LeafSpyProtocolDecoder.java
@@ -80,17 +80,17 @@ public class LeafSpyProtocolDecoder extends BaseHttpProtocolDecoder {
                     case "Elv":
                         position.setAltitude(Double.parseDouble(value));
                         break;
-                    case "DevBat":
+                    case "SOC":
                         position.set(Position.KEY_BATTERY_LEVEL, Double.parseDouble(value));
                         break;
                     case "user":
                         position.set(Position.KEY_DRIVER_UNIQUE_ID, value);
                         break;
-                    case "SOC":
-                        position.set(Position.KEY_CHARGE, Double.parseDouble(value));
+                    case "ChrgMode":
+                        position.set(Position.KEY_CHARGE, Integer.parseInt(value) != 0);
                         break;
                     case "Odo":
-                        position.set(Position.KEY_OBD_ODOMETER, Integer.parseInt(value));
+                        position.set(Position.KEY_OBD_ODOMETER, Integer.parseInt(value) * 1000);
                         break;
                     default:
                         try {
@@ -122,11 +122,13 @@ public class LeafSpyProtocolDecoder extends BaseHttpProtocolDecoder {
         }
 
         if (position.getDeviceId() != 0) {
-            HttpResponse response = new DefaultFullHttpResponse(
-                HttpVersion.HTTP_1_1,
-                HttpResponseStatus.OK,
-                Unpooled.copiedBuffer("\"status\":\"0\"", StandardCharsets.US_ASCII));
-            channel.writeAndFlush(new NetworkMessage(response, channel.remoteAddress()));
+            if(channel != null) {
+                HttpResponse response = new DefaultFullHttpResponse(
+                    HttpVersion.HTTP_1_1,
+                    HttpResponseStatus.OK,
+                    Unpooled.copiedBuffer("\"status\":\"0\"", StandardCharsets.US_ASCII));
+                channel.writeAndFlush(new NetworkMessage(response, channel.remoteAddress()));
+            }
             return position;
         } else {
             sendResponse(channel, HttpResponseStatus.BAD_REQUEST);
diff --git a/src/test/java/org/traccar/protocol/LeafSpyProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/LeafSpyProtocolDecoderTest.java
new file mode 100644
index 000000000..7fe405ea8
--- /dev/null
+++ b/src/test/java/org/traccar/protocol/LeafSpyProtocolDecoderTest.java
@@ -0,0 +1,21 @@
+package org.traccar.protocol;
+
+import org.junit.Test;
+import org.traccar.ProtocolTest;
+
+public class LeafSpyProtocolDecoderTest extends ProtocolTest {
+
+    @Test
+    public void testDecode() throws Exception {
+
+        LeafSpyProtocolDecoder decoder = new LeafSpyProtocolDecoder(null);
+
+        verifyNull(decoder, request(
+                "/?Lat=60.0&Long=30.0"));
+
+        verifyPosition(decoder, request(
+                "/?user=driver&pass=123456&DevBat=80&Gids=200&Lat=60.0&Long=30.0&Elv=5&Seq=50&Trip=1&Odo=10000&SOC=99.99&AHr=55.00&BatTemp=15.2&Amb=12.0&Wpr=12&PlugState=0&ChrgMode=0&ChrgPwr=0&VIN=ZE0-000000&PwrSw=1&Tunits=C&RPM=1000"));
+
+    }
+
+}
-- 
cgit v1.2.3