Add unit tests for ExperimenterIdSerializerKey, ExperimenterIdDeserializerKey

Change-Id: Iaf2ad17a1b6ceee6ed1ec040cb12943f0964f582
Signed-off-by: Marian Adamjak <marian.adamjak@pantheon.sk>

diff --git a/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/experimenter/ExperimenterIdDeserializerKeyTest.java b/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/experimenter/ExperimenterIdDeserializerKeyTest.java
index 8526f54ace38d35ab9b87d568b05becbaea58967..dc3e956bd8b94106f698d9bdbca7529cd24a3f89 100644 (file)
--- a/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/experimenter/ExperimenterIdDeserializerKeyTest.java
+++ b/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/experimenter/ExperimenterIdDeserializerKeyTest.java
@@ -10,6 +10,7 @@ package org.opendaylight.openflowjava.protocol.api.keys.experimenter;
 \r
 import org.junit.Assert;\r
 import org.junit.Test;\r
+import org.opendaylight.openflowjava.protocol.api.extensibility.MessageCodeKey;\r
 import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.ErrorMessage;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.ExperimenterMessage;\r
@@ -47,23 +48,20 @@ public class ExperimenterIdDeserializerKeyTest {
         Assert.assertFalse("Wrong equals", key1.equals(key2));\r
         Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode());\r
     }\r
-    \r
+\r
     /**\r
      * Test ExperimenterIdDeserializerKey equals - additional test\r
      */\r
     @Test\r
     public void testEquals() {\r
-        \r
          ExperimenterIdDeserializerKey key1 =\r
                  new ExperimenterIdDeserializerKey(EncodeConstants.OF10_VERSION_ID, null, ExperimenterMessage.class);\r
-         \r
          Assert.assertTrue("Wrong equal to identical object.", key1.equals(key1));\r
-         Assert.assertFalse("Wrong equal to different class.", key1.equals(new Object()));\r
-         \r
+         MessageCodeKey mk = new MessageCodeKey(EncodeConstants.OF10_VERSION_ID,EncodeConstants.EXPERIMENTER_VALUE, ExperimenterMessage.class);\r
+         Assert.assertFalse("Wrong equal to different class.", key1.equals(mk));\r
          ExperimenterIdDeserializerKey key2 =\r
                  new ExperimenterIdDeserializerKey(EncodeConstants.OF10_VERSION_ID, 42L, ExperimenterMessage.class);\r
          Assert.assertFalse("Wrong equal by experimenterId.", key1.equals(key2));\r
-        \r
     }\r
-    \r
+\r
 }
\ No newline at end of file

diff --git a/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/experimenter/ExperimenterIdSerializerKeyTest.java b/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/experimenter/ExperimenterIdSerializerKeyTest.java
index 27f243b0bc7fce29459d75158b48a904d03c8b8d..97fd73e163d5f117a4c54892c318f138e9df34c7 100644 (file)
--- a/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/experimenter/ExperimenterIdSerializerKeyTest.java
+++ b/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/experimenter/ExperimenterIdSerializerKeyTest.java
@@ -10,6 +10,7 @@ package org.opendaylight.openflowjava.protocol.api.keys.experimenter;
 \r
 import org.junit.Assert;\r
 import org.junit.Test;\r
+import org.opendaylight.openflowjava.protocol.api.extensibility.MessageTypeKey;\r
 import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.ErrorMessage;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.ExperimenterMessage;\r
@@ -55,14 +56,12 @@ public class ExperimenterIdSerializerKeyTest {
     public void testEquals() {\r
         ExperimenterIdSerializerKey<?> key1 =\r
                 new ExperimenterIdSerializerKey<>(EncodeConstants.OF10_VERSION_ID, null, ExperimenterMessage.class);\r
-        \r
         Assert.assertTrue("Wrong equal to identical object.", key1.equals(key1));\r
-        Assert.assertFalse("Wrong equal to different class.", key1.equals(new Object()));\r
-        \r
+        MessageTypeKey<?>mk = new MessageTypeKey<>(EncodeConstants.OF10_VERSION_ID,ExperimenterMessage.class);\r
+        Assert.assertFalse("Wrong equal to different class.", key1.equals(mk));\r
         ExperimenterIdSerializerKey<?> key2 =\r
                 new ExperimenterIdSerializerKey<>(EncodeConstants.OF10_VERSION_ID, 42L, ExperimenterMessage.class);\r
         Assert.assertFalse("Wrong equal by experimenterId.", key1.equals(key2));\r
-        \r
     }\r
     \r
 }
\ No newline at end of file