From: Ritu Sood Date: Wed, 21 Sep 2016 02:03:38 +0000 (-0700) Subject: Checkstyle exception handling fix (Neutron-spi) X-Git-Tag: release/carbon~59 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=2e920cf645ebdbf92752385030c46dc6f7f4ef8e;p=neutron.git Checkstyle exception handling fix (Neutron-spi) Fixing checkstyle violations in the neutron-spi integration tests Change-Id: Ic7a1ed9ea6b4c9362fa73df550825da9e34e00e8 Signed-off-by: Ritu Sood --- diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronFirewallJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronFirewallJAXBTest.java index 026457743..adb82a1a2 100644 --- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronFirewallJAXBTest.java +++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronFirewallJAXBTest.java @@ -8,6 +8,7 @@ package org.opendaylight.neutron.spi; +import javax.xml.bind.JAXBException; import org.junit.Assert; import org.junit.Test; @@ -19,30 +20,27 @@ public class NeutronFirewallJAXBTest { + "\"shared\": true, \"firewall_policy_id\": \"83ca694a-eeff-48e5-b2d8-fe5198cf2e86\" }"; @Test - public void test_NeutronFirewall_JAXB() { + public void test_NeutronFirewall_JAXB() throws JAXBException { NeutronFirewall dummyObject = new NeutronFirewall(); - try { - NeutronFirewall testObject = (NeutronFirewall) JaxbTestHelper.jaxbUnmarshall(dummyObject, - NeutronFirewall_sourceJson); - Assert.assertEquals("NeutronFirewall JAXB Test 1: Testing id failed", - "d6220bbb-35f3-48ab-8eae-69c60aef3546", testObject.getID()); - Assert.assertEquals("NeutronFirewall JAXB Test 2: Testing tenant_id failed", - "aa902936679e4ea29bfe1158e3450a13", testObject.getTenantID()); + NeutronFirewall testObject = (NeutronFirewall) JaxbTestHelper.jaxbUnmarshall(dummyObject, + NeutronFirewall_sourceJson); + Assert.assertEquals("NeutronFirewall JAXB Test 1: Testing id failed", + "d6220bbb-35f3-48ab-8eae-69c60aef3546", testObject.getID()); - Assert.assertEquals("NeutronFirewall JAXB Test 3: Testing name failed", "jaxb-test", - testObject.getFirewallName()); + Assert.assertEquals("NeutronFirewall JAXB Test 2: Testing tenant_id failed", + "aa902936679e4ea29bfe1158e3450a13", testObject.getTenantID()); - Assert.assertFalse("NeutronFirewall JAXB Test 5: Testing admin_state_up failed", - testObject.getFirewallAdminStateIsUp()); + Assert.assertEquals("NeutronFirewall JAXB Test 3: Testing name failed", "jaxb-test", + testObject.getFirewallName()); - Assert.assertTrue("NeutronFirewall JAXB Test 7: Testing shared failed", testObject.getFirewallIsShared()); + Assert.assertFalse("NeutronFirewall JAXB Test 5: Testing admin_state_up failed", + testObject.getFirewallAdminStateIsUp()); - Assert.assertEquals("NeutronFirewall JAXB Test 8: Testing firewall_policy_id failed", - "83ca694a-eeff-48e5-b2d8-fe5198cf2e86", testObject.getFirewallPolicyID()); - } catch (Exception e) { - Assert.assertTrue("Tests failed", false); - } + Assert.assertTrue("NeutronFirewall JAXB Test 7: Testing shared failed", testObject.getFirewallIsShared()); + + Assert.assertEquals("NeutronFirewall JAXB Test 8: Testing firewall_policy_id failed", + "83ca694a-eeff-48e5-b2d8-fe5198cf2e86", testObject.getFirewallPolicyID()); } private static final String NeutronFirewallPolicy_sourceJson = @@ -52,28 +50,25 @@ public class NeutronFirewallJAXBTest { + "\"firewall_rules\": [ \"83ca694a-eeff-48e5-b2d8-fe5198cf2e86\" ] }"; @Test - public void test_NeutronFirewallPolicy_JAXB() { + public void test_NeutronFirewallPolicy_JAXB() throws JAXBException { NeutronFirewallPolicy dummyObject = new NeutronFirewallPolicy(); - try { - NeutronFirewallPolicy testObject = (NeutronFirewallPolicy) JaxbTestHelper.jaxbUnmarshall(dummyObject, - NeutronFirewallPolicy_sourceJson); - Assert.assertEquals("NeutronFirewallPolicy JAXB Test 1: Testing id failed", - "d6220bbb-35f3-48ab-8eae-69c60aef3546", testObject.getID()); - - Assert.assertEquals("NeutronFirewallPolicy JAXB Test 2: Testing tenant_id failed", - "aa902936679e4ea29bfe1158e3450a13", testObject.getTenantID()); - - Assert.assertEquals("NeutronFirewallPolicy JAXB Test 3: Testing name failed", "jaxb-test", - testObject.getFirewallPolicyName()); - - Assert.assertTrue("NeutronFirewallPolicy JAXB Test 5: Testing shared failed", - testObject.getFirewallPolicyIsShared()); - - Assert.assertTrue("NeutronFirewallPolicy JAXB Test 6: Testing audited failed", - testObject.getFirewallPolicyIsAudited()); - } catch (Exception e) { - Assert.assertTrue("Tests failed", false); - } + + NeutronFirewallPolicy testObject = (NeutronFirewallPolicy) JaxbTestHelper.jaxbUnmarshall(dummyObject, + NeutronFirewallPolicy_sourceJson); + Assert.assertEquals("NeutronFirewallPolicy JAXB Test 1: Testing id failed", + "d6220bbb-35f3-48ab-8eae-69c60aef3546", testObject.getID()); + + Assert.assertEquals("NeutronFirewallPolicy JAXB Test 2: Testing tenant_id failed", + "aa902936679e4ea29bfe1158e3450a13", testObject.getTenantID()); + + Assert.assertEquals("NeutronFirewallPolicy JAXB Test 3: Testing name failed", "jaxb-test", + testObject.getFirewallPolicyName()); + + Assert.assertTrue("NeutronFirewallPolicy JAXB Test 5: Testing shared failed", + testObject.getFirewallPolicyIsShared()); + + Assert.assertTrue("NeutronFirewallPolicy JAXB Test 6: Testing audited failed", + testObject.getFirewallPolicyIsAudited()); } private static final String NeutronFirewallRule_sourceJson = "{ \"action\": \"allow\", " @@ -85,60 +80,57 @@ public class NeutronFirewallJAXBTest { + "\"source_port\": null, \"tenant_id\": \"45977fa2dbd7482098dd68d0d8970117\" }"; @Test - public void test_NeutronFirewallRule_JAXB() { + public void test_NeutronFirewallRule_JAXB() throws JAXBException { NeutronFirewallRule dummyObject = new NeutronFirewallRule(); - try { - NeutronFirewallRule testObject = (NeutronFirewallRule) JaxbTestHelper.jaxbUnmarshall(dummyObject, - NeutronFirewallRule_sourceJson); - Assert.assertEquals("NeutronFirewallRule JAXB Test 1: Testing id failed", - "8722e0e0-9cc9-4490-9660-8c9a5732fbb0", testObject.getID()); - Assert.assertEquals("NeutronFirewallRule JAXB Test 2: Testing tenant_id failed", - "45977fa2dbd7482098dd68d0d8970117", testObject.getTenantID()); + NeutronFirewallRule testObject = (NeutronFirewallRule) JaxbTestHelper.jaxbUnmarshall(dummyObject, + NeutronFirewallRule_sourceJson); + Assert.assertEquals("NeutronFirewallRule JAXB Test 1: Testing id failed", + "8722e0e0-9cc9-4490-9660-8c9a5732fbb0", testObject.getID()); + + Assert.assertEquals("NeutronFirewallRule JAXB Test 2: Testing tenant_id failed", + "45977fa2dbd7482098dd68d0d8970117", testObject.getTenantID()); - Assert.assertEquals("NeutronFirewallRule JAXB Test 3: Testing name failed", "ALLOW_HTTP", - testObject.getFirewallRuleName()); + Assert.assertEquals("NeutronFirewallRule JAXB Test 3: Testing name failed", "ALLOW_HTTP", + testObject.getFirewallRuleName()); - Assert.assertEquals("NeutronFirewallRule JAXB Test 5: Testing firewaulPolicyRuleID failed", - "83ca694a-eeff-48e5-b2d8-fe5198cf2e86", testObject.getFirewallRulePolicyID()); + Assert.assertEquals("NeutronFirewallRule JAXB Test 5: Testing firewaulPolicyRuleID failed", + "83ca694a-eeff-48e5-b2d8-fe5198cf2e86", testObject.getFirewallRulePolicyID()); - Assert.assertFalse("NeutronFirewallRule JAXB Test 6: Testing shared failed", - testObject.getFirewallRuleIsShared()); + Assert.assertFalse("NeutronFirewallRule JAXB Test 6: Testing shared failed", + testObject.getFirewallRuleIsShared()); - Assert.assertEquals("NeutronFirewallRule JAXB Test 7: Testing protocol failed", "tcp", - testObject.getFirewallRuleProtocol()); + Assert.assertEquals("NeutronFirewallRule JAXB Test 7: Testing protocol failed", "tcp", + testObject.getFirewallRuleProtocol()); - Assert.assertEquals("NeutronFirewallRule JAXB Test 8: Testing IP version failed", new Integer(4), - testObject.getFirewallRuleIpVer()); + Assert.assertEquals("NeutronFirewallRule JAXB Test 8: Testing IP version failed", new Integer(4), + testObject.getFirewallRuleIpVer()); - Assert.assertEquals("NeutronFirewallRule JAXB Test 9: Testing source IP address failed", "10.10.10.8", - testObject.getFirewallRuleSrcIpAddr()); + Assert.assertEquals("NeutronFirewallRule JAXB Test 9: Testing source IP address failed", "10.10.10.8", + testObject.getFirewallRuleSrcIpAddr()); - Assert.assertEquals("NeutronFirewallRule JAXB Test 10: Testing destination IP address failed", - "10.10.10.10", testObject.getFirewallRuleDstIpAddr()); + Assert.assertEquals("NeutronFirewallRule JAXB Test 10: Testing destination IP address failed", + "10.10.10.10", testObject.getFirewallRuleDstIpAddr()); - Assert.assertEquals("NeutronFirewallRule JAXB Test 11.1: Testing source port min failed", null, - testObject.getFirewallRuleSrcPortRangeMin()); + Assert.assertEquals("NeutronFirewallRule JAXB Test 11.1: Testing source port min failed", null, + testObject.getFirewallRuleSrcPortRangeMin()); - Assert.assertEquals("NeutronFirewallRule JAXB Test 11.2: Testing source port failed", null, - testObject.getFirewallRuleSrcPortRangeMax()); + Assert.assertEquals("NeutronFirewallRule JAXB Test 11.2: Testing source port failed", null, + testObject.getFirewallRuleSrcPortRangeMax()); - Assert.assertEquals("NeutronFirewallRule JAXB Test 12.1: Testing destination port min failed", - new Integer(80), testObject.getFirewallRuleDstPortRangeMin()); + Assert.assertEquals("NeutronFirewallRule JAXB Test 12.1: Testing destination port min failed", + new Integer(80), testObject.getFirewallRuleDstPortRangeMin()); - Assert.assertEquals("NeutronFirewallRule JAXB Test 12.2: Testing destination port max failed", - new Integer(81), testObject.getFirewallRuleDstPortRangeMax()); + Assert.assertEquals("NeutronFirewallRule JAXB Test 12.2: Testing destination port max failed", + new Integer(81), testObject.getFirewallRuleDstPortRangeMax()); - Assert.assertEquals("NeutronFirewallRule JAXB Test 13: Testing position failed", new Integer(1), - testObject.getFirewallRulePosition()); + Assert.assertEquals("NeutronFirewallRule JAXB Test 13: Testing position failed", new Integer(1), + testObject.getFirewallRulePosition()); - Assert.assertEquals("NeutronFirewallRule JAXB Test 14: Testing action", "allow", - testObject.getFirewallRuleAction()); + Assert.assertEquals("NeutronFirewallRule JAXB Test 14: Testing action", "allow", + testObject.getFirewallRuleAction()); - Assert.assertTrue("NeutronFirewallRule JAXB Test 15: Testing enabled failed", - testObject.getFirewallRuleIsEnabled()); - } catch (Exception e) { - Assert.assertTrue("Tests failed", false); - } + Assert.assertTrue("NeutronFirewallRule JAXB Test 15: Testing enabled failed", + testObject.getFirewallRuleIsEnabled()); } } diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronFloatingIPJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronFloatingIPJAXBTest.java index 8cf67bd78..e82f58d19 100644 --- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronFloatingIPJAXBTest.java +++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronFloatingIPJAXBTest.java @@ -8,6 +8,7 @@ package org.opendaylight.neutron.spi; +import javax.xml.bind.JAXBException; import org.junit.Assert; import org.junit.Test; @@ -22,36 +23,33 @@ public class NeutronFloatingIPJAXBTest { + "\"tenant_id\": \"4969c491a3c74ee4af974e6d800c62de\" }"; @Test - public void test_NeutronFloatingIP_JAXB() { + public void test_NeutronFloatingIP_JAXB() throws JAXBException { NeutronFloatingIP dummyObject = new NeutronFloatingIP(); - try { - NeutronFloatingIP testObject = (NeutronFloatingIP) JaxbTestHelper.jaxbUnmarshall(dummyObject, - NeutronFloatingIP_sourceJson); - Assert.assertEquals("NeutronFloatingIP JAXB Test 1: Testing id failed", - "2f245a7b-796b-4f26-9cf9-9e82d248fda7", testObject.getID()); - Assert.assertEquals("NeutronFloatingIP JAXB Test 2: Testing tenant_id failed", - "4969c491a3c74ee4af974e6d800c62de", testObject.getTenantID()); + NeutronFloatingIP testObject = (NeutronFloatingIP) JaxbTestHelper.jaxbUnmarshall(dummyObject, + NeutronFloatingIP_sourceJson); + Assert.assertEquals("NeutronFloatingIP JAXB Test 1: Testing id failed", + "2f245a7b-796b-4f26-9cf9-9e82d248fda7", testObject.getID()); - Assert.assertEquals("NeutronFloatingIP JAXB Test 3: Testing router id failed", - "d23abc8d-2991-4a55-ba98-2aaea84cc72f", testObject.getRouterUUID()); + Assert.assertEquals("NeutronFloatingIP JAXB Test 2: Testing tenant_id failed", + "4969c491a3c74ee4af974e6d800c62de", testObject.getTenantID()); - Assert.assertEquals("NeutronFloatingIP JAXB Test 4: Testing port id failed", - "ce705c24-c1ef-408a-bda3-7bbd946164ab", testObject.getPortUUID()); + Assert.assertEquals("NeutronFloatingIP JAXB Test 3: Testing router id failed", + "d23abc8d-2991-4a55-ba98-2aaea84cc72f", testObject.getRouterUUID()); - Assert.assertEquals("NeutronFloatingIP JAXB Test 5: Testing floating network id failed", - "376da547-b977-4cfe-9cba-275c80debf57", testObject.getFloatingNetworkUUID()); + Assert.assertEquals("NeutronFloatingIP JAXB Test 4: Testing port id failed", + "ce705c24-c1ef-408a-bda3-7bbd946164ab", testObject.getPortUUID()); - Assert.assertEquals("NeutronFloatingIP JAXB Test 6: Testing floating ip address failed", "172.24.4.228", - testObject.getFloatingIPAddress()); + Assert.assertEquals("NeutronFloatingIP JAXB Test 5: Testing floating network id failed", + "376da547-b977-4cfe-9cba-275c80debf57", testObject.getFloatingNetworkUUID()); - Assert.assertEquals("NeutronFloatingIP JAXB Test 7: Testing fixed ip address failed", "10.0.0.3", - testObject.getFixedIPAddress()); + Assert.assertEquals("NeutronFloatingIP JAXB Test 6: Testing floating ip address failed", "172.24.4.228", + testObject.getFloatingIPAddress()); - Assert.assertEquals("NeutronFloatingIP JAXB Test 8: Testing status failed", "ACTIVE", - testObject.getStatus()); - } catch (Exception e) { - Assert.assertTrue("Tests failed", false); - } + Assert.assertEquals("NeutronFloatingIP JAXB Test 7: Testing fixed ip address failed", "10.0.0.3", + testObject.getFixedIPAddress()); + + Assert.assertEquals("NeutronFloatingIP JAXB Test 8: Testing status failed", "ACTIVE", + testObject.getStatus()); } } diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancerHealthMonitorJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancerHealthMonitorJAXBTest.java index 1f7512415..b6bfa17b0 100644 --- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancerHealthMonitorJAXBTest.java +++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancerHealthMonitorJAXBTest.java @@ -10,6 +10,7 @@ package org.opendaylight.neutron.spi; import java.util.ArrayList; import java.util.List; +import javax.xml.bind.JAXBException; import org.junit.Assert; import org.junit.Test; @@ -22,51 +23,48 @@ public class NeutronLoadBalancerHealthMonitorJAXBTest { + "\"tenant_id\": \"00045a7b-796b-4f26-9cf9-9e82d248fda7\" }"; @Test - public void test_NeutronLoadBalancerHealthMonitor_JAXB() { + public void test_NeutronLoadBalancerHealthMonitor_JAXB() throws JAXBException { NeutronLoadBalancerHealthMonitor dummyObject = new NeutronLoadBalancerHealthMonitor(); - try { - NeutronLoadBalancerHealthMonitor testObject = (NeutronLoadBalancerHealthMonitor) JaxbTestHelper - .jaxbUnmarshall(dummyObject, NeutronLoadBalancerHealthMonitor_sourceJson); - Assert.assertEquals("NeutronLoadBalancerHealthMonitor JAXB Test 1: Testing id failed", - "2f245a7b-796b-4f26-9cf9-9e82d248fda7", testObject.getID()); - - Assert.assertEquals("NeutronLoadBalancerHealthMonitor JAXB Test 2: Testing Type failed", "HTTP", - testObject.getLoadBalancerHealthMonitorType()); - - Assert.assertEquals("NeutronLoadBalancerHealthMonitor JAXB Test 3: Testing delay failed", 1, - (long) testObject.getLoadBalancerHealthMonitorDelay()); - - Assert.assertEquals("NeutronLoadBalancerHealthMonitor JAXB Test 4: Testing timeout failed", 1, - (long) testObject.getLoadBalancerHealthMonitorTimeout()); - - Assert.assertFalse("NeutronLoadBalancerHealthMonitor JAXB Test 5: Testing admin_state_up failed", - testObject.getLoadBalancerHealthMonitorAdminStateIsUp()); - - Assert.assertEquals("NeutronLoadBalancerHealthMonitor JAXB Test 6: Testing max_retries failed", 5, - (long) testObject.getLoadBalancerHealthMonitorMaxRetries()); - - Assert.assertEquals("NeutronLoadBalancerHealthMonitor JAXB Test 7: Testing http_methods failed", "get", - testObject.getLoadBalancerHealthMonitorHttpMethod()); - - Assert.assertEquals("NeutronLoadBalancerHealthMonitor JAXB Test 8: Testing url_path failed", "/index.html", - testObject.getLoadBalancerHealthMonitorUrlPath()); - - Assert.assertEquals("NeutronLoadBalancerHealthMonitor JAXB Test 9: Testing expected_codes failed", - "200,201,202", testObject.getLoadBalancerHealthMonitorExpectedCodes()); - - Assert.assertEquals("NeutronLoadBalancerHealthMonitor JAXB Test 10: Testing tenant_id failed", - "00045a7b-796b-4f26-9cf9-9e82d248fda7", testObject.getTenantID()); - - Neutron_ID neutron_id = new Neutron_ID(); - neutron_id.setID("2f245a7b-0000-4f26-9cf9-9e82d248fda7"); - List loadBalancerHealthMonitorPool = new ArrayList(); - loadBalancerHealthMonitorPool.add(neutron_id); - testObject.setLoadBalancerHealthMonitorPools(loadBalancerHealthMonitorPool); - Assert.assertEquals("NeutronLoadBalancerHealthMonitor JAXB Test 11: Testing Pools failed", - "2f245a7b-0000-4f26-9cf9-9e82d248fda7", - testObject.getLoadBalancerHealthMonitorPools().get(0).getID()); - } catch (Exception e) { - Assert.assertFalse("Tests Failed", true); - } + + NeutronLoadBalancerHealthMonitor testObject = (NeutronLoadBalancerHealthMonitor) JaxbTestHelper + .jaxbUnmarshall(dummyObject, NeutronLoadBalancerHealthMonitor_sourceJson); + Assert.assertEquals("NeutronLoadBalancerHealthMonitor JAXB Test 1: Testing id failed", + "2f245a7b-796b-4f26-9cf9-9e82d248fda7", testObject.getID()); + + Assert.assertEquals("NeutronLoadBalancerHealthMonitor JAXB Test 2: Testing Type failed", "HTTP", + testObject.getLoadBalancerHealthMonitorType()); + + Assert.assertEquals("NeutronLoadBalancerHealthMonitor JAXB Test 3: Testing delay failed", 1, + (long) testObject.getLoadBalancerHealthMonitorDelay()); + + Assert.assertEquals("NeutronLoadBalancerHealthMonitor JAXB Test 4: Testing timeout failed", 1, + (long) testObject.getLoadBalancerHealthMonitorTimeout()); + + Assert.assertFalse("NeutronLoadBalancerHealthMonitor JAXB Test 5: Testing admin_state_up failed", + testObject.getLoadBalancerHealthMonitorAdminStateIsUp()); + + Assert.assertEquals("NeutronLoadBalancerHealthMonitor JAXB Test 6: Testing max_retries failed", 5, + (long) testObject.getLoadBalancerHealthMonitorMaxRetries()); + + Assert.assertEquals("NeutronLoadBalancerHealthMonitor JAXB Test 7: Testing http_methods failed", "get", + testObject.getLoadBalancerHealthMonitorHttpMethod()); + + Assert.assertEquals("NeutronLoadBalancerHealthMonitor JAXB Test 8: Testing url_path failed", "/index.html", + testObject.getLoadBalancerHealthMonitorUrlPath()); + + Assert.assertEquals("NeutronLoadBalancerHealthMonitor JAXB Test 9: Testing expected_codes failed", + "200,201,202", testObject.getLoadBalancerHealthMonitorExpectedCodes()); + + Assert.assertEquals("NeutronLoadBalancerHealthMonitor JAXB Test 10: Testing tenant_id failed", + "00045a7b-796b-4f26-9cf9-9e82d248fda7", testObject.getTenantID()); + + Neutron_ID neutron_id = new Neutron_ID(); + neutron_id.setID("2f245a7b-0000-4f26-9cf9-9e82d248fda7"); + List loadBalancerHealthMonitorPool = new ArrayList(); + loadBalancerHealthMonitorPool.add(neutron_id); + testObject.setLoadBalancerHealthMonitorPools(loadBalancerHealthMonitorPool); + Assert.assertEquals("NeutronLoadBalancerHealthMonitor JAXB Test 11: Testing Pools failed", + "2f245a7b-0000-4f26-9cf9-9e82d248fda7", + testObject.getLoadBalancerHealthMonitorPools().get(0).getID()); } } diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancerJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancerJAXBTest.java index dd993608c..d76374b4d 100644 --- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancerJAXBTest.java +++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancerJAXBTest.java @@ -8,6 +8,7 @@ package org.opendaylight.neutron.spi; +import javax.xml.bind.JAXBException; import org.junit.Assert; import org.junit.Test; @@ -21,33 +22,30 @@ public class NeutronLoadBalancerJAXBTest { + "\"tenant_id\": \"4969c491a3c74ee4af974e6d800c62de\" }"; @Test - public void test_NeutronLoadBalancer_JAXB() { + public void test_NeutronLoadBalancer_JAXB() throws JAXBException { NeutronLoadBalancer dummyObject = new NeutronLoadBalancer(); - try { - NeutronLoadBalancer testObject = (NeutronLoadBalancer) JaxbTestHelper.jaxbUnmarshall(dummyObject, - NeutronLoadBalancer_sourceJson); - Assert.assertEquals("NeutronLoadBalancer JAXB Test 1: Testing id failed", - "2f245a7b-796b-4f26-9cf9-9e82d248fda7", testObject.uuid); - Assert.assertEquals("NeutronLoadBalancer JAXB Test 2: Testing LoadBalancer Name failed", - "NeutronLoadBalancer", testObject.getLoadBalancerName()); + NeutronLoadBalancer testObject = (NeutronLoadBalancer) JaxbTestHelper.jaxbUnmarshall(dummyObject, + NeutronLoadBalancer_sourceJson); + Assert.assertEquals("NeutronLoadBalancer JAXB Test 1: Testing id failed", + "2f245a7b-796b-4f26-9cf9-9e82d248fda7", testObject.uuid); - Assert.assertEquals("NeutronLoadBalancer JAXB Test 4: Testing status failed", "ACTIVE", - testObject.getLoadBalancerStatus()); + Assert.assertEquals("NeutronLoadBalancer JAXB Test 2: Testing LoadBalancer Name failed", + "NeutronLoadBalancer", testObject.getLoadBalancerName()); - Assert.assertFalse("NeutronLoadBalancer JAXB Test 5: Testing Admin state up failed", - testObject.getLoadBalancerAdminStateUp()); + Assert.assertEquals("NeutronLoadBalancer JAXB Test 4: Testing status failed", "ACTIVE", + testObject.getLoadBalancerStatus()); - Assert.assertEquals("NeutronLoadBalancer JAXB Test 6: Testing LoadBalancer VipAddress failed", "10.0.0.3", - testObject.getLoadBalancerVipAddress()); + Assert.assertFalse("NeutronLoadBalancer JAXB Test 5: Testing Admin state up failed", + testObject.getLoadBalancerAdminStateUp()); - Assert.assertEquals("NeutronLoadBalancer JAXB Test 7: Testing router id failed", - "d23abc8d-2991-4a55-ba98-2aaea84cc72f", testObject.loadBalancerVipSubnetID); + Assert.assertEquals("NeutronLoadBalancer JAXB Test 6: Testing LoadBalancer VipAddress failed", "10.0.0.3", + testObject.getLoadBalancerVipAddress()); - Assert.assertEquals("NeutronLoadBalancer JAXB Test 8: Testing tenant_id failed", - "4969c491a3c74ee4af974e6d800c62de", testObject.getTenantID()); - } catch (Exception e) { - Assert.assertTrue("Tests failed", false); - } + Assert.assertEquals("NeutronLoadBalancer JAXB Test 7: Testing router id failed", + "d23abc8d-2991-4a55-ba98-2aaea84cc72f", testObject.loadBalancerVipSubnetID); + + Assert.assertEquals("NeutronLoadBalancer JAXB Test 8: Testing tenant_id failed", + "4969c491a3c74ee4af974e6d800c62de", testObject.getTenantID()); } } diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancerListenerJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancerListenerJAXBTest.java index f39a83e69..7f2b4456c 100644 --- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancerListenerJAXBTest.java +++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancerListenerJAXBTest.java @@ -10,6 +10,7 @@ package org.opendaylight.neutron.spi; import java.util.ArrayList; import java.util.List; +import javax.xml.bind.JAXBException; import org.junit.Assert; import org.junit.Test; @@ -23,49 +24,45 @@ public class NeutronLoadBalancerListenerJAXBTest { + "\"protocol_port\": \"80\", " + "\"tenant_id\": \"11145a7b-796b-4f26-9cf9-9e82d248fda7\" }"; @Test - public void test_NeutronLoadBalancerListener_JAXB() { + public void test_NeutronLoadBalancerListener_JAXB() throws JAXBException { NeutronLoadBalancerListener dummyObject = new NeutronLoadBalancerListener(); - try { - NeutronLoadBalancerListener testObject = (NeutronLoadBalancerListener) JaxbTestHelper - .jaxbUnmarshall(dummyObject, NeutronLoadBalancerListener_sourceJson); - Assert.assertEquals("NeutronLoadBalancerListener JAXB Test 1: Testing id failed", - "2f245a7b-796b-4f26-9cf9-9e82d248fda7", testObject.getID()); - Assert.assertEquals("NeutronLoadBalancerListener JAXB Test 2: Testing LoadBalancer defaulti pool ID failed", - "00005a7b-796b-4f26-9cf9-9e82d248fda7", testObject.getNeutronLoadBalancerListenerDefaultPoolID()); + NeutronLoadBalancerListener testObject = (NeutronLoadBalancerListener) JaxbTestHelper + .jaxbUnmarshall(dummyObject, NeutronLoadBalancerListener_sourceJson); + Assert.assertEquals("NeutronLoadBalancerListener JAXB Test 1: Testing id failed", + "2f245a7b-796b-4f26-9cf9-9e82d248fda7", testObject.getID()); - Assert.assertEquals( - "NeutronLoadBalancerListener JAXB Test 3: Testing LoadBalancer listener ConnectionLimit failed", 5, - (long) testObject.getNeutronLoadBalancerListenerConnectionLimit()); + Assert.assertEquals("NeutronLoadBalancerListener JAXB Test 2: Testing LoadBalancer defaulti pool ID failed", + "00005a7b-796b-4f26-9cf9-9e82d248fda7", testObject.getNeutronLoadBalancerListenerDefaultPoolID()); - Assert.assertEquals("NeutronLoadBalancerListener JAXB Test 4: Testing LoadBalancer listener name failed", - "LoadBalancerListener", testObject.getLoadBalancerListenerName()); + Assert.assertEquals( + "NeutronLoadBalancerListener JAXB Test 3: Testing LoadBalancer listener ConnectionLimit failed", 5, + (long) testObject.getNeutronLoadBalancerListenerConnectionLimit()); - Assert.assertFalse( - "NeutronLoadBalancerListener JAXB Test 6: Testing LoadBalancer listener admin_state_up failed", - testObject.getLoadBalancerListenerAdminStateIsUp()); + Assert.assertEquals("NeutronLoadBalancerListener JAXB Test 4: Testing LoadBalancer listener name failed", + "LoadBalancerListener", testObject.getLoadBalancerListenerName()); - Assert.assertEquals( - "NeutronLoadBalancerListener JAXB Test 7: Testing LoadBalancer listener VipAddress failed", "HTTP", - testObject.getNeutronLoadBalancerListenerProtocol()); + Assert.assertFalse( + "NeutronLoadBalancerListener JAXB Test 6: Testing LoadBalancer listener admin_state_up failed", + testObject.getLoadBalancerListenerAdminStateIsUp()); - Assert.assertEquals("NeutronLoadBalancerListener JAXB Test 8: Testing status failed", "80", - testObject.getNeutronLoadBalancerListenerProtocolPort()); + Assert.assertEquals( + "NeutronLoadBalancerListener JAXB Test 7: Testing LoadBalancer listener VipAddress failed", "HTTP", + testObject.getNeutronLoadBalancerListenerProtocol()); - Assert.assertEquals("NeutronLoadBalancerListener JAXB Test 9: Testing tenant_id failed", - "11145a7b-796b-4f26-9cf9-9e82d248fda7", testObject.getTenantID()); + Assert.assertEquals("NeutronLoadBalancerListener JAXB Test 8: Testing status failed", "80", + testObject.getNeutronLoadBalancerListenerProtocolPort()); - Neutron_ID neutron_id = new Neutron_ID(); - neutron_id.setID("2f245a7b-0000-4f26-9cf9-9e82d248fda7"); - List neutronLoadBalancerListenerLoadBalancerIDs = new ArrayList(); - neutronLoadBalancerListenerLoadBalancerIDs.add(neutron_id); - testObject.setNeutronLoadBalancerListenerLoadBalancerIDs(neutronLoadBalancerListenerLoadBalancerIDs); - Assert.assertEquals("NeutronLoadBalancerListener JAXB Test 10: Testing LoadBalancerIDs failed", - "2f245a7b-0000-4f26-9cf9-9e82d248fda7", - testObject.getNeutronLoadBalancerListenerLoadBalancerIDs().get(0).getID()); - } catch (Exception e) { - Assert.assertFalse("Tests Failed", true); - } - } + Assert.assertEquals("NeutronLoadBalancerListener JAXB Test 9: Testing tenant_id failed", + "11145a7b-796b-4f26-9cf9-9e82d248fda7", testObject.getTenantID()); + Neutron_ID neutron_id = new Neutron_ID(); + neutron_id.setID("2f245a7b-0000-4f26-9cf9-9e82d248fda7"); + List neutronLoadBalancerListenerLoadBalancerIDs = new ArrayList(); + neutronLoadBalancerListenerLoadBalancerIDs.add(neutron_id); + testObject.setNeutronLoadBalancerListenerLoadBalancerIDs(neutronLoadBalancerListenerLoadBalancerIDs); + Assert.assertEquals("NeutronLoadBalancerListener JAXB Test 10: Testing LoadBalancerIDs failed", + "2f245a7b-0000-4f26-9cf9-9e82d248fda7", + testObject.getNeutronLoadBalancerListenerLoadBalancerIDs().get(0).getID()); + } } diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancerPoolJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancerPoolJAXBTest.java index 3ab2d8f8b..e82dc7e15 100644 --- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancerPoolJAXBTest.java +++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancerPoolJAXBTest.java @@ -9,6 +9,7 @@ package org.opendaylight.neutron.spi; import java.util.List; +import javax.xml.bind.JAXBException; import org.junit.Assert; import org.junit.Test; @@ -23,51 +24,47 @@ public class NeutronLoadBalancerPoolJAXBTest { + "\"tenant_id\": \"1a3e005cf9ce40308c900bcb08e5320c\" " + "} "; @Test - public void test_NeutronLoadBalancerPool_JAXB() { + public void test_NeutronLoadBalancerPool_JAXB() throws JAXBException { NeutronLoadBalancerPool dummyObject = new NeutronLoadBalancerPool(); - try { - NeutronLoadBalancerPool testObject = (NeutronLoadBalancerPool) JaxbTestHelper.jaxbUnmarshall(dummyObject, - NeutronLoadBalancerPool_sourceJson); - Assert.assertEquals("NeutronLoadBalancerPool JAXB Test 1: Testing id failed", - "12ff63af-4127-4074-a251-bcb2ecc53ebe", testObject.getID()); - Assert.assertEquals("NeutronLoadBalancerPool JAXB Test 2: Testing name failed", "pool1", - testObject.getLoadBalancerPoolName()); + NeutronLoadBalancerPool testObject = (NeutronLoadBalancerPool) JaxbTestHelper.jaxbUnmarshall(dummyObject, + NeutronLoadBalancerPool_sourceJson); + Assert.assertEquals("NeutronLoadBalancerPool JAXB Test 1: Testing id failed", + "12ff63af-4127-4074-a251-bcb2ecc53ebe", testObject.getID()); - Assert.assertTrue("NeutronLoadBalancerPool JAXB Test 3: Testing admin_state_up failed", - testObject.getLoadBalancerPoolAdminIsStateIsUp()); + Assert.assertEquals("NeutronLoadBalancerPool JAXB Test 2: Testing name failed", "pool1", + testObject.getLoadBalancerPoolName()); - Assert.assertEquals("NeutronLoadBalancerPool JAXB Test 5: Testing LbAlgorithm failed", "ROUND_ROBIN", - testObject.getLoadBalancerPoolLbAlgorithm()); + Assert.assertTrue("NeutronLoadBalancerPool JAXB Test 3: Testing admin_state_up failed", + testObject.getLoadBalancerPoolAdminIsStateIsUp()); - Assert.assertEquals("NeutronLoadBalancerPool JAXB Test 6: Testing Protocol failed", "HTTP", - testObject.getLoadBalancerPoolProtocol()); + Assert.assertEquals("NeutronLoadBalancerPool JAXB Test 5: Testing LbAlgorithm failed", "ROUND_ROBIN", + testObject.getLoadBalancerPoolLbAlgorithm()); - Assert.assertEquals("NeutronLoadBalancerPool JAXB Test 7: Testing Tenant_id failed", - "1a3e005cf9ce40308c900bcb08e5320c", testObject.getTenantID()); + Assert.assertEquals("NeutronLoadBalancerPool JAXB Test 6: Testing Protocol failed", "HTTP", + testObject.getLoadBalancerPoolProtocol()); - Assert.assertEquals("NeutronLoadBalancerPool JAXB Test 8: Testing HealthMonitorID failed", - "00066a7b-796b-4f26-9cf9-9e82d248fda7", testObject.getNeutronLoadBalancerPoolHealthMonitorID()); + Assert.assertEquals("NeutronLoadBalancerPool JAXB Test 7: Testing Tenant_id failed", + "1a3e005cf9ce40308c900bcb08e5320c", testObject.getTenantID()); - List testListeners = testObject.getLoadBalancerPoolListeners(); - Assert.assertEquals("NeutronLoadBalancerPool JAXB Test 9.1: Testing Listeners failed", 1, - testListeners.size()); + Assert.assertEquals("NeutronLoadBalancerPool JAXB Test 8: Testing HealthMonitorID failed", + "00066a7b-796b-4f26-9cf9-9e82d248fda7", testObject.getNeutronLoadBalancerPoolHealthMonitorID()); - Assert.assertEquals("NeutronLoadBalancerPool JAXB Test 9.2: Testing Listeners failed", - "39de4d56-d663-46e5-85a1-5b9d5fa17829", testObject.getLoadBalancerPoolListeners().get(0).getID()); + List testListeners = testObject.getLoadBalancerPoolListeners(); + Assert.assertEquals("NeutronLoadBalancerPool JAXB Test 9.1: Testing Listeners failed", 1, + testListeners.size()); - List testMembers = testObject.getLoadBalancerPoolMembers(); - Assert.assertEquals("NeutronLoadBalancerPool JAXB Test 10.1: Testing Listeners failed", 0, - testMembers.size()); + Assert.assertEquals("NeutronLoadBalancerPool JAXB Test 9.2: Testing Listeners failed", + "39de4d56-d663-46e5-85a1-5b9d5fa17829", testObject.getLoadBalancerPoolListeners().get(0).getID()); - Assert.assertEquals("NeutronLoadBalancerPool JAXB Test 11: Testing session_persistence cookie_name failed", - "my_cookie", testObject.getLoadBalancerPoolSessionPersistence().getCookieName()); + List testMembers = testObject.getLoadBalancerPoolMembers(); + Assert.assertEquals("NeutronLoadBalancerPool JAXB Test 10.1: Testing Listeners failed", 0, + testMembers.size()); - Assert.assertEquals("NeutronLoadBalancerPool JAXB Test 12: Testing session_persistence type failed", - "APP_COOKIE", testObject.getLoadBalancerPoolSessionPersistence().getType()); + Assert.assertEquals("NeutronLoadBalancerPool JAXB Test 11: Testing session_persistence cookie_name failed", + "my_cookie", testObject.getLoadBalancerPoolSessionPersistence().getCookieName()); - } catch (Exception e) { - Assert.fail("Tests failed"); - } + Assert.assertEquals("NeutronLoadBalancerPool JAXB Test 12: Testing session_persistence type failed", + "APP_COOKIE", testObject.getLoadBalancerPoolSessionPersistence().getType()); } } diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancerPoolMemberJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancerPoolMemberJAXBTest.java index edfca1c6a..4c931f442 100644 --- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancerPoolMemberJAXBTest.java +++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancerPoolMemberJAXBTest.java @@ -8,6 +8,7 @@ package org.opendaylight.neutron.spi; +import javax.xml.bind.JAXBException; import org.junit.Assert; import org.junit.Test; @@ -20,34 +21,32 @@ public class NeutronLoadBalancerPoolMemberJAXBTest { + "\"tenant_id\": \"00045a7b-796b-4f26-9cf9-9e82d248fda7\" }"; @Test - public void test_NeutronLoadBalancerPoolMember_JAXB() { + public void test_NeutronLoadBalancerPoolMember_JAXB() throws JAXBException { NeutronLoadBalancerPoolMember dummyObject = new NeutronLoadBalancerPoolMember(); - try { - NeutronLoadBalancerPoolMember testObject = (NeutronLoadBalancerPoolMember) JaxbTestHelper - .jaxbUnmarshall(dummyObject, NeutronLoadBalancerPoolMember_sourceJson); - Assert.assertEquals("NeutronLoadBalancerPoolMember JAXB Test 1: Testing id failed", - "2f245a7b-796b-4f26-9cf9-9e82d248fda7", testObject.getID()); - Assert.assertEquals("NeutronLoadBalancerPoolMember JAXB Test 2: Testing address failed", "10.0.0.8", - testObject.getPoolMemberAddress()); + NeutronLoadBalancerPoolMember testObject = (NeutronLoadBalancerPoolMember) JaxbTestHelper + .jaxbUnmarshall(dummyObject, NeutronLoadBalancerPoolMember_sourceJson); + Assert.assertEquals("NeutronLoadBalancerPoolMember JAXB Test 1: Testing id failed", + "2f245a7b-796b-4f26-9cf9-9e82d248fda7", testObject.getID()); - Assert.assertEquals("NeutronLoadBalancerPoolMember JAXB Test 3: Testing protocol_port failed", 80, - (long) testObject.getPoolMemberProtoPort()); + Assert.assertEquals("NeutronLoadBalancerPoolMember JAXB Test 2: Testing address failed", "10.0.0.8", + testObject.getPoolMemberAddress()); - Assert.assertEquals("NeutronLoadBalancerPoolMember JAXB Test 4: Testing weight failed", 1, - (long) testObject.getPoolMemberWeight()); + Assert.assertEquals("NeutronLoadBalancerPoolMember JAXB Test 3: Testing protocol_port failed", 80, + (long) testObject.getPoolMemberProtoPort()); - Assert.assertFalse("NeutronLoadBalancerPoolMember JAXB Test 5: Testing admin_state_up failed", - testObject.getPoolMemberAdminStateIsUp()); + Assert.assertEquals("NeutronLoadBalancerPoolMember JAXB Test 4: Testing weight failed", 1, + (long) testObject.getPoolMemberWeight()); - Assert.assertEquals("NeutronLoadBalancerPoolMember JAXB Test 6: Testing subnet_id failed", - "10045a7b-0000-4f26-9cf9-9e82d248fda7", testObject.getPoolMemberSubnetID()); + Assert.assertFalse("NeutronLoadBalancerPoolMember JAXB Test 5: Testing admin_state_up failed", + testObject.getPoolMemberAdminStateIsUp()); + + Assert.assertEquals("NeutronLoadBalancerPoolMember JAXB Test 6: Testing subnet_id failed", + "10045a7b-0000-4f26-9cf9-9e82d248fda7", testObject.getPoolMemberSubnetID()); + + Assert.assertEquals("NeutronLoadBalancerPoolMember JAXB Test 7: Testing tenant_id failed", + "00045a7b-796b-4f26-9cf9-9e82d248fda7", testObject.getTenantID()); - Assert.assertEquals("NeutronLoadBalancerPoolMember JAXB Test 7: Testing tenant_id failed", - "00045a7b-796b-4f26-9cf9-9e82d248fda7", testObject.getTenantID()); - } catch (Exception e) { - Assert.fail("Test failed"); - } } } diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancer_SessionPersistenceJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancer_SessionPersistenceJAXBTest.java index 71a0e7162..fd9b15ccd 100644 --- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancer_SessionPersistenceJAXBTest.java +++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancer_SessionPersistenceJAXBTest.java @@ -8,6 +8,7 @@ package org.opendaylight.neutron.spi; +import javax.xml.bind.JAXBException; import org.junit.Assert; import org.junit.Test; @@ -17,19 +18,15 @@ public class NeutronLoadBalancer_SessionPersistenceJAXBTest { + "\"cookie_name\": \"NeutronLoadBalancer_SessionPersistence_Cookie\", " + "\"type\": \"HTTP_COOKIE\" }"; @Test - public void test_NeutronLoadBalancer_SessionPersistence_JAXB() { + public void test_NeutronLoadBalancer_SessionPersistence_JAXB() throws JAXBException { NeutronLoadBalancer_SessionPersistence dummyObject = new NeutronLoadBalancer_SessionPersistence(); - try { - NeutronLoadBalancer_SessionPersistence testObject = (NeutronLoadBalancer_SessionPersistence) JaxbTestHelper - .jaxbUnmarshall(dummyObject, NeutronLoadBalancer_SessionPersistence_sourceJson); - Assert.assertEquals("NeutronLoadBalancer JAXB Test 1: Testing id failed", - "NeutronLoadBalancer_SessionPersistence_Cookie", testObject.getCookieName()); - Assert.assertEquals("NeutronLoadBalancer JAXB Test 2: Testing LoadBalancer Name failed", "HTTP_COOKIE", - testObject.getType()); - } catch (Exception e) { - Assert.assertTrue("Tests failed", false); - } - } + NeutronLoadBalancer_SessionPersistence testObject = (NeutronLoadBalancer_SessionPersistence) JaxbTestHelper + .jaxbUnmarshall(dummyObject, NeutronLoadBalancer_SessionPersistence_sourceJson); + Assert.assertEquals("NeutronLoadBalancer JAXB Test 1: Testing id failed", + "NeutronLoadBalancer_SessionPersistence_Cookie", testObject.getCookieName()); + Assert.assertEquals("NeutronLoadBalancer JAXB Test 2: Testing LoadBalancer Name failed", "HTTP_COOKIE", + testObject.getType()); + } } diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronMeteringLabelJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronMeteringLabelJAXBTest.java index 212634d07..4576753d9 100644 --- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronMeteringLabelJAXBTest.java +++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronMeteringLabelJAXBTest.java @@ -8,6 +8,7 @@ package org.opendaylight.neutron.spi; +import javax.xml.bind.JAXBException; import org.junit.Assert; import org.junit.Test; @@ -19,21 +20,18 @@ public class NeutronMeteringLabelJAXBTest { + "\"tenant_id\": \"9bacb3c5d39d41a79512987f338cf177\"}"; @Test - public void test_NeutronMeteringLabel_JAXB() { + public void test_NeutronMeteringLabel_JAXB() throws JAXBException { NeutronMeteringLabel meteringObject = new NeutronMeteringLabel(); - try { - NeutronMeteringLabel testObject = (NeutronMeteringLabel) JaxbTestHelper.jaxbUnmarshall(meteringObject, - NeutronMeteringLabel_sourceJson); - Assert.assertEquals("NeutronMeteringLabel JAXB Test 1: Testing id failed", - "4e8e5957-649f-477b-9e5b-f1f75b21c03c", testObject.getID()); - - Assert.assertEquals("NeutronMeteringLabel JAXB Test 2: Testing name failed", "net1", - testObject.getMeteringLabelName()); - - Assert.assertEquals("NeutronMeteringLabel JAXB Test 4: Testing tenant_id failed", - "9bacb3c5d39d41a79512987f338cf177", testObject.getTenantID()); - } catch (Exception e) { - Assert.fail("Test failed"); - } + + NeutronMeteringLabel testObject = (NeutronMeteringLabel) JaxbTestHelper.jaxbUnmarshall(meteringObject, + NeutronMeteringLabel_sourceJson); + Assert.assertEquals("NeutronMeteringLabel JAXB Test 1: Testing id failed", + "4e8e5957-649f-477b-9e5b-f1f75b21c03c", testObject.getID()); + + Assert.assertEquals("NeutronMeteringLabel JAXB Test 2: Testing name failed", "net1", + testObject.getMeteringLabelName()); + + Assert.assertEquals("NeutronMeteringLabel JAXB Test 4: Testing tenant_id failed", + "9bacb3c5d39d41a79512987f338cf177", testObject.getTenantID()); } } diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronMeteringLabelRuleJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronMeteringLabelRuleJAXBTest.java index 0d0e7e7e4..e792ae897 100644 --- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronMeteringLabelRuleJAXBTest.java +++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronMeteringLabelRuleJAXBTest.java @@ -8,6 +8,7 @@ package org.opendaylight.neutron.spi; +import javax.xml.bind.JAXBException; import org.junit.Assert; import org.junit.Test; @@ -19,28 +20,24 @@ public class NeutronMeteringLabelRuleJAXBTest { + "\"id\": \"4e8e5957-649f-477b-9e5b-f1f75b21c03c\" }"; @Test - public void test_NeutronMeteringLabelRule_JAXB() { + public void test_NeutronMeteringLabelRule_JAXB() throws JAXBException { NeutronMeteringLabelRule meteringObject = new NeutronMeteringLabelRule(); - try { - NeutronMeteringLabelRule testObject = (NeutronMeteringLabelRule) JaxbTestHelper - .jaxbUnmarshall(meteringObject, NeutronMeteringLabelRule_sourceJson); - Assert.assertEquals("NeutronMeteringLabelRule JAXB Test 1: Testing metering_label_id failed", - "e131d186-b02d-4c0b-83d5-0c0725c4f812", testObject.getMeteringLabelRuleLabelID()); - - Assert.assertEquals("NeutronMeteringLabelRule JAXB Test 2: Testing remote_ip_prefix failed", "10.0.0.0/24", - testObject.getMeteringLabelRuleRemoteIPPrefix()); - - Assert.assertEquals("NeutronMeteringLabelRule JAXB Test 3: Testing direction failed", "ingress", - testObject.getMeteringLabelRuleDirection()); - - Assert.assertEquals("NeutronMeteringLabelRule JAXB Test 4: Testing excluded failed", false, - testObject.getMeteringLabelRuleExcluded()); - - Assert.assertEquals("NeutronMeteringLabelRule JAXB Test 5: Testing id failed", - "4e8e5957-649f-477b-9e5b-f1f75b21c03c", testObject.getID()); - } catch (Exception e) { - Assert.fail("Test failed"); - } - } + NeutronMeteringLabelRule testObject = (NeutronMeteringLabelRule) JaxbTestHelper + .jaxbUnmarshall(meteringObject, NeutronMeteringLabelRule_sourceJson); + Assert.assertEquals("NeutronMeteringLabelRule JAXB Test 1: Testing metering_label_id failed", + "e131d186-b02d-4c0b-83d5-0c0725c4f812", testObject.getMeteringLabelRuleLabelID()); + + Assert.assertEquals("NeutronMeteringLabelRule JAXB Test 2: Testing remote_ip_prefix failed", "10.0.0.0/24", + testObject.getMeteringLabelRuleRemoteIPPrefix()); + + Assert.assertEquals("NeutronMeteringLabelRule JAXB Test 3: Testing direction failed", "ingress", + testObject.getMeteringLabelRuleDirection()); + + Assert.assertEquals("NeutronMeteringLabelRule JAXB Test 4: Testing excluded failed", false, + testObject.getMeteringLabelRuleExcluded()); + + Assert.assertEquals("NeutronMeteringLabelRule JAXB Test 5: Testing id failed", + "4e8e5957-649f-477b-9e5b-f1f75b21c03c", testObject.getID()); + } } diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronNetworkJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronNetworkJAXBTest.java index 228ca10aa..72a07cc3b 100644 --- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronNetworkJAXBTest.java +++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronNetworkJAXBTest.java @@ -9,6 +9,7 @@ package org.opendaylight.neutron.spi; import java.util.List; +import javax.xml.bind.JAXBException; import org.junit.Assert; import org.junit.Test; @@ -23,40 +24,37 @@ public class NeutronNetworkJAXBTest { + "\"id\": \"4e8e5957-649f-477b-9e5b-f1f75b21c03c\" }"; @Test - public void test_NeutronNetwork_SingleProvider_JAXB() { + public void test_NeutronNetwork_SingleProvider_JAXB() throws JAXBException { NeutronNetwork dummyObject = new NeutronNetwork(); - try { - NeutronNetwork testObject = (NeutronNetwork) JaxbTestHelper.jaxbUnmarshall(dummyObject, - NeutronNetwork_SingleProvider_sourceJson); - Assert.assertEquals("NeutronNetwork JAXB Test 1: Testing id failed", "4e8e5957-649f-477b-9e5b-f1f75b21c03c", - testObject.getID()); - Assert.assertEquals("NeutronNetwork JAXB Test 2: Testing tenant_id failed", - "9bacb3c5d39d41a79512987f338cf177", testObject.getTenantID()); + NeutronNetwork testObject = (NeutronNetwork) JaxbTestHelper.jaxbUnmarshall(dummyObject, + NeutronNetwork_SingleProvider_sourceJson); + Assert.assertEquals("NeutronNetwork JAXB Test 1: Testing id failed", "4e8e5957-649f-477b-9e5b-f1f75b21c03c", + testObject.getID()); - Assert.assertEquals("NeutronNetwork JAXB Test 3: Testing physical network id failed", - "8bab8453-1bc9-45af-8c70-f83aa9b50453", testObject.getProviderPhysicalNetwork()); + Assert.assertEquals("NeutronNetwork JAXB Test 2: Testing tenant_id failed", + "9bacb3c5d39d41a79512987f338cf177", testObject.getTenantID()); - Assert.assertEquals("NeutronNetwork JAXB Test 4: Testing status failed", "ACTIVE", testObject.getStatus()); + Assert.assertEquals("NeutronNetwork JAXB Test 3: Testing physical network id failed", + "8bab8453-1bc9-45af-8c70-f83aa9b50453", testObject.getProviderPhysicalNetwork()); - Assert.assertEquals("NeutronNetwork JAXB Test 6: Testing name failed", "net1", testObject.getNetworkName()); + Assert.assertEquals("NeutronNetwork JAXB Test 4: Testing status failed", "ACTIVE", testObject.getStatus()); - Assert.assertEquals("NeutronNetwork JAXB Test 7: Testing admin state up failed", true, - testObject.getAdminStateUp()); + Assert.assertEquals("NeutronNetwork JAXB Test 6: Testing name failed", "net1", testObject.getNetworkName()); - Assert.assertEquals("NeutronNetwork JAXB Test 8: Testing router external failed", false, - testObject.getRouterExternal()); + Assert.assertEquals("NeutronNetwork JAXB Test 7: Testing admin state up failed", true, + testObject.getAdminStateUp()); - Assert.assertEquals("NeutronNetwork JAXB Test 9: Testing provider segmentation id failed", "2", - testObject.getProviderSegmentationID()); + Assert.assertEquals("NeutronNetwork JAXB Test 8: Testing router external failed", false, + testObject.getRouterExternal()); - Assert.assertEquals("NeutronNetwork JAXB Test 10: Testing provider network type id failed", "vlan", - testObject.getProviderNetworkType()); + Assert.assertEquals("NeutronNetwork JAXB Test 9: Testing provider segmentation id failed", "2", + testObject.getProviderSegmentationID()); - Assert.assertEquals("NeutronNetwork JAXB Test 11: Testing shared failed", false, testObject.getShared()); - } catch (Exception e) { - Assert.assertTrue("Tests failed", false); - } + Assert.assertEquals("NeutronNetwork JAXB Test 10: Testing provider network type id failed", "vlan", + testObject.getProviderNetworkType()); + + Assert.assertEquals("NeutronNetwork JAXB Test 11: Testing shared failed", false, testObject.getShared()); } private static final String NeutronNetwork_MultipleProvider_sourceJson = "{" + "\"status\": \"ACTIVE\", " @@ -70,53 +68,50 @@ public class NeutronNetworkJAXBTest { + "\"id\": \"4e8e5957-649f-477b-9e5b-f1f75b21c03c\" }"; @Test - public void test_NeutronNetwork_MultipleProvider_JAXB() { + public void test_NeutronNetwork_MultipleProvider_JAXB() throws JAXBException { NeutronNetwork dummyObject = new NeutronNetwork(); - try { - NeutronNetwork testObject = (NeutronNetwork) JaxbTestHelper.jaxbUnmarshall(dummyObject, - NeutronNetwork_MultipleProvider_sourceJson); - Assert.assertEquals("NeutronNetwork JAXB Test 1: Testing id failed", "4e8e5957-649f-477b-9e5b-f1f75b21c03c", - testObject.getID()); - Assert.assertEquals("NeutronNetwork JAXB Test 2: Testing tenant_id failed", - "9bacb3c5d39d41a79512987f338cf177", testObject.getTenantID()); + NeutronNetwork testObject = (NeutronNetwork) JaxbTestHelper.jaxbUnmarshall(dummyObject, + NeutronNetwork_MultipleProvider_sourceJson); + Assert.assertEquals("NeutronNetwork JAXB Test 1: Testing id failed", "4e8e5957-649f-477b-9e5b-f1f75b21c03c", + testObject.getID()); + + Assert.assertEquals("NeutronNetwork JAXB Test 2: Testing tenant_id failed", + "9bacb3c5d39d41a79512987f338cf177", testObject.getTenantID()); - Assert.assertEquals("NeutronNetwork JAXB Test 3: Testing status failed", "ACTIVE", testObject.getStatus()); + Assert.assertEquals("NeutronNetwork JAXB Test 3: Testing status failed", "ACTIVE", testObject.getStatus()); - Assert.assertEquals("NeutronNetwork JAXB Test 5: Testing name failed", "net1", testObject.getNetworkName()); + Assert.assertEquals("NeutronNetwork JAXB Test 5: Testing name failed", "net1", testObject.getNetworkName()); - Assert.assertEquals("NeutronNetwork JAXB Test 6: Testing admin state up failed", true, - testObject.getAdminStateUp()); + Assert.assertEquals("NeutronNetwork JAXB Test 6: Testing admin state up failed", true, + testObject.getAdminStateUp()); - Assert.assertEquals("NeutronNetwork JAXB Test 7: Testing router external failed", false, - testObject.getRouterExternal()); + Assert.assertEquals("NeutronNetwork JAXB Test 7: Testing router external failed", false, + testObject.getRouterExternal()); - Assert.assertEquals("NeutronNetwork JAXB Test 8: Testing shared failed", false, testObject.getShared()); + Assert.assertEquals("NeutronNetwork JAXB Test 8: Testing shared failed", false, testObject.getShared()); - List segments = testObject.getSegments(); - Assert.assertEquals("NeutronNetwork JAXB Test 9.1: Testing segments list length failed", 2, - segments.size()); + List segments = testObject.getSegments(); + Assert.assertEquals("NeutronNetwork JAXB Test 9.1: Testing segments list length failed", 2, + segments.size()); - Assert.assertEquals("NeutronNetwork JAXB Test 9.2: Testing segment index 0 segmentation id failed", "2", - segments.get(0).getProviderSegmentationID()); + Assert.assertEquals("NeutronNetwork JAXB Test 9.2: Testing segment index 0 segmentation id failed", "2", + segments.get(0).getProviderSegmentationID()); - Assert.assertEquals("NeutronNetwork JAXB Test 9.3: Testing segment index 0 physical network failed", - "8bab8453-1bc9-45af-8c70-f83aa9b50453", segments.get(0).getProviderPhysicalNetwork()); + Assert.assertEquals("NeutronNetwork JAXB Test 9.3: Testing segment index 0 physical network failed", + "8bab8453-1bc9-45af-8c70-f83aa9b50453", segments.get(0).getProviderPhysicalNetwork()); - Assert.assertEquals("NeutronNetwork JAXB Test 9.4: Testing segment index 0 network type failed", "vlan", - segments.get(0).getProviderNetworkType()); + Assert.assertEquals("NeutronNetwork JAXB Test 9.4: Testing segment index 0 network type failed", "vlan", + segments.get(0).getProviderNetworkType()); - Assert.assertEquals("NeutronNetwork JAXB Test 9.5: Testing segment index 1 segmentation id failed", null, - segments.get(1).getProviderSegmentationID()); + Assert.assertEquals("NeutronNetwork JAXB Test 9.5: Testing segment index 1 segmentation id failed", null, + segments.get(1).getProviderSegmentationID()); - Assert.assertEquals("NeutronNetwork JAXB Test 9.3: Testing segment index 1 physical network failed", - "8bab8453-1bc9-45af-8c70-f83aa9b50454", segments.get(1).getProviderPhysicalNetwork()); + Assert.assertEquals("NeutronNetwork JAXB Test 9.3: Testing segment index 1 physical network failed", + "8bab8453-1bc9-45af-8c70-f83aa9b50454", segments.get(1).getProviderPhysicalNetwork()); - Assert.assertEquals("NeutronNetwork JAXB Test 9.4: Testing segment index 1 network type failed", "stt", - segments.get(1).getProviderNetworkType()); - } catch (Exception e) { - Assert.assertTrue("Tests failed", false); - } + Assert.assertEquals("NeutronNetwork JAXB Test 9.4: Testing segment index 1 network type failed", "stt", + segments.get(1).getProviderNetworkType()); } private static final String NeutronNetwork_L3_HA_sourceJson = "{" @@ -127,32 +122,29 @@ public class NeutronNetworkJAXBTest { + "\"id\": \"d3a2beea-c6ca-4e76-ba7d-e947c5df0c0e\", " + "\"provider:segmentation_id\": 1018 " + "}"; @Test - public void test_NeutronNetwork_L3_HA_JAXB() { + public void test_NeutronNetwork_L3_HA_JAXB() throws JAXBException { NeutronNetwork dummyObject = new NeutronNetwork(); - try { - NeutronNetwork testObject = (NeutronNetwork) JaxbTestHelper.jaxbUnmarshall(dummyObject, - NeutronNetwork_L3_HA_sourceJson); - Assert.assertEquals("NeutronNetwork JAXB Test 1: Testing id failed", "d3a2beea-c6ca-4e76-ba7d-e947c5df0c0e", - testObject.getID()); - // Bug 4775: tenantId is null when json provides it as empty string - Assert.assertNull("NeutronNetwork JAXB Test 2: Testing tenant_id failed", testObject.getTenantID()); + NeutronNetwork testObject = (NeutronNetwork) JaxbTestHelper.jaxbUnmarshall(dummyObject, + NeutronNetwork_L3_HA_sourceJson); + Assert.assertEquals("NeutronNetwork JAXB Test 1: Testing id failed", "d3a2beea-c6ca-4e76-ba7d-e947c5df0c0e", + testObject.getID()); + + // Bug 4775: tenantId is null when json provides it as empty string + Assert.assertNull("NeutronNetwork JAXB Test 2: Testing tenant_id failed", testObject.getTenantID()); - Assert.assertEquals("NeutronNetwork JAXB Test 3: Testing name failed", - "HA network tenant c15340eb65804b20af2dd0fd3beddc8c", testObject.getNetworkName()); + Assert.assertEquals("NeutronNetwork JAXB Test 3: Testing name failed", + "HA network tenant c15340eb65804b20af2dd0fd3beddc8c", testObject.getNetworkName()); - Assert.assertEquals("NeutronNetwork JAXB Test 4: Testing admin state up failed", true, - testObject.getAdminStateUp()); + Assert.assertEquals("NeutronNetwork JAXB Test 4: Testing admin state up failed", true, + testObject.getAdminStateUp()); - Assert.assertEquals("NeutronNetwork JAXB Test 5: Testing router external failed", false, - testObject.getRouterExternal()); + Assert.assertEquals("NeutronNetwork JAXB Test 5: Testing router external failed", false, + testObject.getRouterExternal()); - Assert.assertEquals("NeutronNetwork JAXB Test 6: Testing shared failed", false, testObject.getShared()); + Assert.assertEquals("NeutronNetwork JAXB Test 6: Testing shared failed", false, testObject.getShared()); - Assert.assertEquals("NeutronNetwork JAXB Test 7: Testing provider segmentation id failed", "1018", - testObject.getProviderSegmentationID()); - } catch (Exception e) { - Assert.assertTrue("Tests failed", false); - } + Assert.assertEquals("NeutronNetwork JAXB Test 7: Testing provider segmentation id failed", "1018", + testObject.getProviderSegmentationID()); } } diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronNetwork_SegmentJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronNetwork_SegmentJAXBTest.java index bb4f2ecbf..fb44ece20 100644 --- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronNetwork_SegmentJAXBTest.java +++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronNetwork_SegmentJAXBTest.java @@ -8,6 +8,7 @@ package org.opendaylight.neutron.spi; +import javax.xml.bind.JAXBException; import org.junit.Assert; import org.junit.Test; @@ -17,24 +18,19 @@ public class NeutronNetwork_SegmentJAXBTest { + "\"provider:physical_network\": \"physnet1\", " + "\"provider:segmentation_id\": \"1001\" }"; @Test - public void test_NeutronNetwork_Segment_JAXB() { + public void test_NeutronNetwork_Segment_JAXB() throws JAXBException { NeutronNetwork_Segment segmentObject = new NeutronNetwork_Segment(); - try { - NeutronNetwork_Segment testObject = (NeutronNetwork_Segment) JaxbTestHelper.jaxbUnmarshall(segmentObject, - NeutronNetwork_Segment_sourceJson); - Assert.assertEquals("NeutronNetwork_Segment JAXB Test 1: Testing provider:network_type failed", "vlan", - testObject.getProviderNetworkType()); + NeutronNetwork_Segment testObject = (NeutronNetwork_Segment) JaxbTestHelper.jaxbUnmarshall(segmentObject, + NeutronNetwork_Segment_sourceJson); - Assert.assertEquals("NeutronNetwork_Segment JAXB Test 2: Testing provider:physical_network failed", - "physnet1", testObject.getProviderPhysicalNetwork()); + Assert.assertEquals("NeutronNetwork_Segment JAXB Test 1: Testing provider:network_type failed", "vlan", + testObject.getProviderNetworkType()); - Assert.assertEquals("NeutronNetwork_Segment JAXB Test 3: Testing provider:segmentation_id failed", "1001", - testObject.getProviderSegmentationID()); + Assert.assertEquals("NeutronNetwork_Segment JAXB Test 2: Testing provider:physical_network failed", + "physnet1", testObject.getProviderPhysicalNetwork()); - } catch (Exception e) { - Assert.fail("Test failed"); - } + Assert.assertEquals("NeutronNetwork_Segment JAXB Test 3: Testing provider:segmentation_id failed", "1001", + testObject.getProviderSegmentationID()); } - } diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronPortJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronPortJAXBTest.java index 08ecd09a5..09a8d782a 100644 --- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronPortJAXBTest.java +++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronPortJAXBTest.java @@ -10,6 +10,7 @@ package org.opendaylight.neutron.spi; import java.util.List; import java.util.Map; +import javax.xml.bind.JAXBException; import org.junit.Assert; import org.junit.Test; @@ -28,80 +29,75 @@ public class NeutronPortJAXBTest { + "\"id\": \"4e8e5957-649f-477b-9e5b-f1f75b21c03c\" }"; @Test - public void test_NeutronPort_JAXB() { + public void test_NeutronPort_JAXB() throws JAXBException { NeutronPort testObject = new NeutronPort(); - try { - NeutronPort neutronObject = (NeutronPort) JaxbTestHelper.jaxbUnmarshall(testObject, NeutronPort_sourceJson); - Assert.assertEquals("NeutronPort JAXB Test 1: Testing id failed", "4e8e5957-649f-477b-9e5b-f1f75b21c03c", - neutronObject.getID()); - Assert.assertEquals("NeutronPort JAXB Test 2: Testing tenant_id failed", "9bacb3c5d39d41a79512987f338cf177", - neutronObject.getTenantID()); + NeutronPort neutronObject = (NeutronPort) JaxbTestHelper.jaxbUnmarshall(testObject, NeutronPort_sourceJson); + Assert.assertEquals("NeutronPort JAXB Test 1: Testing id failed", "4e8e5957-649f-477b-9e5b-f1f75b21c03c", + neutronObject.getID()); - Assert.assertEquals("NeutronPort JAXB Test 3: Testing network_id failed", - "e9330b1f-a2ef-4160-a991-169e56ab17f5", neutronObject.getNetworkUUID()); + Assert.assertEquals("NeutronPort JAXB Test 2: Testing tenant_id failed", "9bacb3c5d39d41a79512987f338cf177", + neutronObject.getTenantID()); - Assert.assertEquals("NeutronPort JAXB Test 4: Testing status failed", "ACTIVE", neutronObject.getStatus()); + Assert.assertEquals("NeutronPort JAXB Test 3: Testing network_id failed", + "e9330b1f-a2ef-4160-a991-169e56ab17f5", neutronObject.getNetworkUUID()); - List fixedIPs = neutronObject.getFixedIPs(); - Assert.assertEquals(" NeutronPort JAXB Test 5.1: Testing fixed_ips list length failed", 1, fixedIPs.size()); + Assert.assertEquals("NeutronPort JAXB Test 4: Testing status failed", "ACTIVE", neutronObject.getStatus()); - Assert.assertEquals(" NeutronPort JAXB Test 5.2: Testing ip_address value failed", "192.168.111.3", - fixedIPs.get(0).ipAddress); + List fixedIPs = neutronObject.getFixedIPs(); + Assert.assertEquals(" NeutronPort JAXB Test 5.1: Testing fixed_ips list length failed", 1, fixedIPs.size()); - Assert.assertEquals(" NeutronPort JAXB Test 5.3: Testing subnet_id value failed", - "22b44fc2-4ffb-4de4-b0f9-69d58b37ae27", fixedIPs.get(0).subnetUUID); + Assert.assertEquals(" NeutronPort JAXB Test 5.2: Testing ip_address value failed", "192.168.111.3", + fixedIPs.get(0).ipAddress); - List extraDHCPOptions = neutronObject.getExtraDHCPOptions(); + Assert.assertEquals(" NeutronPort JAXB Test 5.3: Testing subnet_id value failed", + "22b44fc2-4ffb-4de4-b0f9-69d58b37ae27", fixedIPs.get(0).subnetUUID); - Assert.assertEquals("NeutronPort JAXB Test 6: Testing extra_dhcp_opts list length failed", 1, - extraDHCPOptions.size()); + List extraDHCPOptions = neutronObject.getExtraDHCPOptions(); - List securityGroups = neutronObject.getSecurityGroups(); - Assert.assertEquals("NeutronPort JAXB Test 7: Testing security_groups list length failed", 1, - securityGroups.size()); + Assert.assertEquals("NeutronPort JAXB Test 6: Testing extra_dhcp_opts list length failed", 1, + extraDHCPOptions.size()); - List allowedAddressPairs = neutronObject.getAllowedAddressPairs(); - Assert.assertEquals("NeutronPort JAXB Test 8: Testing allowed_address_pairs list length failed", 1, - allowedAddressPairs.size()); + List securityGroups = neutronObject.getSecurityGroups(); + Assert.assertEquals("NeutronPort JAXB Test 7: Testing security_groups list length failed", 1, + securityGroups.size()); - Map vifDetails = neutronObject.getVIFDetails(); + List allowedAddressPairs = neutronObject.getAllowedAddressPairs(); + Assert.assertEquals("NeutronPort JAXB Test 8: Testing allowed_address_pairs list length failed", 1, + allowedAddressPairs.size()); - Assert.assertEquals("NeutronPort JAXB Test 9.1: Testing vif_details list length failed", 2, - vifDetails.size()); + Map vifDetails = neutronObject.getVIFDetails(); - Assert.assertEquals("NeutronPort JAXB Test 9.2: Testing port_filter value failed", "true", - vifDetails.get("port_filter")); + Assert.assertEquals("NeutronPort JAXB Test 9.1: Testing vif_details list length failed", 2, + vifDetails.size()); - Assert.assertEquals("NeutronPort JAXB Test 9.3: Testing ovs_hybrid_plug value failed", "false", - vifDetails.get("ovs_hybrid_plug")); + Assert.assertEquals("NeutronPort JAXB Test 9.2: Testing port_filter value failed", "true", + vifDetails.get("port_filter")); - Assert.assertEquals("NeutronPort JAXB Test 10: Testing name failed", "net1", neutronObject.getName()); + Assert.assertEquals("NeutronPort JAXB Test 9.3: Testing ovs_hybrid_plug value failed", "false", + vifDetails.get("ovs_hybrid_plug")); - Assert.assertEquals("NeutronPort JAXB Test 11: Testing admin_state_up failed", true, - neutronObject.getAdminStateUp()); + Assert.assertEquals("NeutronPort JAXB Test 10: Testing name failed", "net1", neutronObject.getName()); - Assert.assertEquals("NeutronPort JAXB Test 12: Testing binding:vif_type failed", "unbound", - neutronObject.getBindingvifType()); + Assert.assertEquals("NeutronPort JAXB Test 11: Testing admin_state_up failed", true, + neutronObject.getAdminStateUp()); - Assert.assertEquals("NeutronPort JAXB Test 13: Testing binding:vnic_type failed", "normal", - neutronObject.getBindingvnicType()); + Assert.assertEquals("NeutronPort JAXB Test 12: Testing binding:vif_type failed", "unbound", + neutronObject.getBindingvifType()); - Assert.assertEquals("NeutronPort JAXB Test 14: Testing mac_address failed", "fa:16:3e:c9:cb:f0", - neutronObject.getMacAddress()); + Assert.assertEquals("NeutronPort JAXB Test 13: Testing binding:vnic_type failed", "normal", + neutronObject.getBindingvnicType()); - Assert.assertEquals("NeutronPort JAXB Test 15: Testing device_id failed", - "257614cc-e178-4c92-9c61-3b28d40eca44", neutronObject.getDeviceID()); + Assert.assertEquals("NeutronPort JAXB Test 14: Testing mac_address failed", "fa:16:3e:c9:cb:f0", + neutronObject.getMacAddress()); - Assert.assertEquals("NeutronPort JAXB Test 16: Testing device_owner failed", "", - neutronObject.getDeviceOwner()); + Assert.assertEquals("NeutronPort JAXB Test 15: Testing device_id failed", + "257614cc-e178-4c92-9c61-3b28d40eca44", neutronObject.getDeviceID()); - Assert.assertEquals("NeutronPort JAXB Test 17: Testing binding:host_id failed", "", - neutronObject.getBindinghostID()); + Assert.assertEquals("NeutronPort JAXB Test 16: Testing device_owner failed", "", + neutronObject.getDeviceOwner()); - } catch (Exception e) { - Assert.assertFalse("Tests Failed", true); - } + Assert.assertEquals("NeutronPort JAXB Test 17: Testing binding:host_id failed", "", + neutronObject.getBindinghostID()); } - } diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronPortSecurityJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronPortSecurityJAXBTest.java index 8cec249c2..85e6ed353 100644 --- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronPortSecurityJAXBTest.java +++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronPortSecurityJAXBTest.java @@ -10,6 +10,7 @@ package org.opendaylight.neutron.spi; import java.util.List; import java.util.Map; +import javax.xml.bind.JAXBException; import org.junit.Assert; import org.junit.Test; @@ -58,12 +59,12 @@ public class NeutronPortSecurityJAXBTest { + "\"id\": \"4e8e5957-649f-477b-9e5b-f1f75b21c03c\" }"; @Test - public void test_NeutronPortSecurityEnabled_JAXB() { + public void test_NeutronPortSecurityEnabled_JAXB() throws JAXBException { test_PortSecurityEnabled_JAXB(portSecurityEnabled_sourceJson, true); } @Test - public void test_NeutronPortSecurityDisabled_JAXB() { + public void test_NeutronPortSecurityDisabled_JAXB() throws JAXBException { test_PortSecurityEnabled_JAXB(portSecurityDisabled_sourceJson, false); } @@ -72,86 +73,82 @@ public class NeutronPortSecurityJAXBTest { This test checks the case when the parameter is not available. */ @Test - public void test_NeutronPortSecurityDefault_JAXB() { + public void test_NeutronPortSecurityDefault_JAXB() throws JAXBException { test_PortSecurityEnabled_JAXB(portSecurityDefault_sourceJson, true); } - private void test_PortSecurityEnabled_JAXB(String sourceJson, Boolean portSecurityEnabled) { + private void test_PortSecurityEnabled_JAXB(String sourceJson, Boolean portSecurityEnabled) throws JAXBException { NeutronPort testObject = new NeutronPort(); - try { - NeutronPort neutronObject = (NeutronPort) JaxbTestHelper.jaxbUnmarshall(testObject, sourceJson); - Assert.assertEquals("NeutronPort JAXB Test 1: Testing id failed", "4e8e5957-649f-477b-9e5b-f1f75b21c03c", - neutronObject.getID()); - Assert.assertEquals("NeutronPort JAXB Test 2: Testing tenant_id failed", "9bacb3c5d39d41a79512987f338cf177", - neutronObject.getTenantID()); + NeutronPort neutronObject = (NeutronPort) JaxbTestHelper.jaxbUnmarshall(testObject, sourceJson); + Assert.assertEquals("NeutronPort JAXB Test 1: Testing id failed", "4e8e5957-649f-477b-9e5b-f1f75b21c03c", + neutronObject.getID()); - Assert.assertEquals("NeutronPort JAXB Test 3: Testing network_id failed", - "e9330b1f-a2ef-4160-a991-169e56ab17f5", neutronObject.getNetworkUUID()); + Assert.assertEquals("NeutronPort JAXB Test 2: Testing tenant_id failed", "9bacb3c5d39d41a79512987f338cf177", + neutronObject.getTenantID()); - Assert.assertEquals("NeutronPort JAXB Test 4: Testing status failed", "ACTIVE", neutronObject.getStatus()); + Assert.assertEquals("NeutronPort JAXB Test 3: Testing network_id failed", + "e9330b1f-a2ef-4160-a991-169e56ab17f5", neutronObject.getNetworkUUID()); - List fixedIPs = neutronObject.getFixedIPs(); - Assert.assertEquals(" NeutronPort JAXB Test 5.1: Testing fixed_ips list length failed", 1, fixedIPs.size()); + Assert.assertEquals("NeutronPort JAXB Test 4: Testing status failed", "ACTIVE", neutronObject.getStatus()); - Assert.assertEquals(" NeutronPort JAXB Test 5.2: Testing ip_address value failed", "192.168.111.3", - fixedIPs.get(0).ipAddress); + List fixedIPs = neutronObject.getFixedIPs(); + Assert.assertEquals(" NeutronPort JAXB Test 5.1: Testing fixed_ips list length failed", 1, fixedIPs.size()); - Assert.assertEquals(" NeutronPort JAXB Test 5.3: Testing subnet_id value failed", - "22b44fc2-4ffb-4de4-b0f9-69d58b37ae27", fixedIPs.get(0).subnetUUID); + Assert.assertEquals(" NeutronPort JAXB Test 5.2: Testing ip_address value failed", "192.168.111.3", + fixedIPs.get(0).ipAddress); - List extraDHCPOptions = neutronObject.getExtraDHCPOptions(); + Assert.assertEquals(" NeutronPort JAXB Test 5.3: Testing subnet_id value failed", + "22b44fc2-4ffb-4de4-b0f9-69d58b37ae27", fixedIPs.get(0).subnetUUID); - Assert.assertEquals("NeutronPort JAXB Test 6: Testing extra_dhcp_opts list length failed", 1, - extraDHCPOptions.size()); + List extraDHCPOptions = neutronObject.getExtraDHCPOptions(); - List securityGroups = neutronObject.getSecurityGroups(); - Assert.assertEquals("NeutronPort JAXB Test 7: Testing security_groups list length failed", 1, - securityGroups.size()); + Assert.assertEquals("NeutronPort JAXB Test 6: Testing extra_dhcp_opts list length failed", 1, + extraDHCPOptions.size()); - List allowedAddressPairs = neutronObject.getAllowedAddressPairs(); - Assert.assertEquals("NeutronPort JAXB Test 8: Testing allowed_address_pairs list length failed", 1, - allowedAddressPairs.size()); + List securityGroups = neutronObject.getSecurityGroups(); + Assert.assertEquals("NeutronPort JAXB Test 7: Testing security_groups list length failed", 1, + securityGroups.size()); - Map vifDetails = neutronObject.getVIFDetails(); + List allowedAddressPairs = neutronObject.getAllowedAddressPairs(); + Assert.assertEquals("NeutronPort JAXB Test 8: Testing allowed_address_pairs list length failed", 1, + allowedAddressPairs.size()); - Assert.assertEquals("NeutronPort JAXB Test 9.1: Testing vif_details list length failed", 2, - vifDetails.size()); + Map vifDetails = neutronObject.getVIFDetails(); - Assert.assertEquals("NeutronPort JAXB Test 9.2: Testing port_filter value failed", "true", - vifDetails.get("port_filter")); + Assert.assertEquals("NeutronPort JAXB Test 9.1: Testing vif_details list length failed", 2, + vifDetails.size()); - Assert.assertEquals("NeutronPort JAXB Test 9.3: Testing ovs_hybrid_plug value failed", "false", - vifDetails.get("ovs_hybrid_plug")); + Assert.assertEquals("NeutronPort JAXB Test 9.2: Testing port_filter value failed", "true", + vifDetails.get("port_filter")); - Assert.assertEquals("NeutronPort JAXB Test 10: Testing name failed", "net1", neutronObject.getName()); + Assert.assertEquals("NeutronPort JAXB Test 9.3: Testing ovs_hybrid_plug value failed", "false", + vifDetails.get("ovs_hybrid_plug")); - Assert.assertEquals("NeutronPort JAXB Test 11: Testing admin_state_up failed", true, - neutronObject.getAdminStateUp()); + Assert.assertEquals("NeutronPort JAXB Test 10: Testing name failed", "net1", neutronObject.getName()); - Assert.assertEquals("NeutronPort JAXB Test 12: Testing binding:vif_type failed", "unbound", - neutronObject.getBindingvifType()); + Assert.assertEquals("NeutronPort JAXB Test 11: Testing admin_state_up failed", true, + neutronObject.getAdminStateUp()); - Assert.assertEquals("NeutronPort JAXB Test 13: Testing binding:vnic_type failed", "normal", - neutronObject.getBindingvnicType()); + Assert.assertEquals("NeutronPort JAXB Test 12: Testing binding:vif_type failed", "unbound", + neutronObject.getBindingvifType()); - Assert.assertEquals("NeutronPort JAXB Test 14: Testing mac_address failed", "fa:16:3e:c9:cb:f0", - neutronObject.getMacAddress()); + Assert.assertEquals("NeutronPort JAXB Test 13: Testing binding:vnic_type failed", "normal", + neutronObject.getBindingvnicType()); - Assert.assertEquals("NeutronPort JAXB Test 15: Testing device_id failed", - "257614cc-e178-4c92-9c61-3b28d40eca44", neutronObject.getDeviceID()); + Assert.assertEquals("NeutronPort JAXB Test 14: Testing mac_address failed", "fa:16:3e:c9:cb:f0", + neutronObject.getMacAddress()); - Assert.assertEquals("NeutronPort JAXB Test 16: Testing device_owner failed", "", - neutronObject.getDeviceOwner()); + Assert.assertEquals("NeutronPort JAXB Test 15: Testing device_id failed", + "257614cc-e178-4c92-9c61-3b28d40eca44", neutronObject.getDeviceID()); - Assert.assertEquals("NeutronPort JAXB Test 17: Testing binding:host_id failed", "", - neutronObject.getBindinghostID()); + Assert.assertEquals("NeutronPort JAXB Test 16: Testing device_owner failed", "", + neutronObject.getDeviceOwner()); - Assert.assertEquals("NeutronPort JAXB Test 18: Testing port_security_enabled failed", portSecurityEnabled, - neutronObject.getPortSecurityEnabled()); + Assert.assertEquals("NeutronPort JAXB Test 17: Testing binding:host_id failed", "", + neutronObject.getBindinghostID()); - } catch (Exception e) { - Assert.assertFalse("Tests Failed", true); - } + Assert.assertEquals("NeutronPort JAXB Test 18: Testing port_security_enabled failed", portSecurityEnabled, + neutronObject.getPortSecurityEnabled()); } } diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronPort_AllowedAddressPairsJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronPort_AllowedAddressPairsJAXBTest.java index ec195ca98..e9e052844 100644 --- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronPort_AllowedAddressPairsJAXBTest.java +++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronPort_AllowedAddressPairsJAXBTest.java @@ -8,6 +8,7 @@ package org.opendaylight.neutron.spi; +import javax.xml.bind.JAXBException; import org.junit.Assert; import org.junit.Test; @@ -17,20 +18,15 @@ public class NeutronPort_AllowedAddressPairsJAXBTest { + "\"ip_address\": \"192.168.199.1\", " + "\"mac_address\": \"fa:16:3e:c9:cb:f0\" }"; @Test - public void test_NeutronPort_AllowedAddressPairs_JAXB() { + public void test_NeutronPort_AllowedAddressPairs_JAXB() throws JAXBException { NeutronPort_AllowedAddressPairs portObject = new NeutronPort_AllowedAddressPairs(); - try { - NeutronPort_AllowedAddressPairs testObject = (NeutronPort_AllowedAddressPairs) JaxbTestHelper - .jaxbUnmarshall(portObject, NeutronPort_AllowedAddressPairs_sourceJson); - Assert.assertEquals("NeutronPort Allowed Address Pairs JAXB Test 1: Testing ip_address failed", - "192.168.199.1", testObject.getIpAddress()); - Assert.assertEquals("NeutronPort Allowed Address Pairs JAXB Test 10: Testing mac_address failed", - "fa:16:3e:c9:cb:f0", testObject.getMacAddress()); + NeutronPort_AllowedAddressPairs testObject = (NeutronPort_AllowedAddressPairs) JaxbTestHelper + .jaxbUnmarshall(portObject, NeutronPort_AllowedAddressPairs_sourceJson); + Assert.assertEquals("NeutronPort Allowed Address Pairs JAXB Test 1: Testing ip_address failed", + "192.168.199.1", testObject.getIpAddress()); - } catch (Exception e) { - Assert.assertFalse("Tests Failed", true); - } + Assert.assertEquals("NeutronPort Allowed Address Pairs JAXB Test 10: Testing mac_address failed", + "fa:16:3e:c9:cb:f0", testObject.getMacAddress()); } - } diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronPort_ExtraDHCPOptionJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronPort_ExtraDHCPOptionJAXBTest.java index 02a088576..09e7484cc 100644 --- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronPort_ExtraDHCPOptionJAXBTest.java +++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronPort_ExtraDHCPOptionJAXBTest.java @@ -8,6 +8,7 @@ package org.opendaylight.neutron.spi; +import javax.xml.bind.JAXBException; import org.junit.Assert; import org.junit.Test; @@ -23,16 +24,12 @@ public class NeutronPort_ExtraDHCPOptionJAXBTest { + "\"ip_version\": 6" + "}"; @Test - public void test_NeutronPort_ExtraDHCPOption_JAXB() { + public void test_NeutronPort_ExtraDHCPOption_JAXB() throws JAXBException { NeutronPort_ExtraDHCPOption portObject = new NeutronPort_ExtraDHCPOption(); NeutronPort_ExtraDHCPOption testObject; - try { - testObject = (NeutronPort_ExtraDHCPOption) JaxbTestHelper.jaxbUnmarshall(portObject, - NeutronPort_ExtraDHCPOption_sourceJson); - } catch (Exception e) { - Assert.assertFalse("Tests Failed", true); - return; - } + + testObject = (NeutronPort_ExtraDHCPOption) JaxbTestHelper.jaxbUnmarshall(portObject, + NeutronPort_ExtraDHCPOption_sourceJson); Assert.assertEquals("NeutronPort_ExtraDHCPOption JAXB Test 1: Testing opt_value failed", "123.123.123.456", testObject.getValue()); @@ -43,16 +40,12 @@ public class NeutronPort_ExtraDHCPOptionJAXBTest { } @Test - public void test_NeutronPort_ExtraDHCPOption_IPv4_JAXB() { + public void test_NeutronPort_ExtraDHCPOption_IPv4_JAXB() throws JAXBException { NeutronPort_ExtraDHCPOption portObject = new NeutronPort_ExtraDHCPOption(); NeutronPort_ExtraDHCPOption testObject; - try { - testObject = (NeutronPort_ExtraDHCPOption) JaxbTestHelper.jaxbUnmarshall(portObject, - NeutronPort_ExtraDHCPOption_IPv4_sourceJson); - } catch (Exception e) { - Assert.assertFalse("Tests Failed", true); - return; - } + + testObject = (NeutronPort_ExtraDHCPOption) JaxbTestHelper.jaxbUnmarshall(portObject, + NeutronPort_ExtraDHCPOption_IPv4_sourceJson); Assert.assertEquals("NeutronPort_ExtraDHCPOption_IPv4 JAXB Test 1: Testing opt_value failed", "123.123.123.456", testObject.getValue()); @@ -63,16 +56,12 @@ public class NeutronPort_ExtraDHCPOptionJAXBTest { } @Test - public void test_NeutronPort_ExtraDHCPOption_IPv6_JAXB() { + public void test_NeutronPort_ExtraDHCPOption_IPv6_JAXB() throws JAXBException { NeutronPort_ExtraDHCPOption portObject = new NeutronPort_ExtraDHCPOption(); NeutronPort_ExtraDHCPOption testObject; - try { - testObject = (NeutronPort_ExtraDHCPOption) JaxbTestHelper.jaxbUnmarshall(portObject, - NeutronPort_ExtraDHCPOption_IPv6_sourceJson); - } catch (Exception e) { - Assert.assertFalse("Tests Failed", true); - return; - } + + testObject = (NeutronPort_ExtraDHCPOption) JaxbTestHelper.jaxbUnmarshall(portObject, + NeutronPort_ExtraDHCPOption_IPv6_sourceJson); Assert.assertEquals("NeutronPort_ExtraDHCPOption_IPv6 JAXB Test 1: Testing opt_value failed", "::ffff:123.123.123.456", testObject.getValue()); diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronRouterJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronRouterJAXBTest.java index 3f6b31573..5d8f03683 100644 --- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronRouterJAXBTest.java +++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronRouterJAXBTest.java @@ -9,6 +9,7 @@ package org.opendaylight.neutron.spi; import java.util.List; +import javax.xml.bind.JAXBException; import org.junit.Assert; import org.junit.Test; @@ -22,45 +23,40 @@ public class NeutronRouterJAXBTest { + "\"routes\": [ { \"destination\":\"10.0.0.0/24\",\"nexthop\":\"1.1.1.1\" } ] }"; @Test - public void test_NeutronRouter_JAXB() { + public void test_NeutronRouter_JAXB() throws JAXBException { NeutronRouter dummyObject = new NeutronRouter(); - try { - NeutronRouter testObject = (NeutronRouter) JaxbTestHelper.jaxbUnmarshall(dummyObject, - NeutronRouter_sourceJson); - NeutronRouter_NetworkReference external_gateway_info = testObject.getExternalGatewayInfo(); - List routes = testObject.getRoutes(); + NeutronRouter testObject = (NeutronRouter) JaxbTestHelper.jaxbUnmarshall(dummyObject, + NeutronRouter_sourceJson); - Assert.assertEquals("NeutronRouter JAXB Test 1: Testing router_uuid failed", - "e9330b1f-a2ef-4160-a991-169e56ab17f5", testObject.getID()); + NeutronRouter_NetworkReference external_gateway_info = testObject.getExternalGatewayInfo(); + List routes = testObject.getRoutes(); - Assert.assertEquals("NeutronRouter JAXB Test 2: Testing name failed", "jaxb-test", testObject.getName()); + Assert.assertEquals("NeutronRouter JAXB Test 1: Testing router_uuid failed", + "e9330b1f-a2ef-4160-a991-169e56ab17f5", testObject.getID()); - Assert.assertEquals("NeutronRouter JAXB Test 3: Testing admin_state_up failed", false, - testObject.getAdminStateUp()); + Assert.assertEquals("NeutronRouter JAXB Test 2: Testing name failed", "jaxb-test", testObject.getName()); - Assert.assertEquals("NeutronRouter JAXB Test 4: Testing status failed", "ACTIVE", testObject.getStatus()); + Assert.assertEquals("NeutronRouter JAXB Test 3: Testing admin_state_up failed", false, + testObject.getAdminStateUp()); - Assert.assertEquals("NeutronFloatingIP JAXB Test 5: Testing tenant_id failed", - "aa902936679e4ea29bfe1158e3450a13", testObject.getTenantID()); + Assert.assertEquals("NeutronRouter JAXB Test 4: Testing status failed", "ACTIVE", testObject.getStatus()); - Assert.assertEquals("NeutronRouter JAXB Test 6: Testing external_gateway_info failed", - "e9330b1f-a2ef-4160-a991-169e56ab17f6", external_gateway_info.getNetworkID()); + Assert.assertEquals("NeutronFloatingIP JAXB Test 5: Testing tenant_id failed", + "aa902936679e4ea29bfe1158e3450a13", testObject.getTenantID()); - Assert.assertEquals("NeutronRouter JAXB Test 7: Testing distributed failed", false, - testObject.getDistributed()); + Assert.assertEquals("NeutronRouter JAXB Test 6: Testing external_gateway_info failed", + "e9330b1f-a2ef-4160-a991-169e56ab17f6", external_gateway_info.getNetworkID()); - Assert.assertEquals("NeutronRouter JAXB Test 8: Testing gateway_port_id failed", - "3b80198d-4f7b-4f77-9ef5-774d54e17127", testObject.getGatewayPortId()); + Assert.assertEquals("NeutronRouter JAXB Test 7: Testing distributed failed", false, + testObject.getDistributed()); - Assert.assertEquals("NeutronRouter JAXB Test 9.1: Testing routes failed", 1, routes.size()); + Assert.assertEquals("NeutronRouter JAXB Test 8: Testing gateway_port_id failed", + "3b80198d-4f7b-4f77-9ef5-774d54e17127", testObject.getGatewayPortId()); - Assert.assertEquals("NeutronRouter JAXB Test 9.2: Testing routes failed", "10.0.0.0/24", - routes.get(0).getDestination()); + Assert.assertEquals("NeutronRouter JAXB Test 9.1: Testing routes failed", 1, routes.size()); - } catch (Exception e) { - Assert.fail("Tests failed"); - } + Assert.assertEquals("NeutronRouter JAXB Test 9.2: Testing routes failed", "10.0.0.0/24", + routes.get(0).getDestination()); } - } diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronRouter_InterfaceJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronRouter_InterfaceJAXBTest.java index 3198d4a95..e7808ab34 100644 --- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronRouter_InterfaceJAXBTest.java +++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronRouter_InterfaceJAXBTest.java @@ -8,6 +8,7 @@ package org.opendaylight.neutron.spi; +import javax.xml.bind.JAXBException; import org.junit.Assert; import org.junit.Test; @@ -18,23 +19,19 @@ public class NeutronRouter_InterfaceJAXBTest { + "\"id\": \"7370da7f-234e-3f7a-ed12-e384131d886d\" }"; @Test - public void test_NeutronRouter_Interface_JAXB() { + public void test_NeutronRouter_Interface_JAXB() throws JAXBException { NeutronRouter_Interface dummyObject = new NeutronRouter_Interface(); - try { - NeutronRouter_Interface testObject = (NeutronRouter_Interface) JaxbTestHelper.jaxbUnmarshall(dummyObject, - NeutronRouter_Interface_sourceJson); - Assert.assertEquals("NeutronRouter_Interface JAXB Test 1: Testing subnet_id failed", - "3b80198d-4f7b-4f77-9ef5-774d54e17126", testObject.getSubnetUUID()); + NeutronRouter_Interface testObject = (NeutronRouter_Interface) JaxbTestHelper.jaxbUnmarshall(dummyObject, + NeutronRouter_Interface_sourceJson); - Assert.assertEquals("NeutronRouter_Interface JAXB Test 2: Testing port_id failed", - "65c0ee9f-d634-4522-8954-51021b570b0d", testObject.portUUID); + Assert.assertEquals("NeutronRouter_Interface JAXB Test 1: Testing subnet_id failed", + "3b80198d-4f7b-4f77-9ef5-774d54e17126", testObject.getSubnetUUID()); - Assert.assertEquals("NeutronRouter_Interface JAXB Test 3: Testing id failed", - "7370da7f-234e-3f7a-ed12-e384131d886d", testObject.getID()); + Assert.assertEquals("NeutronRouter_Interface JAXB Test 2: Testing port_id failed", + "65c0ee9f-d634-4522-8954-51021b570b0d", testObject.portUUID); - } catch (Exception e) { - Assert.fail("Tests failed"); - } + Assert.assertEquals("NeutronRouter_Interface JAXB Test 3: Testing id failed", + "7370da7f-234e-3f7a-ed12-e384131d886d", testObject.getID()); } } diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronRouter_NetworkReferenceJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronRouter_NetworkReferenceJAXBTest.java index b0db42394..2cafb599b 100644 --- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronRouter_NetworkReferenceJAXBTest.java +++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronRouter_NetworkReferenceJAXBTest.java @@ -9,6 +9,7 @@ package org.opendaylight.neutron.spi; import java.util.List; +import javax.xml.bind.JAXBException; import org.junit.Assert; import org.junit.Test; @@ -21,32 +22,28 @@ public class NeutronRouter_NetworkReferenceJAXBTest { + "}"; @Test - public void test_NeutronRouter_NetworkReference_JAXB() { + public void test_NeutronRouter_NetworkReference_JAXB() throws JAXBException { NeutronRouter_NetworkReference dummyObject = new NeutronRouter_NetworkReference(); - try { - NeutronRouter_NetworkReference testObject = (NeutronRouter_NetworkReference) JaxbTestHelper - .jaxbUnmarshall(dummyObject, NeutronRouter_NetworkReference_sourceJson); - List externalFixedIPs = testObject.getExternalFixedIPs(); + NeutronRouter_NetworkReference testObject = (NeutronRouter_NetworkReference) JaxbTestHelper + .jaxbUnmarshall(dummyObject, NeutronRouter_NetworkReference_sourceJson); - Assert.assertEquals("NeutronRouter_NetworkReference JAXB Test 1: Testing network_id failed", - "e9330b1f-a2ef-4160-a991-169e56ab17f6", testObject.getNetworkID()); + List externalFixedIPs = testObject.getExternalFixedIPs(); - Assert.assertEquals("NeutronRouter_NetworkReference JAXB Test 2: Testing enable_snat failed", false, - testObject.getEnableSNAT()); + Assert.assertEquals("NeutronRouter_NetworkReference JAXB Test 1: Testing network_id failed", + "e9330b1f-a2ef-4160-a991-169e56ab17f6", testObject.getNetworkID()); - Assert.assertEquals( - "NeutronRouter_NetworkReference JAXB Test 3.1: Testing externalFixedIPs list length failed", 1, - externalFixedIPs.size()); + Assert.assertEquals("NeutronRouter_NetworkReference JAXB Test 2: Testing enable_snat failed", false, + testObject.getEnableSNAT()); - Assert.assertEquals("NeutronRouter_NetworkReference JAXB Test 3.2: Testing ip_address value failed", - "192.168.111.3", externalFixedIPs.get(0).ipAddress); + Assert.assertEquals( + "NeutronRouter_NetworkReference JAXB Test 3.1: Testing externalFixedIPs list length failed", 1, + externalFixedIPs.size()); - Assert.assertEquals("NeutronRouter_NetworkReference JAXB Test 3.3: Testing subnet_id value failed", - "22b44fc2-4ffb-4de4-b0f9-69d58b37ae27", externalFixedIPs.get(0).subnetUUID); + Assert.assertEquals("NeutronRouter_NetworkReference JAXB Test 3.2: Testing ip_address value failed", + "192.168.111.3", externalFixedIPs.get(0).ipAddress); - } catch (Exception e) { - Assert.fail("Tests failed"); - } + Assert.assertEquals("NeutronRouter_NetworkReference JAXB Test 3.3: Testing subnet_id value failed", + "22b44fc2-4ffb-4de4-b0f9-69d58b37ae27", externalFixedIPs.get(0).subnetUUID); } } diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronSecurityGroupJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronSecurityGroupJAXBTest.java index 65822434e..4aead6f39 100644 --- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronSecurityGroupJAXBTest.java +++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronSecurityGroupJAXBTest.java @@ -8,6 +8,7 @@ package org.opendaylight.neutron.spi; +import javax.xml.bind.JAXBException; import org.junit.Assert; import org.junit.Test; @@ -24,21 +25,18 @@ public class NeutronSecurityGroupJAXBTest { + "\"tenant_id\": \"e4f50856753b4dc6afee5fa6b9b6c550\" } ]" + "}"; @Test - public void test_NeutronSecurityGroup_JAXB() { + public void test_NeutronSecurityGroup_JAXB() throws JAXBException { NeutronSecurityGroup dummyObject = new NeutronSecurityGroup(); - try { - NeutronSecurityGroup testObject = (NeutronSecurityGroup) JaxbTestHelper.jaxbUnmarshall(dummyObject, - NeutronSecurityGroup_sourceJson); - Assert.assertEquals("NeutronSecurityGroup JAXB Test 1: Testing id failed", - "2076db17-a522-4506-91de-c6dd8e837028", testObject.getID()); - Assert.assertEquals("NeutronSecurityGroup JAXB Test 2: Testing direction failed", "new-webservers", - testObject.getSecurityGroupName()); + NeutronSecurityGroup testObject = (NeutronSecurityGroup) JaxbTestHelper.jaxbUnmarshall(dummyObject, + NeutronSecurityGroup_sourceJson); + Assert.assertEquals("NeutronSecurityGroup JAXB Test 1: Testing id failed", + "2076db17-a522-4506-91de-c6dd8e837028", testObject.getID()); - Assert.assertEquals("NeutronSecurityGroup JAXB Test 4: Testing port range min failed", - "b4f50856753b4dc6afee5fa6b9b6c550", testObject.getTenantID()); - } catch (Exception e) { - Assert.fail("Tests failed"); - } + Assert.assertEquals("NeutronSecurityGroup JAXB Test 2: Testing direction failed", "new-webservers", + testObject.getSecurityGroupName()); + + Assert.assertEquals("NeutronSecurityGroup JAXB Test 4: Testing port range min failed", + "b4f50856753b4dc6afee5fa6b9b6c550", testObject.getTenantID()); } } diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronSecurityRuleJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronSecurityRuleJAXBTest.java index 30c29cb7e..add7fa626 100644 --- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronSecurityRuleJAXBTest.java +++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronSecurityRuleJAXBTest.java @@ -39,43 +39,40 @@ public class NeutronSecurityRuleJAXBTest { + "\"tenant_id\": \"e4f50856753b4dc6afee5fa6b9b6c550\" }"; @Test - public void test_NeutronSecurityRule_JAXB() { + public void test_NeutronSecurityRule_JAXB() throws JAXBException { NeutronSecurityRule dummyObject = new NeutronSecurityRule(); - try { - NeutronSecurityRule testObject = (NeutronSecurityRule) JaxbTestHelper.jaxbUnmarshall(dummyObject, - NeutronSecurityRule_sourceJson); - Assert.assertEquals("NeutronSecurityRule JAXB Test 1: Testing id failed", - "2bc0accf-312e-429a-956e-e4407625eb62", testObject.getID()); - Assert.assertEquals("NeutronSecurityRule JAXB Test 2: Testing direction failed", "ingress", - testObject.getSecurityRuleDirection()); + NeutronSecurityRule testObject = (NeutronSecurityRule) JaxbTestHelper.jaxbUnmarshall(dummyObject, + NeutronSecurityRule_sourceJson); + Assert.assertEquals("NeutronSecurityRule JAXB Test 1: Testing id failed", + "2bc0accf-312e-429a-956e-e4407625eb62", testObject.getID()); + + Assert.assertEquals("NeutronSecurityRule JAXB Test 2: Testing direction failed", "ingress", + testObject.getSecurityRuleDirection()); - Assert.assertEquals("NeutronSecurityRule JAXB Test 3: Testing protocol failed", "tcp", - testObject.getSecurityRuleProtocol()); + Assert.assertEquals("NeutronSecurityRule JAXB Test 3: Testing protocol failed", "tcp", + testObject.getSecurityRuleProtocol()); - Assert.assertEquals("NeutronSecurityRule JAXB Test 4: Testing port range min failed", new Integer(80), - testObject.getSecurityRulePortMin()); + Assert.assertEquals("NeutronSecurityRule JAXB Test 4: Testing port range min failed", new Integer(80), + testObject.getSecurityRulePortMin()); - Assert.assertEquals("NeutronSecurityRule JAXB Test 5: Testing port range max failed", new Integer(80), - testObject.getSecurityRulePortMax()); + Assert.assertEquals("NeutronSecurityRule JAXB Test 5: Testing port range max failed", new Integer(80), + testObject.getSecurityRulePortMax()); - Assert.assertEquals("NeutronSecurityRule JAXB Test 6: Testing ethertype failed", "IPv4", - testObject.getSecurityRuleEthertype()); + Assert.assertEquals("NeutronSecurityRule JAXB Test 6: Testing ethertype failed", "IPv4", + testObject.getSecurityRuleEthertype()); - Assert.assertEquals("NeutronSecurityRule JAXB Test 7: Testing remote ip prefix failed", "0.0.0.0/0", - testObject.getSecurityRuleRemoteIpPrefix()); + Assert.assertEquals("NeutronSecurityRule JAXB Test 7: Testing remote ip prefix failed", "0.0.0.0/0", + testObject.getSecurityRuleRemoteIpPrefix()); - Assert.assertEquals("NeutronSecurityRule JAXB Test 8: Testing remote group id failed", - "85cc3048-abc3-43cc-89b3-377341426ac5", testObject.getSecurityRemoteGroupID()); + Assert.assertEquals("NeutronSecurityRule JAXB Test 8: Testing remote group id failed", + "85cc3048-abc3-43cc-89b3-377341426ac5", testObject.getSecurityRemoteGroupID()); - Assert.assertEquals("NeutronSecurityRule JAXB Test 9: Testing security group id failed", - "a7734e61-b545-452d-a3cd-0189cbd9747a", testObject.getSecurityRuleGroupID()); + Assert.assertEquals("NeutronSecurityRule JAXB Test 9: Testing security group id failed", + "a7734e61-b545-452d-a3cd-0189cbd9747a", testObject.getSecurityRuleGroupID()); - Assert.assertEquals("NeutronSecurityRule JAXB Test 10: Testing tenant id failed", - "e4f50856753b4dc6afee5fa6b9b6c550", testObject.getTenantID()); - } catch (Exception e) { - Assert.fail("Tests failed"); - } + Assert.assertEquals("NeutronSecurityRule JAXB Test 10: Testing tenant id failed", + "e4f50856753b4dc6afee5fa6b9b6c550", testObject.getTenantID()); } @Test diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronVPNDeadPeerDetectionJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronVPNDeadPeerDetectionJAXBTest.java index a1282e9b4..f4eb8f1ad 100644 --- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronVPNDeadPeerDetectionJAXBTest.java +++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronVPNDeadPeerDetectionJAXBTest.java @@ -8,6 +8,7 @@ package org.opendaylight.neutron.spi; +import javax.xml.bind.JAXBException; import org.junit.Assert; import org.junit.Test; @@ -17,21 +18,18 @@ public class NeutronVPNDeadPeerDetectionJAXBTest { + "\"interval\": 30, " + "\"timeout\": 120 }"; @Test - public void test_NeutronVPNDeadPeerDetection_JAXB() { + public void test_NeutronVPNDeadPeerDetection_JAXB() throws JAXBException { NeutronVPNDeadPeerDetection dummyObject = new NeutronVPNDeadPeerDetection(); - try { - NeutronVPNDeadPeerDetection testObject = (NeutronVPNDeadPeerDetection) JaxbTestHelper - .jaxbUnmarshall(dummyObject, NeutronVPNDeadPeerDetection_sourceJson); - Assert.assertEquals("NeutronVPNDeadPeerDetection JAXB Test 1: Testing action failed", "hold", - testObject.getAction()); - - Assert.assertEquals("NeutronVPNDeadPeerDetection JAXB Test 2: Testing interval failed", new Integer(30), - testObject.getInterval()); - - Assert.assertEquals("NeutronVPNDeadPeerDetection JAXB Test 3: Testing timeout failed", new Integer(120), - testObject.getTimeout()); - } catch (Exception e) { - Assert.fail("Tests failed"); - } + + NeutronVPNDeadPeerDetection testObject = (NeutronVPNDeadPeerDetection) JaxbTestHelper + .jaxbUnmarshall(dummyObject, NeutronVPNDeadPeerDetection_sourceJson); + Assert.assertEquals("NeutronVPNDeadPeerDetection JAXB Test 1: Testing action failed", "hold", + testObject.getAction()); + + Assert.assertEquals("NeutronVPNDeadPeerDetection JAXB Test 2: Testing interval failed", new Integer(30), + testObject.getInterval()); + + Assert.assertEquals("NeutronVPNDeadPeerDetection JAXB Test 3: Testing timeout failed", new Integer(120), + testObject.getTimeout()); } } diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronVPNIKEPolicyJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronVPNIKEPolicyJAXBTest.java index 48ec93503..902b7aac4 100644 --- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronVPNIKEPolicyJAXBTest.java +++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronVPNIKEPolicyJAXBTest.java @@ -8,6 +8,7 @@ package org.opendaylight.neutron.spi; +import javax.xml.bind.JAXBException; import org.junit.Assert; import org.junit.Test; @@ -21,42 +22,39 @@ public class NeutronVPNIKEPolicyJAXBTest { + "\"value\": 3600 " + "} }"; @Test - public void test_NeutronVPNIKEPolicy_JAXB() { + public void test_NeutronVPNIKEPolicy_JAXB() throws JAXBException { NeutronVPNIKEPolicy dummyObject = new NeutronVPNIKEPolicy(); - try { - NeutronVPNIKEPolicy testObject = (NeutronVPNIKEPolicy) JaxbTestHelper.jaxbUnmarshall(dummyObject, - NeutronVPNIKEPolicy_sourceJson); - Assert.assertEquals("NeutronVPNIKEPolicy JAXB Test 1: Testing id failed", - "5522aff7-1b3c-48dd-9c3c-b50f016b73db", testObject.getID()); - Assert.assertEquals("NeutronVPNIKEPolicy JAXB Test 2: Testing tenant id failed", - "ccb81365fe36411a9011e90491fe1330", testObject.getTenantID()); + NeutronVPNIKEPolicy testObject = (NeutronVPNIKEPolicy) JaxbTestHelper.jaxbUnmarshall(dummyObject, + NeutronVPNIKEPolicy_sourceJson); + Assert.assertEquals("NeutronVPNIKEPolicy JAXB Test 1: Testing id failed", + "5522aff7-1b3c-48dd-9c3c-b50f016b73db", testObject.getID()); - Assert.assertEquals("NeutronVPNIKEPolicy JAXB Test 3: Testing name failed", "ikepolicy1", - testObject.getName()); + Assert.assertEquals("NeutronVPNIKEPolicy JAXB Test 2: Testing tenant id failed", + "ccb81365fe36411a9011e90491fe1330", testObject.getTenantID()); - Assert.assertEquals("NeutronVPNIKEPolicy JAXB Test 5: Testing auth algorithm failed", "sha1", - testObject.getAuthAlgorithm()); + Assert.assertEquals("NeutronVPNIKEPolicy JAXB Test 3: Testing name failed", "ikepolicy1", + testObject.getName()); - Assert.assertEquals("NeutronVPNIKEPolicy JAXB Test 6: Testing Encryption algorithm failed", "aes-256", - testObject.getEncryptionAlgorithm()); + Assert.assertEquals("NeutronVPNIKEPolicy JAXB Test 5: Testing auth algorithm failed", "sha1", + testObject.getAuthAlgorithm()); - Assert.assertEquals("NeutronVPNIKEPolicy JAXB Test 7: Testing phase1 negotiation mode failed", "main", - testObject.getPhase1NegotiationMode()); + Assert.assertEquals("NeutronVPNIKEPolicy JAXB Test 6: Testing Encryption algorithm failed", "aes-256", + testObject.getEncryptionAlgorithm()); - Assert.assertEquals("NeutronVPNIKEPolicy JAXB Test 8: Testing ike version failed", "v1", - testObject.getIkeVersion()); + Assert.assertEquals("NeutronVPNIKEPolicy JAXB Test 7: Testing phase1 negotiation mode failed", "main", + testObject.getPhase1NegotiationMode()); - Assert.assertEquals("NeutronVPNIKEPolicy JAXB Test 9: Testing pfs failed", "group5", - testObject.getPerfectForwardSecrecy()); + Assert.assertEquals("NeutronVPNIKEPolicy JAXB Test 8: Testing ike version failed", "v1", + testObject.getIkeVersion()); - Assert.assertEquals("NeutronVPNIKEPolicy JAXB Test 10.1: Testing lifetime units value failed", "seconds", - testObject.getLifetime().getUnits()); + Assert.assertEquals("NeutronVPNIKEPolicy JAXB Test 9: Testing pfs failed", "group5", + testObject.getPerfectForwardSecrecy()); - Assert.assertEquals("NeutronVPNIKEPolicy JAXB Test 10.2: Testing lifetime values failed", new Integer(3600), - testObject.getLifetime().getValue()); - } catch (Exception e) { - Assert.fail("Tests failed"); - } + Assert.assertEquals("NeutronVPNIKEPolicy JAXB Test 10.1: Testing lifetime units value failed", "seconds", + testObject.getLifetime().getUnits()); + + Assert.assertEquals("NeutronVPNIKEPolicy JAXB Test 10.2: Testing lifetime values failed", new Integer(3600), + testObject.getLifetime().getValue()); } } diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronVPNIPSECPolicyJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronVPNIPSECPolicyJAXBTest.java index 39632638b..8d5919f54 100644 --- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronVPNIPSECPolicyJAXBTest.java +++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronVPNIPSECPolicyJAXBTest.java @@ -8,6 +8,7 @@ package org.opendaylight.neutron.spi; +import javax.xml.bind.JAXBException; import org.junit.Assert; import org.junit.Test; @@ -22,42 +23,39 @@ public class NeutronVPNIPSECPolicyJAXBTest { + "\"units\": \"seconds\", " + "\"value\": 3600 " + "} }"; @Test - public void test_NeutronVPNIPSECPolicy_JAXB() { + public void test_NeutronVPNIPSECPolicy_JAXB() throws JAXBException { NeutronVPNIPSECPolicy dummyObject = new NeutronVPNIPSECPolicy(); - try { - NeutronVPNIPSECPolicy testObject = (NeutronVPNIPSECPolicy) JaxbTestHelper.jaxbUnmarshall(dummyObject, - NeutronVPNIPSECPolicy_SingleProvider_sourceJson); - Assert.assertEquals("NeutronVPNIPSECPolicy JAXB Test 1: Testing id failed", - "5291b189-fd84-46e5-84bd-78f40c05d69c", testObject.getID()); - Assert.assertEquals("NeutronVPNIPSECPolicy JAXB Test 2: Testing tenant id failed", - "ccb81365fe36411a9011e90491fe1330", testObject.getTenantID()); + NeutronVPNIPSECPolicy testObject = (NeutronVPNIPSECPolicy) JaxbTestHelper.jaxbUnmarshall(dummyObject, + NeutronVPNIPSECPolicy_SingleProvider_sourceJson); + Assert.assertEquals("NeutronVPNIPSECPolicy JAXB Test 1: Testing id failed", + "5291b189-fd84-46e5-84bd-78f40c05d69c", testObject.getID()); - Assert.assertEquals("NeutronVPNIPSECPolicy JAXB Test 3: Testing name failed", "ipsecpolicy1", - testObject.getName()); + Assert.assertEquals("NeutronVPNIPSECPolicy JAXB Test 2: Testing tenant id failed", + "ccb81365fe36411a9011e90491fe1330", testObject.getTenantID()); - Assert.assertEquals("NeutronVPNIPSECPolicy JAXB Test 5: Testing transform protocol failed", "esp", - testObject.getTransformProtocol()); + Assert.assertEquals("NeutronVPNIPSECPolicy JAXB Test 3: Testing name failed", "ipsecpolicy1", + testObject.getName()); - Assert.assertEquals("NeutronVPNIPSECPolicy JAXB Test 6: Testing encapsulation mode failed", "tunnel", - testObject.getEncapsulationMode()); + Assert.assertEquals("NeutronVPNIPSECPolicy JAXB Test 5: Testing transform protocol failed", "esp", + testObject.getTransformProtocol()); - Assert.assertEquals("NeutronVPNIPSECPolicy JAXB Test 7: Testing authorization algorithm failed", "sha1", - testObject.getAuthAlgorithm()); + Assert.assertEquals("NeutronVPNIPSECPolicy JAXB Test 6: Testing encapsulation mode failed", "tunnel", + testObject.getEncapsulationMode()); - Assert.assertEquals("NeutronVPNIPSECPolicy JAXB Test 8: Testing encryption algorithm failed", "aes-128", - testObject.getEncryptionAlgorithm()); + Assert.assertEquals("NeutronVPNIPSECPolicy JAXB Test 7: Testing authorization algorithm failed", "sha1", + testObject.getAuthAlgorithm()); - Assert.assertEquals("NeutronVPNIPSECPolicy JAXB Test 9: Testing PerfectForwardSecrecy failed", "group5", - testObject.getPerfectForwardSecrecy()); + Assert.assertEquals("NeutronVPNIPSECPolicy JAXB Test 8: Testing encryption algorithm failed", "aes-128", + testObject.getEncryptionAlgorithm()); - Assert.assertEquals("NeutronVPNIPSECPolicy JAXB Test 10: Testing Lifetime unit value failed", "seconds", - testObject.getLifetime().getUnits()); + Assert.assertEquals("NeutronVPNIPSECPolicy JAXB Test 9: Testing PerfectForwardSecrecy failed", "group5", + testObject.getPerfectForwardSecrecy()); - Assert.assertEquals("NeutronVPNIPSECPolicy JAXB Test 11: Testing Lifetime value failed", new Integer(3600), - testObject.getLifetime().getValue()); - } catch (Exception e) { - Assert.fail("Tests failed"); - } + Assert.assertEquals("NeutronVPNIPSECPolicy JAXB Test 10: Testing Lifetime unit value failed", "seconds", + testObject.getLifetime().getUnits()); + + Assert.assertEquals("NeutronVPNIPSECPolicy JAXB Test 11: Testing Lifetime value failed", new Integer(3600), + testObject.getLifetime().getValue()); } } diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronVPNIPSECSiteConnectionJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronVPNIPSECSiteConnectionJAXBTest.java index d9b20a8ad..3dcfa364a 100644 --- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronVPNIPSECSiteConnectionJAXBTest.java +++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronVPNIPSECSiteConnectionJAXBTest.java @@ -9,6 +9,7 @@ package org.opendaylight.neutron.spi; import java.util.List; +import javax.xml.bind.JAXBException; import org.junit.Assert; import org.junit.Test; @@ -27,75 +28,71 @@ public class NeutronVPNIPSECSiteConnectionJAXBTest { + "\"interval\": 30 ," + "\"timeout\": 120 " + "} }"; @Test - public void test_NeutronVPNIPSECSiteConnection_JAXB() { + public void test_NeutronVPNIPSECSiteConnection_JAXB() throws JAXBException { NeutronVPNIPSECSiteConnection dummyObject = new NeutronVPNIPSECSiteConnection(); - try { - NeutronVPNIPSECSiteConnection testObject = (NeutronVPNIPSECSiteConnection) JaxbTestHelper - .jaxbUnmarshall(dummyObject, NeutronVPNIPSECSiteConnection_sourceJson); - Assert.assertEquals("NeutronVPNIPSECSiteConnection JAXB Test 1: Testing id failed", - "cbc152a0-7e93-4f98-9f04-b085a4bf2511", testObject.getID()); + NeutronVPNIPSECSiteConnection testObject = (NeutronVPNIPSECSiteConnection) JaxbTestHelper + .jaxbUnmarshall(dummyObject, NeutronVPNIPSECSiteConnection_sourceJson); + Assert.assertEquals("NeutronVPNIPSECSiteConnection JAXB Test 1: Testing id failed", + "cbc152a0-7e93-4f98-9f04-b085a4bf2511", testObject.getID()); - Assert.assertEquals("NeutronVPNIPSECSiteConnection JAXB Test 2: Testing tenant id failed", - "ccb81365fe36411a9011e90491fe1330", testObject.getTenantID()); + Assert.assertEquals("NeutronVPNIPSECSiteConnection JAXB Test 2: Testing tenant id failed", + "ccb81365fe36411a9011e90491fe1330", testObject.getTenantID()); - Assert.assertEquals("NeutronVPNIPSECSiteConnection JAXB Test 3: Testing name failed", "myvpn", - testObject.getName()); + Assert.assertEquals("NeutronVPNIPSECSiteConnection JAXB Test 3: Testing name failed", "myvpn", + testObject.getName()); - Assert.assertEquals("NeutronVPNIPSECSiteConnection JAXB Test 5: Testing peer address failed", - "172.24.4.226", testObject.getPeerAddress()); + Assert.assertEquals("NeutronVPNIPSECSiteConnection JAXB Test 5: Testing peer address failed", + "172.24.4.226", testObject.getPeerAddress()); - Assert.assertEquals("NeutronVPNIPSECSiteConnection JAXB Test 6: Testing peer id failed", "172.24.4.226", - testObject.getPeerID()); + Assert.assertEquals("NeutronVPNIPSECSiteConnection JAXB Test 6: Testing peer id failed", "172.24.4.226", + testObject.getPeerID()); - List peerCidrs = testObject.getPeerCidrs(); + List peerCidrs = testObject.getPeerCidrs(); - Assert.assertEquals("NeutronVPNIPSECSiteConnection JAXB Test 7: Testing peerCidrs size failed", 1, - peerCidrs.size()); + Assert.assertEquals("NeutronVPNIPSECSiteConnection JAXB Test 7: Testing peerCidrs size failed", 1, + peerCidrs.size()); - Assert.assertEquals("NeutronVPNIPSECSiteConnection Test 8.1: Testing peerCidrs value failed", "10.1.0.0/24", - peerCidrs.get(0)); + Assert.assertEquals("NeutronVPNIPSECSiteConnection Test 8.1: Testing peerCidrs value failed", "10.1.0.0/24", + peerCidrs.get(0)); - Assert.assertEquals("NeutronVPNIPSECSiteConnection JAXB Test 8.2: Testing list value failed", "static", - testObject.getRouteMode()); + Assert.assertEquals("NeutronVPNIPSECSiteConnection JAXB Test 8.2: Testing list value failed", "static", + testObject.getRouteMode()); - Assert.assertEquals("NeutronVPNIPSECSiteConnection JAXB Test 9: Testing mtu failed", 1500, - (long) testObject.getMtu()); + Assert.assertEquals("NeutronVPNIPSECSiteConnection JAXB Test 9: Testing mtu failed", 1500, + (long) testObject.getMtu()); - Assert.assertEquals("NeutronVPNIPSECSiteConnection JAXB Test 10: Testing authmode failed", "psk", - testObject.getAuthMode()); + Assert.assertEquals("NeutronVPNIPSECSiteConnection JAXB Test 10: Testing authmode failed", "psk", + testObject.getAuthMode()); - Assert.assertEquals("NeutronVPNIPSECSiteConnection JAXB Test 11: Testing presharedkey failed", "secret", - testObject.getPreSharedKey()); + Assert.assertEquals("NeutronVPNIPSECSiteConnection JAXB Test 11: Testing presharedkey failed", "secret", + testObject.getPreSharedKey()); - Assert.assertEquals("NeutronVPNIPSECSiteConnection JAXB Test 12: Testing initiator failed", - "bi-directional", testObject.getInitiator()); + Assert.assertEquals("NeutronVPNIPSECSiteConnection JAXB Test 12: Testing initiator failed", + "bi-directional", testObject.getInitiator()); - Assert.assertEquals("NeutronVPNIPSECSiteConnection JAXB Test 13: Testing Admin state failed", true, - testObject.getAdminStateUp()); + Assert.assertEquals("NeutronVPNIPSECSiteConnection JAXB Test 13: Testing Admin state failed", true, + testObject.getAdminStateUp()); - Assert.assertEquals("NeutronVPNIPSECSiteConnection JAXB Test 14: Testing status failed", "PENDING_CREATE", - testObject.getStatus()); + Assert.assertEquals("NeutronVPNIPSECSiteConnection JAXB Test 14: Testing status failed", "PENDING_CREATE", + testObject.getStatus()); - Assert.assertEquals("NeutronVPNIPSECSiteConnection JAXB Test 15: Testing IkePolicyID failed", - "bf5612ac-15fb-460c-9b3d-6453da2fafa2", testObject.getIkePolicyID()); + Assert.assertEquals("NeutronVPNIPSECSiteConnection JAXB Test 15: Testing IkePolicyID failed", + "bf5612ac-15fb-460c-9b3d-6453da2fafa2", testObject.getIkePolicyID()); - Assert.assertEquals("NeutronVPNIPSECSiteConnection JAXB Test 16: Testing IpsecPolicyID failed", - "8ba867b2-67eb-4835-bb61-c226804a1584", testObject.getIpsecPolicyID()); + Assert.assertEquals("NeutronVPNIPSECSiteConnection JAXB Test 16: Testing IpsecPolicyID failed", + "8ba867b2-67eb-4835-bb61-c226804a1584", testObject.getIpsecPolicyID()); - Assert.assertEquals("NeutronVPNIPSECSiteConnection JAXB Test 17: Testing VpnServiceID failed", - "c2f3178d-5530-4c4a-89fc-050ecd552636", testObject.getVpnServiceID()); + Assert.assertEquals("NeutronVPNIPSECSiteConnection JAXB Test 17: Testing VpnServiceID failed", + "c2f3178d-5530-4c4a-89fc-050ecd552636", testObject.getVpnServiceID()); - Assert.assertEquals("NeutronVPNIPSECSiteConnection JAXB Test 18.1: Testing DeadPeerDetection failed", - "hold", testObject.getDeadPeerDetection().getAction()); + Assert.assertEquals("NeutronVPNIPSECSiteConnection JAXB Test 18.1: Testing DeadPeerDetection failed", + "hold", testObject.getDeadPeerDetection().getAction()); - Assert.assertEquals("NeutronVPNIPSECSiteConnection JAXB Test 18.2: Testing DeadPeerDetection failed", - new Integer(30), testObject.getDeadPeerDetection().getInterval()); + Assert.assertEquals("NeutronVPNIPSECSiteConnection JAXB Test 18.2: Testing DeadPeerDetection failed", + new Integer(30), testObject.getDeadPeerDetection().getInterval()); - Assert.assertEquals("NeutronVPNIPSECSiteConnection JAXB Test 18.3: Testing DeadPeerDetection failed", - new Integer(120), testObject.getDeadPeerDetection().getTimeout()); - } catch (Exception e) { - Assert.fail("Tests failed"); - } + Assert.assertEquals("NeutronVPNIPSECSiteConnection JAXB Test 18.3: Testing DeadPeerDetection failed", + new Integer(120), testObject.getDeadPeerDetection().getTimeout()); } } diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronVPNLifetimeJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronVPNLifetimeJAXBTest.java index 5c9c77529..62c90466f 100644 --- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronVPNLifetimeJAXBTest.java +++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronVPNLifetimeJAXBTest.java @@ -8,6 +8,7 @@ package org.opendaylight.neutron.spi; +import javax.xml.bind.JAXBException; import org.junit.Assert; import org.junit.Test; @@ -17,18 +18,15 @@ public class NeutronVPNLifetimeJAXBTest { + "\"value\": 3600 }"; @Test - public void test_NeutronVPNLifetime_JAXB() { + public void test_NeutronVPNLifetime_JAXB() throws JAXBException { NeutronVPNLifetime dummyObject = new NeutronVPNLifetime(); - try { - NeutronVPNLifetime testObject = (NeutronVPNLifetime) JaxbTestHelper.jaxbUnmarshall(dummyObject, - NeutronVPNLifetimeTest_sourceJson); - Assert.assertEquals("NeutronVPNLifetime JAXB Test 1: Testing units failed", "seconds", - testObject.getUnits()); - Assert.assertEquals("NeutronVPNLifetime JAXB Test 2: Testing value failed", new Integer(3600), - testObject.getValue()); - } catch (Exception e) { - Assert.fail("Tests failed"); - } + NeutronVPNLifetime testObject = (NeutronVPNLifetime) JaxbTestHelper.jaxbUnmarshall(dummyObject, + NeutronVPNLifetimeTest_sourceJson); + Assert.assertEquals("NeutronVPNLifetime JAXB Test 1: Testing units failed", "seconds", + testObject.getUnits()); + + Assert.assertEquals("NeutronVPNLifetime JAXB Test 2: Testing value failed", new Integer(3600), + testObject.getValue()); } } diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronVPNServiceJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronVPNServiceJAXBTest.java index a67289b76..f29f2c59f 100644 --- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronVPNServiceJAXBTest.java +++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronVPNServiceJAXBTest.java @@ -8,6 +8,7 @@ package org.opendaylight.neutron.spi; +import javax.xml.bind.JAXBException; import org.junit.Assert; import org.junit.Test; @@ -21,33 +22,30 @@ public class NeutronVPNServiceJAXBTest { + "\"id\": \"9faaf49f-dd89-4e39-a8c6-101839aa49bc\", " + "\"description\": \"Updated description\" }"; @Test - public void test_NeutronVPNService_JAXB() { + public void test_NeutronVPNService_JAXB() throws JAXBException { NeutronVPNService dummyObject = new NeutronVPNService(); - try { - NeutronVPNService testObject = (NeutronVPNService) JaxbTestHelper.jaxbUnmarshall(dummyObject, - NeutronVPNService_sourceJson); - Assert.assertEquals("NeutronVPNService JAXB Test 1: Testing router id failed", - "ec8619be-0ba8-4955-8835-3b49ddb76f89", testObject.getRouterUUID()); - Assert.assertEquals("NeutronVPNService JAXB Test 2: Testing status failed", "PENDING_CREATE", - testObject.getStatus()); + NeutronVPNService testObject = (NeutronVPNService) JaxbTestHelper.jaxbUnmarshall(dummyObject, + NeutronVPNService_sourceJson); + Assert.assertEquals("NeutronVPNService JAXB Test 1: Testing router id failed", + "ec8619be-0ba8-4955-8835-3b49ddb76f89", testObject.getRouterUUID()); - Assert.assertEquals("NeutronVPNService JAXB Test 3: Testing name failed", "myservice", - testObject.getName()); + Assert.assertEquals("NeutronVPNService JAXB Test 2: Testing status failed", "PENDING_CREATE", + testObject.getStatus()); - Assert.assertEquals("NeutronVPNService JAXB Test 4: Testing admin state up failed", true, - testObject.getAdminStateUp()); + Assert.assertEquals("NeutronVPNService JAXB Test 3: Testing name failed", "myservice", + testObject.getName()); - Assert.assertEquals("NeutronVPNService JAXB Test 5: Testing Subnet UUID failed", - "f4fb4528-ed93-467c-a57b-11c7ea9f963e", testObject.getSubnetUUID()); + Assert.assertEquals("NeutronVPNService JAXB Test 4: Testing admin state up failed", true, + testObject.getAdminStateUp()); - Assert.assertEquals("NeutronVPNService JAXB Test 6: Testing Tenant Id failed", - "ccb81365fe36411a9011e90491fe1330", testObject.getTenantID()); + Assert.assertEquals("NeutronVPNService JAXB Test 5: Testing Subnet UUID failed", + "f4fb4528-ed93-467c-a57b-11c7ea9f963e", testObject.getSubnetUUID()); - Assert.assertEquals("NeutronVPNService JAXB Test 7: Testing id failed", - "9faaf49f-dd89-4e39-a8c6-101839aa49bc", testObject.getID()); - } catch (Exception e) { - Assert.fail("Tests failed"); - } + Assert.assertEquals("NeutronVPNService JAXB Test 6: Testing Tenant Id failed", + "ccb81365fe36411a9011e90491fe1330", testObject.getTenantID()); + + Assert.assertEquals("NeutronVPNService JAXB Test 7: Testing id failed", + "9faaf49f-dd89-4e39-a8c6-101839aa49bc", testObject.getID()); } } diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/Neutron_IDJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/Neutron_IDJAXBTest.java index 85a0ac3c1..6ab606116 100644 --- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/Neutron_IDJAXBTest.java +++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/Neutron_IDJAXBTest.java @@ -8,6 +8,7 @@ package org.opendaylight.neutron.spi; +import javax.xml.bind.JAXBException; import org.junit.Assert; import org.junit.Test; @@ -17,17 +18,12 @@ public class Neutron_IDJAXBTest { "{ \"id\": \"4e8e5957-649f-477b-9e5b-f1f75b21c03c\" }"; @Test - public void test_Neutron_ID_JAXB() { + public void test_Neutron_ID_JAXB() throws JAXBException { Neutron_ID neutronObject = new Neutron_ID(); - try { - Neutron_ID testObject = (Neutron_ID) JaxbTestHelper.jaxbUnmarshall(neutronObject, Neutron_ID_sourceJson); + Neutron_ID testObject = (Neutron_ID) JaxbTestHelper.jaxbUnmarshall(neutronObject, Neutron_ID_sourceJson); - Assert.assertEquals("Neutron_ID JAXB Test 1: Testing id failed", "4e8e5957-649f-477b-9e5b-f1f75b21c03c", + Assert.assertEquals("Neutron_ID JAXB Test 1: Testing id failed", "4e8e5957-649f-477b-9e5b-f1f75b21c03c", testObject.getID()); - - } catch (Exception e) { - Assert.fail("Test failed"); - } } } diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/Neutron_IPsJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/Neutron_IPsJAXBTest.java index 98e819a07..233947dc4 100644 --- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/Neutron_IPsJAXBTest.java +++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/Neutron_IPsJAXBTest.java @@ -8,6 +8,7 @@ package org.opendaylight.neutron.spi; +import javax.xml.bind.JAXBException; import org.junit.Assert; import org.junit.Test; @@ -17,20 +18,14 @@ public class Neutron_IPsJAXBTest { "{ \"ip_address\": \"192.168.111.3\", " + "\"subnet_id\": \"22b44fc2-4ffb-4de4-b0f9-69d58b37ae27\" }"; @Test - public void test_Neutron_IPs_JAXB() { + public void test_Neutron_IPs_JAXB() throws JAXBException { Neutron_IPs neutronObject = new Neutron_IPs(); - try { - Neutron_IPs testObject = (Neutron_IPs) JaxbTestHelper.jaxbUnmarshall(neutronObject, Neutron_IPs_sourceJson); + Neutron_IPs testObject = (Neutron_IPs) JaxbTestHelper.jaxbUnmarshall(neutronObject, Neutron_IPs_sourceJson); - Assert.assertEquals("Neutron_IPs JAXB Test 1: Testing ip_address failed", "192.168.111.3", + Assert.assertEquals("Neutron_IPs JAXB Test 1: Testing ip_address failed", "192.168.111.3", testObject.getIpAddress()); - Assert.assertEquals("Neutron_IPs JAXB Test 2: Testing subnet_id failed", + Assert.assertEquals("Neutron_IPs JAXB Test 2: Testing subnet_id failed", "22b44fc2-4ffb-4de4-b0f9-69d58b37ae27", testObject.getSubnetUUID()); - - } catch (Exception e) { - Assert.fail("Test failed"); - } } - }