Added key unit tests

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

diff --git a/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/extensibility/EnhancedMessageCodeKeyTest.java b/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/extensibility/EnhancedMessageCodeKeyTest.java
index 9d64b21ae35d4597f1f0277942577db5c9f37865..a99b890174c1f4062717df48734b35d70346a639 100644 (file)
--- a/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/extensibility/EnhancedMessageCodeKeyTest.java
+++ b/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/extensibility/EnhancedMessageCodeKeyTest.java
@@ -47,4 +47,18 @@ public class EnhancedMessageCodeKeyTest {
         Assert.assertFalse("Wrong equals", key1.equals(key2));\r
         Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode());\r
     }\r
+    \r
+    /**\r
+     * Test EnhancedMessageTypeKey equals - additional test\r
+     */\r
+    @Test\r
+    public void testEquals() {\r
+        \r
+         EnhancedMessageCodeKey key1 =\r
+                 new EnhancedMessageCodeKey(EncodeConstants.OF10_VERSION_ID, 4, 8, BarrierInput.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
+    }\r
 }
\ No newline at end of file

diff --git a/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/extensibility/EnhancedMessageTypeKeyTest.java b/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/extensibility/EnhancedMessageTypeKeyTest.java
index 1d1508444d1f2a8e3c459ae7d9623ccc11c90caa..ec48d7ea787e3a8df74613dcf6962328194be154 100644 (file)
--- a/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/extensibility/EnhancedMessageTypeKeyTest.java
+++ b/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/extensibility/EnhancedMessageTypeKeyTest.java
@@ -49,4 +49,29 @@ public class EnhancedMessageTypeKeyTest {
         Assert.assertFalse("Wrong equals", key1.equals(key2));\r
         Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode());\r
     }\r
+    \r
+    /**\r
+     * Test EnhancedMessageTypeKey equals - additional test\r
+     */\r
+    @Test\r
+    public void testEquals() {\r
+        EnhancedMessageTypeKey<?,?> key1;\r
+        EnhancedMessageTypeKey<?,?> key2;\r
+\r
+        key1 = new EnhancedMessageTypeKey<>(EncodeConstants.OF10_VERSION_ID, Action.class, Output.class);\r
+        key2 = new EnhancedMessageTypeKey<>(EncodeConstants.OF10_VERSION_ID, Action.class, Output.class);\r
+        \r
+        Assert.assertTrue("Wrong equal to identical object.", key1.equals(key1));\r
+        \r
+        Assert.assertFalse("Wrong equal to different class.", key1.equals(new Object()));\r
+        \r
+        key1 = new EnhancedMessageTypeKey<>(EncodeConstants.OF10_VERSION_ID, Action.class, null);\r
+        Assert.assertFalse("Wrong equal by msgType2.", key1.equals(key2));\r
+        key1 = new EnhancedMessageTypeKey<>(EncodeConstants.OF10_VERSION_ID, Action.class, Output.class);\r
+        key2 = new EnhancedMessageTypeKey<>(EncodeConstants.OF10_VERSION_ID, Action.class, SetField.class);\r
+        Assert.assertFalse("Wrong equal by msgType2 class name.", 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/extensibility/MessageCodeKeyTest.java b/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/extensibility/MessageCodeKeyTest.java
index 0a991f629ad3499bb3cb6b2b78c8dde3f046ca19..7b3f36a0bfea9ccaaf7a4a01b4f9aebe8b434e42 100644 (file)
--- a/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/extensibility/MessageCodeKeyTest.java
+++ b/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/extensibility/MessageCodeKeyTest.java
@@ -44,4 +44,28 @@ public class MessageCodeKeyTest {
         Assert.assertFalse("Wrong equals", key1.equals(key2));\r
         Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode());\r
     }\r
+    \r
+    /**\r
+     * Test EnhancedMessageTypeKey equals - additional test\r
+     */\r
+    @Test\r
+    public void testEquals() {\r
+        \r
+        MessageCodeKey key1;\r
+        MessageCodeKey key2;\r
+        \r
+        key1 = new MessageCodeKey(EncodeConstants.OF10_VERSION_ID, 4, BarrierInput.class);\r
+        \r
+        \r
+        Assert.assertTrue("Wrong equal to identical object.", key1.equals(key1));\r
+        Assert.assertFalse("Wrong equal to null.", key1.equals(null));\r
+        Assert.assertFalse("Wrong equal to different class.", key1.equals(new Object()));\r
+        \r
+        key1 = new MessageCodeKey(EncodeConstants.OF10_VERSION_ID, 4, null);\r
+        key2 = new MessageCodeKey(EncodeConstants.OF10_VERSION_ID, 4, BarrierInput.class);\r
+        \r
+        Assert.assertFalse("Wrong equal by clazz.", key1.equals(key2));\r
+        \r
+    }\r
+    \r
 }
