Cleanup eclipse warnings

[bgpcep.git] / bgp / parser-impl / src / test / java / org / opendaylight / protocol / bgp / parser / impl / MultiProtocolCapabilityHandlerTest.java

diff --git a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/MultiProtocolCapabilityHandlerTest.java b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/MultiProtocolCapabilityHandlerTest.java
index c17a60384baa141665e76628d75eeabc45e2b88b..bf749dfb7a45ddf6addd19712888e80e5ade9659 100644 (file)
--- a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/MultiProtocolCapabilityHandlerTest.java
+++ b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/MultiProtocolCapabilityHandlerTest.java
@@ -32,33 +32,38 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.type
 
 public class MultiProtocolCapabilityHandlerTest {
 
-    private final static Class afi = Ipv6AddressFamily.class;
-    @Mock private AddressFamilyRegistry afir;
-    @Mock private AddressFamilyRegistry afirExpection;
-    private final static Class safi = UnicastSubsequentAddressFamily.class;
-    @Mock private SubsequentAddressFamilyRegistry safir;
-    @Mock private SubsequentAddressFamilyRegistry safirException;
+    private static final Class<Ipv6AddressFamily> AFI = Ipv6AddressFamily.class;
+    private static final Class<UnicastSubsequentAddressFamily> SAFI = UnicastSubsequentAddressFamily.class;
+
+    @Mock
+    private AddressFamilyRegistry afir;
+    @Mock
+    private AddressFamilyRegistry afirExpection;
+    @Mock
+    private SubsequentAddressFamilyRegistry safir;
+    @Mock
+    private SubsequentAddressFamilyRegistry safirException;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-        Mockito.doReturn(260).when(this.afir).numberForClass(afi);
-        Mockito.doReturn(this.afi).when(this.afir).classForFamily(260);
+        Mockito.doReturn(260).when(this.afir).numberForClass(AFI);
+        Mockito.doReturn(MultiProtocolCapabilityHandlerTest.AFI).when(this.afir).classForFamily(260);
 
-        Mockito.doReturn(null).when(this.afirExpection).numberForClass(afi);
+        Mockito.doReturn(null).when(this.afirExpection).numberForClass(AFI);
         Mockito.doReturn(null).when(this.afirExpection).classForFamily(260);
 
-        Mockito.doReturn(4).when(this.safir).numberForClass(safi);
-        Mockito.doReturn(this.safi).when(this.safir).classForFamily(4);
+        Mockito.doReturn(4).when(this.safir).numberForClass(SAFI);
+        Mockito.doReturn(MultiProtocolCapabilityHandlerTest.SAFI).when(this.safir).classForFamily(4);
 
-        Mockito.doReturn(null).when(this.safirException).numberForClass(safi);
+        Mockito.doReturn(null).when(this.safirException).numberForClass(SAFI);
         Mockito.doReturn(null).when(this.safirException).classForFamily(4);
     }
 
     @Test
     public void testCapabilityHandler() throws BGPDocumentedException, BGPParsingException {
         final CParameters capabilityToSerialize = new CParametersBuilder().addAugmentation(CParameters1.class, new CParameters1Builder().setMultiprotocolCapability(
-            new MultiprotocolCapabilityBuilder().setAfi(this.afi).setSafi(this.safi).build()).build()).build();
+            new MultiprotocolCapabilityBuilder().setAfi(MultiProtocolCapabilityHandlerTest.AFI).setSafi(MultiProtocolCapabilityHandlerTest.SAFI).build()).build()).build();
 
         final ByteBuf bytes = Unpooled.buffer();
         final MultiProtocolCapabilityHandler handler = new MultiProtocolCapabilityHandler(this.afir, this.safir);
@@ -71,7 +76,7 @@ public class MultiProtocolCapabilityHandlerTest {
     @Test(expected=IllegalArgumentException.class)
     public void testUnhandledAfi() {
         final CParameters capabilityToSerialize = new CParametersBuilder().addAugmentation(CParameters1.class, new CParameters1Builder().setMultiprotocolCapability(
-            new MultiprotocolCapabilityBuilder().setAfi(this.afi).setSafi(this.safi).build()).build()).build();
+            new MultiprotocolCapabilityBuilder().setAfi(MultiProtocolCapabilityHandlerTest.AFI).setSafi(MultiProtocolCapabilityHandlerTest.SAFI).build()).build()).build();
 
         final ByteBuf bytes = Unpooled.buffer();
         final MultiProtocolCapabilityHandler handler = new MultiProtocolCapabilityHandler(this.afirExpection, this.safir);
@@ -81,7 +86,7 @@ public class MultiProtocolCapabilityHandlerTest {
     @Test(expected=IllegalArgumentException.class)
     public void testUnhandledSafi() {
         final CParameters capabilityToSerialize = new CParametersBuilder().addAugmentation(CParameters1.class, new CParameters1Builder().setMultiprotocolCapability(
-            new MultiprotocolCapabilityBuilder().setAfi(this.afi).setSafi(this.safi).build()).build()).build();
+            new MultiprotocolCapabilityBuilder().setAfi(MultiProtocolCapabilityHandlerTest.AFI).setSafi(MultiProtocolCapabilityHandlerTest.SAFI).build()).build()).build();
 
         final ByteBuf bytes = Unpooled.buffer();
         final MultiProtocolCapabilityHandler handler = new MultiProtocolCapabilityHandler(this.afir, this.safirException);