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) --- .../openstack/keystone/model/AccessTest.java | 141 ++++++--------------- 1 file changed, 40 insertions(+), 101 deletions(-) (limited to 'keystone-model/src/test/java/com/woorea/openstack/keystone/model/AccessTest.java') diff --git a/keystone-model/src/test/java/com/woorea/openstack/keystone/model/AccessTest.java b/keystone-model/src/test/java/com/woorea/openstack/keystone/model/AccessTest.java index 807c528..85e40d9 100644 --- a/keystone-model/src/test/java/com/woorea/openstack/keystone/model/AccessTest.java +++ b/keystone-model/src/test/java/com/woorea/openstack/keystone/model/AccessTest.java @@ -26,10 +26,8 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; import com.woorea.openstack.keystone.model.Access.Service; import com.woorea.openstack.keystone.model.Access.User; - import java.util.List; import java.util.Map; - import org.junit.Assert; import org.junit.Test; import org.skyscreamer.jsonassert.JSONAssert; @@ -39,101 +37,42 @@ public class AccessTest { private static final String EOL = System.lineSeparator(); - private static final String JSON_FULL = "{" + EOL - + " \"access\" : {" + EOL - + " \"token\" : {" + EOL - + " \"id\" : \"id\"," + EOL - + " \"issued_at\" : 1488024000000," + EOL - + " \"expires\" : 1488628800000," + EOL - + " \"tenant\" : {" + EOL - + " \"id\" : \"id\"," + EOL - + " \"name\" : \"name\"," + EOL - + " \"description\" : \"description\"," + EOL - + " \"enabled\" : false" + EOL - + " }" + EOL - + " }," + EOL - + " \"serviceCatalog\" : [ {" + EOL - + " \"type\" : \"type\"," + EOL - + " \"name\" : \"name\"," + EOL - + " \"endpoints\" : [ {" + EOL - + " \"region\" : \"region\"," + EOL - + " \"publicURL\" : \"publicurl\"," + EOL - + " \"internalURL\" : \"internalurl\"," + EOL - + " \"adminURL\" : \"adminurl\"" + EOL - + " }, {" + EOL - + " \"region\" : \"region\"," + EOL - + " \"publicURL\" : \"publicurl\"," + EOL - + " \"internalURL\" : \"internalurl\"," + EOL - + " \"adminURL\" : \"adminurl\"" + EOL - + " } ]," + EOL - + " \"endpoints_links\" : [ {" + EOL - + " \"rel\" : \"rel\"," + EOL - + " \"href\" : \"href\"," + EOL - + " \"type\" : \"type\"" + EOL - + " }, {" + EOL - + " \"rel\" : \"rel\"," + EOL - + " \"href\" : \"href\"," + EOL - + " \"type\" : \"type\"" + EOL - + " } ]" + EOL - + " }, {" + EOL - + " \"type\" : \"type\"," + EOL - + " \"name\" : \"name\"," + EOL - + " \"endpoints\" : [ {" + EOL - + " \"region\" : \"region\"," + EOL - + " \"publicURL\" : \"publicurl\"," + EOL - + " \"internalURL\" : \"internalurl\"," + EOL - + " \"adminURL\" : \"adminurl\"" + EOL - + " }, {" + EOL - + " \"region\" : \"region\"," + EOL - + " \"publicURL\" : \"publicurl\"," + EOL - + " \"internalURL\" : \"internalurl\"," + EOL - + " \"adminURL\" : \"adminurl\"" + EOL - + " } ]," + EOL - + " \"endpoints_links\" : [ {" + EOL - + " \"rel\" : \"rel\"," + EOL - + " \"href\" : \"href\"," + EOL - + " \"type\" : \"type\"" + EOL - + " }, {" + EOL - + " \"rel\" : \"rel\"," + EOL - + " \"href\" : \"href\"," + EOL - + " \"type\" : \"type\"" + EOL - + " } ]" + EOL - + " } ]," + EOL - + " \"user\" : {" + EOL - + " \"id\" : \"id\"," + EOL - + " \"name\" : \"name\"," + EOL - + " \"username\" : \"username\"," + EOL - + " \"roles\" : [ {" + EOL - + " \"id\" : \"id\"," + EOL - + " \"name\" : \"name\"" + EOL - + " }, {" + EOL - + " \"id\" : \"id\"," + EOL - + " \"name\" : \"name\"" + EOL - + " } ]," + EOL - + " \"roles_links\" : [ {" + EOL - + " \"rel\" : \"rel\"," + EOL - + " \"href\" : \"href\"," + EOL - + " \"type\" : \"type\"" + EOL - + " }, {" + EOL - + " \"rel\" : \"rel\"," + EOL - + " \"href\" : \"href\"," + EOL - + " \"type\" : \"type\"" + EOL - + " } ]" + EOL - + " }," + EOL - + " \"metadata\" : {" + EOL - + " \"metadata-k1\" : \"metadata-v1\"," + EOL - + " \"metadata-k2\" : \"metadata-v2\"" + EOL - + " }" + EOL - + " }" + EOL - + "}"; + private static final String JSON_FULL = "{" + EOL + " \"access\" : {" + EOL + " \"token\" : {" + EOL + + " \"id\" : \"id\"," + EOL + " \"issued_at\" : 1488024000000," + EOL + + " \"expires\" : 1488628800000," + EOL + " \"tenant\" : {" + EOL + " \"id\" : \"id\"," + + EOL + " \"name\" : \"name\"," + EOL + " \"description\" : \"description\"," + EOL + + " \"enabled\" : false" + EOL + " }" + EOL + " }," + EOL + " \"serviceCatalog\" : [ {" + + EOL + " \"type\" : \"type\"," + EOL + " \"name\" : \"name\"," + EOL + + " \"endpoints\" : [ {" + EOL + " \"region\" : \"region\"," + EOL + + " \"publicURL\" : \"publicurl\"," + EOL + " \"internalURL\" : \"internalurl\"," + EOL + + " \"adminURL\" : \"adminurl\"" + EOL + " }, {" + EOL + " \"region\" : \"region\"," + + EOL + " \"publicURL\" : \"publicurl\"," + EOL + " \"internalURL\" : \"internalurl\"," + EOL + + " \"adminURL\" : \"adminurl\"" + EOL + " } ]," + EOL + " \"endpoints_links\" : [ {" + EOL + + " \"rel\" : \"rel\"," + EOL + " \"href\" : \"href\"," + EOL + " \"type\" : \"type\"" + + EOL + " }, {" + EOL + " \"rel\" : \"rel\"," + EOL + " \"href\" : \"href\"," + EOL + + " \"type\" : \"type\"" + EOL + " } ]" + EOL + " }, {" + EOL + " \"type\" : \"type\"," + + EOL + " \"name\" : \"name\"," + EOL + " \"endpoints\" : [ {" + EOL + + " \"region\" : \"region\"," + EOL + " \"publicURL\" : \"publicurl\"," + EOL + + " \"internalURL\" : \"internalurl\"," + EOL + " \"adminURL\" : \"adminurl\"" + EOL + + " }, {" + EOL + " \"region\" : \"region\"," + EOL + " \"publicURL\" : \"publicurl\"," + + EOL + " \"internalURL\" : \"internalurl\"," + EOL + " \"adminURL\" : \"adminurl\"" + EOL + + " } ]," + EOL + " \"endpoints_links\" : [ {" + EOL + " \"rel\" : \"rel\"," + EOL + + " \"href\" : \"href\"," + EOL + " \"type\" : \"type\"" + EOL + " }, {" + EOL + + " \"rel\" : \"rel\"," + EOL + " \"href\" : \"href\"," + EOL + " \"type\" : \"type\"" + + EOL + " } ]" + EOL + " } ]," + EOL + " \"user\" : {" + EOL + " \"id\" : \"id\"," + EOL + + " \"name\" : \"name\"," + EOL + " \"username\" : \"username\"," + EOL + " \"roles\" : [ {" + + EOL + " \"id\" : \"id\"," + EOL + " \"name\" : \"name\"" + EOL + " }, {" + EOL + + " \"id\" : \"id\"," + EOL + " \"name\" : \"name\"" + EOL + " } ]," + EOL + + " \"roles_links\" : [ {" + EOL + " \"rel\" : \"rel\"," + EOL + " \"href\" : \"href\"," + + EOL + " \"type\" : \"type\"" + EOL + " }, {" + EOL + " \"rel\" : \"rel\"," + EOL + + " \"href\" : \"href\"," + EOL + " \"type\" : \"type\"" + EOL + " } ]" + EOL + " }," + + EOL + " \"metadata\" : {" + EOL + " \"metadata-k1\" : \"metadata-v1\"," + EOL + + " \"metadata-k2\" : \"metadata-v2\"" + EOL + " }" + 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 { @@ -149,18 +88,18 @@ public class AccessTest { public void testMethods() throws Exception { Access access = objectMapper.readValue(JSON_FULL, Access.class); access.toString(); - + List serviceCatalog = access.getServiceCatalog(); Assert.assertNotNull(serviceCatalog); Assert.assertEquals(2, serviceCatalog.size()); - - Map metadata = access.getMetadata(); + + Map metadata = access.getMetadata(); Assert.assertNotNull(metadata); Assert.assertEquals(2, metadata.size()); - + User user = access.getUser(); Assert.assertNotNull(user); - + Token token = access.getToken(); Assert.assertNotNull(token); } -- cgit 1.2.3-korg