Migrate MockitoJUnitRunner

[openflowplugin.git] / openflowplugin / src / test / java / org / opendaylight / openflowplugin / openflow / md / core / sal / convertor / ConvertorManagerTest.java

diff --git a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/ConvertorManagerTest.java b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/ConvertorManagerTest.java
index 5049fbbd0d55fb78429283e40da8553c85fe30f1..e6167f2966b4cade27b933916a5319ef93ea54a5 100644 (file)
--- a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/ConvertorManagerTest.java
+++ b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/ConvertorManagerTest.java
@@ -17,20 +17,21 @@ import java.util.List;
 import java.util.Optional;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common.Convertor;
+import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common.ConvertorData;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.data.VersionConvertorData;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.list.Action;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.list.ActionBuilder;
 
 /**
- * Test for {@link org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorManager}
+ * Test for {@link org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorManager}.
  */
 @RunWith(MockitoJUnitRunner.class)
 public class ConvertorManagerTest {
     @Test
-    public void testRegisterConvertor() throws Exception {
+    public void testRegisterConvertor() {
         final ConvertorManager convertorManager = new ConvertorManager(OFConstants.OFP_VERSION_1_3)
                 .registerConvertor(OFConstants.OFP_VERSION_1_3, new Convertor<Action, String, VersionConvertorData>() {
                     @Override
@@ -49,7 +50,7 @@ public class ConvertorManagerTest {
     }
 
     @Test
-    public void testConvert() throws Exception {
+    public void testConvert() {
         final ConvertorManager convertorManager = new ConvertorManager(OFConstants.OFP_VERSION_1_3)
                 .registerConvertor(OFConstants.OFP_VERSION_1_3, new Convertor<Action, String, VersionConvertorData>() {
                     @Override
@@ -73,13 +74,13 @@ public class ConvertorManagerTest {
     }
 
     /**
-     * Test for {@link org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorManager#convert(java.util.Collection, org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common.ConvertorData)}
-     * @throws Exception
+     * Test for {@link ConvertorManager#convert(Collection, ConvertorData)}.
      */
     @Test
-    public void testConvert1() throws Exception {
+    public void testConvert1() {
         final ConvertorManager convertorManager = new ConvertorManager(OFConstants.OFP_VERSION_1_3)
-                .registerConvertor(OFConstants.OFP_VERSION_1_3, new Convertor<List<Action>, String, VersionConvertorData>() {
+            .registerConvertor(OFConstants.OFP_VERSION_1_3,
+                new Convertor<List<Action>, String, VersionConvertorData>() {
                     @Override
                     public Collection<Class<?>> getTypes() {
                         return Collections.singleton(Action.class);
@@ -99,4 +100,4 @@ public class ConvertorManagerTest {
         assertTrue("Failed to convert action to string", result.isPresent());
         assertEquals("Result and expected result do not match", result.get(), expectedResult);
     }
-}
\ No newline at end of file
+}