aboutsummaryrefslogtreecommitdiff
path: root/test/org/traccar/web
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2015-11-30 13:55:05 +1300
committerAnton Tananaev <anton.tananaev@gmail.com>2015-11-30 13:55:05 +1300
commitcefc12afe98f610aa0f266bcac4361f9ec414ee5 (patch)
tree48d47a0eec0c2d8a3ee7f448f8d535d7d826d546 /test/org/traccar/web
parentc6692703c8099577cb86c3eace5d8d1bc11f212d (diff)
parent1a25796d62bdf88f2cba0387a09e2eb71599e588 (diff)
downloadtrackermap-server-cefc12afe98f610aa0f266bcac4361f9ec414ee5.tar.gz
trackermap-server-cefc12afe98f610aa0f266bcac4361f9ec414ee5.tar.bz2
trackermap-server-cefc12afe98f610aa0f266bcac4361f9ec414ee5.zip
Merge master of guterresrafael/traccar into rest
Diffstat (limited to 'test/org/traccar/web')
-rw-r--r--test/org/traccar/web/JsonConverterTest.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/org/traccar/web/JsonConverterTest.java b/test/org/traccar/web/JsonConverterTest.java
index 5b2d80ebc..2a0055f54 100644
--- a/test/org/traccar/web/JsonConverterTest.java
+++ b/test/org/traccar/web/JsonConverterTest.java
@@ -20,7 +20,7 @@ public class JsonConverterTest {
"\"string\": \"discworld\", " +
"\"date\":\"2015-07-09T19:02:17.000Z\"" +
"}"),
- new Primitives());
+ Primitives.class);
assertEquals(true, o.getBoolean());
assertEquals(42, o.getInt());