diff options
Diffstat (limited to 'nova-model/src/test/java/com/woorea/openstack/nova/model/HostAggregateTest.java')
-rw-r--r-- | nova-model/src/test/java/com/woorea/openstack/nova/model/HostAggregateTest.java | 60 |
1 files changed, 23 insertions, 37 deletions
diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/HostAggregateTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/HostAggregateTest.java index 5631245..29ae8c6 100644 --- a/nova-model/src/test/java/com/woorea/openstack/nova/model/HostAggregateTest.java +++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/HostAggregateTest.java @@ -24,10 +24,8 @@ 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 java.util.Map; - import org.junit.Assert; import org.junit.Test; import org.skyscreamer.jsonassert.JSONAssert; @@ -37,30 +35,18 @@ public class HostAggregateTest { private static final String EOL = System.lineSeparator(); - private static final String JSON_FULL = "{" + EOL - + " \"aggregate\" : {" + EOL - + " \"id\" : \"id\"," + EOL - + " \"name\" : \"name\"," + EOL - + " \"deleted\" : false," + EOL - + " \"hosts\" : [ \"hosts-v1\", \"hosts-v2\" ]," + EOL - + " \"metadata\" : {" + EOL - + " \"metadata-k1\" : \"metadata-v1\"," + EOL - + " \"metadata-k2\" : \"metadata-v2\"" + EOL - + " }," + EOL - + " \"availability_zone\" : \"availabilityzone\"," + EOL - + " \"created_at\" : \"createdat\"," + EOL - + " \"updated_at\" : \"updatedat\"," + EOL - + " \"deleted_at\" : \"deletedat\"" + 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 static final String JSON_FULL = "{" + EOL + " \"aggregate\" : {" + EOL + " \"id\" : 1," + EOL + + " \"name\" : \"name\"," + EOL + " \"deleted\" : false," + EOL + + " \"hosts\" : [ \"hosts-v1\", \"hosts-v2\" ]," + EOL + " \"metadata\" : {" + EOL + + " \"metadata-k1\" : \"metadata-v1\"," + EOL + " \"metadata-k2\" : \"metadata-v2\"" + EOL + + " }," + EOL + " \"availability_zone\" : \"availabilityzone\"," + EOL + + " \"created_at\" : \"2013-02-25T02:40:21Z\"," + EOL + " \"updated_at\" : \"2013-02-25T02:40:21Z\"," + + EOL + " \"deleted_at\" : \"2013-02-25T02:40:21Z\"" + 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); @Test public void testSerialization() throws Exception { @@ -76,33 +62,33 @@ public class HostAggregateTest { public void testMethods() throws Exception { HostAggregate hostaggregate = objectMapper.readValue(JSON_FULL, HostAggregate.class); hostaggregate.toString(); - + String createdAt = hostaggregate.getCreatedAt(); Assert.assertNotNull(createdAt); - - Map<String,String> metadata = hostaggregate.getMetadata(); + + Map<String, String> metadata = hostaggregate.getMetadata(); Assert.assertNotNull(metadata); Assert.assertEquals(2, metadata.size()); - + String deletedAt = hostaggregate.getDeletedAt(); Assert.assertNotNull(deletedAt); - + Boolean deleted = hostaggregate.getDeleted(); Assert.assertNotNull(deleted); - + List<String> hosts = hostaggregate.getHosts(); Assert.assertNotNull(hosts); Assert.assertEquals(2, hosts.size()); - + String name = hostaggregate.getName(); Assert.assertNotNull(name); - - String id = hostaggregate.getId(); + + Integer id = hostaggregate.getId(); Assert.assertNotNull(id); - + String availabilityZone = hostaggregate.getAvailabilityZone(); Assert.assertNotNull(availabilityZone); - + String updatedAt = hostaggregate.getUpdatedAt(); Assert.assertNotNull(updatedAt); } |