\ No newline at end of file

diff --git a/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/extensibility/MessageTypeKeyTest.java b/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/extensibility/MessageTypeKeyTest.java
index 05db7457ce29d42ed91b577d01477e302190d2cf..73dee30400133ec966a6e058188c75570141b317 100644 (file)
--- a/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/extensibility/MessageTypeKeyTest.java
+++ b/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/extensibility/MessageTypeKeyTest.java
@@ -41,4 +41,24 @@ public class MessageTypeKeyTest {
         Assert.assertFalse("Wrong equals", key1.equals(key2));\r
         Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode());\r
     }\r
+    \r
+    /**\r
+     * Test EnhancedMessageTypeKey equals - additional test\r
+     */\r
+    @Test\r
+    public void testEquals() {\r
+         MessageTypeKey<?> key1;\r
+         MessageTypeKey<?> key2; \r
+         \r
+         key1 = new MessageTypeKey<>(EncodeConstants.OF10_VERSION_ID, BarrierInput.class);\r
+         \r
+         Assert.assertTrue("Wrong equal to identical object.", key1.equals(key1));\r
+         Assert.assertFalse("Wrong equal to null.", key1.equals(null));\r
+         Assert.assertFalse("Wrong equal to different class.", key1.equals(new Object()));\r
+         \r
+         key1 = new MessageTypeKey<>(EncodeConstants.OF10_VERSION_ID, null);\r
+         key2 = new MessageTypeKey<>(EncodeConstants.OF10_VERSION_ID, BarrierInput.class);\r
+         \r
+         Assert.assertFalse("Wrong equal by msgType.", key1.equals(key2));\r
+    }\r
 }
\ No newline at end of file

diff --git a/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/ActionDeserializerKeyTest.java b/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/ActionDeserializerKeyTest.java
index 3acddc0fa46a02bf12a768108ebe5127feb2a823..3ffe358f9e210023c37d879c655cbf3d4fa14401 100644 (file)
--- a/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/ActionDeserializerKeyTest.java
+++ b/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/ActionDeserializerKeyTest.java
@@ -40,4 +40,21 @@ public class ActionDeserializerKeyTest {
         Assert.assertFalse("Wrong equals", key1.equals(key2));\r
         Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode());\r
     }\r
+    \r
+    /**\r
+     * Test ActionDeserializerKey equals - additional test\r
+     */\r
+    @Test\r
+    public void testEquals(){\r
+        \r
+        ActionDeserializerKey key1 = new ActionDeserializerKey(EncodeConstants.OF10_VERSION_ID, 11, null);\r
+        ActionDeserializerKey key2 = new ActionDeserializerKey(EncodeConstants.OF10_VERSION_ID, 11, 42L);\r
+        \r
+        Assert.assertTrue("Wrong equal to identical object.", key1.equals(key1));\r
+        \r
+        Assert.assertFalse("Wrong equal to different class.", key1.equals(new Object()));\r
+        \r
+        Assert.assertFalse("Wrong equal by experimenterId", key1.equals(key2));\r
+        \r
+    }\r
 }
