Bug 5540 - Remove ConvertorManager singleton

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

diff --git a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/PacketOutConvertorTest.java b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/PacketOutConvertorTest.java
index cce8c34e94fc046b575d20986d58bdd77347ecbc..ca5909d6935bb6eb6a74c8a965bd0190a23f7a1c 100644 (file)
--- a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/PacketOutConvertorTest.java
+++ b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/PacketOutConvertorTest.java
@@ -52,9 +52,12 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 \r
 public class PacketOutConvertorTest {\r
 \r
+    private ConvertorManager convertorManager;\r
+\r
     @Before\r
-    public void init() {\r
+    public void setUp() {\r
         OpenflowPortsUtil.init();\r
+        convertorManager = ConvertorManagerFactory.createDefaultManager();\r
     }\r
 \r
     /**\r
@@ -182,7 +185,7 @@ public class PacketOutConvertorTest {
         ActionConvertorData actionConvertorData = new ActionConvertorData(version);\r
         actionConvertorData.setDatapathId(datapathId);\r
 \r
-        Optional<List<Action>> actionsOptional = ConvertorManager.getInstance().convert(\r
+        Optional<List<Action>> actionsOptional = convertorManager.convert(\r
                 actionList, actionConvertorData);\r
 \r
         List<Action> actions = actionsOptional.orElse(Collections.emptyList());\r
@@ -282,7 +285,7 @@ public class PacketOutConvertorTest {
     }\r
 \r
     private PacketOutInput convert(TransmitPacketInput transmitPacketInput, PacketOutConvertorData data) {\r
-        Optional<PacketOutInput> messageOptional = ConvertorManager.getInstance().convert(transmitPacketInput, data);\r
+        Optional<PacketOutInput> messageOptional = convertorManager.convert(transmitPacketInput, data);\r
         return messageOptional.orElse(PacketOutConvertor.defaultResult(data.getVersion()));\r
     }\r
 }\r