Bug 5540 - Remove ConvertorManager singleton

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

diff --git a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/translator/MultipartReplyTranslatorFourthTest.java b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/translator/MultipartReplyTranslatorFourthTest.java
index af8fa893c8f3117e714af6b4e4c20a65557bf89c..412b67cbcb8d17347b740b4228a557be1b584fd2 100644 (file)
--- a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/translator/MultipartReplyTranslatorFourthTest.java
+++ b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/translator/MultipartReplyTranslatorFourthTest.java
@@ -9,18 +9,22 @@
 package org.opendaylight.openflowplugin.openflow.md.core.translator;\r
 \r
 import static org.mockito.Mockito.when;\r
+\r
 import java.math.BigInteger;\r
 import java.util.ArrayList;\r
 import java.util.List;\r
 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.group.statistics.rev131111.GroupDescStatsUpdated;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.statistics.rev131111.GroupStatisticsUpdated;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.GroupTypes;\r
@@ -57,6 +61,7 @@ import org.opendaylight.yangtools.yang.binding.DataObject;
  * @author michal.polkorab\r
  *\r
  */\r
+@RunWith(MockitoJUnitRunner.class)\r
 public class MultipartReplyTranslatorFourthTest {\r
 \r
     @Mock SwitchConnectionDistinguisher cookie;\r
@@ -64,14 +69,15 @@ public class MultipartReplyTranslatorFourthTest {
     @Mock ConnectionConductor conductor;\r
     @Mock GetFeaturesOutput features;\r
 \r
-    MultipartReplyTranslator translator = new MultipartReplyTranslator();\r
+    MultipartReplyTranslator translator;\r
 \r
     /**\r
      * Initializes mocks\r
      */\r
     @Before\r
     public void startUp() {\r
-        MockitoAnnotations.initMocks(this);\r
+        final ConvertorManager convertorManager = ConvertorManagerFactory.createDefaultManager();\r
+        translator = new MultipartReplyTranslator(convertorManager);\r
         when(sc.getPrimaryConductor()).thenReturn(conductor);\r
         when(conductor.getVersion()).thenReturn((short) EncodeConstants.OF13_VERSION_ID);\r
         when(sc.getFeatures()).thenReturn(features);\r