Bug 5540 - Remove ConvertorManager singleton

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

diff --git a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/flow/FlowStatsResponseConvertorTest.java b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/flow/FlowStatsResponseConvertorTest.java
index 1081f6df13fdf742f4b667ecd0bca4206e492c75..11003c9c0f0088d3735b746836c90c534121f1df 100644 (file)
--- a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/flow/FlowStatsResponseConvertorTest.java
+++ b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/flow/FlowStatsResponseConvertorTest.java
@@ -16,9 +16,11 @@ import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
+import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorManager;
+import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorManagerFactory;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.data.VersionConvertorData;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.flow.Instructions;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action;
@@ -42,23 +44,15 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev13
  * Created by Martin Bobak mbobak@cisco.com on 9/18/14.
  */
 public class FlowStatsResponseConvertorTest {
+    private ConvertorManager convertorManager;
 
-    private static final int PRESET_COUNT = 7;
-
-    /**
-     * Test method for {@link FlowStatsResponseConvertor#wrapOF10ActionsToInstruction(java.util.List, short)} }
-     */
-    @Test
-    public void testWrapOF10ActionsToInstruction() {
-        ActionBuilder actionBuilder = new ActionBuilder();
-        List<Action> actions = new ArrayList<>();
-        for (int j = 0; j < PRESET_COUNT; j++) {
-            actions.add(actionBuilder.build());
-        }
-        Instructions instructions = FlowStatsResponseConvertor.wrapOF10ActionsToInstruction(actions, OFConstants.OFP_VERSION_1_3);
-        assertNotNull(instructions);
+    @Before
+    public void setUp() {
+        convertorManager = ConvertorManagerFactory.createDefaultManager();
     }
 
+    private static final int PRESET_COUNT = 7;
+
     /**
      * Test method for {@link FlowInstructionResponseConvertor#convert(java.util.List, org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.data.VersionConvertorData)} }
      */
@@ -165,7 +159,7 @@ public class FlowStatsResponseConvertorTest {
     }
 
     private Instructions convert(List<Instruction> instructionsList, VersionConvertorData data) {
-        Optional<Instructions> instructionsOptional = ConvertorManager.getInstance().convert(instructionsList, data);
+        Optional<Instructions> instructionsOptional = convertorManager.convert(instructionsList, data);
         assertTrue("Flow instruction response convertor not found", instructionsOptional.isPresent());
         return instructionsOptional.get();
     }