aboutsummaryrefslogtreecommitdiff
path: root/test/org/traccar/web
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2015-12-01 15:20:05 +1300
committerAnton Tananaev <anton.tananaev@gmail.com>2015-12-01 15:20:05 +1300
commitef2ae4103726dae12a0153886219d4ac43d20ae0 (patch)
tree79291f74ce2631a4a9a176b7e510028e534a23d4 /test/org/traccar/web
parentc6692703c8099577cb86c3eace5d8d1bc11f212d (diff)
parent53f70085891cdb0feae56df8990c1245091352a1 (diff)
downloadtrackermap-server-ef2ae4103726dae12a0153886219d4ac43d20ae0.tar.gz
trackermap-server-ef2ae4103726dae12a0153886219d4ac43d20ae0.tar.bz2
trackermap-server-ef2ae4103726dae12a0153886219d4ac43d20ae0.zip
Merge branch 'rest' into master
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());