Checkstyle exception handling fix (Neutron-spi)

[neutron.git] / neutron-spi / src / test / java / org / opendaylight / neutron / spi / NeutronPort_ExtraDHCPOptionJAXBTest.java

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 cf44fd993b839b0d40f9d196dee6641f0c7e8b65..09e7484cce53aef8d2c6bf128fc4525c448e5f9d 100644 (file)
--- 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
@@ -1,5 +1,5 @@
 /*
- * Copyright Tata Consultancy Services, 2015.  All rights reserved.
+ * Copyright (c) 2015 Tata Consultancy Services.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
@@ -8,83 +8,66 @@
 
 package org.opendaylight.neutron.spi;
 
+import javax.xml.bind.JAXBException;
 import org.junit.Assert;
 import org.junit.Test;
 
-import org.opendaylight.neutron.spi.JaxbTestHelper;
-import org.opendaylight.neutron.spi.NeutronPort_ExtraDHCPOption;
-
 public class NeutronPort_ExtraDHCPOptionJAXBTest {
 
     private static final String NeutronPort_ExtraDHCPOption_sourceJson = "{" + "\"opt_value\": \"123.123.123.456\", "
-            + "\"opt_name\": \"server-ip-address\" "
-            + "}";
-    private static final String NeutronPort_ExtraDHCPOption_IPv4_sourceJson = "{" + "\"opt_value\": \"123.123.123.456\", "
-            + "\"opt_name\": \"server-ip-address\", "
-            + "\"ip_version\": 4"
-            + "}";
-    private static final String NeutronPort_ExtraDHCPOption_IPv6_sourceJson = "{" + "\"opt_value\": \"::ffff:123.123.123.456\", "
-            + "\"opt_name\": \"server-ip-address\", "
-            + "\"ip_version\": 6"
+            + "\"opt_name\": \"server-ip-address\" " + "}";
+    private static final String NeutronPort_ExtraDHCPOption_IPv4_sourceJson = "{"
+            + "\"opt_value\": \"123.123.123.456\", " + "\"opt_name\": \"server-ip-address\", " + "\"ip_version\": 4"
             + "}";
+    private static final String NeutronPort_ExtraDHCPOption_IPv6_sourceJson = "{"
+            + "\"opt_value\": \"::ffff:123.123.123.456\", " + "\"opt_name\": \"server-ip-address\", "
+            + "\"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());
-        Assert.assertEquals("NeutronPort_ExtraDHCPOption JAXB Test 10: Testing opt_name failed",
-                            "server-ip-address", testObject.getName());
-        Assert.assertEquals("NeutronPort_ExtraDHCPOption JAXB Test 20: Testing opt_name failed",
-                            4, testObject.getIpVersion().intValue());
+                testObject.getValue());
+        Assert.assertEquals("NeutronPort_ExtraDHCPOption JAXB Test 10: Testing opt_name failed", "server-ip-address",
+                testObject.getName());
+        Assert.assertEquals("NeutronPort_ExtraDHCPOption JAXB Test 20: Testing opt_name failed", 4,
+                testObject.getIpVersion().intValue());
     }
 
     @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;
-        }
 
-        Assert.assertEquals("NeutronPort_ExtraDHCPOption_IPv4 JAXB Test 1: Testing opt_value failed",
-                            "123.123.123.456", testObject.getValue());
+        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());
         Assert.assertEquals("NeutronPort_ExtraDHCPOption_IPv4 JAXB Test 10: Testing opt_name failed",
-                            "server-ip-address", testObject.getName());
-        Assert.assertEquals("NeutronPort_ExtraDHCPOption_IPv4 JAXB Test 20: Testing opt_name failed",
-                            4, testObject.getIpVersion().intValue());
+                "server-ip-address", testObject.getName());
+        Assert.assertEquals("NeutronPort_ExtraDHCPOption_IPv4 JAXB Test 20: Testing opt_name failed", 4,
+                testObject.getIpVersion().intValue());
     }
 
     @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());
+                "::ffff:123.123.123.456", testObject.getValue());
         Assert.assertEquals("NeutronPort_ExtraDHCPOption_IPv6 JAXB Test 10: Testing opt_name failed",
-                            "server-ip-address", testObject.getName());
-        Assert.assertEquals("NeutronPort_ExtraDHCPOption_IPv6 JAXB Test 20: Testing opt_name failed",
-                            6, testObject.getIpVersion().intValue());
+                "server-ip-address", testObject.getName());
+        Assert.assertEquals("NeutronPort_ExtraDHCPOption_IPv6 JAXB Test 20: Testing opt_name failed", 6,
+                testObject.getIpVersion().intValue());
     }
 }