Update MRI upstreams for Phosphorus

[openflowplugin.git] / openflowjava / openflow-protocol-api / src / test / java / org / opendaylight / openflowjava / protocol / api / keys / ActionDeserializerKeyTest.java

diff --git a/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/ActionDeserializerKeyTest.java b/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/ActionDeserializerKeyTest.java
index 94f0609e4f60d514f6bd66ad4e3ff92d78babf73..91d5e5b590436a46897baf3e479cf9dd6868c887 100644 (file)
--- a/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/ActionDeserializerKeyTest.java
+++ b/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/ActionDeserializerKeyTest.java
@@ -5,7 +5,6 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.openflowjava.protocol.api.keys;
 
 import org.junit.Assert;
@@ -24,20 +23,20 @@ public class ActionDeserializerKeyTest {
      */
     @Test
     public void test() {
-        ActionDeserializerKey key1 = new ActionDeserializerKey(EncodeConstants.OF10_VERSION_ID, 11, 42L);
-        ActionDeserializerKey key2 = new ActionDeserializerKey(EncodeConstants.OF10_VERSION_ID, 11, 42L);
+        ActionDeserializerKey key1 = new ActionDeserializerKey(EncodeConstants.OF_VERSION_1_0, 11, 42L);
+        ActionDeserializerKey key2 = new ActionDeserializerKey(EncodeConstants.OF_VERSION_1_0, 11, 42L);
         Assert.assertTrue("Wrong equals", key1.equals(key2));
         Assert.assertTrue("Wrong hashcode", key1.hashCode() == key2.hashCode());
-        key2 = new ActionDeserializerKey(EncodeConstants.OF10_VERSION_ID, 11, null);
+        key2 = new ActionDeserializerKey(EncodeConstants.OF_VERSION_1_0, 11, null);
         Assert.assertFalse("Wrong equals", key1.equals(key2));
         Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode());
-        key2 = new ActionDeserializerKey(EncodeConstants.OF10_VERSION_ID, 11, 55L);
+        key2 = new ActionDeserializerKey(EncodeConstants.OF_VERSION_1_0, 11, 55L);
         Assert.assertFalse("Wrong equals", key1.equals(key2));
         Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode());
-        key2 = new ActionDeserializerKey(EncodeConstants.OF10_VERSION_ID, 0, 42L);
+        key2 = new ActionDeserializerKey(EncodeConstants.OF_VERSION_1_0, 0, 42L);
         Assert.assertFalse("Wrong equals", key1.equals(key2));
         Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode());
-        key2 = new ActionDeserializerKey(EncodeConstants.OF13_VERSION_ID, 11, 42L);
+        key2 = new ActionDeserializerKey(EncodeConstants.OF_VERSION_1_3, 11, 42L);
         Assert.assertFalse("Wrong equals", key1.equals(key2));
         Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode());
     }
@@ -47,13 +46,13 @@ public class ActionDeserializerKeyTest {
      */
     @Test
     public void testEquals() {
-        ActionDeserializerKey key1 = new ActionDeserializerKey(EncodeConstants.OF10_VERSION_ID, 11, null);
-        ActionDeserializerKey key2 = new ActionDeserializerKey(EncodeConstants.OF10_VERSION_ID, 11, 42L);
+        ActionDeserializerKey key1 = new ActionDeserializerKey(EncodeConstants.OF_VERSION_1_0, 11, null);
+        ActionDeserializerKey key2 = new ActionDeserializerKey(EncodeConstants.OF_VERSION_1_0, 11, 42L);
 
         Assert.assertTrue("Wrong equal to identical object.", key1.equals(key1));
         Assert.assertFalse("Wrong equal to different class.", key1.equals(new Object()));
         Assert.assertFalse("Wrong equal by experimenterId", key1.equals(key2));
-        key2 = new ActionDeserializerKey(EncodeConstants.OF10_VERSION_ID, 11, null);
+        key2 = new ActionDeserializerKey(EncodeConstants.OF_VERSION_1_0, 11, null);
         Assert.assertTrue("Wrong equal by experimenterId", key1.equals(key2));
     }
 
@@ -62,7 +61,7 @@ public class ActionDeserializerKeyTest {
      */
     @Test
     public void testToString() {
-        ActionDeserializerKey key1 = new ActionDeserializerKey(EncodeConstants.OF10_VERSION_ID, 11, null);
+        ActionDeserializerKey key1 = new ActionDeserializerKey(EncodeConstants.OF_VERSION_1_0, 11, null);
 
         Assert.assertEquals("Wrong toString()", "msgVersion: 1 objectClass: org.opendaylight.yang.gen.v1.urn"
                 + ".opendaylight.openflow.common.action.rev150203.actions.grouping.Action msgType: 11"