X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=openflow-protocol-api%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fopenflowjava%2Fprotocol%2Fapi%2Fkeys%2FMatchEntrySerializerKeyTest.java;h=fbd5e26adc37cbcae01d0fd65270e0b395204495;hb=29a2a074c78708f6d18583779ece96bb6573f0c6;hp=5e79712df9515680487733b492d89b89cdb93792;hpb=c5349a10e27b85756a2fea7898cc2296d43d37fd;p=openflowjava.git

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 5e79712d..fbd5e26a 100644
--- 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
@@ -1,85 +1,108 @@
-/*
- * 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;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.InPhyPort;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.InPort;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.Nxm0Class;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.OpenflowBasicClass;
-
-/**
- * @author michal.polkorab
- *
- */
-public class MatchEntrySerializerKeyTest {
-
-    /**
-     * Test MatchEntrySerializerKey equals and hashCode
-     */
-    @Test
-    public void test() {
-        MatchEntrySerializerKey<?, ?> key1 = new MatchEntrySerializerKey<>
-                (EncodeConstants.OF13_VERSION_ID, OpenflowBasicClass.class, InPort.class);
-        MatchEntrySerializerKey<?, ?> key2 = new MatchEntrySerializerKey<>
-                (EncodeConstants.OF13_VERSION_ID, OpenflowBasicClass.class, InPort.class);
-        Assert.assertTrue("Wrong equals", key1.equals(key2));
-        Assert.assertTrue("Wrong hashCode", key1.hashCode() == key2.hashCode());
-        key2 = new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID,
-                OpenflowBasicClass.class, InPhyPort.class);
-        Assert.assertFalse("Wrong equals", key1.equals(key2));
-        Assert.assertFalse("Wrong hashCode", key1.hashCode() == key2.hashCode());
-        key2 = new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID,
-                Nxm0Class.class, InPort.class);
-        Assert.assertFalse("Wrong equals", key1.equals(key2));
-        Assert.assertFalse("Wrong hashCode", key1.hashCode() == key2.hashCode());
-        key2 = new MatchEntrySerializerKey<>(EncodeConstants.OF10_VERSION_ID,
-                OpenflowBasicClass.class, InPhyPort.class);
-        Assert.assertFalse("Wrong equals", key1.equals(key2));
-        Assert.assertFalse("Wrong hashCode", key1.hashCode() == key2.hashCode());
-        key2 = new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID,
-                OpenflowBasicClass.class, null);
-        Assert.assertFalse("Wrong equals", key1.equals(key2));
-        Assert.assertFalse("Wrong hashCode", key1.hashCode() == key2.hashCode());
-        key2 = new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID,
-                null, InPhyPort.class);
-        Assert.assertFalse("Wrong equals", key1.equals(key2));
-        Assert.assertFalse("Wrong hashCode", key1.hashCode() == key2.hashCode());
-    }
-    
-    /**
-     * Test MatchEntrySerializerKey equals - additional test 
-     */
-    @Test
-    public void testEquals(){
-        MatchEntrySerializerKey<?, ?> key1;
-        MatchEntrySerializerKey<?, ?> key2;
-        key1 = new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, OpenflowBasicClass.class, InPort.class);
-        key2 = new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, OpenflowBasicClass.class, InPort.class);
-        Assert.assertTrue("Wrong equal to identical object.", key1.equals(key1));
-        Assert.assertFalse("Wrong equal to different class.", key1.equals(new Object()));
-        
-        Long expId1 = 987654331L;
-        Long expId2 = 123456789L;
-        
-        key1.setExperimenterId(null);
-        key2.setExperimenterId(expId2);
-        Assert.assertFalse("Wrong equal by experimenterId", key1.equals(key2));
-        key1.setExperimenterId(expId1);
-        Assert.assertFalse("Wrong equal by experimenterId", key1.equals(key2));
-        key1 = new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, null, InPort.class);
-        key1.setExperimenterId(expId2);
-        Assert.assertFalse("Wrong equal by oxmClass", key1.equals(key2));
-        key1 = new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, OpenflowBasicClass.class, null);
-        key1.setExperimenterId(expId2);
-        Assert.assertFalse("Wrong equal by oxmField", key1.equals(key2));
-    }
+/*
+ * 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;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.InPhyPort;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.InPort;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm0Class;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.OpenflowBasicClass;
+
+/**
+ * @author michal.polkorab
+ *
+ */
+public class MatchEntrySerializerKeyTest {
+
+    /**
+     * Test MatchEntrySerializerKey equals and hashCode
+     */
+    @Test
+    public void test() {
+        MatchEntrySerializerKey<?, ?> key1 = new MatchEntrySerializerKey<>
+                (EncodeConstants.OF13_VERSION_ID, OpenflowBasicClass.class, InPort.class);
+        MatchEntrySerializerKey<?, ?> key2 = new MatchEntrySerializerKey<>
+                (EncodeConstants.OF13_VERSION_ID, OpenflowBasicClass.class, InPort.class);
+        Assert.assertTrue("Wrong equals", key1.equals(key2));
+        Assert.assertTrue("Wrong hashCode", key1.hashCode() == key2.hashCode());
+        key2 = new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID,
+                OpenflowBasicClass.class, InPhyPort.class);
+        Assert.assertFalse("Wrong equals", key1.equals(key2));
+        Assert.assertFalse("Wrong hashCode", key1.hashCode() == key2.hashCode());
+        key2 = new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID,
+                Nxm0Class.class, InPort.class);
+        Assert.assertFalse("Wrong equals", key1.equals(key2));
+        Assert.assertFalse("Wrong hashCode", key1.hashCode() == key2.hashCode());
+        key2 = new MatchEntrySerializerKey<>(EncodeConstants.OF10_VERSION_ID,
+                OpenflowBasicClass.class, InPhyPort.class);
+        Assert.assertFalse("Wrong equals", key1.equals(key2));
+        Assert.assertFalse("Wrong hashCode", key1.hashCode() == key2.hashCode());
+        key2 = new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID,
+                OpenflowBasicClass.class, null);
+        Assert.assertFalse("Wrong equals", key1.equals(key2));
+        Assert.assertFalse("Wrong hashCode", key1.hashCode() == key2.hashCode());
+        key2 = new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID,
+                null, InPhyPort.class);
+        Assert.assertFalse("Wrong equals", key1.equals(key2));
+        Assert.assertFalse("Wrong hashCode", key1.hashCode() == key2.hashCode());
+        key2.setExperimenterId(42L);
+        Assert.assertFalse("Wrong hashCode", key1.hashCode() == key2.hashCode());
+    }
+
+    /**
+     * Test MatchEntrySerializerKey equals - additional test
+     */
+    @Test
+    public void testEquals(){
+        MatchEntrySerializerKey<?, ?> key1;
+        MatchEntrySerializerKey<?, ?> key2;
+        key1 = new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, OpenflowBasicClass.class, InPort.class);
+        key2 = new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, OpenflowBasicClass.class, InPort.class);
+        Assert.assertTrue("Wrong equal to identical object.", key1.equals(key1));
+        Assert.assertFalse("Wrong equal to different class.", key1.equals(new Object()));
+
+        Long expId1 = 987654331L;
+        Long expId2 = 123456789L;
+
+        key1.setExperimenterId(null);
+        key2.setExperimenterId(expId2);
+        Assert.assertFalse("Wrong equal by experimenterId", key1.equals(key2));
+        key1.setExperimenterId(expId1);
+        Assert.assertFalse("Wrong equal by experimenterId", key1.equals(key2));
+        key1 = new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, null, InPort.class);
+        key1.setExperimenterId(expId2);
+        Assert.assertFalse("Wrong equal by oxmClass", key1.equals(key2));
+        key2 = new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, null, InPort.class);
+        key2.setExperimenterId(expId2);
+        Assert.assertTrue("Wrong equal by oxmClass", key1.equals(key2));
+        key1 = new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, OpenflowBasicClass.class, null);
+        key1.setExperimenterId(expId2);
+        Assert.assertFalse("Wrong equal by oxmField", key1.equals(key2));
+        key2 = new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, OpenflowBasicClass.class, null);
+        key2.setExperimenterId(expId2);
+        Assert.assertTrue("Wrong equal by oxmField", key1.equals(key2));
+    }
+
+    /**
+     * Test MatchEntrySerializerKey toString()
+     */
+    @Test
+    public void testToString(){
+        MatchEntrySerializerKey<?, ?> key1;
+        key1 = new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, OpenflowBasicClass.class, InPort.class);
+
+        Assert.assertEquals("Wrong toString()", "msgVersion: 4 objectType: org.opendaylight.yang.gen.v1.urn"
+                + ".opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry"
+                + " oxm_class: org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225"
+                + ".OpenflowBasicClass oxm_field: org.opendaylight.yang.gen.v1.urn.opendaylight.openflow"
+                + ".oxm.rev150225.InPort experimenterID: null", key1.toString());
+    }
 }
\ No newline at end of file