Bug 5540 - Remove ConvertorManager singleton

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

diff --git a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchResponseConvertor2Test.java b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchResponseConvertor2Test.java
index 361a69ad468034173a701ad2384e98554a00d369..e91667ca88f3679d2f11add55fbe9870b7eba922 100644 (file)
--- a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchResponseConvertor2Test.java
+++ b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchResponseConvertor2Test.java
@@ -17,6 +17,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.Dscp;\r
@@ -161,12 +162,15 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.matc
  */\r
 public class MatchResponseConvertor2Test {\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
@@ -174,7 +178,7 @@ public class MatchResponseConvertor2Test {
      */\r
     @Test(expected = NullPointerException.class)\r
     public void testEmptyMatch() {\r
-        final VersionDatapathIdConvertorData datapathIdConvertorData = new VersionDatapathIdConvertorData(OFConstants.OFP_VERSION_1_0);\r
+        final VersionDatapathIdConvertorData datapathIdConvertorData = new VersionDatapathIdConvertorData(OFConstants.OFP_VERSION_1_3);\r
         datapathIdConvertorData.setDatapathId(new BigInteger("42"));\r
         convert(new MatchBuilder().build(), datapathIdConvertorData);\r
     }\r
@@ -191,7 +195,7 @@ public class MatchResponseConvertor2Test {
         builder.setMatchEntry(entries);\r
         final Match match = builder.build();\r
 \r
-        final VersionDatapathIdConvertorData datapathIdConvertorData = new VersionDatapathIdConvertorData(OFConstants.OFP_VERSION_1_0);\r
+        final VersionDatapathIdConvertorData datapathIdConvertorData = new VersionDatapathIdConvertorData(OFConstants.OFP_VERSION_1_3);\r
         datapathIdConvertorData.setDatapathId(new BigInteger("42"));\r
 \r
         final org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.flow\r
@@ -500,7 +504,7 @@ public class MatchResponseConvertor2Test {
 \r
         final Match match = builder.build();\r
 \r
-        final VersionDatapathIdConvertorData datapathIdConvertorData = new VersionDatapathIdConvertorData(OFConstants.OFP_VERSION_1_0);\r
+        final VersionDatapathIdConvertorData datapathIdConvertorData = new VersionDatapathIdConvertorData(OFConstants.OFP_VERSION_1_3);\r
         datapathIdConvertorData.setDatapathId(new BigInteger("42"));\r
 \r
         final org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.flow\r
@@ -650,7 +654,7 @@ public class MatchResponseConvertor2Test {
         builder.setMatchEntry(entries);\r
         final Match match = builder.build();\r
 \r
-        final VersionDatapathIdConvertorData datapathIdConvertorData = new VersionDatapathIdConvertorData(OFConstants.OFP_VERSION_1_0);\r
+        final VersionDatapathIdConvertorData datapathIdConvertorData = new VersionDatapathIdConvertorData(OFConstants.OFP_VERSION_1_3);\r
         datapathIdConvertorData.setDatapathId(new BigInteger("42"));\r
 \r
         final org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.flow\r
@@ -1604,7 +1608,7 @@ public class MatchResponseConvertor2Test {
     private org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.flow\r
             .MatchBuilder convert(Match match, VersionDatapathIdConvertorData data) {\r
         final Optional<org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.flow\r
-                .MatchBuilder> salMatchOptional = ConvertorManager.getInstance().convert(match, data);\r
+                .MatchBuilder> salMatchOptional = convertorManager.convert(match, data);\r
 \r
         return salMatchOptional\r
                 .orElse(new org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.flow.MatchBuilder());\r