Bug 5540 - Remove ConvertorManager singleton

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

diff --git a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/flow/FlowConvertorTest.java b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/flow/FlowConvertorTest.java
index 5cf33ef4091c4811486365c494b861e7230896a2..45ac82c9d61013cf1311863d8b0dc1d742d5d336 100644 (file)
--- a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/flow/FlowConvertorTest.java
+++ b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/flow/FlowConvertorTest.java
@@ -14,9 +14,11 @@ 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.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.data.VersionDatapathIdConvertorData;\r
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Uri;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.SetVlanIdActionCaseBuilder;\r
@@ -74,6 +76,12 @@ import org.opendaylight.yangtools.yang.binding.DataContainer;
  *\r
  */\r
 public class FlowConvertorTest {\r
+    private ConvertorManager convertorManager;\r
+\r
+    @Before\r
+    public void setUp() {\r
+        convertorManager = ConvertorManagerFactory.createDefaultManager();\r
+    }\r
 \r
     /**\r
      * Tests {@link org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.flow.FlowConvertor#convert(org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.Flow, org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.data.VersionDatapathIdConvertorData)} }\r
@@ -264,7 +272,7 @@ public class FlowConvertorTest {
     }\r
 \r
     private List<FlowModInputBuilder> convert(Flow flow, VersionDatapathIdConvertorData data) {\r
-        Optional<List<FlowModInputBuilder>> flowModOptional = ConvertorManager.getInstance().convert(flow, data);\r
+        Optional<List<FlowModInputBuilder>> flowModOptional = convertorManager.convert(flow, data);\r
         Assert.assertTrue("Flow convertor not found", flowModOptional.isPresent());\r
         return flowModOptional.get();\r
     }\r