Replace deprecated initMocks() in openflow-protocol-impl

initMocks has been deprecated. Use MockitoJUnitRunner instead.
Also, remove unnecessary stubbings and fix some typos in
openflow-protocol-impl.

JIRA: OPNFLWPLUG-1122
Change-Id: I9f30868c84b67a69b262044c047b43df1510ff93
Signed-off-by: Sangwook Ha <sangwook.ha@verizon.com>

diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/DelegatingInboundHandlerTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/DelegatingInboundHandlerTest.java
index 52cadd7e9332aa7c133436d0f90613afa1371f63..820be11686b8c73a2420aab84ec700c6283d62ed 100644 (file)
--- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/DelegatingInboundHandlerTest.java
+++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/DelegatingInboundHandlerTest.java
@@ -15,8 +15,9 @@ import static org.mockito.Mockito.verify;
 import io.netty.channel.ChannelHandlerContext;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.opendaylight.openflowjava.protocol.impl.core.connection.MessageConsumer;
 import org.opendaylight.yangtools.yang.binding.DataObject;
 
@@ -25,6 +26,7 @@ import org.opendaylight.yangtools.yang.binding.DataObject;
  *
  * @author jameshall
  */
+@RunWith(MockitoJUnitRunner.class)
 public class DelegatingInboundHandlerTest {
 
     @Mock ChannelHandlerContext mockChHndlrCtx;
@@ -38,7 +40,6 @@ public class DelegatingInboundHandlerTest {
      */
     @Before
     public void setUp() {
-        MockitoAnnotations.initMocks(this);
         dih = new DelegatingInboundHandler(mockMsgConsumer) ;
     }
 

diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/IdleHandlerTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/IdleHandlerTest.java
index ccf382ec8a8d60fe104cc6cd89b8b33b371e722e..ec1cf72af19e99a7c834ab4c8693b64b40958579 100644 (file)
--- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/IdleHandlerTest.java
+++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/IdleHandlerTest.java
@@ -16,9 +16,10 @@ import io.netty.channel.ChannelHandlerContext;
 import java.util.concurrent.TimeUnit;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.system.rev130927.SwitchIdleEvent;
 
 /**
@@ -26,6 +27,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.system.rev130927.S
  *
  * @author jameshall
  */
+@RunWith(MockitoJUnitRunner.class)
 public class IdleHandlerTest {
 
     @Mock ChannelHandlerContext mockChHndlrCtx ;
@@ -37,7 +39,6 @@ public class IdleHandlerTest {
      */
     @Before
     public void setUp() {
-        MockitoAnnotations.initMocks(this);
         idleHandler = new IdleHandler(60L, TimeUnit.MINUTES);
     }
 

diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/OFDatagramPacketDecoderTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/OFDatagramPacketDecoderTest.java
index 7e243ee81ea9dcd1634aef51dee309a656cbd425..ac3ca28ddc9298f95c48908360c4b37452f5c0eb 100644 (file)
--- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/OFDatagramPacketDecoderTest.java
+++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/OFDatagramPacketDecoderTest.java
@@ -13,10 +13,10 @@ import static org.mockito.Mockito.verify;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
 import java.net.InetSocketAddress;
-import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
 import org.opendaylight.openflowjava.protocol.impl.deserialization.DeserializationFactory;
 
@@ -25,6 +25,7 @@ import org.opendaylight.openflowjava.protocol.impl.deserialization.Deserializati
  *
  * @author madamjak
  */
+@RunWith(MockitoJUnitRunner.class)
 public class OFDatagramPacketDecoderTest {
     @Mock DeserializationFactory deserializationFactory;
     @Mock ChannelHandlerContext ctx;
@@ -32,11 +33,6 @@ public class OFDatagramPacketDecoderTest {
 
     private VersionMessageUdpWrapper msgWrapper;
 
-    @Before
-    public void startUp() {
-        MockitoAnnotations.initMocks(this);
-    }
-
     @Test
     public void test() {
         OFDatagramPacketDecoder decoder = new OFDatagramPacketDecoder();

diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/OFDatagramPacketEncoderTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/OFDatagramPacketEncoderTest.java
index 3788b046585c68ca391595e92842fbae70f8b46f..2c185dbac48d3fc8f236733a34d5dc288e42880a 100644 (file)
--- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/OFDatagramPacketEncoderTest.java
+++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/OFDatagramPacketEncoderTest.java
@@ -18,8 +18,9 @@ import java.util.ArrayList;
 import java.util.List;
 import org.junit.Assert;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
 import org.opendaylight.openflowjava.protocol.impl.core.connection.UdpMessageListenerWrapper;
 import org.opendaylight.openflowjava.protocol.impl.serialization.SerializationFactory;
@@ -32,6 +33,7 @@ import org.opendaylight.yangtools.yang.common.Uint8;
  *
  * @author michal.polkorab
  */
+@RunWith(MockitoJUnitRunner.class)
 public class OFDatagramPacketEncoderTest {
 
     @Mock ChannelHandlerContext ctx;
@@ -48,7 +50,6 @@ public class OFDatagramPacketEncoderTest {
      * @param version openflow protocol wire version
      */
     public void startUp(Uint8 version) {
-        MockitoAnnotations.initMocks(this);
         out = new ArrayList<>();
         HelloInputBuilder builder = new HelloInputBuilder();
         builder.setVersion(version);

diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/OFDatagramPacketHandlerTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/OFDatagramPacketHandlerTest.java
index b1b104eefeaf454e91d827cbf5b883ec1d350300..1a5dea113ead8326c9ab8e039a0119e908b22664 100644 (file)
--- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/OFDatagramPacketHandlerTest.java
+++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/OFDatagramPacketHandlerTest.java
@@ -7,20 +7,17 @@
  */
 package org.opendaylight.openflowjava.protocol.impl.core;
 
-import static org.mockito.Mockito.when;
-
 import io.netty.buffer.ByteBuf;
-import io.netty.channel.Channel;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.socket.DatagramPacket;
 import java.net.InetSocketAddress;
 import java.util.ArrayList;
 import java.util.List;
 import org.junit.Assert;
-import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.opendaylight.openflowjava.protocol.api.connection.SwitchConnectionHandler;
 import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
 import org.opendaylight.openflowjava.protocol.impl.core.connection.MessageConsumer;
@@ -31,19 +28,13 @@ import org.opendaylight.openflowjava.util.ByteBufUtils;
  *
  * @author madamjak
  */
+@RunWith(MockitoJUnitRunner.class)
 public class OFDatagramPacketHandlerTest {
 
     private static final int CHANNEL_OUTBOUND_QUEUE_SIZE = 1024;
     @Mock ChannelHandlerContext ctxMock;
     @Mock SwitchConnectionHandler switchConnHandler;
     @Mock MessageConsumer consumerMock;
-    @Mock Channel channelMock;
-
-    @Before
-    public void startUp() {
-        MockitoAnnotations.initMocks(this);
-        when(ctxMock.channel()).thenReturn(channelMock);
-    }
 
     /**
      * Test {@link OFDatagramPacketHandler}.

diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/OFDecoderStatisticsTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/OFDecoderStatisticsTest.java
index 847846b6f15efddd7642b47a93c736714d1a07a9..ecab9ee531076a6897dfac84aa09689261feaedb 100644 (file)
--- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/OFDecoderStatisticsTest.java
+++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/OFDecoderStatisticsTest.java
@@ -18,8 +18,9 @@ import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.opendaylight.openflowjava.protocol.impl.deserialization.DeserializationFactory;
 import org.opendaylight.openflowjava.statistics.CounterEventTypes;
 import org.opendaylight.openflowjava.statistics.StatisticsCounters;
@@ -33,6 +34,7 @@ import org.opendaylight.yangtools.yang.common.Uint8;
  *
  * @author madamjak
  */
+@RunWith(MockitoJUnitRunner.class)
 public class OFDecoderStatisticsTest {
 
     @Mock ChannelHandlerContext mockChHndlrCtx;
@@ -50,7 +52,6 @@ public class OFDecoderStatisticsTest {
      */
     @Before
     public void setUp() {
-        MockitoAnnotations.initMocks(this);
         ofDecoder = new OFDecoder();
         ofDecoder.setDeserializationFactory(mockDeserializationFactory);
         outList = new ArrayList<>();
@@ -62,7 +63,7 @@ public class OFDecoderStatisticsTest {
      * Stop counting after each test.
      */
     @After
-    public void tierDown() {
+    public void tearDown() {
         statCounters.stopCounting();
     }
 
@@ -70,7 +71,7 @@ public class OFDecoderStatisticsTest {
      * Test decode success counter.
      */
     @Test
-    public void testDecodeSuccesfullCounter() {
+    public void testDecodeSuccessfulCounter() {
         if (!statCounters.isCounterEnabled(CounterEventTypes.US_DECODE_SUCCESS)) {
             Assert.fail("Counter " + CounterEventTypes.US_DECODE_SUCCESS + " is not enable");
         }

diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/OFDecoderTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/OFDecoderTest.java
index 84d17d8b8790e54a2c40e838a0812c2adba66a82..543592a77bb2038093cea2dbf74ac087c004b478 100644 (file)
--- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/OFDecoderTest.java
+++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/OFDecoderTest.java
@@ -18,8 +18,9 @@ import java.util.ArrayList;
 import java.util.List;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.opendaylight.openflowjava.protocol.impl.deserialization.DeserializationFactory;
 import org.opendaylight.openflowjava.util.ByteBufUtils;
 import org.opendaylight.yangtools.yang.binding.DataObject;
@@ -30,6 +31,7 @@ import org.opendaylight.yangtools.yang.common.Uint8;
  *
  * @author jameshall
  */
+@RunWith(MockitoJUnitRunner.class)
 public class OFDecoderTest {
 
     @Mock ChannelHandlerContext mockChHndlrCtx ;
@@ -46,7 +48,6 @@ public class OFDecoderTest {
      */
     @Before
     public void setUp() {
-        MockitoAnnotations.initMocks(this);
         ofDecoder = new OFDecoder();
         ofDecoder.setDeserializationFactory(mockDeserializationFactory);
         writeObj = ByteBufUtils.hexStringToByteBuf("16 03 01 00");

diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/OFEncoderStatisticsTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/OFEncoderStatisticsTest.java
index c71431841e60c8ef198bb738aea467a82a0f43a6..fa57c2e0969108f1a9bf84fbcaa3f04bc91d8704 100644 (file)
--- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/OFEncoderStatisticsTest.java
+++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/OFEncoderStatisticsTest.java
@@ -19,8 +19,9 @@ import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
 import org.opendaylight.openflowjava.protocol.impl.core.connection.MessageListenerWrapper;
 import org.opendaylight.openflowjava.protocol.impl.serialization.SerializationFactory;
@@ -37,6 +38,7 @@ import org.opendaylight.yangtools.yang.common.Uint8;
  *
  * @author madamjak
  */
+@RunWith(MockitoJUnitRunner.class)
 public class OFEncoderStatisticsTest {
 
     @Mock ChannelHandlerContext mockChHndlrCtx ;
@@ -44,7 +46,6 @@ public class OFEncoderStatisticsTest {
     @Mock MessageListenerWrapper wrapper;
     @Mock OfHeader mockMsg ;
     @Mock ByteBuf mockOut ;
-    @Mock Future<Void> future;
     @Mock GenericFutureListener<Future<Void>> listener;
     @Mock FlowModInput mockFlowModInput;
 
@@ -55,8 +56,7 @@ public class OFEncoderStatisticsTest {
      * Initialize tests, start and reset counters before each test.
      */
     @Before
-    public void initTlest() {
-        MockitoAnnotations.initMocks(this);
+    public void initTest() {
         ofEncoder = new OFEncoder() ;
         ofEncoder.setSerializationFactory(mockSerializationFactory) ;
         statCounters = StatisticsCounters.getInstance();
@@ -67,7 +67,7 @@ public class OFEncoderStatisticsTest {
      * Stop counting after each test.
      */
     @After
-    public void tierDown() {
+    public void tearDown() {
         statCounters.stopCounting();
     }
 
@@ -81,7 +81,6 @@ public class OFEncoderStatisticsTest {
             Assert.fail("Counter " + cet + " is not enabled.");
         }
 
-        when(mockOut.readableBytes()).thenReturn(1);
         when(wrapper.getMsg()).thenReturn(mockMsg);
         when(wrapper.getMsg().getVersion()).thenReturn(Uint8.valueOf(EncodeConstants.OF13_VERSION_ID));
 
@@ -103,7 +102,6 @@ public class OFEncoderStatisticsTest {
         if (!statCounters.isCounterEnabled(cet)) {
             Assert.fail("Counter " + cet + " is not enabled.");
         }
-        when(mockOut.readableBytes()).thenReturn(1);
         when(wrapper.getMsg()).thenReturn(mockFlowModInput);
         when(wrapper.getMsg().getVersion()).thenReturn(Uint8.valueOf(EncodeConstants.OF13_VERSION_ID));
 

diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/OFEncoderTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/OFEncoderTest.java
index 9bbfb64c2260e53c9ac411d974ffc89fc9bfacce..cd4b2f88af0820be5c8f13edbfc69d7e941c7696 100644 (file)
--- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/OFEncoderTest.java
+++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/OFEncoderTest.java
@@ -20,8 +20,9 @@ import io.netty.util.concurrent.Future;
 import io.netty.util.concurrent.GenericFutureListener;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
 import org.opendaylight.openflowjava.protocol.impl.core.connection.MessageListenerWrapper;
 import org.opendaylight.openflowjava.protocol.impl.serialization.SerializationFactory;
@@ -34,6 +35,7 @@ import org.opendaylight.yangtools.yang.common.Uint8;
  *
  * @author jameshall
  */
+@RunWith(MockitoJUnitRunner.class)
 public class OFEncoderTest {
 
     @Mock ChannelHandlerContext mockChHndlrCtx ;
@@ -51,7 +53,6 @@ public class OFEncoderTest {
      */
     @Before
     public void setUp() {
-        MockitoAnnotations.initMocks(this);
         ofEncoder = new OFEncoder() ;
         ofEncoder.setSerializationFactory(mockSerializationFactory);
     }
@@ -61,7 +62,6 @@ public class OFEncoderTest {
      */
     @Test
     public void testEncodeSuccess() throws Exception {
-        when(mockOut.readableBytes()).thenReturn(1);
         when(wrapper.getMsg()).thenReturn(mockMsg);
         when(wrapper.getMsg().getVersion()).thenReturn(Uint8.valueOf(EncodeConstants.OF13_VERSION_ID));
 
@@ -93,7 +93,6 @@ public class OFEncoderTest {
      */
     @Test
     public void testEncodeSerializesNoBytes() throws Exception {
-        when(mockOut.readableBytes()).thenReturn(0);
         when(wrapper.getMsg()).thenReturn(mockMsg);
         when(wrapper.getMsg().getVersion()).thenReturn(Uint8.valueOf(EncodeConstants.OF13_VERSION_ID));
 

diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/PublishingChannelInitializerFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/PublishingChannelInitializerFactoryTest.java
index cc856beb5aca7d4d22b7e48462ecaa16ebfd0fc0..26079c3855f56355c25074836e33d5df686bbee5 100644 (file)
--- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/PublishingChannelInitializerFactoryTest.java
+++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/PublishingChannelInitializerFactoryTest.java
@@ -13,8 +13,9 @@ import static org.junit.Assert.assertNotNull;
 import com.google.common.collect.Lists;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.opendaylight.openflowjava.protocol.api.connection.SwitchConnectionHandler;
 import org.opendaylight.openflowjava.protocol.api.connection.TlsConfiguration;
 import org.opendaylight.openflowjava.protocol.api.connection.TlsConfigurationImpl;
@@ -28,6 +29,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.config.rev140630.P
  *
  * @author jameshall
  */
+@RunWith(MockitoJUnitRunner.class)
 public class PublishingChannelInitializerFactoryTest {
 
     TlsConfiguration tlsConfiguration ;
@@ -42,7 +44,6 @@ public class PublishingChannelInitializerFactoryTest {
      */
     @Before
     public void setUp() {
-        MockitoAnnotations.initMocks(this);
         factory = new ChannelInitializerFactory();
         tlsConfiguration = new TlsConfigurationImpl(KeystoreType.JKS, "/exemplary-ctlTrustStore",
                 PathType.CLASSPATH, KeystoreType.JKS, "/exemplary-ctlKeystore", PathType.CLASSPATH,

diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/PublishingChannelInitializerTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/PublishingChannelInitializerTest.java
index 71c23a28f2d6194241e2de9cd19aec3b7b3f3f67..b1aa5013a7095a02929ea39c1081c71ea13375f2 100644 (file)
--- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/PublishingChannelInitializerTest.java
+++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/PublishingChannelInitializerTest.java
@@ -25,11 +25,11 @@ import io.netty.handler.ssl.SslHandler;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.UnknownHostException;
-import javax.net.ssl.SSLEngine;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.opendaylight.openflowjava.protocol.api.connection.SwitchConnectionHandler;
 import org.opendaylight.openflowjava.protocol.api.connection.TlsConfiguration;
 import org.opendaylight.openflowjava.protocol.api.connection.TlsConfigurationImpl;
@@ -45,6 +45,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.config.rev140630.P
  *
  * @author james.hall
  */
+@RunWith(MockitoJUnitRunner.class)
 public class PublishingChannelInitializerTest {
 
     private static final int CHANNEL_OUTBOUND_QUEUE_SIZE = 1024;
@@ -54,8 +55,6 @@ public class PublishingChannelInitializerTest {
     @Mock ConnectionAdapterFactory mockConnAdaptorFactory;
     @Mock DefaultChannelGroup mockChGrp ;
     @Mock ConnectionFacade mockConnFacade ;
-    @Mock
-    SSLEngine sslEngine ;
 
     @Mock SerializationFactory mockSerializationFactory ;
     @Mock DeserializationFactory mockDeserializationFactory ;
@@ -69,7 +68,6 @@ public class PublishingChannelInitializerTest {
      */
     @Before
     public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
         pubChInitializer = new TcpChannelInitializer(mockChGrp, mockConnAdaptorFactory) ;
         pubChInitializer.setSerializationFactory(mockSerializationFactory);
         pubChInitializer.setDeserializationFactory(mockDeserializationFactory);
@@ -113,7 +111,7 @@ public class PublishingChannelInitializerTest {
      * Test channel initialization with null encryption config.
      */
     @Test
-    public void testinitChannelEncryptionSetNullTls()  {
+    public void testInitChannelEncryptionSetNullTls()  {
         pubChInitializer.setTlsConfiguration(null);
         pubChInitializer.initChannel(mockSocketCh) ;
 
@@ -125,7 +123,7 @@ public class PublishingChannelInitializerTest {
      * Test channel initialization without setting the encryption.
      */
     @Test
-    public void testinitChannelEncryptionNotSet()  {
+    public void testInitChannelEncryptionNotSet()  {
         // Without encryption, only the common
         pubChInitializer.initChannel(mockSocketCh) ;
 
@@ -136,7 +134,7 @@ public class PublishingChannelInitializerTest {
      * Test disconnect on new connection rejected.
      */
     @Test
-    public void testinitChannelNoEncryptionAcceptFails() throws UnknownHostException  {
+    public void testInitChannelNoEncryptionAcceptFails() throws UnknownHostException  {
         when(mockSwConnHandler.accept(eq(InetAddress.getLocalHost()))).thenReturn(false) ;
         pubChInitializer.initChannel(mockSocketCh) ;
 

diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/TcpHandlerTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/TcpHandlerTest.java
index 13441ab077f99bd0bb1f0a93b2b5d664a0ef8afd..a767bfa8c0e0992a5681025e3b835578e4233995 100644 (file)
--- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/TcpHandlerTest.java
+++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/TcpHandlerTest.java
@@ -21,8 +21,9 @@ import java.net.InetSocketAddress;
 import java.net.Socket;
 import java.util.concurrent.ExecutionException;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.opendaylight.openflowjava.protocol.api.connection.SwitchConnectionHandler;
 import org.opendaylight.openflowjava.protocol.impl.deserialization.DeserializationFactory;
 import org.opendaylight.openflowjava.protocol.impl.serialization.SerializationFactory;
@@ -32,6 +33,7 @@ import org.opendaylight.openflowjava.protocol.impl.serialization.SerializationFa
  *
  * @author jameshall
  */
+@RunWith(MockitoJUnitRunner.class)
 public class TcpHandlerTest {
 
     private final InetAddress serverAddress = InetAddress.getLoopbackAddress() ;
@@ -43,13 +45,6 @@ public class TcpHandlerTest {
 
     TcpHandler tcpHandler ;
 
-    /**
-     * Initialize mocks.
-     */
-    public TcpHandlerTest() {
-        MockitoAnnotations.initMocks(this);
-    }
-
     /**
      * Test run with null address set.
      */

diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/UdpConnectionMapTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/UdpConnectionMapTest.java
index 8b1bb5027aa6dbba801b8416cf918a325058c654..26243df2521e83453fd8e1193b8a650ad0514505 100644 (file)
--- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/UdpConnectionMapTest.java
+++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/UdpConnectionMapTest.java
@@ -11,10 +11,10 @@ import io.netty.buffer.ByteBuf;
 import io.netty.channel.socket.DatagramPacket;
 import java.net.InetSocketAddress;
 import org.junit.Assert;
-import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.opendaylight.openflowjava.protocol.impl.core.connection.MessageConsumer;
 
 /**
@@ -22,16 +22,12 @@ import org.opendaylight.openflowjava.protocol.impl.core.connection.MessageConsum
  *
  * @author madamjak
  */
+@RunWith(MockitoJUnitRunner.class)
 public class UdpConnectionMapTest {
 
     @Mock MessageConsumer consumerMock;
     @Mock ByteBuf messageBuffer;
 
-    @Before
-    public void startUp() {
-        MockitoAnnotations.initMocks(this);
-    }
-
     /**
      * Test {@link UdpConnectionMap} - sender address is not null.
      */

diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/VersionMessageUdpWrapperTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/VersionMessageUdpWrapperTest.java
index 622d18ccc57982da4f58b367b3f6e8d062b99b99..2e2ded651f43dab3009f19e0366ef248b0a6cba0 100644 (file)
--- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/VersionMessageUdpWrapperTest.java
+++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/VersionMessageUdpWrapperTest.java
@@ -10,10 +10,10 @@ package org.opendaylight.openflowjava.protocol.impl.core;
 import io.netty.buffer.ByteBuf;
 import java.net.InetSocketAddress;
 import org.junit.Assert;
-import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.opendaylight.yangtools.yang.common.Uint8;
 
 /**
@@ -21,15 +21,11 @@ import org.opendaylight.yangtools.yang.common.Uint8;
  *
  * @author madamjak
  */
+@RunWith(MockitoJUnitRunner.class)
 public class VersionMessageUdpWrapperTest {
 
     @Mock ByteBuf byteBuff;
 
-    @Before
-    public void startUp() {
-        MockitoAnnotations.initMocks(this);
-    }
-
     @Test
     public void test() {
         Uint8 version = Uint8.valueOf(35);

diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/ChannelOutboundQueue02Test.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/ChannelOutboundQueue02Test.java
index ed943118271ed7531b5e2bf0007d767b2cf07913..ca26576d9552ef76349c081781921a0b2a513042 100644 (file)
--- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/ChannelOutboundQueue02Test.java
+++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/ChannelOutboundQueue02Test.java
@@ -23,8 +23,9 @@ import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.BarrierInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.EchoInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.EchoReplyInput;
@@ -37,6 +38,7 @@ import org.opendaylight.yangtools.yang.common.Uint32;
  *
  * @author madamjak
  */
+@RunWith(MockitoJUnitRunner.class)
 public class ChannelOutboundQueue02Test {
     private static int counter;
     private static final int CHANNEL_OUTBOUND_QUEUE_SIZE = 1024;
@@ -56,7 +58,6 @@ public class ChannelOutboundQueue02Test {
      */
     @Before
     public void setUp() {
-        MockitoAnnotations.initMocks(this);
         mockXid(echoInput);
         mockXid(barrierInput);
         mockXid(echoReplyInput);
@@ -71,7 +72,7 @@ public class ChannelOutboundQueue02Test {
      * Disconnect adapter after each test.
      */
     @After
-    public void tierDown() {
+    public void tearDown() {
         if (adapter != null && adapter.isAlive()) {
             adapter.disconnect();
         }

diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/ChannelOutboundQueueTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/ChannelOutboundQueueTest.java
index d36dd3b69e8157f456fb36972bf0e1f6e7244b3c..5cc233ec633f70d7dce540c52b132d6e882ba713 100644 (file)
--- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/ChannelOutboundQueueTest.java
+++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/ChannelOutboundQueueTest.java
@@ -10,25 +10,20 @@ package org.opendaylight.openflowjava.protocol.impl.core.connection;
 import io.netty.channel.Channel;
 import org.junit.Assert;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
 
 /**
  * UNit tests for ChannelOutboundQueue.
  *
  * @author michal.polkorab
  */
+@RunWith(MockitoJUnitRunner.class)
 public class ChannelOutboundQueueTest {
 
     @Mock Channel channel;
 
-    /**
-     * Initialize mocks.
-     */
-    public ChannelOutboundQueueTest() {
-        MockitoAnnotations.initMocks(this);
-    }
-
     /**
      * Test incorrect queue creation handling.
      */

diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/ConnectionAdapterFactoryImplTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/ConnectionAdapterFactoryImplTest.java
index e721f1437519fb533e612749a53fcb6d05da6f9f..535d3f099c0f94f803e7da6e1e7f3f6894eb3835 100644 (file)
--- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/ConnectionAdapterFactoryImplTest.java
+++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/ConnectionAdapterFactoryImplTest.java
@@ -15,14 +15,16 @@ import java.net.InetSocketAddress;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
 
 /**
  * Unit tests for ConnectionAdapterFactoryImpl.
  *
  * @author madamjak
  */
+@RunWith(MockitoJUnitRunner.class)
 public class ConnectionAdapterFactoryImplTest {
 
     private static final int CHANNEL_OUTBOUND_QUEUE_SIZE = 1024;
@@ -32,7 +34,6 @@ public class ConnectionAdapterFactoryImplTest {
 
     @Before
     public void startUp() {
-        MockitoAnnotations.initMocks(this);
         when(channel.pipeline()).thenReturn(channnelPipe);
     }
 

diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/ConnectionAdapterImp02lTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/ConnectionAdapterImp02lTest.java
index 7d83f776d72adc930ca50419ee4fabd3f4cee55b..79278d6a319ae1ed3e507fb86800e4baea7518ab 100644 (file)
--- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/ConnectionAdapterImp02lTest.java
+++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/ConnectionAdapterImp02lTest.java
@@ -22,8 +22,9 @@ import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.BarrierInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.EchoInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.EchoReplyInput;
@@ -52,6 +53,7 @@ import org.opendaylight.yangtools.yang.common.Uint32;
  * @author madamjak
  * @author michal.polkorab
  */
+@RunWith(MockitoJUnitRunner.class)
 public class ConnectionAdapterImp02lTest {
     private static final int RPC_RESPONSE_EXPIRATION = 1;
     private static final int CHANNEL_OUTBOUND_QUEUE_SIZE = 1024;
@@ -86,7 +88,6 @@ public class ConnectionAdapterImp02lTest {
      */
     @Before
     public void setUp() {
-        MockitoAnnotations.initMocks(this);
         mockXid(barrierInput);
         mockXid(echoInput);
         mockXid(echoReplyInput);
@@ -109,7 +110,7 @@ public class ConnectionAdapterImp02lTest {
      * Disconnect adapter.
      */
     @After
-    public void tierDown() {
+    public void tearDown() {
         if (adapter != null && adapter.isAlive()) {
             adapter.disconnect();
         }

diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/ConnectionAdapterImpl02Test.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/ConnectionAdapterImpl02Test.java
index 1398d404c1b06f7071fbaaaf3f11e2d21eb4e86e..b70569228e103bd45648e87fac4baadb12791209 100644 (file)
--- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/ConnectionAdapterImpl02Test.java
+++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/ConnectionAdapterImpl02Test.java
@@ -22,8 +22,9 @@ import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.BarrierInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.EchoInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.EchoReplyInput;
@@ -52,6 +53,7 @@ import org.opendaylight.yangtools.yang.common.Uint32;
  * @author madamjak
  * @author michal.polkorab
  */
+@RunWith(MockitoJUnitRunner.class)
 public class ConnectionAdapterImpl02Test {
     private static final int RPC_RESPONSE_EXPIRATION = 1;
     private static final int CHANNEL_OUTBOUND_QUEUE_SIZE = 1024;
@@ -86,7 +88,6 @@ public class ConnectionAdapterImpl02Test {
      */
     @Before
     public void setUp() {
-        MockitoAnnotations.initMocks(this);
         mockXid(barrierInput);
         mockXid(echoInput);
         mockXid(echoReplyInput);
@@ -109,7 +110,7 @@ public class ConnectionAdapterImpl02Test {
      * Disconnect adapter.
      */
     @After
-    public void tierDown() {
+    public void tearDown() {
         if (adapter != null && adapter.isAlive()) {
             adapter.disconnect();
         }

diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/ConnectionAdapterImplStatisticsTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/ConnectionAdapterImplStatisticsTest.java
index d07ef20b829c9296853fa5710d203355547d556e..988f4b8696b8f208dc957f1cf07dcc518b8ce501 100644 (file)
--- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/ConnectionAdapterImplStatisticsTest.java
+++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/ConnectionAdapterImplStatisticsTest.java
@@ -24,8 +24,9 @@ import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.opendaylight.openflowjava.protocol.api.connection.ConnectionReadyListener;
 import org.opendaylight.openflowjava.statistics.CounterEventTypes;
 import org.opendaylight.openflowjava.statistics.StatisticsCounters;
@@ -68,6 +69,7 @@ import org.opendaylight.yangtools.yang.common.Uint32;
  *
  * @author madamjak
  */
+@RunWith(MockitoJUnitRunner.class)
 public class ConnectionAdapterImplStatisticsTest {
 
     private static final int RPC_RESPONSE_EXPIRATION = 1;
@@ -111,7 +113,6 @@ public class ConnectionAdapterImplStatisticsTest {
      */
     @Before
     public void setUp() {
-        MockitoAnnotations.initMocks(this);
         mockXid(barrierInput);
         mockXid(echoInput);
         mockXid(echoReplyInput);
@@ -138,7 +139,7 @@ public class ConnectionAdapterImplStatisticsTest {
      * Stop counting after each test.
      */
     @After
-    public void tierDown() {
+    public void tearDown() {
         if (adapter != null && adapter.isAlive()) {
             adapter.disconnect();
         }

diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/ConnectionAdapterImplTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/ConnectionAdapterImplTest.java
index ace4389d97778e1c83894b6f9c9fb7b6d5f40acc..6f5ce578938f3d4cfe8b595789ea122200b1bb95 100644 (file)
--- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/ConnectionAdapterImplTest.java
+++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/ConnectionAdapterImplTest.java
@@ -24,8 +24,9 @@ import java.util.concurrent.TimeUnit;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.opendaylight.openflowjava.protocol.api.connection.ConnectionReadyListener;
 import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.BarrierInput;
@@ -64,6 +65,7 @@ import org.opendaylight.yangtools.yang.common.Uint32;
  * @author michal.polkorab
  * @author madamjak
  */
+@RunWith(MockitoJUnitRunner.class)
 public class ConnectionAdapterImplTest {
 
     private static final int RPC_RESPONSE_EXPIRATION = 1;
@@ -87,7 +89,6 @@ public class ConnectionAdapterImplTest {
      */
     @Before
     public void setUp() {
-        MockitoAnnotations.initMocks(this);
         when(channel.pipeline()).thenReturn(pipeline);
         adapter = new ConnectionAdapterImpl(channel, InetSocketAddress.createUnresolved("10.0.0.1", 6653), true,
                 CHANNEL_OUTBOUND_QUEUE_SIZE);

diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/SimpleRpcListenerTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/SimpleRpcListenerTest.java
index 7bd1473ba927b66caa74334277a1adcb6bd74b50..07d5eb2675df7ee4e3352b842a00890d1fb22665 100644 (file)
--- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/SimpleRpcListenerTest.java
+++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/SimpleRpcListenerTest.java
@@ -16,10 +16,10 @@ import com.google.common.util.concurrent.SettableFuture;
 import io.netty.util.concurrent.Future;
 import java.util.concurrent.ExecutionException;
 import org.junit.Assert;
-import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.opendaylight.yangtools.yang.common.RpcResult;
 import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
 
@@ -28,18 +28,11 @@ import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
  *
  * @author michal.polkorab
  */
+@RunWith(MockitoJUnitRunner.class)
 public class SimpleRpcListenerTest {
 
     @Mock Future<Void> future;
 
-    /**
-     * Initializes mocks.
-     */
-    @Before
-    public void startUp() {
-        MockitoAnnotations.initMocks(this);
-    }
-
     /**
      * Test SimpleRpcListener creation.
      */

diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/SwitchConnectionProviderImpl02Test.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/SwitchConnectionProviderImpl02Test.java
index f18aafbcf1a05b02c58ad689ddb43b39e46ac6f0..027edfc55fd047c41d7f88603281660738668f37 100755 (executable)
--- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/SwitchConnectionProviderImpl02Test.java
+++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/SwitchConnectionProviderImpl02Test.java
@@ -13,8 +13,9 @@ import java.net.InetAddress;
 import java.net.UnknownHostException;
 import org.junit.Assert;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.opendaylight.openflowjava.protocol.api.connection.OpenflowDiagStatusProvider;
 import org.opendaylight.openflowjava.protocol.api.connection.SwitchConnectionHandler;
 import org.opendaylight.openflowjava.protocol.api.connection.TlsConfiguration;
@@ -59,6 +60,7 @@ import org.opendaylight.yangtools.yang.common.Uint32;
  * @author madamjak
  * @author michal.polkorab
  */
+@RunWith(MockitoJUnitRunner.class)
 public class SwitchConnectionProviderImpl02Test {
     @Mock SwitchConnectionHandler handler;
     @Mock OFGeneralSerializer serializer;
@@ -84,7 +86,6 @@ public class SwitchConnectionProviderImpl02Test {
      * @param protocol communication protocol
      */
     public void startUp(final TransportProtocol protocol) throws UnknownHostException {
-        MockitoAnnotations.initMocks(this);
         config = null;
         if (protocol != null) {
             createConfig(protocol);

diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/SwitchConnectionProviderImplTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/SwitchConnectionProviderImplTest.java
index ca6bc3e50e329d44deb95132c17a5fa176d969a7..e7178c746c542ff090ecc2848888fdcc6d3b5b93 100644 (file)
--- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/SwitchConnectionProviderImplTest.java
+++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/SwitchConnectionProviderImplTest.java
@@ -17,8 +17,9 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import org.junit.Assert;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.opendaylight.openflowjava.protocol.api.connection.OpenflowDiagStatusProvider;
 import org.opendaylight.openflowjava.protocol.api.connection.SwitchConnectionHandler;
 import org.opendaylight.openflowjava.protocol.api.connection.TlsConfiguration;
@@ -35,6 +36,7 @@ import org.slf4j.LoggerFactory;
  *
  * @author michal.polkorab
  */
+@RunWith(MockitoJUnitRunner.class)
 public class SwitchConnectionProviderImplTest {
 
     @Mock SwitchConnectionHandler handler;
@@ -53,7 +55,6 @@ public class SwitchConnectionProviderImplTest {
      */
 
     public void startUp(final TransportProtocol protocol) throws UnknownHostException {
-        MockitoAnnotations.initMocks(this);
         config = null;
         if (protocol != null) {
             createConfig(protocol);

diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/UdpHandlerTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/UdpHandlerTest.java
index 949007051ab782a37010fd43d1e1461ad70689f1..871e2adf6aab7d61dd928d17e5b68c6fa203f464 100644 (file)
--- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/UdpHandlerTest.java
+++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/UdpHandlerTest.java
@@ -13,10 +13,10 @@ import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import org.junit.Assert;
-import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.opendaylight.openflowjava.protocol.impl.core.UdpChannelInitializer;
 import org.opendaylight.openflowjava.protocol.impl.core.UdpHandler;
 import org.slf4j.Logger;
@@ -27,6 +27,7 @@ import org.slf4j.LoggerFactory;
  *
  * @author madamjak
  */
+@RunWith(MockitoJUnitRunner.class)
 public class UdpHandlerTest {
 
     private static final Logger LOG = LoggerFactory.getLogger(UdpHandlerTest.class);
@@ -35,14 +36,6 @@ public class UdpHandlerTest {
     private UdpChannelInitializer udpChannelInitializerMock;
     private UdpHandler udpHandler;
 
-    /**
-     * Mock init.
-     */
-    @Before
-    public void startUp() {
-        MockitoAnnotations.initMocks(this);
-    }
-
     /**
      * Test to create UdpHandler with empty address and zero port.
      */

diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/UdpMessageListenerWrapperTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/UdpMessageListenerWrapperTest.java
index b9e854e88b04da0fa544278d4641dde40c5f62ac..e2526482525973e831422d9cdb036e1cbfe94e29 100644 (file)
--- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/UdpMessageListenerWrapperTest.java
+++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/UdpMessageListenerWrapperTest.java
@@ -12,10 +12,10 @@ import io.netty.util.concurrent.Future;
 import io.netty.util.concurrent.GenericFutureListener;
 import java.net.InetSocketAddress;
 import org.junit.Assert;
-import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.OfHeader;
 
 /**
@@ -23,16 +23,12 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731
  *
  * @author madamjak
  */
+@RunWith(MockitoJUnitRunner.class)
 public class UdpMessageListenerWrapperTest {
 
     @Mock GenericFutureListener<Future<Void>> listener;
     @Mock OfHeader msg;
 
-    @Before
-    public void startUp() {
-        MockitoAnnotations.initMocks(this);
-    }
-
     /**
      * Getters test.
      */

diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/action/OF13SetFieldActionSerializerTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/action/OF13SetFieldActionSerializerTest.java
index c43b4f5092ca47fcad765da0f2dc13518c523abc..eefc3d959847f905763c39e0605a45a63d5f8617 100644 (file)
--- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/action/OF13SetFieldActionSerializerTest.java
+++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/action/OF13SetFieldActionSerializerTest.java
@@ -6,6 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 package org.opendaylight.openflowjava.protocol.impl.serialization.action;
+
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.UnpooledByteBufAllocator;
 import java.util.ArrayList;
@@ -13,9 +14,10 @@ import java.util.List;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.opendaylight.openflowjava.protocol.api.extensibility.OFSerializer;
 import org.opendaylight.openflowjava.protocol.api.extensibility.SerializerRegistry;
 import org.opendaylight.openflowjava.protocol.api.keys.MatchEntrySerializerKey;
@@ -39,6 +41,7 @@ import org.opendaylight.yangtools.yang.common.Uint32;
  *
  * @author madamjak
  */
+@RunWith(MockitoJUnitRunner.class)
 public class OF13SetFieldActionSerializerTest {
 
     private SerializerRegistry registry;
@@ -49,7 +52,6 @@ public class OF13SetFieldActionSerializerTest {
      */
     @Before
     public void startUp() {
-        MockitoAnnotations.initMocks(this);
         registry = new SerializerRegistryImpl();
         registry.init();
     }

diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/ExperimenterInputMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/ExperimenterInputMessageFactoryTest.java
index 6877e26e915e902633bb008c7845c36b7d3e17d0..6238d0a836bd63daafd55bf488dd96dfa2d70bcf 100644 (file)
--- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/ExperimenterInputMessageFactoryTest.java
+++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/ExperimenterInputMessageFactoryTest.java
@@ -11,9 +11,10 @@ import static org.mockito.ArgumentMatchers.any;
 
 import io.netty.buffer.ByteBuf;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.opendaylight.openflowjava.protocol.api.extensibility.OFSerializer;
 import org.opendaylight.openflowjava.protocol.api.extensibility.SerializerRegistry;
 import org.opendaylight.openflowjava.protocol.api.extensibility.SerializerRegistryInjector;
@@ -32,6 +33,7 @@ import org.opendaylight.yangtools.yang.common.Uint32;
  *
  * @author michal.polkorab
  */
+@RunWith(MockitoJUnitRunner.class)
 public class ExperimenterInputMessageFactoryTest {
 
     @Mock SerializerRegistry registry;
@@ -48,7 +50,6 @@ public class ExperimenterInputMessageFactoryTest {
      * @param real true if setup should use real registry, false when mock is desired
      */
     public void startUp(boolean real) {
-        MockitoAnnotations.initMocks(this);
         expFactory = new ExperimenterInputMessageFactory();
         if (real) {
             SerializerRegistry realRegistry = new SerializerRegistryImpl();

diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/statistics/StatisticsCountersTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/statistics/StatisticsCountersTest.java
index 7521bc111b5555e525a90b7d1a94a3674993514b..cd6e995ba4c682f17800b522ea2670e89fadd177 100644 (file)
--- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/statistics/StatisticsCountersTest.java
+++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/statistics/StatisticsCountersTest.java
@@ -37,7 +37,7 @@ public class StatisticsCountersTest {
      * Stop counting after each test.
      */
     @After
-    public void tierDown() {
+    public void tearDown() {
         statCounters.stopCounting();
     }