X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=openflowjava%2Fopenflow-protocol-impl%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fopenflowjava%2Fprotocol%2Fimpl%2Fcore%2FOFDatagramPacketHandlerTest.java;fp=openflowjava%2Fopenflow-protocol-impl%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fopenflowjava%2Fprotocol%2Fimpl%2Fcore%2FOFDatagramPacketHandlerTest.java;h=1a5dea113ead8326c9ab8e039a0119e908b22664;hb=15541ae08523bd48ad1adbb0b6e91a71ea8de553;hp=b1b104eefeaf454e91d827cbf5b883ec1d350300;hpb=f9cbf450469a2a4f28d46515e0f67025d39efb04;p=openflowplugin.git

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 b1b104eefe..1a5dea113e 100644
--- 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}.