Bug 5540 - ActionConvertor, ActionResponseConvertor

[openflowplugin.git] / openflowplugin / src / test / java / org / opendaylight / openflowplugin / openflow / md / core / sal / convertor / PacketOutConvertorTest.java

diff --git a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/PacketOutConvertorTest.java b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/PacketOutConvertorTest.java
index e9cccd8f7f88b0279127d34f568edaeb3543e9c2..c5ef62043e25cad4625febab95428e0de91f79c3 100644 (file)
--- a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/PacketOutConvertorTest.java
+++ b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/PacketOutConvertorTest.java
@@ -10,13 +10,16 @@ package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor;
 \r
 import java.math.BigInteger;\r
 import java.util.ArrayList;\r
+import java.util.Collections;\r
 import java.util.List;\r
+import java.util.Optional;\r
 import org.junit.Assert;\r
 import org.junit.Before;\r
 import org.junit.Test;\r
 import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;\r
 import org.opendaylight.openflowplugin.api.OFConstants;\r
 import org.opendaylight.openflowplugin.api.openflow.md.util.OpenflowVersion;\r
+import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.data.ActionConvertorData;\r
 import org.opendaylight.openflowplugin.openflow.md.util.InventoryDataServiceUtil;\r
 import org.opendaylight.openflowplugin.openflow.md.util.OpenflowPortsUtil;\r
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Uri;\r
@@ -173,9 +176,14 @@ public class PacketOutConvertorTest {
         Assert.assertEquals((Object) version,\r
                 Short.valueOf(message.getVersion()));\r
         Assert.assertEquals(xid, message.getXid());\r
-        Assert.assertEquals(\r
-                ActionConvertor.getActions(actionList, version, datapathId, null),\r
-                message.getAction());\r
+        ActionConvertorData actionConvertorData = new ActionConvertorData(version);\r
+        actionConvertorData.setDatapathId(datapathId);\r
+\r
+        Optional<List<Action>> actionsOptional = ConvertorManager.getInstance().convert(\r
+                actionList, actionConvertorData);\r
+\r
+        List<Action> actions = actionsOptional.orElse(Collections.emptyList());\r
+        Assert.assertEquals(actions, message.getAction());\r
         Assert.assertArrayEquals(transmitPacketInput.getPayload(), message.getData());\r
     }\r
 \r