Skip to content

Commit

Permalink
test refactoring
Browse files Browse the repository at this point in the history
  • Loading branch information
cowtowncoder committed Jul 14, 2016
1 parent 83d7139 commit 26f2669
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 47 deletions.
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@
import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonGetter; import com.fasterxml.jackson.annotation.JsonGetter;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;

import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.core.type.TypeReference;

import com.fasterxml.jackson.databind.*; import com.fasterxml.jackson.databind.*;
import com.fasterxml.jackson.databind.deser.Deserializers; import com.fasterxml.jackson.databind.deser.Deserializers;
import com.fasterxml.jackson.databind.deser.std.EnumDeserializer; import com.fasterxml.jackson.databind.deser.std.EnumDeserializer;
Expand Down Expand Up @@ -140,6 +142,36 @@ static class MyEnum960Wrapper {
public MyEnum960 value; public MyEnum960 value;
} }


static enum Enum1291 {

V1("val1"),
V2("val2"),
V3("val3"),
V4("val4"),
V5("val5"),
V6("val6");

private final String name;

Enum1291(String name) {
this.name = name;
}

public static Enum1291 fromString(String name) {
for (Enum1291 type : Enum1291.values()) {
if (type.name.equals(name)) {
return type;
}
}
return Enum1291.valueOf(name.toUpperCase());
}

@Override
public String toString() {
return name;
}
}

/* /*
/********************************************************** /**********************************************************
/* Test methods /* Test methods
Expand Down Expand Up @@ -231,4 +263,13 @@ public void testNoArgEnumCreator() throws Exception
MyEnum960 v = MAPPER.readValue("{\"value\":\"bogus\"}", MyEnum960.class); MyEnum960 v = MAPPER.readValue("{\"value\":\"bogus\"}", MyEnum960.class);
assertEquals(MyEnum960.VALUE, v); assertEquals(MyEnum960.VALUE, v);
} }

// for [databind#1291]
public void testEnumCreators1291() throws Exception
{
ObjectMapper mapper = new ObjectMapper();
String json = mapper.writeValueAsString(Enum1291.V2);
Enum1291 result = mapper.readValue(json, Enum1291.class);
assertSame(Enum1291.V2, result);
}
} }

This file was deleted.

0 comments on commit 26f2669

Please sign in to comment.