Bump mdsal to 5.0.2

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

diff --git a/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/MatchEntryDeserializerKeyTest.java b/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/MatchEntryDeserializerKeyTest.java
index ceefbc1b493d52502fca96b5dc2a1646b1b62e20..73044d6f3818ca67a326815f862f16640f7ec297 100644 (file)
--- a/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/MatchEntryDeserializerKeyTest.java
+++ b/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/MatchEntryDeserializerKeyTest.java
@@ -11,15 +11,17 @@ package org.opendaylight.openflowjava.protocol.api.keys;
 import org.junit.Assert;
 import org.junit.Test;
 import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
+import org.opendaylight.yangtools.yang.common.Uint32;
 
 /**
- * @author michal.polkorab
+ * Unit tests for MatchEntryDeserializerKey.
  *
+ * @author michal.polkorab
  */
 public class MatchEntryDeserializerKeyTest {
 
     /**
-     * Test MatchEntryDeserializerKey equals and hashCode
+     * Test MatchEntryDeserializerKey equals and hashCode.
      */
     @Test
     public void test() {
@@ -37,43 +39,42 @@ public class MatchEntryDeserializerKeyTest {
         Assert.assertFalse("Wrong equals", key1.equals(key2));
         Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode());
         key2 = new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID, 0x8000, 42);
-        key2.setExperimenterId(158L);
+        key2.setExperimenterId(Uint32.valueOf(158L));
         Assert.assertFalse("Wrong equals", key1.equals(key2));
         Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode());
         key2 = new MatchEntryDeserializerKey(EncodeConstants.OF10_VERSION_ID, 0x8000, 42);
-        key2.setExperimenterId(158L);
-        key1.setExperimenterId(158L);
+        key2.setExperimenterId(Uint32.valueOf(158L));
+        key1.setExperimenterId(Uint32.valueOf(158L));
         Assert.assertTrue("Wrong equals", key1.equals(key2));
         Assert.assertTrue("Wrong hashcode", key1.hashCode() == key2.hashCode());
     }
 
     /**
-     * Test MatchEntryDeserializerKey equals - additional test
+     * Test MatchEntryDeserializerKey equals - additional test.
      */
     @Test
     public void testEquals() {
         MatchEntryDeserializerKey key1 = new MatchEntryDeserializerKey(EncodeConstants.OF10_VERSION_ID, 0x8000, 42);
-        MatchEntryDeserializerKey key2 = new MatchEntryDeserializerKey(EncodeConstants.OF10_VERSION_ID, 0x8000, 42);
 
         Assert.assertTrue("Wrong equal to identical object.", key1.equals(key1));
         Assert.assertFalse("Wrong equal to different class.", key1.equals(new Object()));
 
-        Long expId1=123456L;
-        Long expId2=654321L;
+        MatchEntryDeserializerKey key2 = new MatchEntryDeserializerKey(EncodeConstants.OF10_VERSION_ID, 0x8000, 42);
+
         key1.setExperimenterId(null);
-        key2.setExperimenterId(expId2);
+        key2.setExperimenterId(Uint32.valueOf(654321L));
         Assert.assertFalse("Wrong equal by experimeterId.", key1.equals(key2));
 
-        key1.setExperimenterId(expId1);
+        key1.setExperimenterId(Uint32.valueOf(123456L));
         Assert.assertFalse("Wrong equal by experimeterId.", key1.equals(key2));
         Assert.assertFalse("Wrong equals with different object class", key1.equals(key2));
     }
 
     /**
-     * Test MatchEntryDeserializerKey toString()
+     * Test MatchEntryDeserializerKey toString().
      */
     @Test
-    public void testToString(){
+    public void testToString() {
         MatchEntryDeserializerKey key1 = new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID, 0x8000, 42);
 
         Assert.assertEquals("Wrong toString()", "msgVersion: 4 objectClass: org.opendaylight.yang.gen.v1.urn"