Bug 5540 - Remove ConvertorManager singleton

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

diff --git a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/ActionConvertorV10Test.java b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/ActionConvertorV10Test.java
index 2a84783aa471713f13025020a3a5d8ea83da39b1..f88207c7b2d78cda2b4e3b3c3c7aa56b6f3de8f3 100644 (file)
--- a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/ActionConvertorV10Test.java
+++ b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/ActionConvertorV10Test.java
@@ -14,10 +14,12 @@ import java.util.Collections;
 import java.util.List;\r
 import java.util.Optional;\r
 import org.junit.Assert;\r
+import org.junit.Before;\r
 import org.junit.Test;\r
 import org.opendaylight.openflowplugin.api.OFConstants;\r
 import org.opendaylight.openflowplugin.extension.api.path.ActionPath;\r
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorManager;\r
+import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorManagerFactory;\r
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.data.ActionConvertorData;\r
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.data.ActionResponseConvertorData;\r
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.flow.FlowConvertorUtil;\r
@@ -78,6 +80,12 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev1
  *\r
  */\r
 public class ActionConvertorV10Test {\r
+    private ConvertorManager convertorManager;\r
+\r
+    @Before\r
+    public void setUp() {\r
+        convertorManager = ConvertorManagerFactory.createDefaultManager();\r
+    }\r
 \r
     /**\r
      * Test {@link org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.ActionConvertor#convert(java.util.List, org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.data.ActionConvertorData)}}\r
@@ -206,7 +214,7 @@ public class ActionConvertorV10Test {
         data.setIpProtocol(FlowConvertorUtil.getIpProtocolFromFlow(flow));\r
 \r
         Optional<List<org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action>> actionsOptional =\r
-                ConvertorManager.getInstance().convert(salActions, data);\r
+                convertorManager.convert(salActions, data);\r
 \r
         List<org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action> actions = actionsOptional.orElse(Collections.emptyList());\r
         \r
@@ -305,7 +313,7 @@ public class ActionConvertorV10Test {
 \r
         Optional<List<org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action\r
         .Action>> mdSalActionsOptional =\r
-                ConvertorManager.getInstance().convert(\r
+                convertorManager.convert(\r
                         actions, data);\r
 \r
         List<org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action\r