\ No newline at end of file

diff --git a/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/ActionSerializerKeyTest.java b/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/ActionSerializerKeyTest.java
index 5dbd02cb768e95d118dc8bd051b3c4049f33a55e..e145e8a23e01ba0044f7bbfb12b0f87ee791a575 100644 (file)
--- a/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/ActionSerializerKeyTest.java
+++ b/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/ActionSerializerKeyTest.java
@@ -47,4 +47,20 @@ public class ActionSerializerKeyTest {
         Assert.assertFalse("Wrong equals", key1.equals(key2));\r
         Assert.assertFalse("Wrong hashCode", key1.hashCode() == key2.hashCode());\r
     }\r
+    \r
+    /**\r
+     * Test ActionDeserializerKey equals - additional test\r
+     */\r
+    @Test\r
+    public void testEquals(){\r
+         ActionSerializerKey<CopyTtlIn> key1 = new ActionSerializerKey<>(EncodeConstants.OF10_VERSION_ID, null, 42L);\r
+         ActionSerializerKey<?> key2 = new ActionSerializerKey<>(EncodeConstants.OF10_VERSION_ID, CopyTtlIn.class, 42L);\r
+         \r
+         Assert.assertTrue("Wrong equal to identical object.", key1.equals(key1));\r
+         \r
+         Assert.assertFalse("Wrong equal by actionType", key1.equals(key2));\r
+         \r
+         key1 = new ActionSerializerKey<>(EncodeConstants.OF10_VERSION_ID,  CopyTtlIn.class, null);\r
+         Assert.assertFalse("Wrong equal by experimenterId", key1.equals(key2));\r
+    }\r
 }
\ No newline at end of file

diff --git a/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/InstructionDeserializerKeyTest.java b/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/InstructionDeserializerKeyTest.java
index abf859adb61d9e5dcb7febe95ef6a10c60a70170..ccd3311108769be8d8191793f2248da590f3253f 100644 (file)
--- a/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/InstructionDeserializerKeyTest.java
+++ b/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/InstructionDeserializerKeyTest.java
@@ -40,4 +40,21 @@ public class InstructionDeserializerKeyTest {
         Assert.assertFalse("Wrong equals", key1.equals(key2));\r
         Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode());\r
     }\r
+    \r
+    /**\r
+     * Test InstructionDeserializerKey equals - additional test\r
+     */\r
+    @Test\r
+    public void testEquals(){\r
+        \r
+        InstructionDeserializerKey key1 = new InstructionDeserializerKey(EncodeConstants.OF10_VERSION_ID, 11, null);\r
+        InstructionDeserializerKey key2 = new InstructionDeserializerKey(EncodeConstants.OF10_VERSION_ID, 11, 24L);\r
+        \r
+        Assert.assertTrue("Wrong equal to identical object.", key1.equals(key1));\r
+        \r
+        Assert.assertFalse("Wrong equal to different class.", key1.equals(new Object()));\r
+        \r
+        Assert.assertFalse("Wrong equal by experimenterId", key1.equals(key2));\r
+        \r
+    }\r
 }
\ No newline at end of file

diff --git a/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/InstructionSerializerKeyTest.java b/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/InstructionSerializerKeyTest.java
index 295ba4e3a864b64ef46bdde71baf5cc04514b86c..f6b65a90b6a6de84789325d4dbe4a865e833d0ab 100644 (file)
--- a/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/InstructionSerializerKeyTest.java
+++ b/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/InstructionSerializerKeyTest.java
@@ -47,4 +47,26 @@ public class InstructionSerializerKeyTest {
         Assert.assertFalse("Wrong equals", key1.equals(key2));\r
         Assert.assertFalse("Wrong hashCode", key1.hashCode() == key2.hashCode());\r
     }\r
