summaryrefslogtreecommitdiffstats
path: root/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/DomainTest.java
diff options
context:
space:
mode:
Diffstat (limited to 'keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/DomainTest.java')
-rw-r--r--keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/DomainTest.java18
1 files changed, 10 insertions, 8 deletions
diff --git a/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/DomainTest.java b/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/DomainTest.java
index f4e75c3..f2ea79a 100644
--- a/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/DomainTest.java
+++ b/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/DomainTest.java
@@ -20,11 +20,12 @@
package com.woorea.openstack.keystone.v3.model;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
import com.woorea.openstack.keystone.v3.model.Token.Domain;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
import org.junit.Assert;
import org.junit.Test;
import org.skyscreamer.jsonassert.JSONAssert;
@@ -38,11 +39,12 @@ public class DomainTest {
+ " \"id\" : \"id\"," + EOL
+ " \"name\" : \"name\"" + EOL
+ "}";
-
+
private ObjectMapper objectMapper = new ObjectMapper()
- .setSerializationInclusion(Inclusion.NON_NULL)
- .enable(SerializationConfig.Feature.INDENT_OUTPUT)
- .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+ .setSerializationInclusion(Include.NON_NULL)
+ .enable(SerializationFeature.INDENT_OUTPUT)
+ .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+ .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
@Test
public void testSerialization() throws Exception {