summaryrefslogtreecommitdiffstats
path: root/glance-model/src/test/java/com/woorea/openstack/glance/model/SharedImageTest.java
diff options
context:
space:
mode:
Diffstat (limited to 'glance-model/src/test/java/com/woorea/openstack/glance/model/SharedImageTest.java')
-rw-r--r--glance-model/src/test/java/com/woorea/openstack/glance/model/SharedImageTest.java22
1 files changed, 10 insertions, 12 deletions
diff --git a/glance-model/src/test/java/com/woorea/openstack/glance/model/SharedImageTest.java b/glance-model/src/test/java/com/woorea/openstack/glance/model/SharedImageTest.java
index f1348ee..41805cb 100644
--- a/glance-model/src/test/java/com/woorea/openstack/glance/model/SharedImageTest.java
+++ b/glance-model/src/test/java/com/woorea/openstack/glance/model/SharedImageTest.java
@@ -20,28 +20,26 @@
package com.woorea.openstack.glance.model;
-import com.woorea.openstack.glance.model.SharedImage;
-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 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 org.junit.Test;
import org.skyscreamer.jsonassert.JSONAssert;
import org.skyscreamer.jsonassert.JSONCompareMode;
public class SharedImageTest {
- private static final String EOL = System.lineSeparator();
-
private static final String JSON_FULL = "{ }";
// FAIL_ON_EMPTY_BEANS set to false to conform to legacy behavior
private ObjectMapper objectMapper = new ObjectMapper()
- .setSerializationInclusion(Inclusion.NON_NULL)
- .enable(SerializationConfig.Feature.INDENT_OUTPUT)
- .disable(SerializationConfig.Feature.FAIL_ON_EMPTY_BEANS)
- .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+ .setSerializationInclusion(Include.NON_NULL)
+ .enable(SerializationFeature.INDENT_OUTPUT)
+ .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+ .disable(SerializationFeature.FAIL_ON_EMPTY_BEANS)
+ .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
@Test
public void testSerialization() throws Exception {