+    \r
+    /**\r
+     * Test InstructionSerializerKey equals  - additional test\r
+     */\r
+    @Test\r
+    public void testEquals(){\r
+        \r
+        InstructionSerializerKey<?> key1 =\r
+                new InstructionSerializerKey<>(EncodeConstants.OF10_VERSION_ID, ApplyActions.class, 42L);\r
+        InstructionSerializerKey<?> key2 =\r
+                new InstructionSerializerKey<>(EncodeConstants.OF10_VERSION_ID, ApplyActions.class, 42L);\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
+        key1 = new InstructionSerializerKey<>(EncodeConstants.OF10_VERSION_ID, ApplyActions.class, null);\r
+        Assert.assertFalse("Wrong equal by experimenterId.", key1.equals(key2));\r
+        \r
+        key1 = new InstructionSerializerKey<>(EncodeConstants.OF10_VERSION_ID,  null, 42L);\r
+        Assert.assertFalse("Wrong equal by instructionType.", key1.equals(key2));\r
+        \r
+    }\r
 }
\ No newline at end of file

diff --git a/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/MatchEntryDeserializerKeyTest.java b/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/MatchEntryDeserializerKeyTest.java
index 1a5613fffce21bbc03b0cd3011685c7b3b4bd751..0f8e254e011baab7b7c45a3449cf60721f8d3747 100644 (file)
--- a/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/MatchEntryDeserializerKeyTest.java
+++ b/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/MatchEntryDeserializerKeyTest.java
@@ -46,4 +46,30 @@ public class MatchEntryDeserializerKeyTest {
         Assert.assertTrue("Wrong equals", key1.equals(key2));\r
         Assert.assertTrue("Wrong hashcode", key1.hashCode() == key2.hashCode());\r
     }\r
+    \r
+    /**\r
+     * Test MatchEntryDeserializerKey equals - additional test\r
+     */\r
+    @Test\r
+    public void testEquals() {\r
+        \r
+         MatchEntryDeserializerKey key1 = new MatchEntryDeserializerKey(EncodeConstants.OF10_VERSION_ID, 0x8000, 42);\r
+         MatchEntryDeserializerKey key2 = new MatchEntryDeserializerKey(EncodeConstants.OF10_VERSION_ID, 0x8000, 42);\r
+         \r
+         Assert.assertTrue("Wrong equal to identical object.", key1.equals(key1));\r
+        \r
+         Assert.assertFalse("Wrong equal to different class.", key1.equals(new Object()));\r
+         \r
+         \r
+         Long expId1=123456L;\r
+         Long expId2=654321L;\r
+         \r
+         key1.setExperimenterId(null);\r
+         key2.setExperimenterId(expId2);\r
+         Assert.assertFalse("Wrong equal by  experimeterId.", key1.equals(key2));\r
+         \r
+         key1.setExperimenterId(expId1);\r
+         Assert.assertFalse("Wrong equal by  experimeterId.", key1.equals(key2));\r
+\r
+    }\r
 }
\ No newline at end of file

diff --git a/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/MatchEntrySerializerKeyTest.java b/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/MatchEntrySerializerKeyTest.java
index 0a6793aaa683b23f5759ddaa77b51212c9e3e103..fa88fd7b6b2f864d8657365c8f07ba9028943b7c 100644 (file)
--- a/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/MatchEntrySerializerKeyTest.java
+++ b/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/MatchEntrySerializerKeyTest.java
@@ -54,4 +54,38 @@ public class MatchEntrySerializerKeyTest {
         Assert.assertFalse("Wrong equals", key1.equals(key2));\r
         Assert.assertFalse("Wrong hashCode", key1.hashCode() == key2.hashCode());\r
     }\r
