aboutsummaryrefslogtreecommitdiff
path: root/test/org/traccar/web/JsonConverterTest.java
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2015-07-17 19:35:30 +1200
committerAnton Tananaev <anton.tananaev@gmail.com>2015-07-17 19:35:30 +1200
commit1262a26ffd8be27609eccc23d4c652c2b0083b46 (patch)
tree37c475ab849c886de8cff12007e80d6f711a7caf /test/org/traccar/web/JsonConverterTest.java
parent3f6f92cedd969e741e65bb6e14737b98722b214e (diff)
downloadtrackermap-server-1262a26ffd8be27609eccc23d4c652c2b0083b46.tar.gz
trackermap-server-1262a26ffd8be27609eccc23d4c652c2b0083b46.tar.bz2
trackermap-server-1262a26ffd8be27609eccc23d4c652c2b0083b46.zip
Remove enum json conversion
Diffstat (limited to 'test/org/traccar/web/JsonConverterTest.java')
-rw-r--r--test/org/traccar/web/JsonConverterTest.java187
1 files changed, 46 insertions, 141 deletions
diff --git a/test/org/traccar/web/JsonConverterTest.java b/test/org/traccar/web/JsonConverterTest.java
index 07d70d3f2..b02ec2d40 100644
--- a/test/org/traccar/web/JsonConverterTest.java
+++ b/test/org/traccar/web/JsonConverterTest.java
@@ -1,170 +1,75 @@
package org.traccar.web;
-import org.junit.Test;
-import org.traccar.model.Factory;
-
-import java.io.Reader;
import java.io.StringReader;
import java.text.ParseException;
import java.util.Calendar;
import java.util.Date;
-
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import org.junit.Test;
+import org.traccar.model.Factory;
public class JsonConverterTest {
- private <T extends Factory> T convert(String jsonString, T prototype) throws ParseException {
- Reader r = new StringReader(
- jsonString);
-
- return JsonConverter.objectFromJson(r, prototype);
- }
-
@Test
public void primitiveConversion() throws ParseException {
- AllPrimitives o = convert("{" +
- "\"aBoolean\": true, " +
- "\"anInt\": 42, " +
- "\"aDouble\": 41.99, " +
- "\"aString\": \"discworld\", " +
- "\"aDate\":\"2015-07-09T19:02:17\"" +
- "}",
- new AllPrimitives());
-
- assertEquals(true, o.getaBoolean());
- assertEquals(42, o.getAnInt());
- assertEquals(41.99, o.getaDouble(), 0.001);
- assertEquals("discworld", o.getaString());
+ Primitives o = JsonConverter.objectFromJson(new StringReader(
+ "{" +
+ "\"boolean\": true, " +
+ "\"int\": 42, " +
+ "\"double\": 41.99, " +
+ "\"string\": \"discworld\", " +
+ "\"date\":\"2015-07-09T19:02:17\"" +
+ "}"),
+ new Primitives());
+
+ assertEquals(true, o.getBoolean());
+ assertEquals(42, o.getInt());
+ assertEquals(41.99, o.getDouble(), 0.001);
+ assertEquals("discworld", o.getString());
Calendar c = Calendar.getInstance();
- c.setTime(o.getaDate());
+ c.setTime(o.getDate());
assertEquals(2015, c.get(Calendar.YEAR));
assertEquals(Calendar.JULY, c.get(Calendar.MONTH));
assertEquals(9, c.get(Calendar.DAY_OF_MONTH));
assertEquals(19, c.get(Calendar.HOUR_OF_DAY));
assertEquals(2, c.get(Calendar.MINUTE));
assertEquals(17, c.get(Calendar.SECOND));
- }
-
- public static class AllPrimitives implements Factory {
-
- private boolean aBoolean;
- private int anInt;
- private double aDouble;
- private String aString;
- private Date aDate;
-
-
- @Override
- public Object create() {
- return new AllPrimitives();
- }
-
- public boolean getaBoolean() {
- return aBoolean;
- }
-
- public void setaBoolean(boolean aBoolean) {
- this.aBoolean = aBoolean;
- }
-
- public int getAnInt() {
- return anInt;
- }
-
- public void setAnInt(int anInt) {
- this.anInt = anInt;
- }
-
- public double getaDouble() {
- return aDouble;
- }
-
- public void setaDouble(double aDouble) {
- this.aDouble = aDouble;
- }
-
- public String getaString() {
- return aString;
- }
-
- public void setaString(String aString) {
- this.aString = aString;
- }
- public Date getaDate() {
- return aDate;
- }
-
- public void setaDate(Date aDate) {
- this.aDate = aDate;
- }
- }
-
-
- @Test
- public void enumConversion() throws ParseException {
- ObjectWithEnum o = convert("{\"anEnum\": \"VALUE2\"}", new ObjectWithEnum());
- assertEquals(TestEnum.VALUE2, o.getAnEnum());
- }
-
-
- public enum TestEnum {
- VALUE1, VALUE2
}
- public static class ObjectWithEnum implements Factory {
- private TestEnum anEnum;
-
- public TestEnum getAnEnum() {
- return anEnum;
- }
-
- public void setAnEnum(TestEnum anEnum) {
- this.anEnum = anEnum;
- }
-
+ public static class Primitives implements Factory {
+
@Override
- public Object create() {
- return new ObjectWithEnum();
- }
- }
-
+ public Primitives create() {
+ return new Primitives();
+ }
+
+ private boolean b;
+ public boolean getBoolean() { return b; }
+ public void setBoolean(boolean b) { this.b = b; }
+
+ private int i;
+ public int getInt() { return i; }
+ public void setInt(int i) { this.i = i; }
+
+ private long l;
+ public long getLong() { return l; }
+ public void setLong(long l) { this.l = l; }
+
+ private double d;
+ public double getDouble() { return d; }
+ public void setDouble(double d) { this.d = d; }
+
+ private String s;
+ public String getString() { return s; }
+ public void setString(String s) { this.s = s; }
+
+ private Date t;
+ public Date getDate() { return t; }
+ public void setDate(Date t) { this.t = t; }
- @Test
- public void nestedObjectsConversion() throws ParseException {
- NestedObjects o = convert("{\"name\": \"Rincewind\", \"nestedObject\": {\"anEnum\":\"VALUE1\"}}", new NestedObjects());
- assertEquals("Rincewind", o.getName());
- assertNotNull("The nested object should be populated", o.getNestedObject());
- assertEquals(TestEnum.VALUE1, o.getNestedObject().getAnEnum());
}
- public static class NestedObjects implements Factory {
-
- private String name;
- private ObjectWithEnum nestedObject;
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public ObjectWithEnum getNestedObject() {
- return nestedObject;
- }
-
- public void setNestedObject(ObjectWithEnum nestedObject) {
- this.nestedObject = nestedObject;
- }
-
- @Override
- public Object create() {
- return new NestedObjects();
- }
- }
}