Cleanup PacketOutConvertorTest

Use BindingMap.of() to migrate the single use of list remaining,
also cleaning up builder usage a bit.

Change-Id: I52e675943c6375631601a95b5ee261968216d22e
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

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 c6ac7bf526116768a36e8347271908a45b31e3d6..a2b4face8c559df87c232953ceb51c4a26a54a24 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
@@ -41,6 +41,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.Co
 import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.TransmitPacketInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.TransmitPacketInputBuilder;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.opendaylight.yangtools.yang.binding.util.BindingMap;
 import org.opendaylight.yangtools.yang.common.Uint16;
 import org.opendaylight.yangtools.yang.common.Uint32;
 import org.opendaylight.yangtools.yang.common.Uint64;
@@ -64,25 +65,19 @@ public class PacketOutConvertorTest {
      */
     @Test
     public void toPacketOutInputAllParmNullTest() {
-
-        TransmitPacketInputBuilder transmitPacketInputBuilder = new TransmitPacketInputBuilder();
-
         String nodeId = "0";
         String port = "0";
-
-        NodeRef ref = createNodeRef(nodeId);
         NodeConnectorKey nodeConnKey = PacketOutConvertorTest.createNodeConnKey(nodeId, port);
-        NodeConnectorRef egressConfRef = new NodeConnectorRef(
-                createNodeConnRef(nodeId, nodeConnKey));
+        NodeConnectorRef egressConfRef = new NodeConnectorRef(createNodeConnRef(nodeId, nodeConnKey));
 
-        transmitPacketInputBuilder.setBufferId((Uint32) null);
-        transmitPacketInputBuilder.setConnectionCookie(null);
-        transmitPacketInputBuilder.setNode(ref);
-        transmitPacketInputBuilder.setPayload(null);
-        transmitPacketInputBuilder.setEgress(egressConfRef);
-        transmitPacketInputBuilder.setIngress(null);
-        TransmitPacketInput transmitPacketInput = transmitPacketInputBuilder
-                .build();
+        TransmitPacketInput transmitPacketInput = new TransmitPacketInputBuilder()
+            .setBufferId((Uint32) null)
+            .setConnectionCookie(null)
+            .setNode(createNodeRef(nodeId))
+            .setPayload(null)
+            .setEgress(egressConfRef)
+            .setIngress(null)
+            .build();
 
         Short version = (short) 0x04;
         Long xid = null;
@@ -128,8 +123,6 @@ public class PacketOutConvertorTest {
 
         String nodeId = "node:1";
 
-        NodeRef ref = createNodeRef(nodeId);
-
         String portO = "0xfffffffd";
         NodeConnectorKey egrConKey = PacketOutConvertorTest.createNodeConnKey(nodeId, portO);
         NodeConnectorRef egressConfRef = new NodeConnectorRef(
@@ -140,21 +133,15 @@ public class PacketOutConvertorTest {
         NodeConnectorRef ingressConRef = new NodeConnectorRef(
                 createNodeConnRef(nodeId, ingrConKey));
 
-        String string = new String("sendOutputMsg_TEST");
-        byte[] msg = string.getBytes();
-
-        byte[] payload = msg;
-
-        TransmitPacketInputBuilder transmitPacketInputBuilder = new TransmitPacketInputBuilder();
-        transmitPacketInputBuilder.setAction(actionList);
-        transmitPacketInputBuilder.setBufferId(bufferId);
-        transmitPacketInputBuilder.setConnectionCookie(connCook);
-        transmitPacketInputBuilder.setEgress(egressConfRef);
-        transmitPacketInputBuilder.setIngress(ingressConRef);
-        transmitPacketInputBuilder.setNode(ref);
-        transmitPacketInputBuilder.setPayload(payload);
-
-        final TransmitPacketInput transmitPacketInput = transmitPacketInputBuilder.build();
+        final TransmitPacketInput transmitPacketInput = new TransmitPacketInputBuilder()
+            .setAction(BindingMap.of(ab.build()))
+            .setBufferId(bufferId)
+            .setConnectionCookie(connCook)
+            .setEgress(egressConfRef)
+            .setIngress(ingressConRef)
+            .setNode(createNodeRef(nodeId))
+            .setPayload("sendOutputMsg_TEST".getBytes())
+            .build();
 
         Short version = (short) 0x04;
         byte[] datapathIdByte = new byte[Long.BYTES];