fix failing tesrs fixtures

(cherry picked from commit c3d5863)

Author: tzolov

spring-cloud-dataflow-configuration-metadata/src/test/java/org/springframework/cloud/dataflow/container/registry/DefaultContainerImageMetadataResolverTest.java

@@ -21,6 +21,8 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
@@ -96,7 +98,7 @@ public void getImageLabelsInvalidImageName() {
 	}
 
 	@Test
-	public void getImageLabels() {
+	public void getImageLabels() throws JsonProcessingException {
 
 		DefaultContainerImageMetadataResolver resolver = new MockedDefaultContainerImageMetadataResolver(this.containerRegistryService);
 
@@ -112,7 +114,7 @@ public void getImageLabels() {
 	}
 
 	@Test
-	public void getImageLabelsFromPrivateRepository() {
+	public void getImageLabelsFromPrivateRepository() throws JsonProcessingException {
 
 		DefaultContainerImageMetadataResolver resolver = new MockedDefaultContainerImageMetadataResolver(this.containerRegistryService);
 
@@ -129,10 +131,8 @@ public void getImageLabelsFromPrivateRepository() {
 
 	@Test(expected = ContainerRegistryException.class)
 	public void getImageLabelsMissingRegistryConfiguration() {
-
 		DefaultContainerImageMetadataResolver resolver = new MockedDefaultContainerImageMetadataResolver(this.containerRegistryService);
-
-		resolver.getImageLabels("test/image:latest");
+		resolver.getImageLabels("somehost:8083/test/image:latest");
 	}
 
 	@Test(expected = ContainerRegistryException.class)
@@ -183,7 +183,7 @@ public void getImageLabelsInvalidDigest() {
 	}
 
 	@Test
-	public void getImageLabelsWithInvalidLabels() {
+	public void getImageLabelsWithInvalidLabels() throws JsonProcessingException {
 
 		DefaultContainerImageMetadataResolver resolver = new MockedDefaultContainerImageMetadataResolver(this.containerRegistryService);
 
@@ -217,7 +217,7 @@ private void mockManifestRestTemplateCall(Map<String, Object> mapToReturn, Strin
 	}
 
 	private void mockBlogRestTemplateCall(String jsonResponse, String registryHost, String registryPort,
-			String repository, String digest) {
+			String repository, String digest) throws JsonProcessingException {
 
 		UriComponents blobUriComponents = UriComponentsBuilder.newInstance()
 				.scheme("https")
@@ -230,8 +230,8 @@ private void mockBlogRestTemplateCall(String jsonResponse, String registryHost,
 				eq(blobUriComponents.toUri()),
 				eq(HttpMethod.GET),
 				any(HttpEntity.class),
-				eq(String.class)))
-				.thenReturn(new ResponseEntity<>(jsonResponse, HttpStatus.OK));
+				eq(Map.class)))
+				.thenReturn(new ResponseEntity<>(new ObjectMapper().readValue(jsonResponse, Map.class), HttpStatus.OK));
 	}
 
 	private class MockedDefaultContainerImageMetadataResolver extends DefaultContainerImageMetadataResolver {