Bug 5540 - Remove ConvertorManager singleton

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

diff --git a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchV10ResponseConvertorTest.java b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchV10ResponseConvertorTest.java
index a8198d334c0f45e2cbe71a3679483d21746008f6..ffdc5032966a8daad1cb4b437f7db2df4da977f9 100644 (file)
--- a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchV10ResponseConvertorTest.java
+++ b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchV10ResponseConvertorTest.java
@@ -15,6 +15,7 @@ import org.junit.Before;
 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.openflowplugin.openflow.md.util.OpenflowPortsUtil;\r
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address;\r
@@ -37,12 +38,15 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.matc
  */\r
 public class MatchV10ResponseConvertorTest {\r
 \r
+    private ConvertorManager convertorManager;\r
+\r
     /**\r
      * Initializes OpenflowPortsUtil\r
      */\r
     @Before\r
     public void startUp() {\r
         OpenflowPortsUtil.init();\r
+        convertorManager = ConvertorManagerFactory.createDefaultManager();\r
     }\r
 \r
     /**\r
@@ -815,7 +819,7 @@ public class MatchV10ResponseConvertorTest {
     }\r
 \r
     private MatchBuilder convert(MatchV10 match, VersionDatapathIdConvertorData data) {\r
-        final Optional<MatchBuilder> salMatchOptional = ConvertorManager.getInstance().convert(match, data);\r
+        final Optional<MatchBuilder> salMatchOptional = convertorManager.convert(match, data);\r
 \r
         return salMatchOptional.orElse(new MatchBuilder());\r
     }\r