Bug 2756 - Match model update

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

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 be87d557792e6af09fff09891e993544b8c7b30f..c9c84688d13b19e6ed0dd83904957de6f082d3fe 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
@@ -1,83 +1,83 @@
-/*\r
- * Copyright (c) 2014 Pantheon Technologies s.r.o. and others. All rights reserved.\r
- *\r
- * This program and the accompanying materials are made available under the\r
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
- * and is available at http://www.eclipse.org/legal/epl-v10.html\r
- */\r
-\r
-package org.opendaylight.openflowjava.protocol.api.keys;\r
-\r
-import org.junit.Assert;\r
-import org.junit.Test;\r
-import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;\r
-\r
-/**\r
- * @author michal.polkorab\r
- *\r
- */\r
-public class MatchEntryDeserializerKeyTest {\r
-\r
-    /**\r
-     * Test MatchEntryDeserializerKey equals and hashCode\r
-     */\r
-    @Test\r
-    public void test() {\r
-        MatchEntryDeserializerKey key1 = new MatchEntryDeserializerKey(EncodeConstants.OF10_VERSION_ID, 0x8000, 42);\r
-        MatchEntryDeserializerKey key2 = new MatchEntryDeserializerKey(EncodeConstants.OF10_VERSION_ID, 0x8000, 42);\r
-        Assert.assertTrue("Wrong equals", key1.equals(key2));\r
-        Assert.assertTrue("Wrong hashcode", key1.hashCode() == key2.hashCode());\r
-        key2 = new MatchEntryDeserializerKey(EncodeConstants.OF10_VERSION_ID, 0, 42);\r
-        Assert.assertFalse("Wrong equals", key1.equals(key2));\r
-        Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode());\r
-        key2 = new MatchEntryDeserializerKey(EncodeConstants.OF10_VERSION_ID, 0x8000, 0);\r
-        Assert.assertFalse("Wrong equals", key1.equals(key2));\r
-        Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode());\r
-        key2 = new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID, 0x8000, 42);\r
-        Assert.assertFalse("Wrong equals", key1.equals(key2));\r
-        Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode());\r
-        key2 = new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID, 0x8000, 42);\r
-        key2.setExperimenterId(158L);\r
-        Assert.assertFalse("Wrong equals", key1.equals(key2));\r
-        Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode());\r
-        key2 = new MatchEntryDeserializerKey(EncodeConstants.OF10_VERSION_ID, 0x8000, 42);\r
-        key2.setExperimenterId(158L);\r
-        key1.setExperimenterId(158L);\r
-        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
-         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
-         Assert.assertFalse("Wrong equal to different class.", key1.equals(new Object()));\r
-         \r
-         Long expId1=123456L;\r
-         Long expId2=654321L;\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
-         Assert.assertFalse("Wrong equals with different object class", key1.equals(key2));\r
-    }\r
-\r
-    /**\r
-     * Test MatchEntryDeserializerKey toString()\r
-     */\r
-    @Test\r
-    public void testToString(){\r
-        MatchEntryDeserializerKey key1 = new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID, 0x8000, 42);\r
-\r
-        Assert.assertEquals("Wrong toString()", "msgVersion: 4 objectClass: org.opendaylight.yang.gen.v1.urn.opendaylight"\r
-                + ".openflow.oxm.rev130731.oxm.fields.grouping.MatchEntries msgType: 32768 oxm_field: 42"\r
-                + " experimenterID: null", key1.toString());\r
-    }\r
+/*
+ * Copyright (c) 2014 Pantheon Technologies s.r.o. and others. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * 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;
+import org.junit.Test;
+import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
+
+/**
+ * @author michal.polkorab
+ *
+ */
+public class MatchEntryDeserializerKeyTest {
+
+    /**
+     * Test MatchEntryDeserializerKey equals and hashCode
+     */
+    @Test
+    public void test() {
+        MatchEntryDeserializerKey key1 = new MatchEntryDeserializerKey(EncodeConstants.OF10_VERSION_ID, 0x8000, 42);
+        MatchEntryDeserializerKey key2 = new MatchEntryDeserializerKey(EncodeConstants.OF10_VERSION_ID, 0x8000, 42);
+        Assert.assertTrue("Wrong equals", key1.equals(key2));
+        Assert.assertTrue("Wrong hashcode", key1.hashCode() == key2.hashCode());
+        key2 = new MatchEntryDeserializerKey(EncodeConstants.OF10_VERSION_ID, 0, 42);
+        Assert.assertFalse("Wrong equals", key1.equals(key2));
+        Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode());
+        key2 = new MatchEntryDeserializerKey(EncodeConstants.OF10_VERSION_ID, 0x8000, 0);
+        Assert.assertFalse("Wrong equals", key1.equals(key2));
+        Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode());
+        key2 = new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID, 0x8000, 42);
+        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);
+        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);
+        Assert.assertTrue("Wrong equals", key1.equals(key2));
+        Assert.assertTrue("Wrong hashcode", key1.hashCode() == key2.hashCode());
+    }
+
+    /**
+     * 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;
+         key1.setExperimenterId(null);
+         key2.setExperimenterId(expId2);
+         Assert.assertFalse("Wrong equal by experimeterId.", key1.equals(key2));
+
+         key1.setExperimenterId(expId1);
+         Assert.assertFalse("Wrong equal by experimeterId.", key1.equals(key2));
+         Assert.assertFalse("Wrong equals with different object class", key1.equals(key2));
+    }
+
+    /**
+     * Test MatchEntryDeserializerKey toString()
+     */
+    @Test
+    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"
+                + ".opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry"
+                + " msgType: 32768 oxm_field: 42 experimenterID: null", key1.toString());
+    }
 }
\ No newline at end of file