Migrate MockitoJUnitRunner

[openflowplugin.git] / openflowplugin / src / test / java / org / opendaylight / openflowplugin / openflow / md / core / extension / ExtensionConverterManagerImplTest.java

diff --git a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/extension/ExtensionConverterManagerImplTest.java b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/extension/ExtensionConverterManagerImplTest.java
index 83998b390e47e05035e792da5537c73eef9a0de7..adbb1268ea1c47ad67f6e7e4902e473577b48dfb 100644 (file)
--- a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/extension/ExtensionConverterManagerImplTest.java
+++ b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/extension/ExtensionConverterManagerImplTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -13,33 +13,38 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.opendaylight.openflowjava.protocol.api.keys.ExperimenterActionSerializerKey;
+import org.opendaylight.openflowjava.protocol.api.keys.MessageTypeKey;
+import org.opendaylight.openflowplugin.extension.api.ConverterExtensionKey;
 import org.opendaylight.openflowplugin.extension.api.ConvertorActionFromOFJava;
 import org.opendaylight.openflowplugin.extension.api.ConvertorActionToOFJava;
+import org.opendaylight.openflowplugin.extension.api.ConvertorFromOFJava;
 import org.opendaylight.openflowplugin.extension.api.TypeVersionKey;
 import org.opendaylight.openflowplugin.extension.api.path.ActionPath;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.ExperimenterActionSubType;
 
 /**
- * {@link ExtensionConverterManagerImpl} test
+ * {@link ExtensionConverterManagerImpl} test.
  */
 @RunWith(MockitoJUnitRunner.class)
 public class ExtensionConverterManagerImplTest {
 
     private ExtensionConverterManagerImpl manager;
     @Mock
-    private ConvertorActionToOFJava<Action, org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action> extConvertorToOFJava;
+    private ConvertorActionToOFJava<Action, org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action
+        .rev150203.actions.grouping.Action> extConvertorToOFJava;
     private TypeVersionKey<? extends Action> keyToOFJava;
     @Mock
-    private ConvertorActionFromOFJava<org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action, ActionPath> extConvertorFromOFJava;
+    private ConvertorActionFromOFJava<org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203
+        .actions.grouping.Action, ActionPath> extConvertorFromOFJava;
     private ExperimenterActionSerializerKey keyFromOFJava;
     private AutoCloseable regFromOFJava;
     private AutoCloseable regToOFJava;
 
     /**
-     * prepare required stuff
+     * prepare required stuff.
      */
     @Before
     public void setUp() {
@@ -52,9 +57,7 @@ public class ExtensionConverterManagerImplTest {
     }
 
     /**
-     * tear down test case - close registrations
-     *
-     * @throws Exception
+     * tear down test case - close registrations.
      */
     @After
     public void tearDown() throws Exception {
@@ -63,9 +66,7 @@ public class ExtensionConverterManagerImplTest {
     }
 
     /**
-     * Test method for {@link org.opendaylight.openflowplugin.openflow.md.core.extension.ExtensionConverterManagerImpl#unregister(org.opendaylight.openflowplugin.extension.api.ConverterExtensionKey, org.opendaylight.openflowplugin.extension.api.ConvertorToOFJava)}.
-     *
-     * @throws Exception
+     * Test method for ExtensionConverterManagerImpl#unregister(ConverterExtensionKey, ConvertorToOFJava)}.
      */
     @Test
     public void testUnregisterConverterExtensionKeyOfQConvertorToOFJavaOfQQ() throws Exception {
@@ -74,9 +75,7 @@ public class ExtensionConverterManagerImplTest {
     }
 
     /**
-     * Test method for {@link org.opendaylight.openflowplugin.openflow.md.core.extension.ExtensionConverterManagerImpl#unregister(org.opendaylight.openflowjava.protocol.api.extensibility.MessageTypeKey, org.opendaylight.openflowplugin.extension.api.ConvertorFromOFJava)}.
-     *
-     * @throws Exception
+     * Test method for {@link ExtensionConverterManagerImpl#unregister(MessageTypeKey, ConvertorFromOFJava)}.
      */
     @Test
     public void testUnregisterMessageTypeKeyOfQConvertorFromOFJavaOfQQ() throws Exception {
@@ -85,7 +84,7 @@ public class ExtensionConverterManagerImplTest {
     }
 
     /**
-     * Test method for {@link org.opendaylight.openflowplugin.openflow.md.core.extension.ExtensionConverterManagerImpl#getConverter(org.opendaylight.openflowplugin.extension.api.ConverterExtensionKey)}.
+     * Test method for {@link ExtensionConverterManagerImpl#getConverter(ConverterExtensionKey)}.
      */
     @Test
     public void testGetConverterConverterExtensionKeyOfQ() {
@@ -93,18 +92,18 @@ public class ExtensionConverterManagerImplTest {
     }
 
     /**
-     * Test method for {@link org.opendaylight.openflowplugin.openflow.md.core.extension.ExtensionConverterManagerImpl#getConverter(org.opendaylight.openflowjava.protocol.api.extensibility.MessageTypeKey)}.
+     * Test method for {@link ExtensionConverterManagerImpl#getConverter(MessageTypeKey)}.
      */
     @Test
     public void testGetConverterMessageTypeKeyOfQ() {
         Assert.assertEquals(extConvertorFromOFJava, manager.getActionConverter(keyFromOFJava));
     }
 
-    private static class ExpSubType extends ExperimenterActionSubType {
+    private interface ExpSubType extends ExperimenterActionSubType {
         // NOOP
     }
 
-    private static interface ActionExpCase extends Action {
+    private interface ActionExpCase extends Action {
         // NOOP
     }