summaryrefslogtreecommitdiffstats
path: root/keystone-model/src/test/java/com/woorea/openstack/keystone/model/authentication/UsernamePasswordTest.java
diff options
context:
space:
mode:
Diffstat (limited to 'keystone-model/src/test/java/com/woorea/openstack/keystone/model/authentication/UsernamePasswordTest.java')
-rw-r--r--keystone-model/src/test/java/com/woorea/openstack/keystone/model/authentication/UsernamePasswordTest.java32
1 files changed, 11 insertions, 21 deletions
diff --git a/keystone-model/src/test/java/com/woorea/openstack/keystone/model/authentication/UsernamePasswordTest.java b/keystone-model/src/test/java/com/woorea/openstack/keystone/model/authentication/UsernamePasswordTest.java
index 60d5385..c691484 100644
--- a/keystone-model/src/test/java/com/woorea/openstack/keystone/model/authentication/UsernamePasswordTest.java
+++ b/keystone-model/src/test/java/com/woorea/openstack/keystone/model/authentication/UsernamePasswordTest.java
@@ -25,7 +25,6 @@ import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
import com.woorea.openstack.keystone.model.authentication.UsernamePassword.PasswordCredentials;
-
import org.junit.Assert;
import org.junit.Test;
import org.skyscreamer.jsonassert.JSONAssert;
@@ -35,24 +34,15 @@ public class UsernamePasswordTest {
private static final String EOL = System.lineSeparator();
- private static final String JSON_FULL = "{" + EOL
- + " \"auth\" : {" + EOL
- + " \"tenantId\" : \"tenantid\"," + EOL
- + " \"tenantName\" : \"tenantname\"," + EOL
- + " \"passwordCredentials\" : {" + EOL
- + " \"username\" : \"username\"," + EOL
- + " \"password\" : \"password\"" + EOL
- + " }" + EOL
- + " }" + EOL
- + "}";
+ private static final String JSON_FULL = "{" + EOL + " \"auth\" : {" + EOL + " \"tenantId\" : \"tenantid\","
+ + EOL + " \"tenantName\" : \"tenantname\"," + EOL + " \"passwordCredentials\" : {" + EOL
+ + " \"username\" : \"username\"," + EOL + " \"password\" : \"password\"" + 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 {
@@ -68,15 +58,15 @@ public class UsernamePasswordTest {
public void testMethods() throws Exception {
UsernamePassword usernamepassword = objectMapper.readValue(JSON_FULL, UsernamePassword.class);
usernamepassword.toString();
-
+
PasswordCredentials passwordCredentials = usernamepassword.getPasswordCredentials();
Assert.assertNotNull(passwordCredentials);
usernamepassword.setPasswordCredentials(passwordCredentials);
-
+
String tenantId = usernamepassword.getTenantId();
Assert.assertNotNull(tenantId);
usernamepassword.setTenantId(tenantId);
-
+
String tenantName = usernamepassword.getTenantName();
Assert.assertNotNull(tenantName);
usernamepassword.setTenantName(tenantName);