Remove trailing whitespace

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

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/GetFeaturesInputMessageFactoryTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/GetFeaturesInputMessageFactoryTest.java
index a99dab67b64cfda8e3e73c1afbded1208a9b5e8a..1f4a400f1e5ea5c80bdb080d0d23f6351be85354 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/GetFeaturesInputMessageFactoryTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/GetFeaturesInputMessageFactoryTest.java
@@ -11,9 +11,14 @@ package org.opendaylight.openflowjava.protocol.impl.serialization.factories;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.UnpooledByteBufAllocator;
 
+import org.junit.Before;
 import org.junit.Test;
+import org.opendaylight.openflowjava.protocol.api.extensibility.MessageTypeKey;
+import org.opendaylight.openflowjava.protocol.api.extensibility.OFSerializer;
+import org.opendaylight.openflowjava.protocol.api.extensibility.SerializerRegistry;
+import org.opendaylight.openflowjava.protocol.impl.serialization.SerializerRegistryImpl;
 import org.opendaylight.openflowjava.protocol.impl.util.BufferHelper;
-import org.opendaylight.openflowjava.protocol.impl.util.EncodeConstants;
+import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.GetFeaturesInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.GetFeaturesInputBuilder;
 
@@ -23,39 +28,50 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731
  */
 public class GetFeaturesInputMessageFactoryTest {
 
-    private static final byte FEATURES_REQUEST_MESSAGE_CODE_TYPE = GetFeaturesInputMessageFactory.MESSAGE_TYPE;
-    
+    private static final byte FEATURES_REQUEST_MESSAGE_CODE_TYPE = 5;
+    private SerializerRegistry registry;
+    private OFSerializer<GetFeaturesInput> featuresFactory;
+
+    /**
+     * Initializes serializer registry and stores correct factory in field
+     */
+    @Before
+    public void startUp() {
+        registry = new SerializerRegistryImpl();
+        registry.init();
+        featuresFactory = registry.getSerializer(
+                new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, GetFeaturesInput.class));
+    }
+
     /**
      * Testing of {@link GetFeaturesInputMessageFactory} for correct translation from POJO
-     * @throws Exception 
+     * @throws Exception
      */
     @Test
     public void testV13() throws Exception {
         GetFeaturesInputBuilder gfib = new GetFeaturesInputBuilder();
         BufferHelper.setupHeader(gfib, EncodeConstants.OF13_VERSION_ID);
         GetFeaturesInput gfi = gfib.build();
-        
+
         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
-        GetFeaturesInputMessageFactory gfimf = GetFeaturesInputMessageFactory.getInstance();
-        gfimf.messageToBuffer(EncodeConstants.OF13_VERSION_ID, out, gfi);
-        
+        featuresFactory.serialize(gfi, out);
+
         BufferHelper.checkHeaderV13(out, FEATURES_REQUEST_MESSAGE_CODE_TYPE, 8);
     }
 
     /**
      * Testing of {@link GetFeaturesInputMessageFactory} for correct translation from POJO
-     * @throws Exception 
+     * @throws Exception
      */
     @Test
     public void testV10() throws Exception {
         GetFeaturesInputBuilder gfib = new GetFeaturesInputBuilder();
         BufferHelper.setupHeader(gfib, EncodeConstants.OF10_VERSION_ID);
         GetFeaturesInput gfi = gfib.build();
-        
+
         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
-        GetFeaturesInputMessageFactory gfimf = GetFeaturesInputMessageFactory.getInstance();
-        gfimf.messageToBuffer(EncodeConstants.OF10_VERSION_ID, out, gfi);
-        
+        featuresFactory.serialize(gfi, out);
+
         BufferHelper.checkHeaderV10(out, FEATURES_REQUEST_MESSAGE_CODE_TYPE, 8);
     }
 }