Bug 5540 - Remove ConvertorManager singleton

[openflowplugin.git] / openflowplugin / src / test / java / org / opendaylight / openflowplugin / openflow / md / core / translator / MultipartReplyTranslatorFifthTest.java

diff --git a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/translator/MultipartReplyTranslatorFifthTest.java b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/translator/MultipartReplyTranslatorFifthTest.java
index d625aa38e1a902b54c5ce22159caa041c992d366..6413795b4f859f886c011031bbd977edabea7fb4 100644 (file)
--- a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/translator/MultipartReplyTranslatorFifthTest.java
+++ b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/translator/MultipartReplyTranslatorFifthTest.java
@@ -16,12 +16,16 @@ import java.util.List;
 import org.junit.Assert;\r
 import org.junit.Before;\r
 import org.junit.Test;\r
+import org.junit.runner.RunWith;\r
 import org.mockito.Mock;\r
 import org.mockito.MockitoAnnotations;\r
+import org.mockito.runners.MockitoJUnitRunner;\r
 import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;\r
 import org.opendaylight.openflowplugin.api.openflow.md.core.ConnectionConductor;\r
 import org.opendaylight.openflowplugin.api.openflow.md.core.SwitchConnectionDistinguisher;\r
 import org.opendaylight.openflowplugin.api.openflow.md.core.session.SessionContext;\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.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.MeterConfigStatsUpdated;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.MeterStatisticsUpdated;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.meter.config.stats.reply.MeterConfigStats;\r
@@ -56,6 +60,7 @@ import org.opendaylight.yangtools.yang.binding.DataObject;
 /**\r
  * @author michal.polkorab\r
  */\r
+@RunWith(MockitoJUnitRunner.class)\r
 public class MultipartReplyTranslatorFifthTest {\r
 \r
     @Mock\r
@@ -67,13 +72,15 @@ public class MultipartReplyTranslatorFifthTest {
     @Mock\r
     GetFeaturesOutput features;\r
 \r
-    MultipartReplyTranslator translator = new MultipartReplyTranslator();\r
+    MultipartReplyTranslator translator;\r
 \r
     /**\r
      * Initializes mocks\r
      */\r
     @Before\r
     public void startUp() {\r
+        final ConvertorManager convertorManager = ConvertorManagerFactory.createDefaultManager();\r
+        translator = new MultipartReplyTranslator(convertorManager);\r
         MockitoAnnotations.initMocks(this);\r
         when(sc.getPrimaryConductor()).thenReturn(conductor);\r
         when(conductor.getVersion()).thenReturn((short) EncodeConstants.OF13_VERSION_ID);\r