[hotfix] [tests] Let MarshallingTestBases read the value from String …

…value
apache · Dec 1, 2017 · c1ffc11 · c1ffc11
1 parent 6aced12
commit c1ffc11
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/.../src/test/java/org/apache/flink/runtime/rest/messages/RestRequestMarshallingTestBase.java b/.../src/test/java/org/apache/flink/runtime/rest/messages/RestRequestMarshallingTestBase.java
@@ -21,7 +21,6 @@
 import org.apache.flink.runtime.rest.util.RestMapperUtils;
 import org.apache.flink.util.TestLogger;
 
-import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
 import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper;
 
 import org.junit.Assert;
@@ -54,9 +53,9 @@ public void testJsonMarshalling() throws Exception {
 		final R expected = getTestRequestInstance();
 
 		ObjectMapper objectMapper = RestMapperUtils.getStrictObjectMapper();
-		JsonNode json = objectMapper.valueToTree(expected);
+		final String marshalled = objectMapper.writeValueAsString(expected);
 
-		final R unmarshalled = objectMapper.treeToValue(json, getTestRequestClass());
+		final R unmarshalled = objectMapper.readValue(marshalled, getTestRequestClass());
 		Assert.assertEquals(expected, unmarshalled);
 	}
 

diff --git a/...src/test/java/org/apache/flink/runtime/rest/messages/RestResponseMarshallingTestBase.java b/...src/test/java/org/apache/flink/runtime/rest/messages/RestResponseMarshallingTestBase.java
@@ -21,7 +21,6 @@
 import org.apache.flink.runtime.rest.util.RestMapperUtils;
 import org.apache.flink.util.TestLogger;
 
-import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
 import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper;
 
 import org.junit.Assert;
@@ -54,9 +53,9 @@ public void testJsonMarshalling() throws Exception {
 		final R expected = getTestResponseInstance();
 
 		ObjectMapper objectMapper = RestMapperUtils.getStrictObjectMapper();
-		JsonNode json = objectMapper.valueToTree(expected);
+		final String marshalled = objectMapper.writeValueAsString(expected);
 
-		final R unmarshalled = objectMapper.treeToValue(json, getTestResponseClass());
+		final R unmarshalled = objectMapper.readValue(marshalled, getTestResponseClass());
 		assertOriginalEqualsToUnmarshalled(expected, unmarshalled);
 	}