+    \r
+    /**\r
+     * Test MatchEntrySerializerKey equals - additional test \r
+     */\r
+    @Test\r
+    public void testEquals(){\r
+        \r
+        MatchEntrySerializerKey<?, ?> key1;\r
+        MatchEntrySerializerKey<?, ?> key2;\r
+        \r
+        key1 = new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, OpenflowBasicClass.class, InPort.class);\r
+        key2 = new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, OpenflowBasicClass.class, InPort.class);\r
+        \r
+        Assert.assertTrue("Wrong equal to identical object.", key1.equals(key1));\r
+        \r
+        Assert.assertFalse("Wrong equal to different class.", key1.equals(new Object()));\r
+        \r
+        Long expId1 = 987654331L;\r
+        Long expId2 = 123456789L;\r
+        \r
+        key1.setExperimenterId(null);\r
+        key2.setExperimenterId(expId2);\r
+        \r
+        Assert.assertFalse("Wrong equal by experimenterId", key1.equals(key2));\r
+        \r
+        key1.setExperimenterId(expId1);\r
+        Assert.assertFalse("Wrong equal by experimenterId", key1.equals(key2));\r
+        \r
+        key1 = new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, null, InPort.class);\r
+        Assert.assertFalse("Wrong equal by oxmClass", key1.equals(key2));\r
+        \r
+        key1 = new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, OpenflowBasicClass.class, null);\r
+        Assert.assertFalse("Wrong equal by oxmField", key1.equals(key2));\r
+    }\r
 }
\ No newline at end of file

diff --git a/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/experimenter/ExperimenterActionSerializerKeyTest.java b/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/experimenter/ExperimenterActionSerializerKeyTest.java
index 59141fc4051ccf9f06ce1c723c8f31218e7a816a..657a34c3e2bf5de8bb8bcf455712d8ccaf1e8c95 100644 (file)
--- a/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/experimenter/ExperimenterActionSerializerKeyTest.java
+++ b/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/experimenter/ExperimenterActionSerializerKeyTest.java
@@ -47,6 +47,26 @@ public class ExperimenterActionSerializerKeyTest {
         Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode());\r
     }\r
 \r
+    @Test\r
+    public void testEquals() {\r
+        \r
+        ExperimenterActionSerializerKey key1;\r
+        ExperimenterActionSerializerKey key2;\r
+        \r
+        key1 = new ExperimenterActionSerializerKey(EncodeConstants.OF10_VERSION_ID, 42L, null);\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
+        key2 = new ExperimenterActionSerializerKey(EncodeConstants.OF10_VERSION_ID, 42L, TestSubType2.class);\r
+        Assert.assertFalse("Wrong equal by actionSubType.", key1.equals(key2));\r
+        \r
+        key1 = new ExperimenterActionSerializerKey(EncodeConstants.OF10_VERSION_ID, 42L, TestSubType.class);\r
+        Assert.assertFalse("Wrong equal by actionSubType.", key1.equals(key2));\r
+        \r
+    }\r
+    \r
+    \r
     private static class TestSubType extends ExperimenterActionSubType {\r
         // empty class - only used in test for comparation\r
     }\r

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 ec0619049129a6ad3f9f8bca38ba4b29be49d979..8526f54ace38d35ab9b87d568b05becbaea58967 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
@@ -47,4 +47,23 @@ public class ExperimenterIdDeserializerKeyTest {
         Assert.assertFalse("Wrong equals", key1.equals(key2));\r
         Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode());\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
+         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
 }
\ 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 768af3cca091cd0d5d841dc00eb3e4aacec9dd60..27f243b0bc7fce29459d75158b48a904d03c8b8d 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
@@ -47,4 +47,22 @@ public class ExperimenterIdSerializerKeyTest {
         Assert.assertFalse("Wrong equals", key1.equals(key2));\r
         Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode());\r
     }\r
+    \r
+    /**\r
+     * Test ExperimenterIdSerializerKey equals - additional test\r
+     */\r
+    @Test\r
+    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
+        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