QPID-8349: [Tests][AMQP 1.0] Add methods to set delivery id from internal counter
diff --git a/systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/Interaction.java b/systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/Interaction.java
index 4df4db0..98ffe45 100644
--- a/systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/Interaction.java
+++ b/systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/Interaction.java
@@ -159,7 +159,7 @@
         _transfer = new Transfer();
         _transfer.setHandle(defaultLinkHandle);
         _transfer.setDeliveryTag(new Binary("testDeliveryTag".getBytes(StandardCharsets.UTF_8)));
-        _transfer.setDeliveryId(getNextDeliveryId());
+        _transfer.setDeliveryId(UnsignedInteger.valueOf(_deliveryIdCounter));
 
         _disposition = new Disposition();
         _disposition.setFirst(UnsignedInteger.ZERO);
@@ -671,6 +671,12 @@
         return this;
     }
 
+    public Interaction flowNextOutgoingId()
+    {
+        _flow.setNextOutgoingId(UnsignedInteger.valueOf(_deliveryIdCounter));
+        return this;
+    }
+
     public Interaction flowEcho(final Boolean echo)
     {
         _flow.setEcho(echo);
@@ -761,6 +767,12 @@
         return this;
     }
 
+    public Interaction transferDeliveryId()
+    {
+        _transfer.setDeliveryId(getNextDeliveryId());
+        return this;
+    }
+
     public Interaction transferDeliveryTag(final Binary deliveryTag)
     {
         _transfer.setDeliveryTag(deliveryTag);