Bug 5540 - Remove ConvertorManager singleton

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

diff --git a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/TableFeaturesResponseConvertorTest.java b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/TableFeaturesResponseConvertorTest.java
index 6a026fe468479c3da7dca0f30a75d2f4a6c6e630..68656a440e9f90ad466f989f7ed089a4a4030032 100644 (file)
--- a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/TableFeaturesResponseConvertorTest.java
+++ b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/TableFeaturesResponseConvertorTest.java
@@ -14,8 +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.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address;\r
+import org.opendaylight.openflowplugin.api.OFConstants;\r
+import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.data.VersionConvertorData;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.ActionRelatedTableFeatureProperty;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.ActionRelatedTableFeaturePropertyBuilder;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.InstructionRelatedTableFeatureProperty;\r
@@ -107,6 +110,12 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table
  * @author michal.polkorab\r
  */\r
 public class TableFeaturesResponseConvertorTest {\r
+    private ConvertorManager convertorManager;\r
+\r
+    @Before\r
+    public void setUp() {\r
+        convertorManager = ConvertorManagerFactory.createDefaultManager();\r
+    }\r
 \r
     /**\r
      * Incorrect / empty input test\r
@@ -787,7 +796,7 @@ public class TableFeaturesResponseConvertorTest {
 \r
 \r
     private List<TableFeatures> convert(MultipartReplyTableFeatures features) {\r
-        Optional<List<TableFeatures>> listOptional = ConvertorManager.getInstance().convert(features);\r
+        Optional<List<TableFeatures>> listOptional = convertorManager.convert(features, new VersionConvertorData(OFConstants.OFP_VERSION_1_3));\r
         return listOptional.orElse(Collections.emptyList());\r
     }\r
 }
\ No newline at end of file