Skip to content

Commit dea22cc

Browse files
committed
fix all tests
1 parent d236817 commit dea22cc

File tree

7 files changed

+19
-23
lines changed

7 files changed

+19
-23
lines changed

src/test/java/com/jsoniter/ABC.java

Lines changed: 0 additions & 5 deletions
This file was deleted.

src/test/java/com/jsoniter/AnnotatedObject.java

Lines changed: 0 additions & 12 deletions
This file was deleted.

src/test/java/com/jsoniter/InheritedObject.java

Lines changed: 0 additions & 5 deletions
This file was deleted.

src/test/java/com/jsoniter/TestAnnotation.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,21 @@
11
package com.jsoniter;
22

3+
import com.jsoniter.annotation.jsoniter.JsonIgnore;
4+
import com.jsoniter.annotation.jsoniter.JsonProperty;
35
import com.jsoniter.annotation.jsoniter.JsoniterAnnotationSupport;
46
import junit.framework.TestCase;
57

68
import java.io.IOException;
79

810
public class TestAnnotation extends TestCase {
11+
12+
public static class AnnotatedObject {
13+
@JsonProperty("field-1")
14+
public int field1;
15+
16+
@JsonIgnore
17+
public int field2;
18+
}
919
public void test_rename() throws IOException {
1020
JsoniterAnnotationSupport.enable();
1121
JsonIterator iter = JsonIterator.parse("{'field-1': 100}".replace('\'', '"'));

src/test/java/com/jsoniter/TestDemo.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ public void test_iterator_api() throws IOException {
2525
System.out.println(total);
2626
}
2727

28+
public static class ABC {
29+
public Any a;
30+
}
31+
2832
public void test_abc() throws IOException {
2933
JsonIterator iter = JsonIterator.parse("{'a': {'b': {'c': 'd'}}}".replace('\'', '"'));
3034
ABC abc = iter.read(ABC.class);

src/test/java/com/jsoniter/TestGenerics.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,6 @@ public void test_complex_object() throws IOException {
5656
JsonIterator iter = JsonIterator.parse("{'field1': 100, 'field2': [[1,2],[3,4]]}".replace('\'', '"'));
5757
ComplexObject val = iter.read(ComplexObject.class);
5858
assertEquals(100, val.field1);
59-
assertEquals(Integer.valueOf(4), val.field2.get(1).get(1));
59+
assertEquals(4.0d, val.field2.get(1).get(1));
6060
}
6161
}

src/test/java/com/jsoniter/TestObject.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,10 @@ public void test_native_field() throws IOException {
8484
assertEquals(100, any.toInt("field1"));
8585
}
8686

87+
public static class InheritedObject extends SimpleObject {
88+
public String inheritedField;
89+
}
90+
8791
public void test_inheritance() throws IOException {
8892
JsonIterator iter = JsonIterator.parse("{'inheritedField': 'hello'}".replace('\'', '"'));
8993
InheritedObject inheritedObject = iter.read(InheritedObject.class);

0 commit comments

Comments
 (0)