InstructionDeserializer split into separate deserializers

[openflowjava.git] / openflow-protocol-impl / src / test / java / org / opendaylight / openflowjava / protocol / impl / util / InstructionsDeserializerTest.java

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/InstructionsDeserializerTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/InstructionsDeserializerTest.java
index 53e95088fa7b80c6c0f84f74df9e09f3711b65e4..1d7231d057b874597ab6f6572647aae67c209f84 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/InstructionsDeserializerTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/InstructionsDeserializerTest.java
@@ -15,8 +15,6 @@ import org.junit.Assert;
 import org.junit.Before;\r
 import org.junit.Test;\r
 import org.opendaylight.openflowjava.protocol.api.extensibility.DeserializerRegistry;\r
-import org.opendaylight.openflowjava.protocol.api.extensibility.MessageCodeKey;\r
-import org.opendaylight.openflowjava.protocol.api.extensibility.OFDeserializer;\r
 import org.opendaylight.openflowjava.protocol.impl.deserialization.DeserializerRegistryImpl;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.ActionsInstruction;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.GroupIdAction;\r
@@ -36,18 +34,16 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.instruction
  */\r
 public class InstructionsDeserializerTest {\r
 \r
-    private OFDeserializer<Instruction> insDeserializer;\r
+\r
+    private DeserializerRegistry registry;\r
 \r
     /**\r
      * Initializes deserializer registry and lookups correct deserializer\r
      */\r
     @Before\r
     public void startUp() {\r
-        DeserializerRegistry registry = new DeserializerRegistryImpl();\r
+        registry = new DeserializerRegistryImpl();\r
         registry.init();\r
-        insDeserializer = registry.getDeserializer(\r
-                new MessageCodeKey(EncodeConstants.OF13_VERSION_ID,\r
-                        EncodeConstants.EMPTY_VALUE, Instruction.class));\r
     }\r
 \r
     /**\r
@@ -62,8 +58,9 @@ public class InstructionsDeserializerTest {
         \r
         message.skipBytes(4); // skip XID\r
         \r
-        List<Instruction> instructions = DecodingUtils.deserializeList(\r
-                message.readableBytes(), message, insDeserializer);\r
+        CodeKeyMaker keyMaker = CodeKeyMakerFactory.createInstructionsKeyMaker(EncodeConstants.OF13_VERSION_ID);\r
+        List<Instruction> instructions = ListDeserializer.deserializeList(EncodeConstants.OF13_VERSION_ID,\r
+                message.readableBytes(), message, keyMaker, registry);\r
         Instruction i1 = instructions.get(0);\r
         Assert.assertEquals("Wrong type - i1", "org.opendaylight.yang.gen.v1.urn."\r
                 + "opendaylight.openflow.common.instruction.rev130731.GotoTable", i1.getType().getName());\r