Bump MRI upstreams

[openflowplugin.git] / openflowjava / openflow-protocol-impl / src / test / java / org / opendaylight / openflowjava / protocol / impl / deserialization / factories / ErrorMessageFactoryTest.java

diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/ErrorMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/ErrorMessageFactoryTest.java
index 0d7dc5c40b21f1b927339e55933f685eb4d1277a..c692151a7f4e22f021f5304b6a6a670014c7b06b 100644 (file)
--- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/ErrorMessageFactoryTest.java
+++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/ErrorMessageFactoryTest.java
@@ -8,22 +8,24 @@
 
 package org.opendaylight.openflowjava.protocol.impl.deserialization.factories;
 
-import io.netty.buffer.ByteBuf;
+import static org.mockito.ArgumentMatchers.any;
 
+import io.netty.buffer.ByteBuf;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Matchers;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.opendaylight.openflowjava.protocol.api.extensibility.DeserializerRegistry;
 import org.opendaylight.openflowjava.protocol.api.keys.MessageCodeKey;
 import org.opendaylight.openflowjava.protocol.impl.util.BufferHelper;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.ErrorMessage;
 
 /**
+ * Unit tests for ErrorMessageFactory.
+ *
  * @author michal.polkorab
  * @author timotej.kubas
  */
@@ -36,15 +38,17 @@ public class ErrorMessageFactoryTest {
     private ErrorMessageFactory errorFactory;
 
     /**
-     * Initializes deserializer registry and lookups correct deserializer
+     * Initializes deserializer registry and lookups correct deserializer..
      */
     @Before
     public void startUp() {
         errorFactory = new ErrorMessageFactory();
+        Mockito.when(registry.getDeserializer(any(MessageCodeKey.class))).thenReturn(deserializer);
+        errorFactory.injectDeserializerRegistry(registry);
     }
 
     /**
-     * Test of {@link ErrorMessageFactory} for correct translation into POJO
+     * Test of {@link ErrorMessageFactory} for correct translation into POJO.
      */
     @Test
     public void testWithoutData() {
@@ -191,7 +195,7 @@ public class ErrorMessageFactoryTest {
 
     /**
      * Test of {@link ErrorMessageFactory} for correct translation into POJO
-     * - not existing code used
+     * - not existing code used.
      */
     @Test
     public void testWithoutData2() {
@@ -337,7 +341,7 @@ public class ErrorMessageFactoryTest {
     }
 
     /**
-     * Test of {@link ErrorMessageFactory} for correct translation into POJO
+     * Test of {@link ErrorMessageFactory} for correct translation into POJO.
      */
     @Test
     public void testWithData() {
@@ -353,7 +357,7 @@ public class ErrorMessageFactoryTest {
     }
 
     /**
-     * Test of {@link ErrorMessageFactory} for correct translation into POJO
+     * Test of {@link ErrorMessageFactory} for correct translation into POJO.
      */
     @Test
     public void testWithIncorrectTypeEnum() {
@@ -369,7 +373,7 @@ public class ErrorMessageFactoryTest {
     }
 
     /**
-     * Test of {@link ErrorMessageFactory} for correct translation into POJO
+     * Test of {@link ErrorMessageFactory} for correct translation into POJO.
      */
     @Test
     public void testWithIncorrectCodeEnum() {
@@ -385,15 +389,13 @@ public class ErrorMessageFactoryTest {
     }
 
     /**
-     * Test of {@link ErrorMessageFactory} for correct translation into POJO
+     * Test of {@link ErrorMessageFactory} for correct translation into POJO.
      */
     @Test
     public void testExperimenterError() {
-        Mockito.when(registry.getDeserializer(Matchers.any(MessageCodeKey.class))).thenReturn(deserializer);
-        errorFactory.injectDeserializerRegistry(registry);
         ByteBuf bb = BufferHelper.buildBuffer("FF FF 00 00 00 01");
         BufferHelper.deserialize(errorFactory, bb);
 
         Mockito.verify(deserializer, Mockito.times(1)).deserialize(bb);
     }
-}
\ No newline at end of file
+}