Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
import static org.junit.jupiter.api.Assertions.*;

// Silly test for JsonAutoDetect.Visibility type, for code coverage
public class VisibilityTest
public class JsonAutoDetectTest
extends AnnotationTestUtil
{
static class Bogus {
public String value;
Expand Down Expand Up @@ -82,6 +83,12 @@ public void testFromAnnotation()
assertEquals(ann.isGetterVisibility(), v.getIsGetterVisibility());
assertEquals(ann.setterVisibility(), v.getSetterVisibility());
assertEquals(ann.creatorVisibility(), v.getCreatorVisibility());

// Let's also verify JDK serializability
byte[] b = jdkSerialize(v);
JsonAutoDetect.Value deser = jdkDeserialize(b);

assertEquals(v, deser);
}

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
* instances for overrides
*/
public class JsonIgnorePropertiesTest
extends AnnotationTestUtil
{
@JsonIgnoreProperties(value={ "foo", "bar" }, ignoreUnknown=true)
private final static class Bogus {
Expand Down Expand Up @@ -53,6 +54,12 @@ public void testFromAnnotation() throws Exception
Set<String> ign = v.getIgnored();
assertEquals(2, v.getIgnored().size());
assertEquals(_set("foo", "bar"), ign);

// Let's also verify JDK serializability
byte[] b = jdkSerialize(v);
JsonIgnoreProperties.Value deser = jdkDeserialize(b);

assertEquals(v, deser);
}

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
* instances for overrides
*/
public class JsonIncludePropertiesTest
extends AnnotationTestUtil
{
@JsonIncludeProperties(value = {"foo", "bar"})
private final static class Bogus
Expand Down Expand Up @@ -42,6 +43,12 @@ public void testFromAnnotation()
boolean test2 = tmp.equals("JsonIncludeProperties.Value(included=[bar, foo])");
assertTrue(test1 || test2);
assertEquals(v, JsonIncludeProperties.Value.from(Bogus.class.getAnnotation(JsonIncludeProperties.class)));

// Let's also verify JDK serializability
byte[] b = jdkSerialize(v);
JsonIncludeProperties.Value deser = jdkDeserialize(b);

assertEquals(v, deser);
}

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
* Tests to verify that it is possibly to merge {@link JsonInclude.Value}
* instances for overrides
*/
public class IncludeTest
public class JsonIncludeTest
extends AnnotationTestUtil
{
private final JsonInclude.Value EMPTY = JsonInclude.Value.empty();

Expand Down Expand Up @@ -45,6 +46,12 @@ public void testFromAnnotation()
JsonInclude.Value v = JsonInclude.Value.from(ann);
assertEquals(Include.NON_EMPTY, v.getValueInclusion());
assertEquals(Include.NON_DEFAULT, v.getContentInclusion());

// Let's also verify JDK serializability
byte[] b = jdkSerialize(v);
JsonInclude.Value deser = jdkDeserialize(b);

assertEquals(v, deser);
}

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import static org.junit.jupiter.api.Assertions.*;

public class JsonSetterTest
extends AnnotationTestUtil
{
private final static class Bogus {
@JsonSetter(nulls=Nulls.FAIL, contentNulls=Nulls.SKIP)
Expand Down Expand Up @@ -47,6 +48,12 @@ public void testFromAnnotation() throws Exception
JsonSetter.Value v = JsonSetter.Value.from(ann);
assertEquals(Nulls.FAIL, v.getValueNulls());
assertEquals(Nulls.SKIP, v.getContentNulls());

// Let's also verify JDK serializability
byte[] b = jdkSerialize(v);
JsonSetter.Value deser = jdkDeserialize(b);

assertEquals(v, deser);
}

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import static org.junit.jupiter.api.Assertions.*;

public class JsonTypeInfoTest
extends AnnotationTestUtil
{
@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, visible=true,
defaultImpl = JsonTypeInfo.class, requireTypeIdForSubtypes = OptBoolean.TRUE)
Expand Down Expand Up @@ -57,6 +58,12 @@ public void testFromAnnotation() throws Exception

assertEquals("JsonTypeInfo.Value(idType=CLASS,includeAs=PROPERTY,propertyName=@class,defaultImpl=NULL,idVisible=true,requireTypeIdForSubtypes=true)", v1.toString());
assertEquals("JsonTypeInfo.Value(idType=NAME,includeAs=EXTERNAL_PROPERTY,propertyName=ext,defaultImpl=java.lang.Void,idVisible=false,requireTypeIdForSubtypes=false)", v2.toString());

// Let's also verify JDK serializability
byte[] b = jdkSerialize(v1);
JsonTypeInfo.Value deser = jdkDeserialize(b);

assertEquals(v1, deser);
}

@Test
Expand Down