Revert "Bug-2827: role switch proposal"

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

diff --git a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/translator/PacketInV10TranslatorTest.java b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/translator/PacketInV10TranslatorTest.java
index 043811a68cf16800f6dabe72f2c2e264b9687fec..570e511da95892cca1e15e18c0c3f509af2b90e1 100644 (file)
--- a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/translator/PacketInV10TranslatorTest.java
+++ b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/translator/PacketInV10TranslatorTest.java
@@ -17,6 +17,7 @@ import java.util.Collection;
 import java.util.HashMap;\r
 import java.util.List;\r
 import java.util.Map;\r
+\r
 import org.junit.Assert;\r
 import org.junit.Before;\r
 import org.junit.Test;\r
@@ -47,10 +48,10 @@ import org.slf4j.LoggerFactory;
  * Created by Jakub Toth jatoth@cisco.com on 3/10/14.\r
  */\r
 @RunWith(MockitoJUnitRunner.class)\r
-public class PacketInV10TranslatorTest {\r
+public class PacketInV10TranslatorTest{\r
     private static final Logger LOG = LoggerFactory\r
             .getLogger(PacketInV10TranslatorTest.class);\r
-\r
+    \r
     @Mock\r
     private SessionContext sc;\r
     @Mock\r
@@ -60,7 +61,7 @@ public class PacketInV10TranslatorTest {
 \r
     private SwitchConnectionDistinguisher cookie;\r
     private byte[] data;\r
-\r
+    \r
     /**\r
      * Initializes mocks\r
      */\r
@@ -71,11 +72,11 @@ public class PacketInV10TranslatorTest {
         when(sc.getFeatures()).thenReturn(features);\r
         when(features.getDatapathId()).thenReturn(new BigInteger("42"));\r
         OpenflowPortsUtil.init();\r
-\r
+        \r
         cookie = settingCookie();\r
         data = messageData();\r
     }\r
-\r
+    \r
     /**\r
      * test\r
      * {@link PacketInV10Translator#translate(SwitchConnectionDistinguisher, SessionContext, OfHeader)}\r
@@ -83,7 +84,7 @@ public class PacketInV10TranslatorTest {
      * MD-SAL model, supports OF-1.0\r
      */\r
     @Test\r
-    public void testTranslateWithAllNullParam() {\r
+    public void testTranslateWithAllNullParam(){\r
         SwitchConnectionDistinguisher cookieNull = null;\r
         SessionContext sessionContext = null;\r
         OfHeader msg = null;\r
@@ -105,8 +106,8 @@ public class PacketInV10TranslatorTest {
      * supports OF-1.0\r
      */\r
     @Test\r
-    public void testTranslateDPIDNull() {\r
-        SessionContext sessionContextOFImpl = new SessionContextOFImpl();\r
+    public void testTranslateDPIDNull(){\r
+        SessionContextOFImpl sessionContextOFImpl = new SessionContextOFImpl();\r
 \r
         PacketInMessage message = createPacketInMessage(data, null);\r
 \r
@@ -126,7 +127,7 @@ public class PacketInV10TranslatorTest {
      * supports OF-1.0\r
      */\r
     @Test\r
-    public void testTranslateInPortNull() {\r
+    public void testTranslateInPortNull(){\r
         BigInteger datapathId = dataPathId();\r
 \r
         GetFeaturesOutputBuilder featuresBuilder = new GetFeaturesOutputBuilder();\r
@@ -151,11 +152,11 @@ public class PacketInV10TranslatorTest {
      * test\r
      * {@link PacketInV10Translator#translate(SwitchConnectionDistinguisher, SessionContext, OfHeader)}\r
      * - translates packetIn from OF-API model to MD-SAL model, supports OF-1.0\r
-     *\r
+     * \r
      * @throws IOException\r
      */\r
     @Test\r
-    public void testTranslate() {\r
+    public void testTranslate(){\r
         BigInteger datapathId = dataPathId();\r
 \r
         PacketInMessage message = createPacketInMessage(data, 5);\r
@@ -169,7 +170,7 @@ public class PacketInV10TranslatorTest {
         OpenflowPortsUtil.init();\r
         List<DataObject> salPacketIn = packetInV10Translator.translate(cookie,\r
                 sessionContextOFImpl, message);\r
-\r
+        \r
         //TODO: rewrite to object and involve object comparison in Assert\r
         String expectedString = "[PacketReceived [_ingress=NodeConnectorRef [_value=KeyedInstanceIdentifier"\r
                 + "{targetType=interface org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.node.NodeConnector,"\r
@@ -192,12 +193,12 @@ public class PacketInV10TranslatorTest {
 \r
     /**\r
      * create datapathID\r
-     *\r
+     * \r
      * @return BigInteger\r
      */\r
-    private static BigInteger dataPathId() {\r
+    private static BigInteger dataPathId(){\r
         byte[] datapathIdByte = new byte[EncodeConstants.SIZE_OF_LONG_IN_BYTES];\r
-        for (int i = 0; i < datapathIdByte.length; i++) {\r
+        for(int i = 0; i < datapathIdByte.length; i++){\r
             datapathIdByte[i] = 1;\r
         }\r
         return new BigInteger(1, datapathIdByte);\r
@@ -205,23 +206,23 @@ public class PacketInV10TranslatorTest {
 \r
     /**\r
      * generate message from string to byte[]\r
-     *\r
+     * \r
      * @return byte[]\r
      */\r
-    private static byte[] messageData() {\r
+    private static byte[] messageData(){\r
         String string = new String("sendOutputMsg_TEST");\r
         return string.getBytes();\r
     }\r
 \r
     /**\r
      * create PacketInMessage with setting Version, InPort, Data, Reason\r
-     *\r
+     * \r
      * @param data\r
      * @param port\r
      * @return PacketInMessage\r
      */\r
     private static PacketInMessage createPacketInMessage(final byte[] data,\r
-                                                         final java.lang.Integer port) {\r
+            final java.lang.Integer port){\r
         PacketInReason reason = PacketInReason.OFPRACTION;\r
         return new PacketInMessageBuilder()\r
                 .setVersion((short) EncodeConstants.OF10_VERSION_ID)\r
@@ -231,10 +232,10 @@ public class PacketInV10TranslatorTest {
 \r
     /**\r
      * create cookie\r
-     *\r
+     * \r
      * @return SwitchConnectionDistinguisher\r
      */\r
-    private static SwitchConnectionDistinguisher settingCookie() {\r
+    private static SwitchConnectionDistinguisher settingCookie(){\r
         SwitchConnectionCookieOFImpl key = new SwitchConnectionCookieOFImpl();\r
         key.setAuxiliaryId((short) 1);\r
         key.init(42);\r
@@ -243,24 +244,24 @@ public class PacketInV10TranslatorTest {
 \r
     /**\r
      * create GetFeatureOutput\r
-     *\r
+     * \r
      * @param datapathId\r
      * @return GetFeaturesOutput\r
      */\r
-    private static GetFeaturesOutput createGetFeatureOutput(final BigInteger datapathId) {\r
+    private static GetFeaturesOutput createGetFeatureOutput(final BigInteger datapathId){\r
         return new GetFeaturesOutputBuilder().setDatapathId(datapathId)\r
                 .setVersion((short) 0x01).build();\r
     }\r
 \r
     /**\r
      * init connectionConductor\r
-     *\r
+     * \r
      * @param connectionConductor\r
      * @param featuresOutput\r
      */\r
     private static void initConnectionConductor(\r
             final ConnectionConductorImpl connectionConductor,\r
-            final GetFeaturesOutput featuresOutput) {\r
+            final GetFeaturesOutput featuresOutput){\r
         TranslatorKey paramK = new TranslatorKey(1, PacketInMessage.class.getSimpleName());\r
         Collection<IMDMessageTranslator<OfHeader, List<DataObject>>> coll = new ArrayList<>();\r
         coll.add(new PacketInV10Translator());\r