X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=openflow-protocol-impl%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fopenflowjava%2Fprotocol%2Fimpl%2Fdeserialization%2Ffactories%2FEchoRequestMessageFactoryTest.java;h=8aff8b7553e3348f129fda7c71284f8e6f942653;hb=07de1ed897da9d7dc70c6d550f38c59339ed751e;hp=bcb125342b8867ebf49ae9072dbbcfb4f74629ef;hpb=0d942e8fb70b2c21f97eea3ed8904336ab5c54a4;p=openflowjava.git

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/EchoRequestMessageFactoryTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/EchoRequestMessageFactoryTest.java
index bcb12534..8aff8b75 100644
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/EchoRequestMessageFactoryTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/EchoRequestMessageFactoryTest.java
@@ -11,9 +11,14 @@ package org.opendaylight.openflowjava.protocol.impl.deserialization.factories;
 import io.netty.buffer.ByteBuf;
 
 import org.junit.Assert;
+import org.junit.Before;
 import org.junit.Test;
-import org.opendaylight.openflowjava.protocol.impl.deserialization.factories.EchoRequestMessageFactory;
+import org.opendaylight.openflowjava.protocol.api.extensibility.DeserializerRegistry;
+import org.opendaylight.openflowjava.protocol.api.extensibility.MessageCodeKey;
+import org.opendaylight.openflowjava.protocol.api.extensibility.OFDeserializer;
+import org.opendaylight.openflowjava.protocol.impl.deserialization.DeserializerRegistryImpl;
 import org.opendaylight.openflowjava.protocol.impl.util.BufferHelper;
+import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.EchoRequestMessage;
 
 /**
@@ -22,56 +27,40 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731
  */
 public class EchoRequestMessageFactoryTest {
 
-    /**
-     * Testing {@link EchoRequestMessageFactory} for correct translation into POJO
-     */
-    @Test
-    public void testWithEmptyDataField() {
-        ByteBuf bb = BufferHelper.buildBuffer();
-        EchoRequestMessage builtByFactory = BufferHelper.decodeV13(
-                EchoRequestMessageFactory.getInstance(), bb);
+    private OFDeserializer<EchoRequestMessage> echoFactory;
 
-        BufferHelper.checkHeaderV13(builtByFactory);
-    }
-    
     /**
-     * Testing {@link EchoRequestMessageFactory} for correct translation into POJO
+     * Initializes deserializer registry and lookups correct deserializer
      */
-    @Test
-    public void testWithDataFieldSet() {
-        byte[] data = new byte[]{0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07};
-        ByteBuf bb = BufferHelper.buildBuffer(data);
-        EchoRequestMessage builtByFactory = BufferHelper.decodeV13(
-                EchoRequestMessageFactory.getInstance(), bb);
-
-        BufferHelper.checkHeaderV13(builtByFactory);
-        Assert.assertArrayEquals("Wrong data", data, builtByFactory.getData());
+    @Before
+    public void startUp() {
+        DeserializerRegistry registry = new DeserializerRegistryImpl();
+        registry.init();
+        echoFactory = registry.getDeserializer(
+                new MessageCodeKey(EncodeConstants.OF13_VERSION_ID, 2, EchoRequestMessage.class));
     }
-    
+
     /**
      * Testing {@link EchoRequestMessageFactory} for correct translation into POJO
      */
     @Test
-    public void testWithEmptyDataFieldV10() {
+    public void testWithEmptyDataField() {
         ByteBuf bb = BufferHelper.buildBuffer();
-        EchoRequestMessage builtByFactory = BufferHelper.decodeV10(
-                EchoRequestMessageFactory.getInstance(), bb);
+        EchoRequestMessage builtByFactory = BufferHelper.deserialize(echoFactory, bb);
 
-        BufferHelper.checkHeaderV10(builtByFactory);
+        BufferHelper.checkHeaderV13(builtByFactory);
     }
-    
+
     /**
      * Testing {@link EchoRequestMessageFactory} for correct translation into POJO
      */
     @Test
-    public void testWithDataFieldSetV10() {
+    public void testWithDataFieldSet() {
         byte[] data = new byte[]{0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07};
         ByteBuf bb = BufferHelper.buildBuffer(data);
-        EchoRequestMessage builtByFactory = BufferHelper.decodeV10(
-                EchoRequestMessageFactory.getInstance(), bb);
+        EchoRequestMessage builtByFactory = BufferHelper.deserialize(echoFactory, bb);
 
-        BufferHelper.checkHeaderV10(builtByFactory);
+        BufferHelper.checkHeaderV13(builtByFactory);
         Assert.assertArrayEquals("Wrong data", data, builtByFactory.getData());
     }
-
 }