Update MRI upstreams for Phosphorus

[openflowplugin.git] / openflowjava / openflow-protocol-impl / src / test / java / org / opendaylight / openflowjava / protocol / impl / serialization / SerializerRegistryImplTest.java

diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/SerializerRegistryImplTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/SerializerRegistryImplTest.java
index 77f3173846ac5d4fc9d0165f9a3701529bb54ac0..e1de29da63dfb38cc70b8c1182e3a67795781114 100644 (file)
--- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/SerializerRegistryImplTest.java
+++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/SerializerRegistryImplTest.java
@@ -7,10 +7,12 @@
  */
 package org.opendaylight.openflowjava.protocol.impl.serialization;
 
+import static org.opendaylight.openflowjava.protocol.api.util.EncodeConstants.OF_VERSION_1_0;
+import static org.opendaylight.openflowjava.protocol.api.util.EncodeConstants.OF_VERSION_1_3;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.opendaylight.openflowjava.protocol.api.keys.MessageTypeKey;
-import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
 import org.opendaylight.openflowjava.protocol.impl.util.OF13MatchSerializer;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.grouping.Match;
 
@@ -21,9 +23,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.matc
  */
 public class SerializerRegistryImplTest {
 
-    private static final short OF13 = EncodeConstants.OF13_VERSION_ID;
-    private static final short OF10 = EncodeConstants.OF10_VERSION_ID;
-
     /**
      * Test - register serializer without arguments.
      */
@@ -41,7 +40,7 @@ public class SerializerRegistryImplTest {
     public void testUnRegisterSerializerNoMessageTypeKey() {
         SerializerRegistryImpl serReg = new SerializerRegistryImpl();
         serReg.init();
-        serReg.registerSerializer(new MessageTypeKey<>(OF13, Match.class), new OF13MatchSerializer());
+        serReg.registerSerializer(new MessageTypeKey<>(OF_VERSION_1_3, Match.class), new OF13MatchSerializer());
         serReg.unregisterSerializer(null);
     }
 
@@ -52,12 +51,12 @@ public class SerializerRegistryImplTest {
     public void testUnRegisterSerializer() {
         SerializerRegistryImpl serReg = new SerializerRegistryImpl();
         serReg.init();
-        serReg.registerSerializer(new MessageTypeKey<>(OF13, Match.class), new OF13MatchSerializer());
+        serReg.registerSerializer(new MessageTypeKey<>(OF_VERSION_1_3, Match.class), new OF13MatchSerializer());
         Assert.assertTrue("Wrong - unregister serializer",
-                serReg.unregisterSerializer(new MessageTypeKey<>(OF13, Match.class)));
+                serReg.unregisterSerializer(new MessageTypeKey<>(OF_VERSION_1_3, Match.class)));
 
-        serReg.registerSerializer(new MessageTypeKey<>(OF13, Match.class), new OF13MatchSerializer());
+        serReg.registerSerializer(new MessageTypeKey<>(OF_VERSION_1_3, Match.class), new OF13MatchSerializer());
         Assert.assertFalse("Wrong - unregister serializer",
-                serReg.unregisterSerializer(new MessageTypeKey<>(OF10, Match.class)));
+                serReg.unregisterSerializer(new MessageTypeKey<>(OF_VERSION_1_0, Match.class)));
     }
 }