BUG-730 : added tests to bgp-parser-api

Change-Id: I4b90b646610262cb4ff51b9cf68177eb8113c12c
Signed-off-by: Dana Kutenicsova <dkutenic@cisco.com>

diff --git a/bgp/parser-api/src/main/java/org/opendaylight/protocol/bgp/parser/AsNumberUtil.java b/bgp/parser-api/src/main/java/org/opendaylight/protocol/bgp/parser/AsNumberUtil.java
index d87c60bb89da3a600e1098d27b94cbbc4f380a3d..07de7fca31ffa915a9ef7c033aab0bef9b86c484 100644 (file)
--- a/bgp/parser-api/src/main/java/org/opendaylight/protocol/bgp/parser/AsNumberUtil.java
+++ b/bgp/parser-api/src/main/java/org/opendaylight/protocol/bgp/parser/AsNumberUtil.java
@@ -19,7 +19,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.mess
 public final class AsNumberUtil {
 
     private AsNumberUtil() {
-        throw new UnsupportedOperationException("Utility class should never be instantiated");
     }
 
     /**

diff --git a/bgp/parser-api/src/main/java/org/opendaylight/protocol/bgp/parser/BGPParsingException.java b/bgp/parser-api/src/main/java/org/opendaylight/protocol/bgp/parser/BGPParsingException.java
index db77312f306ec4e3f25b7ee0eb37a3b5033d56c7..83bdcf20a90a7698a5b6e5f884591d7d7c48b6a2 100644 (file)
--- a/bgp/parser-api/src/main/java/org/opendaylight/protocol/bgp/parser/BGPParsingException.java
+++ b/bgp/parser-api/src/main/java/org/opendaylight/protocol/bgp/parser/BGPParsingException.java
@@ -31,15 +31,4 @@ public class BGPParsingException extends Exception {
     public BGPParsingException(final String message, final Exception cause) {
         super(message, cause);
     }
-
-    /**
-     *
-     * @return error message.
-     *
-     * @deprecated Use getMessage() instead.
-     */
-    @Deprecated
-    public String getError() {
-        return this.getMessage();
-    }
 }

diff --git a/bgp/parser-api/src/test/java/org/opendaylight/protocol/bgp/parser/APITest.java b/bgp/parser-api/src/test/java/org/opendaylight/protocol/bgp/parser/APITest.java
index ea54c876e65923bea62fc3cbcfdf79833971bc78..f48aec19d5a94f042f647b3105e9d66e0d56ade2 100644 (file)
--- a/bgp/parser-api/src/test/java/org/opendaylight/protocol/bgp/parser/APITest.java
+++ b/bgp/parser-api/src/test/java/org/opendaylight/protocol/bgp/parser/APITest.java
@@ -22,6 +22,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.mess
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130919.open.BgpParametersBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130919.open.bgp.parameters.c.parameters.As4BytesCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130919.open.bgp.parameters.c.parameters.as4.bytes._case.As4BytesCapabilityBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev130919.open.bgp.parameters.c.parameters.MultiprotocolCaseBuilder;
 
 public class APITest {
 
@@ -40,6 +41,9 @@ public class APITest {
     public void testParsingException() {
         final BGPParsingException de = new BGPParsingException("Some message");
         assertEquals("Some message", de.getMessage());
+
+        final BGPParsingException de1 = new BGPParsingException("Some message", new IllegalArgumentException("text"));
+        assertEquals("text", de1.getCause().getMessage());
     }
 
     @Test
@@ -56,7 +60,9 @@ public class APITest {
     public void testAsNumberUtil() {
         final List<BgpParameters> params = new ArrayList<>();
         params.add(new BgpParametersBuilder().setCParameters(
-                new As4BytesCaseBuilder().setAs4BytesCapability(new As4BytesCapabilityBuilder().setAsNumber(new AsNumber(35L)).build()).build()).build());
+            new MultiprotocolCaseBuilder().setMultiprotocolCapability(null).build()).build());
+        params.add(new BgpParametersBuilder().setCParameters(
+            new As4BytesCaseBuilder().setAs4BytesCapability(new As4BytesCapabilityBuilder().setAsNumber(new AsNumber(35L)).build()).build()).build());
         final Open open1 = new OpenBuilder().setBgpParameters(params).build();
         assertEquals(35L, AsNumberUtil.advertizedAsNumber(open1).getValue().longValue());