diff options
author | Rob Daugherty <rd472p@att.com> | 2018-09-10 17:45:52 -0400 |
---|---|---|
committer | Rob Daugherty <rd472p@att.com> | 2018-09-10 17:53:28 -0400 |
commit | 9e0219abc61b28b94d88fefbf8cc4a13d1683a67 (patch) | |
tree | 2e1e76e80bcea8c398d2a22851dce66680e68352 /nova-model/src/test/java/com/woorea/openstack/nova/model/SecurityGroupRuleForCreateTest.java | |
parent | 77ba0e5627d39af1459cf3058fb521e68b475220 (diff) |
Functional so/libs unit tests
Unit tests to prepare for migration from the codehaus to the fasterxml
implementation of jackson.
Iincreases the code coverage metric from 51% to 70%.
Change-Id: I6338214f3de9df95956b46d4e313d00052eb8692
Issue-ID: SO-1011
Signed-off-by: Rob Daugherty <rd472p@att.com>
Diffstat (limited to 'nova-model/src/test/java/com/woorea/openstack/nova/model/SecurityGroupRuleForCreateTest.java')
-rw-r--r-- | nova-model/src/test/java/com/woorea/openstack/nova/model/SecurityGroupRuleForCreateTest.java | 134 |
1 files changed, 65 insertions, 69 deletions
diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/SecurityGroupRuleForCreateTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/SecurityGroupRuleForCreateTest.java index d72094b..ae1dbac 100644 --- a/nova-model/src/test/java/com/woorea/openstack/nova/model/SecurityGroupRuleForCreateTest.java +++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/SecurityGroupRuleForCreateTest.java @@ -2,8 +2,8 @@ * ============LICENSE_START======================================================= * ONAP - SO * ================================================================================ - * Copyright (C) 2018 Huawei Intellectual Property. All rights reserved. - * ================================================================================ + * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved. + * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -17,82 +17,78 @@ * limitations under the License. * ============LICENSE_END========================================================= */ + package com.woorea.openstack.nova.model; +import com.woorea.openstack.nova.model.SecurityGroupRuleForCreate; +import org.codehaus.jackson.map.DeserializationConfig; +import org.codehaus.jackson.map.ObjectMapper; +import org.codehaus.jackson.map.SerializationConfig; +import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion; +import org.junit.Assert; import org.junit.Test; +import org.skyscreamer.jsonassert.JSONAssert; +import org.skyscreamer.jsonassert.JSONCompareMode; public class SecurityGroupRuleForCreateTest { - SecurityGroupRuleForCreate securityGroupRuleForCreate = new SecurityGroupRuleForCreate(); - - @Test - public void getParentGroupId() throws Exception { - securityGroupRuleForCreate.getParentGroupId(); - } - - @Test - public void setParentGroupId() throws Exception { - securityGroupRuleForCreate.setParentGroupId("parent"); - } - - @Test - public void setParentGroupId1() throws Exception { - securityGroupRuleForCreate.setParentGroupId(1); - } - - @Test - public void getFromPort() throws Exception { - securityGroupRuleForCreate.getFromPort(); - } - - @Test - public void setFromPort() throws Exception { - securityGroupRuleForCreate.setFromPort(80); - } - - @Test - public void getToPort() throws Exception { - securityGroupRuleForCreate.getToPort(); - } + private static final String EOL = System.lineSeparator(); + + private static final String JSON_FULL = "{" + EOL + + " \"security_group_rule\" : {" + EOL + + " \"cidr\" : \"cidr\"," + EOL + + " \"parent_group_id\" : \"parentgroupid\"," + EOL + + " \"ip_protocol\" : \"ipprotocol\"," + EOL + + " \"from_port\" : 7," + EOL + + " \"to_port\" : 98," + EOL + + " \"group_id\" : \"groupid\"" + EOL + + " }" + EOL + + "}"; + + private ObjectMapper objectMapper = new ObjectMapper() + .setSerializationInclusion(Inclusion.NON_NULL) + .enable(SerializationConfig.Feature.INDENT_OUTPUT) + .enable(SerializationConfig.Feature.WRAP_ROOT_VALUE) + .enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE) + .enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY); @Test - public void setToPort() throws Exception { - securityGroupRuleForCreate.setToPort(80); + public void testSerialization() throws Exception { + System.out.println("CLASS: " + SecurityGroupRuleForCreate.class.getName()); + System.out.println("TEST JSON: " + JSON_FULL); + SecurityGroupRuleForCreate securitygroupruleforcreate = objectMapper.readValue(JSON_FULL, SecurityGroupRuleForCreate.class); + String json = objectMapper.writeValueAsString(securitygroupruleforcreate); + System.out.println("RE-SERIALIZED OBJECT: " + json); + JSONAssert.assertEquals(JSON_FULL, json, JSONCompareMode.LENIENT); } @Test - public void getIpProtocol() throws Exception { - securityGroupRuleForCreate.getIpProtocol(); + public void testMethods() throws Exception { + SecurityGroupRuleForCreate securitygroupruleforcreate = objectMapper.readValue(JSON_FULL, SecurityGroupRuleForCreate.class); + securitygroupruleforcreate.toString(); + + String parentGroupId = securitygroupruleforcreate.getParentGroupId(); + Assert.assertNotNull(parentGroupId); + securitygroupruleforcreate.setParentGroupId(parentGroupId); + + String ipProtocol = securitygroupruleforcreate.getIpProtocol(); + Assert.assertNotNull(ipProtocol); + securitygroupruleforcreate.setIpProtocol(ipProtocol); + + String groupId = securitygroupruleforcreate.getGroupId(); + Assert.assertNotNull(groupId); + securitygroupruleforcreate.setGroupId(groupId); + + Integer fromPort = securitygroupruleforcreate.getFromPort(); + Assert.assertNotNull(fromPort); + securitygroupruleforcreate.setFromPort(fromPort); + + String cidr = securitygroupruleforcreate.getCidr(); + Assert.assertNotNull(cidr); + securitygroupruleforcreate.setCidr(cidr); + + Integer toPort = securitygroupruleforcreate.getToPort(); + Assert.assertNotNull(toPort); + securitygroupruleforcreate.setToPort(toPort); } - - @Test - public void setIpProtocol() throws Exception { - securityGroupRuleForCreate.setIpProtocol("test"); - } - - @Test - public void getCidr() throws Exception { - securityGroupRuleForCreate.getCidr(); - } - - @Test - public void setCidr() throws Exception { - securityGroupRuleForCreate.setCidr("test"); - } - - @Test - public void getGroupId() throws Exception { - securityGroupRuleForCreate.getGroupId(); - } - - @Test - public void setGroupId() throws Exception { - securityGroupRuleForCreate.setGroupId("test"); - } - - @Test - public void setGroupId1() throws Exception { - securityGroupRuleForCreate.setGroupId(1); - } - -}
\ No newline at end of file +} |