-
-
Notifications
You must be signed in to change notification settings - Fork 1.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Minor tweaks to (failing) test for #4214
- Loading branch information
1 parent
3aa59b9
commit d8be79d
Showing
1 changed file
with
17 additions
and
37 deletions.
There are no files selected for viewing
54 changes: 17 additions & 37 deletions
54
src/test/java/com/fasterxml/jackson/failing/EnumSetSerialization4214Test.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,68 +1,48 @@ | ||
package com.fasterxml.jackson.failing; | ||
|
||
import com.fasterxml.jackson.databind.BaseMapTest; | ||
import com.fasterxml.jackson.databind.ObjectMapper; | ||
|
||
import java.util.EnumSet; | ||
import java.util.Set; | ||
|
||
import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility; | ||
import com.fasterxml.jackson.annotation.PropertyAccessor; | ||
import com.fasterxml.jackson.databind.DeserializationFeature; | ||
import com.fasterxml.jackson.databind.BaseMapTest; | ||
import com.fasterxml.jackson.databind.ObjectMapper; | ||
import com.fasterxml.jackson.databind.ObjectMapper.DefaultTyping; | ||
import com.fasterxml.jackson.databind.jsontype.BasicPolymorphicTypeValidator; | ||
import com.google.common.base.Objects; | ||
|
||
public class EnumSetSerialization4214Test extends BaseMapTest { | ||
|
||
// For [databind#4214] | ||
public class EnumSetSerialization4214Test extends BaseMapTest | ||
{ | ||
static enum MyEnum { | ||
ITEM_A, ITEM_B; | ||
} | ||
|
||
static class EnumSetHolder { | ||
private Set<MyEnum> enumSet; // use Set instead of EnumSet for type of this | ||
|
||
public Set<MyEnum> getEnumSet() { | ||
return enumSet; | ||
} | ||
|
||
public void setEnumSet(Set<MyEnum> enumSet) { | ||
this.enumSet = enumSet; | ||
} | ||
public Set<MyEnum> enumSet; // use Set instead of EnumSet for type of this | ||
|
||
@Override | ||
public boolean equals(Object o) { | ||
if (!(o instanceof EnumSetHolder)) { | ||
return false; | ||
} | ||
EnumSetHolder eh = (EnumSetHolder) o; | ||
if (eh == this) { | ||
return true; | ||
} | ||
if (enumSet == null) { | ||
if (eh.getEnumSet() == null) { | ||
return true; | ||
} else { | ||
return false; | ||
} | ||
} else { | ||
if (eh.getEnumSet() == null) { | ||
return false; | ||
} | ||
return enumSet.containsAll(eh.getEnumSet()); | ||
} | ||
return Objects.equal(enumSet, eh.enumSet); | ||
} | ||
} | ||
|
||
public void testSerialization() throws Exception { | ||
public void testSerialization() throws Exception | ||
{ | ||
ObjectMapper mapper = jsonMapperBuilder().build() | ||
// this type information is needed in json string, for this test | ||
.activateDefaultTyping(BasicPolymorphicTypeValidator.builder().allowIfBaseType(Object.class).build(), | ||
DefaultTyping.EVERYTHING); | ||
DefaultTyping.NON_FINAL_AND_ENUMS); | ||
|
||
EnumSetHolder enumSetHolder = new EnumSetHolder(); | ||
enumSetHolder.setEnumSet(EnumSet.allOf(MyEnum.class)); | ||
String jsonStr = mapper.writeValueAsString(enumSetHolder); | ||
EnumSetHolder result = mapper.readValue(jsonStr, EnumSetHolder.class); | ||
enumSetHolder.enumSet = EnumSet.allOf(MyEnum.class); | ||
String json = mapper.writeValueAsString(enumSetHolder); | ||
|
||
//System.err.println("JSON = \n"+json); | ||
|
||
EnumSetHolder result = mapper.readValue(json, EnumSetHolder.class); | ||
assertEquals(result, enumSetHolder); | ||
} | ||
} |