From 72dc597437b0377fb060ef8d26aba404c62e73e2 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Sun, 3 Apr 2016 19:28:54 +1200
Subject: Implement web data handler unit test

---
 src/org/traccar/WebDataHandler.java      | 11 ++++++++---
 test/org/traccar/WebDataHandlerTest.java | 22 ++++++++++++++++++++++
 2 files changed, 30 insertions(+), 3 deletions(-)
 create mode 100644 test/org/traccar/WebDataHandlerTest.java

diff --git a/src/org/traccar/WebDataHandler.java b/src/org/traccar/WebDataHandler.java
index 688b4a840..cc60af248 100644
--- a/src/org/traccar/WebDataHandler.java
+++ b/src/org/traccar/WebDataHandler.java
@@ -89,8 +89,7 @@ public class WebDataHandler extends BaseDataHandler {
         }
     }
 
-    @Override
-    protected Position handlePosition(Position position) {
+    public String formatRequest(Position position) {
 
         Device device = Context.getIdentityManager().getDeviceById(position.getDeviceId());
 
@@ -132,7 +131,13 @@ public class WebDataHandler extends BaseDataHandler {
             request = request.replace("{gprmc}", formatSentence(position));
         }
 
-        Context.getAsyncHttpClient().prepareGet(request).execute();
+        return request;
+    }
+
+    @Override
+    protected Position handlePosition(Position position) {
+
+        Context.getAsyncHttpClient().prepareGet(formatRequest(position)).execute();
 
         return position;
     }
diff --git a/test/org/traccar/WebDataHandlerTest.java b/test/org/traccar/WebDataHandlerTest.java
new file mode 100644
index 000000000..f8818a0c4
--- /dev/null
+++ b/test/org/traccar/WebDataHandlerTest.java
@@ -0,0 +1,22 @@
+package org.traccar;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.traccar.model.Position;
+
+public class WebDataHandlerTest extends ProtocolTest {
+
+    @Test
+    public void testFormatRequest() throws Exception {
+
+        Position p = position("2016-01-01 01:02:03.000", true, 20, 30);
+
+        WebDataHandler handler = new WebDataHandler("http://localhost/?fixTime={fixTime}&gprmc={gprmc}");
+
+        Assert.assertEquals(
+                "http://localhost/?fixTime=1451610123000&gprmc=$GPRMC,010203.000,A,2000.0000,N,03000.0000,E,0.00,0.00,010116,,*21",
+                handler.formatRequest(p));
+
+    }
+
+}
-- 
cgit v1.2.3