Migrate a few convertors

[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 27dc780976ddf15510e01d72cbc4ea553a6c2cea..ca6a81cc6bef60d43ece92d8941bd3a59e110500 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,7 +17,7 @@ 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;
@@ -31,7 +31,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.acti
 @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
@@ -50,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
@@ -64,7 +64,7 @@ public class ConvertorManagerTest {
                     }
                 });
 
-        final Action source = new ActionBuilder().build();
+        final Action source = new ActionBuilder().setOrder(0).build();
         final VersionConvertorData data = new VersionConvertorData(OFConstants.OFP_VERSION_1_3);
         final String expectedResult = String.valueOf(source) + String.valueOf(data);
         final Optional<String> result = convertorManager.convert(source, data);
@@ -77,7 +77,7 @@ public class ConvertorManagerTest {
      * 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>() {
@@ -92,7 +92,7 @@ public class ConvertorManagerTest {
                     }
                 });
 
-        final List<Action> source = Collections.singletonList(new ActionBuilder().build());
+        final List<Action> source = Collections.singletonList(new ActionBuilder().setOrder(0).build());
         final VersionConvertorData data = new VersionConvertorData(OFConstants.OFP_VERSION_1_3);
         final String expectedResult = String.valueOf(source) + String.valueOf(data);
         final Optional<String> result = convertorManager.convert(source, data);