qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rob...@apache.org
Subject [1/3] qpid-jms git commit: update initial IDs used for next incoming/outgoing transfer to match what we actually use
Date Fri, 05 Dec 2014 14:49:31 GMT
Repository: qpid-jms
Updated Branches:
  refs/heads/master 090286dc1 -> 7c8f8e1cb


update initial IDs used for next incoming/outgoing transfer to match what we actually use


Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/f994b354
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/f994b354
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/f994b354

Branch: refs/heads/master
Commit: f994b35439d17d315d2f3022119d9e5148af20fa
Parents: 090286d
Author: Robert Gemmell <robbie@apache.org>
Authored: Fri Dec 5 11:23:21 2014 +0000
Committer: Robert Gemmell <robbie@apache.org>
Committed: Fri Dec 5 14:48:34 2014 +0000

----------------------------------------------------------------------
 .../apache/qpid/jms/test/testpeer/TestAmqpPeer.java   | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/f994b354/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java
b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java
index b7ccfa9..e252345 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java
@@ -373,13 +373,13 @@ public class TestAmqpPeer implements AutoCloseable
     {
         final BeginMatcher beginMatcher = new BeginMatcher()
                 .withRemoteChannel(nullValue())
-                .withNextOutgoingId(notNullValue())
+                .withNextOutgoingId(equalTo(UnsignedInteger.ONE))
                 .withIncomingWindow(notNullValue())
                 .withOutgoingWindow(notNullValue());
 
         // The response will have its remoteChannel field dynamically set based on incoming
value
         final BeginFrame beginResponse = new BeginFrame()
-            .setNextOutgoingId(UnsignedInteger.ZERO)
+            .setNextOutgoingId(UnsignedInteger.ONE)
             .setIncomingWindow(UnsignedInteger.ZERO)
             .setOutgoingWindow(UnsignedInteger.ZERO);
 
@@ -468,9 +468,9 @@ public class TestAmqpPeer implements AutoCloseable
             }
         });
 
-        final FlowFrame flowFrame = new FlowFrame().setNextIncomingId(UnsignedInteger.ZERO)
+        final FlowFrame flowFrame = new FlowFrame().setNextIncomingId(UnsignedInteger.ONE)
 //TODO: shouldnt be hard coded
                 .setIncomingWindow(UnsignedInteger.valueOf(2048))
-                .setNextOutgoingId(UnsignedInteger.ZERO)
+                .setNextOutgoingId(UnsignedInteger.ONE) //TODO: shouldnt be hard coded
                 .setOutgoingWindow(UnsignedInteger.valueOf(2048))
                 .setLinkCredit(UnsignedInteger.valueOf(100))
                 .setHandle(linkHandle);
@@ -548,9 +548,9 @@ public class TestAmqpPeer implements AutoCloseable
             attachResponseSender.setDeferWrite(true);
         }
 
-        final FlowFrame flowFrame = new FlowFrame().setNextIncomingId(UnsignedInteger.ZERO)
+        final FlowFrame flowFrame = new FlowFrame().setNextIncomingId(UnsignedInteger.ONE)
//TODO: shouldnt be hard coded
                 .setIncomingWindow(UnsignedInteger.valueOf(2048))
-                .setNextOutgoingId(UnsignedInteger.ZERO)
+                .setNextOutgoingId(UnsignedInteger.ONE) //TODO: shouldnt be hard coded
                 .setOutgoingWindow(UnsignedInteger.valueOf(2048))
                 .setLinkCredit(UnsignedInteger.valueOf(100))
                 .setHandle(linkHandle);
@@ -728,7 +728,7 @@ public class TestAmqpPeer implements AutoCloseable
             throw new IllegalArgumentException("Message count must be >= 1");
         }
 
-        int nextIncomingId = 0; // TODO: we shouldn't assume this will be the first transfer
on the session
+        int nextIncomingId = 1; // TODO: we shouldn't assume this will be the first transfer
on the session
 
         final FlowMatcher flowMatcher = new FlowMatcher()
                         .withLinkCredit(Matchers.greaterThanOrEqualTo(UnsignedInteger.valueOf(count)))


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message