Bug 5540 - Remove ConvertorManager singleton

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

diff --git a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/GroupStatsResponseConvertorTest.java b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/GroupStatsResponseConvertorTest.java
index 64531a5320c147f37e0c0197d07f55fdd18030a2..c0d570058577f6403a69476879ef03bad3eb9384 100644 (file)
--- a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/GroupStatsResponseConvertorTest.java
+++ b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/GroupStatsResponseConvertorTest.java
@@ -14,7 +14,10 @@ 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.data.VersionConvertorData;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.group.statistics.buckets.BucketCounter;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.GroupId;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.multipart.reply.group._case.multipart.reply.group.GroupStats;\r
@@ -27,6 +30,12 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731
  *\r
  */\r
 public class GroupStatsResponseConvertorTest {\r
+    private ConvertorManager convertorManager;\r
+\r
+    @Before\r
+    public void setUp() {\r
+        convertorManager = ConvertorManagerFactory.createDefaultManager();\r
+    }\r
 \r
     /**\r
      * Test empty GroupStats conversion\r
@@ -36,7 +45,7 @@ public class GroupStatsResponseConvertorTest {
         List<GroupStats> groupStats = new ArrayList<>();\r
 \r
         Optional<List<org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.group.statistics.reply\r
-                .GroupStats>> salGroupStats = ConvertorManager.getInstance().convert(groupStats);\r
+                .GroupStats>> salGroupStats = convertorManager.convert(groupStats, new VersionConvertorData(OFConstants.OFP_VERSION_1_3));\r
 \r
         Assert.assertFalse("Group stats response should be not present", salGroupStats.isPresent());\r
     }\r
@@ -58,7 +67,7 @@ public class GroupStatsResponseConvertorTest {
         groupStats.add(statsBuilder.build());\r
 \r
         Optional<List<org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.group.statistics.reply\r
-                .GroupStats>> salGroupStatsOptional = ConvertorManager.getInstance().convert(groupStats);\r
+                .GroupStats>> salGroupStatsOptional = convertorManager.convert(groupStats, new VersionConvertorData(OFConstants.OFP_VERSION_1_3));\r
         Assert.assertTrue("Group stats response convertor not found", salGroupStatsOptional.isPresent());\r
         List<org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.group.statistics.reply\r
                 .GroupStats> salGroupStats = salGroupStatsOptional.get();\r
@@ -101,7 +110,7 @@ public class GroupStatsResponseConvertorTest {
         groupStats.add(statsBuilder.build());\r
 \r
         Optional<List<org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.group.statistics.reply\r
-                .GroupStats>> salGroupStatsOptional = ConvertorManager.getInstance().convert(groupStats);\r
+                .GroupStats>> salGroupStatsOptional = convertorManager.convert(groupStats, new VersionConvertorData(OFConstants.OFP_VERSION_1_3));\r
         Assert.assertTrue("Group stats response convertor not found", salGroupStatsOptional.isPresent());\r
         List<org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.group.statistics.reply\r
                 .GroupStats> salGroupStats = salGroupStatsOptional.get();\r
@@ -154,7 +163,7 @@ public class GroupStatsResponseConvertorTest {
         groupStats.add(statsBuilder.build());\r
 \r
         Optional<List<org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.group.statistics.reply\r
-                .GroupStats>> salGroupStatsOptional = ConvertorManager.getInstance().convert(groupStats);\r
+                .GroupStats>> salGroupStatsOptional = convertorManager.convert(groupStats, new VersionConvertorData(OFConstants.OFP_VERSION_1_3));\r
         Assert.assertTrue("Group stats response convertor not found", salGroupStatsOptional.isPresent());\r
         List<org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.group.statistics.reply\r
                 .GroupStats> salGroupStats = salGroupStatsOptional.get();\r