Merge "Remove redundant exception declarations"

[openflowplugin.git] / extension / openflowplugin-extension-nicira / src / test / java / org / opendaylight / openflowplugin / extension / vendor / nicira / NiciraExtensionProviderTest.java

diff --git a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/NiciraExtensionProviderTest.java b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/NiciraExtensionProviderTest.java
index 1ac9630310f8e3fbf8e080fafa2ac9ec397fe036..3fe7dfa6276b04cca140f61ee4f1466dda07f189 100644 (file)
--- a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/NiciraExtensionProviderTest.java
+++ b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/NiciraExtensionProviderTest.java
@@ -8,16 +8,16 @@
 
 package org.opendaylight.openflowplugin.extension.vendor.nicira;
 
-import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Matchers;
+import org.mockito.ArgumentMatchers;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.runners.MockitoJUnitRunner;
 import org.opendaylight.openflowplugin.extension.api.ConvertorActionToOFJava;
 import org.opendaylight.openflowplugin.extension.api.ExtensionConverterRegistrator;
+import org.opendaylight.openflowplugin.extension.api.OpenFlowPluginExtensionRegistratorProvider;
 import org.opendaylight.openflowplugin.extension.api.TypeVersionKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action;
 
@@ -27,21 +27,26 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.acti
 @RunWith(MockitoJUnitRunner.class)
 public class NiciraExtensionProviderTest {
 
+    @Mock
+    private OpenFlowPluginExtensionRegistratorProvider openFlowPluginExtensionRegistratorProvider;
+
     @Mock
     private ExtensionConverterRegistrator extensionConverterRegistrator;
 
     private NiciraExtensionProvider niciraExtensionProvider;
 
     @Before
-    public void setUp() throws Exception {
-
-        niciraExtensionProvider = new NiciraExtensionProvider();
-        niciraExtensionProvider.setExtensionConverterRegistrator(extensionConverterRegistrator);
+    public void setUp() {
+        Mockito.when(openFlowPluginExtensionRegistratorProvider.getExtensionConverterRegistrator())
+                .thenReturn(extensionConverterRegistrator);
+        niciraExtensionProvider = new NiciraExtensionProvider(openFlowPluginExtensionRegistratorProvider);
     }
 
     @Test
-    public void testRegisterConverters() throws Exception {
-        niciraExtensionProvider.registerConverters();
-        Mockito.verify(extensionConverterRegistrator, Mockito.atLeastOnce()).registerActionConvertor(Matchers.<TypeVersionKey<? extends Action>>any(), Matchers.<ConvertorActionToOFJava<Action, org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action>>any());
+    public void testRegisterConverters() {
+        Mockito.verify(extensionConverterRegistrator, Mockito.atLeastOnce()).registerActionConvertor(
+                ArgumentMatchers.<TypeVersionKey<? extends Action>>any(),
+                ArgumentMatchers.<ConvertorActionToOFJava<Action, org.opendaylight.yang.gen.v1.urn.opendaylight.openflow
+                                    .common.action.rev150203.actions.grouping.Action>>any());
     }
-}
\ No newline at end of file
+}