diff options
Diffstat (limited to 'glance-model/src/test/java/com/woorea/openstack/glance/model/ImagesTest.java')
-rw-r--r-- | glance-model/src/test/java/com/woorea/openstack/glance/model/ImagesTest.java | 89 |
1 files changed, 28 insertions, 61 deletions
diff --git a/glance-model/src/test/java/com/woorea/openstack/glance/model/ImagesTest.java b/glance-model/src/test/java/com/woorea/openstack/glance/model/ImagesTest.java index 1ba0907..f72e1cf 100644 --- a/glance-model/src/test/java/com/woorea/openstack/glance/model/ImagesTest.java +++ b/glance-model/src/test/java/com/woorea/openstack/glance/model/ImagesTest.java @@ -24,9 +24,7 @@ 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 java.util.List; - import org.junit.Assert; import org.junit.Test; import org.skyscreamer.jsonassert.JSONAssert; @@ -36,63 +34,31 @@ public class ImagesTest { private static final String EOL = System.lineSeparator(); - private static final String JSON_FULL = "{" + EOL - + " \"images\" : [ {" + EOL - + " \"id\" : \"id\"," + EOL - + " \"uri\" : \"uri\"," + EOL - + " \"name\" : \"name\"," + EOL - + " \"size\" : 43," + EOL - + " \"checksum\" : \"checksum\"," + EOL - + " \"status\" : \"status\"," + EOL - + " \"owner\" : \"owner\"," + EOL - + " \"properties\" : {" + EOL - + " \"properties-k1\" : \"properties-v1\"," + EOL - + " \"properties-k2\" : \"properties-v2\"" + EOL - + " }," + EOL - + " \"public\" : false," + EOL - + " \"deleted\" : false," + EOL - + " \"protected\" : true," + EOL - + " \"disk_format\" : \"diskformat\"," + EOL - + " \"container_format\" : \"containerformat\"," + EOL - + " \"virtual_size\" : 18," + EOL - + " \"created_at\" : 1486296000000," + EOL - + " \"updated_at\" : 1487592000000," + EOL - + " \"deleted_at\" : 1486209600000," + EOL - + " \"is_public\" : false," + EOL - + " \"min_ram\" : 62," + EOL - + " \"min_disk\" : 69" + EOL - + " }, {" + EOL - + " \"id\" : \"id\"," + EOL - + " \"uri\" : \"uri\"," + EOL - + " \"name\" : \"name\"," + EOL - + " \"size\" : 43," + EOL - + " \"checksum\" : \"checksum\"," + EOL - + " \"status\" : \"status\"," + EOL - + " \"owner\" : \"owner\"," + EOL - + " \"properties\" : {" + EOL - + " \"properties-k1\" : \"properties-v1\"," + EOL - + " \"properties-k2\" : \"properties-v2\"" + EOL - + " }," + EOL - + " \"public\" : false," + EOL - + " \"deleted\" : false," + EOL - + " \"protected\" : true," + EOL - + " \"disk_format\" : \"diskformat\"," + EOL - + " \"container_format\" : \"containerformat\"," + EOL - + " \"virtual_size\" : 18," + EOL - + " \"created_at\" : 1486296000000," + EOL - + " \"updated_at\" : 1487592000000," + EOL - + " \"deleted_at\" : 1486209600000," + EOL - + " \"is_public\" : false," + EOL - + " \"min_ram\" : 62," + EOL - + " \"min_disk\" : 69" + EOL - + " } ]" + EOL - + "}"; + private static final String JSON_FULL = "{" + EOL + " \"images\" : [ {" + EOL + " \"id\" : \"id\"," + EOL + + " \"uri\" : \"uri\"," + EOL + " \"name\" : \"name\"," + EOL + " \"size\" : 43," + EOL + + " \"checksum\" : \"checksum\"," + EOL + " \"status\" : \"status\"," + EOL + + " \"owner\" : \"owner\"," + EOL + " \"properties\" : {" + EOL + + " \"properties-k1\" : \"properties-v1\"," + EOL + " \"properties-k2\" : \"properties-v2\"" + EOL + + " }," + EOL + " \"public\" : false," + EOL + " \"deleted\" : false," + EOL + + " \"protected\" : true," + EOL + " \"disk_format\" : \"diskformat\"," + EOL + + " \"container_format\" : \"containerformat\"," + EOL + " \"virtual_size\" : 18," + EOL + + " \"created_at\" : 1486296000000," + EOL + " \"updated_at\" : 1487592000000," + EOL + + " \"deleted_at\" : 1486209600000," + EOL + " \"is_public\" : false," + EOL + " \"min_ram\" : 62," + + EOL + " \"min_disk\" : 69" + EOL + " }, {" + EOL + " \"id\" : \"id\"," + EOL + + " \"uri\" : \"uri\"," + EOL + " \"name\" : \"name\"," + EOL + " \"size\" : 43," + EOL + + " \"checksum\" : \"checksum\"," + EOL + " \"status\" : \"status\"," + EOL + + " \"owner\" : \"owner\"," + EOL + " \"properties\" : {" + EOL + + " \"properties-k1\" : \"properties-v1\"," + EOL + " \"properties-k2\" : \"properties-v2\"" + EOL + + " }," + EOL + " \"public\" : false," + EOL + " \"deleted\" : false," + EOL + + " \"protected\" : true," + EOL + " \"disk_format\" : \"diskformat\"," + EOL + + " \"container_format\" : \"containerformat\"," + EOL + " \"virtual_size\" : 18," + EOL + + " \"created_at\" : 1486296000000," + EOL + " \"updated_at\" : 1487592000000," + EOL + + " \"deleted_at\" : 1486209600000," + EOL + " \"is_public\" : false," + EOL + " \"min_ram\" : 62," + + EOL + " \"min_disk\" : 69" + EOL + " } ]" + EOL + "}"; - private ObjectMapper objectMapper = new ObjectMapper() - .setSerializationInclusion(Include.NON_NULL) - .enable(SerializationFeature.INDENT_OUTPUT) - .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(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES) + .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY); @Test public void testSerialization() throws Exception { @@ -108,13 +74,14 @@ public class ImagesTest { public void testMethods() throws Exception { Images images = objectMapper.readValue(JSON_FULL, Images.class); images.toString(); - + List<Image> list = images.getList(); Assert.assertNotNull(list); Assert.assertEquals(2, list.size()); - + int cnt = 0; - for (@SuppressWarnings("unused") Image x : images) { + for (@SuppressWarnings("unused") + Image x : images) { ++cnt; } Assert.assertEquals(2, cnt); |