X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=openflow-protocol-impl%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fopenflowjava%2Fprotocol%2Fimpl%2Fserialization%2Ffactories%2FEchoInputMessageFactoryTest.java;fp=openflow-protocol-impl%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fopenflowjava%2Fprotocol%2Fimpl%2Fserialization%2Ffactories%2FEchoInputMessageFactoryTest.java;h=158557b7aeaaf8d27b95ac2290f619e1630bf010;hb=1adc52b6fedfc7ecdb03cb6cab5ae7da3bfb52e4;hp=bb2ee8e33bb1638162a61a71d419d59df59ab562;hpb=cbe4871cddf78adab335b5270269b6e704eb8bf9;p=openflowjava.git

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/EchoInputMessageFactoryTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/EchoInputMessageFactoryTest.java
index bb2ee8e3..158557b7 100644
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/EchoInputMessageFactoryTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/EchoInputMessageFactoryTest.java
@@ -11,7 +11,12 @@ 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.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.EchoInput;
@@ -23,8 +28,21 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731
  */
 public class EchoInputMessageFactoryTest {
 
-    private static final byte ECHO_REQUEST_MESSAGE_CODE_TYPE = EchoInputMessageFactory.MESSAGE_TYPE;
-    
+    private static final byte ECHO_REQUEST_MESSAGE_CODE_TYPE = 2;
+    private SerializerRegistry registry;
+    private OFSerializer<EchoInput> echoFactory;
+
+    /**
+     * Initializes serializer registry and stores correct factory in field
+     */
+    @Before
+    public void startUp() {
+        registry = new SerializerRegistryImpl();
+        registry.init();
+        echoFactory = registry.getSerializer(
+                new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, EchoInput.class));
+    }
+
     /**
      * Testing of {@link EchoInputMessageFactory} for correct translation from POJO
      * @throws Exception 
@@ -36,8 +54,7 @@ public class EchoInputMessageFactoryTest {
         EchoInput ei = eib.build();
         
         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
-        EchoInputMessageFactory eimf = EchoInputMessageFactory.getInstance();
-        eimf.messageToBuffer(EncodeConstants.OF13_VERSION_ID, out, ei);
+        echoFactory.serialize(ei, out);
         
         BufferHelper.checkHeaderV13(out, ECHO_REQUEST_MESSAGE_CODE_TYPE, 8);
     }
@@ -53,8 +70,7 @@ public class EchoInputMessageFactoryTest {
         EchoInput ei = eib.build();
         
         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
-        EchoInputMessageFactory eimf = EchoInputMessageFactory.getInstance();
-        eimf.messageToBuffer(EncodeConstants.OF10_VERSION_ID, out, ei);
+        echoFactory.serialize(ei, out);
         
         BufferHelper.checkHeaderV10(out, ECHO_REQUEST_MESSAGE_CODE_TYPE, 8);
     }