aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornativbarak <nativ@globekeeper.com>2018-02-05 13:35:19 +0200
committernativbarak <nativ@globekeeper.com>2018-02-05 13:35:19 +0200
commited4a723e518d444bcfd6c310c4ed448b8ee8dedf (patch)
tree40febb01226e049dad77b742c88ae4c68ceec0a4
parent00b1715aa854f62b2cc90753c05d558cea9dd6ea (diff)
downloadtrackermap-server-ed4a723e518d444bcfd6c310c4ed448b8ee8dedf.tar.gz
trackermap-server-ed4a723e518d444bcfd6c310c4ed448b8ee8dedf.tar.bz2
trackermap-server-ed4a723e518d444bcfd6c310c4ed448b8ee8dedf.zip
added unit test, fixed spaces, fixed primitive types
-rw-r--r--src/org/traccar/WebDataHandler.java6
-rw-r--r--test/org/traccar/WebDataHandlerTest.java15
2 files changed, 17 insertions, 4 deletions
diff --git a/src/org/traccar/WebDataHandler.java b/src/org/traccar/WebDataHandler.java
index e45a47835..8bfabf183 100644
--- a/src/org/traccar/WebDataHandler.java
+++ b/src/org/traccar/WebDataHandler.java
@@ -32,15 +32,14 @@ import java.util.Formatter;
import java.util.Locale;
import java.util.TimeZone;
-
public class WebDataHandler extends BaseDataHandler {
private final String url;
- private final Boolean json;
+ private final boolean json;
private static final String KEY_POSITION = "position";
private static final String KEY_DEVICE = "device";
- public WebDataHandler(String url, Boolean json) {
+ public WebDataHandler(String url, boolean json) {
this.url = url;
this.json = json;
}
@@ -168,7 +167,6 @@ public class WebDataHandler extends BaseDataHandler {
}
try {
- System.out.println(Context.getObjectMapper().writeValueAsString(data).toString());
return Context.getObjectMapper().writeValueAsString(data);
} catch (JsonProcessingException e) {
Log.warning(e);
diff --git a/test/org/traccar/WebDataHandlerTest.java b/test/org/traccar/WebDataHandlerTest.java
index 70c744b3a..3e79232ec 100644
--- a/test/org/traccar/WebDataHandlerTest.java
+++ b/test/org/traccar/WebDataHandlerTest.java
@@ -3,6 +3,8 @@ package org.traccar;
import org.junit.Test;
import org.traccar.model.Position;
+import java.text.ParseException;
+
import static org.junit.Assert.assertEquals;
public class WebDataHandlerTest extends ProtocolTest {
@@ -20,4 +22,17 @@ public class WebDataHandlerTest extends ProtocolTest {
}
+ @Test
+ public void testBuilderRequest() throws ParseException {
+
+ Position p = position("2016-01-01 01:02:03.000", true, 20, 30);
+
+ WebDataHandler handler = new WebDataHandler("http://localhost/", true);
+
+ assertEquals(
+ "{\"position\":{\"id\":0,\"attributes\":{},\"deviceId\":0,\"type\":null,\"protocol\":null,\"serverTime\":null,\"deviceTime\":1451610123000,\"fixTime\":1451610123000,\"outdated\":false,\"valid\":true,\"latitude\":20.0,\"longitude\":30.0,\"altitude\":0.0,\"speed\":0.0,\"course\":0.0,\"address\":null,\"accuracy\":0.0,\"network\":null}}",
+ handler.prepareJsonPayload(p));
+
+ }
+
}