Bug 5540 - Remove ConvertorManager singleton

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

diff --git a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/translator/MultipartReplyTableFeaturesToTableUpdatedTranslatorTest.java b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/translator/MultipartReplyTableFeaturesToTableUpdatedTranslatorTest.java
index 56799b28cf2dfc2904a0df876b1e99ccf586bc09..bb046425dabde216ac22079e74ec8863d7b3c191 100644 (file)
--- a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/translator/MultipartReplyTableFeaturesToTableUpdatedTranslatorTest.java
+++ b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/translator/MultipartReplyTableFeaturesToTableUpdatedTranslatorTest.java
@@ -13,15 +13,19 @@ import static org.mockito.Mockito.when;
 import java.math.BigInteger;\r
 import java.util.ArrayList;\r
 import java.util.List;\r
-\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.OFConstants;\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.openflow.augments.rev150225.NextTableRelatedTableFeatureProperty;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.NextTableRelatedTableFeaturePropertyBuilder;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.table.features.properties.container.table.feature.properties.NextTableIds;\r
@@ -50,21 +54,26 @@ import org.opendaylight.yangtools.yang.binding.DataObject;
  * @author michal.polkorab\r
  *\r
  */\r
+@RunWith(MockitoJUnitRunner.class)\r
 public class MultipartReplyTableFeaturesToTableUpdatedTranslatorTest {\r
 \r
     @Mock SwitchConnectionDistinguisher cookie;\r
     @Mock SessionContext sc;\r
     @Mock GetFeaturesOutput features;\r
+    @Mock ConnectionConductor conductor;\r
 \r
-    MultipartReplyTableFeaturesToTableUpdatedTranslator translator = new MultipartReplyTableFeaturesToTableUpdatedTranslator();\r
+    MultipartReplyTableFeaturesToTableUpdatedTranslator 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 MultipartReplyTableFeaturesToTableUpdatedTranslator(convertorManager);\r
+        when(sc.getPrimaryConductor()).thenReturn(conductor);\r
         when(sc.getFeatures()).thenReturn(features);\r
+        when(conductor.getVersion()).thenReturn(OFConstants.OFP_VERSION_1_3);\r
         when(features.getDatapathId()).thenReturn(new BigInteger("42"));\r
     }\r
 \r