From 3f9a0c3183480d150089c0d5a6e507c877f7d121 Mon Sep 17 00:00:00 2001 From: "Smokowski, Steve (ss835w)" Date: Thu, 2 May 2019 09:42:55 -0400 Subject: Enhance Openstack Client Update Openstack Client to support additional fields Updat all formatting issues Issue-ID: SO-1844 Change-Id: I1369e0c18cc25274db8df7e12855a020b8da38da Signed-off-by: Smokowski, Steve (ss835w) --- .../nova/model/VolumeForImageCreateTest.java | 39 +++++++++------------- 1 file changed, 15 insertions(+), 24 deletions(-) (limited to 'nova-model/src/test/java/com/woorea/openstack/nova/model/VolumeForImageCreateTest.java') diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/VolumeForImageCreateTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/VolumeForImageCreateTest.java index 98a3e1a..b9be30d 100644 --- a/nova-model/src/test/java/com/woorea/openstack/nova/model/VolumeForImageCreateTest.java +++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/VolumeForImageCreateTest.java @@ -24,7 +24,6 @@ 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.Assert; import org.junit.Test; import org.skyscreamer.jsonassert.JSONAssert; @@ -34,24 +33,16 @@ public class VolumeForImageCreateTest { private static final String EOL = System.lineSeparator(); - private static final String JSON_FULL = "{" + EOL - + " \"os-volume_upload_image\" : {" + EOL - + " \"volumeId\" : \"volumeid\"," + EOL - + " \"tenantId\" : \"tenantid\"," + EOL - + " \"force\" : false," + EOL - + " \"container_format\" : \"container_format\"," + EOL - + " \"disk_format\" : \"disk_format\"," + EOL - + " \"image_name\" : \"image_name\"" + EOL - + " }" + EOL - + "}"; + private static final String JSON_FULL = "{" + EOL + " \"os-volume_upload_image\" : {" + EOL + + " \"volumeId\" : \"volumeid\"," + EOL + " \"tenantId\" : \"tenantid\"," + EOL + + " \"force\" : false," + EOL + " \"container_format\" : \"container_format\"," + EOL + + " \"disk_format\" : \"disk_format\"," + EOL + " \"image_name\" : \"image_name\"" + EOL + " }" + EOL + + "}"; - private ObjectMapper objectMapper = new ObjectMapper() - .setSerializationInclusion(Include.NON_NULL) - .enable(SerializationFeature.INDENT_OUTPUT) - .enable(SerializationFeature.WRAP_ROOT_VALUE) - .enable(DeserializationFeature.UNWRAP_ROOT_VALUE) - .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES) - .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY); + private ObjectMapper objectMapper = new ObjectMapper().setSerializationInclusion(Include.NON_NULL) + .enable(SerializationFeature.INDENT_OUTPUT).enable(SerializationFeature.WRAP_ROOT_VALUE) + .enable(DeserializationFeature.UNWRAP_ROOT_VALUE).enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES) + .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY); @Test public void testSerialization() throws Exception { @@ -67,27 +58,27 @@ public class VolumeForImageCreateTest { public void testMethods() throws Exception { VolumeForImageCreate volumeforimagecreate = objectMapper.readValue(JSON_FULL, VolumeForImageCreate.class); volumeforimagecreate.toString(); - + String image_name = volumeforimagecreate.getImage_name(); Assert.assertNotNull(image_name); volumeforimagecreate.setImage_name(image_name); - + String tenantId = volumeforimagecreate.getTenantId(); Assert.assertNotNull(tenantId); volumeforimagecreate.setTenantId(tenantId); - + String volumeId = volumeforimagecreate.getVolumeId(); Assert.assertNotNull(volumeId); volumeforimagecreate.setVolumeId(volumeId); - + String disk_format = volumeforimagecreate.getDisk_format(); Assert.assertNotNull(disk_format); volumeforimagecreate.setDisk_format(disk_format); - + Boolean force = volumeforimagecreate.getForce(); Assert.assertNotNull(force); volumeforimagecreate.setForce(force); - + String container_format = volumeforimagecreate.getContainer_format(); Assert.assertNotNull(container_format); volumeforimagecreate.setContainer_format(container_format); -- cgit 1.2.3-korg