Author: robbie
Date: Fri Jul 18 10:41:27 2014
New Revision: 1611583
URL: http://svn.apache.org/r1611583
Log:
NO-JIRA: update tests to handle new behaviour from recent proton-j changes
Modified:
qpid/jms/trunk/src/test/java/org/apache/qpid/jms/BytesMessageIntegrationTest.java
qpid/jms/trunk/src/test/java/org/apache/qpid/jms/ConnectionIntegrationTest.java
qpid/jms/trunk/src/test/java/org/apache/qpid/jms/MapMessageIntegrationTest.java
qpid/jms/trunk/src/test/java/org/apache/qpid/jms/MessageIntegrationTest.java
qpid/jms/trunk/src/test/java/org/apache/qpid/jms/ObjectMessageIntegrationTest.java
qpid/jms/trunk/src/test/java/org/apache/qpid/jms/SenderIntegrationTest.java
qpid/jms/trunk/src/test/java/org/apache/qpid/jms/SessionIntegrationTest.java
qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java
Modified:
qpid/jms/trunk/src/test/java/org/apache/qpid/jms/BytesMessageIntegrationTest.java
URL:
http://svn.apache.org/viewvc/qpid/jms/trunk/src/test/java/org/apache/qpid/jms/BytesMessageIntegrationTest.java?rev=1611583&r1=1611582&r2=1611583&view=diff
==============================================================================
---
qpid/jms/trunk/src/test/java/org/apache/qpid/jms/BytesMessageIntegrationTest.java
(original)
+++
qpid/jms/trunk/src/test/java/org/apache/qpid/jms/BytesMessageIntegrationTest.java
Fri Jul 18 10:41:27 2014
@@ -62,7 +62,7 @@ public class BytesMessageIntegrationTest
try(TestAmqpPeer testPeer = new
TestAmqpPeer(IntegrationTestFixture.PORT);)
{
Connection connection = _testFixture.establishConnecton(testPeer);
- testPeer.expectBegin();
+ testPeer.expectBegin(true);
testPeer.expectSenderAttach();
Session session = connection.createSession(false,
Session.AUTO_ACKNOWLEDGE);
@@ -99,7 +99,7 @@ public class BytesMessageIntegrationTest
Connection connection = _testFixture.establishConnecton(testPeer);
connection.start();
- testPeer.expectBegin();
+ testPeer.expectBegin(true);
Session session = connection.createSession(false,
Session.AUTO_ACKNOWLEDGE);
Queue queue = session.createQueue("myQueue");
@@ -147,7 +147,7 @@ public class BytesMessageIntegrationTest
Connection connection = _testFixture.establishConnecton(testPeer);
connection.start();
- testPeer.expectBegin();
+ testPeer.expectBegin(true);
Session session = connection.createSession(false,
Session.AUTO_ACKNOWLEDGE);
Queue queue = session.createQueue("myQueue");
@@ -256,7 +256,7 @@ public class BytesMessageIntegrationTest
Connection connection = _testFixture.establishConnecton(testPeer);
connection.start();
- testPeer.expectBegin();
+ testPeer.expectBegin(true);
Session session = connection.createSession(false,
Session.AUTO_ACKNOWLEDGE);
Queue queue = session.createQueue("myQueue");
Modified:
qpid/jms/trunk/src/test/java/org/apache/qpid/jms/ConnectionIntegrationTest.java
URL:
http://svn.apache.org/viewvc/qpid/jms/trunk/src/test/java/org/apache/qpid/jms/ConnectionIntegrationTest.java?rev=1611583&r1=1611582&r2=1611583&view=diff
==============================================================================
---
qpid/jms/trunk/src/test/java/org/apache/qpid/jms/ConnectionIntegrationTest.java
(original)
+++
qpid/jms/trunk/src/test/java/org/apache/qpid/jms/ConnectionIntegrationTest.java
Fri Jul 18 10:41:27 2014
@@ -50,7 +50,7 @@ public class ConnectionIntegrationTest e
try(TestAmqpPeer testPeer = new
TestAmqpPeer(IntegrationTestFixture.PORT);)
{
Connection connection = _testFixture.establishConnecton(testPeer);
- testPeer.expectBegin();
+ testPeer.expectBegin(true);
Session session = connection.createSession(false,
Session.AUTO_ACKNOWLEDGE);
assertNotNull("Session should not be null", session);
}
Modified:
qpid/jms/trunk/src/test/java/org/apache/qpid/jms/MapMessageIntegrationTest.java
URL:
http://svn.apache.org/viewvc/qpid/jms/trunk/src/test/java/org/apache/qpid/jms/MapMessageIntegrationTest.java?rev=1611583&r1=1611582&r2=1611583&view=diff
==============================================================================
---
qpid/jms/trunk/src/test/java/org/apache/qpid/jms/MapMessageIntegrationTest.java
(original)
+++
qpid/jms/trunk/src/test/java/org/apache/qpid/jms/MapMessageIntegrationTest.java
Fri Jul 18 10:41:27 2014
@@ -66,7 +66,7 @@ public class MapMessageIntegrationTest e
Connection connection = _testFixture.establishConnecton(testPeer);
connection.start();
- testPeer.expectBegin();
+ testPeer.expectBegin(true);
Session session = connection.createSession(false,
Session.AUTO_ACKNOWLEDGE);
Queue queue = session.createQueue("myQueue");
@@ -190,7 +190,7 @@ index 808d43e..6cdf84c 100644
try(TestAmqpPeer testPeer = new
TestAmqpPeer(IntegrationTestFixture.PORT);)
{
Connection connection = _testFixture.establishConnecton(testPeer);
- testPeer.expectBegin();
+ testPeer.expectBegin(true);
testPeer.expectSenderAttach();
Session session = connection.createSession(false,
Session.AUTO_ACKNOWLEDGE);
Modified:
qpid/jms/trunk/src/test/java/org/apache/qpid/jms/MessageIntegrationTest.java
URL:
http://svn.apache.org/viewvc/qpid/jms/trunk/src/test/java/org/apache/qpid/jms/MessageIntegrationTest.java?rev=1611583&r1=1611582&r2=1611583&view=diff
==============================================================================
---
qpid/jms/trunk/src/test/java/org/apache/qpid/jms/MessageIntegrationTest.java
(original)
+++
qpid/jms/trunk/src/test/java/org/apache/qpid/jms/MessageIntegrationTest.java
Fri Jul 18 10:41:27 2014
@@ -91,7 +91,7 @@ public class MessageIntegrationTest exte
try(TestAmqpPeer testPeer = new
TestAmqpPeer(IntegrationTestFixture.PORT);)
{
Connection connection = _testFixture.establishConnecton(testPeer);
- testPeer.expectBegin();
+ testPeer.expectBegin(true);
testPeer.expectSenderAttach();
Session session = connection.createSession(false,
Session.AUTO_ACKNOWLEDGE);
@@ -149,7 +149,7 @@ public class MessageIntegrationTest exte
Connection connection = _testFixture.establishConnecton(testPeer);
connection.start();
- testPeer.expectBegin();
+ testPeer.expectBegin(true);
Session session = connection.createSession(false,
Session.AUTO_ACKNOWLEDGE);
Queue queue = session.createQueue("myQueue");
@@ -214,7 +214,7 @@ public class MessageIntegrationTest exte
Connection connection = _testFixture.establishConnecton(testPeer);
connection.start();
- testPeer.expectBegin();
+ testPeer.expectBegin(true);
Session session = connection.createSession(false,
Session.AUTO_ACKNOWLEDGE);
Queue queue = session.createQueue("myQueue");
@@ -256,7 +256,7 @@ public class MessageIntegrationTest exte
Connection connection = _testFixture.establishConnecton(testPeer);
connection.start();
- testPeer.expectBegin();
+ testPeer.expectBegin(true);
Session session = connection.createSession(false,
Session.AUTO_ACKNOWLEDGE);
String queueName = "myQueue";
@@ -293,7 +293,7 @@ public class MessageIntegrationTest exte
Connection connection = _testFixture.establishConnecton(testPeer);
connection.start();
- testPeer.expectBegin();
+ testPeer.expectBegin(true);
Session session = connection.createSession(false,
Session.AUTO_ACKNOWLEDGE);
Queue queue = session.createQueue("myQueue");
@@ -335,7 +335,7 @@ public class MessageIntegrationTest exte
Connection connection = _testFixture.establishConnecton(testPeer);
connection.start();
- testPeer.expectBegin();
+ testPeer.expectBegin(true);
Session session = connection.createSession(false,
Session.AUTO_ACKNOWLEDGE);
Queue queue = session.createQueue("myQueue");
@@ -374,7 +374,7 @@ public class MessageIntegrationTest exte
Connection connection = _testFixture.establishConnecton(testPeer);
connection.start();
- testPeer.expectBegin();
+ testPeer.expectBegin(true);
Session session = connection.createSession(false,
Session.AUTO_ACKNOWLEDGE);
Queue queue = session.createQueue("myQueue");
@@ -406,7 +406,7 @@ public class MessageIntegrationTest exte
Connection connection = _testFixture.establishConnecton(testPeer);
connection.start();
- testPeer.expectBegin();
+ testPeer.expectBegin(true);
Session session = connection.createSession(false,
Session.AUTO_ACKNOWLEDGE);
Queue queue = session.createQueue("myQueue");
@@ -438,7 +438,7 @@ public class MessageIntegrationTest exte
Connection connection = _testFixture.establishConnecton(testPeer);
connection.start();
- testPeer.expectBegin();
+ testPeer.expectBegin(true);
Session session = connection.createSession(false,
Session.AUTO_ACKNOWLEDGE);
Queue queue = session.createQueue("myQueue");
@@ -499,7 +499,7 @@ public class MessageIntegrationTest exte
Connection connection = _testFixture.establishConnecton(testPeer);
connection.start();
- testPeer.expectBegin();
+ testPeer.expectBegin(true);
Session session = connection.createSession(false,
Session.AUTO_ACKNOWLEDGE);
Queue queue = session.createQueue("myQueue");
@@ -573,7 +573,7 @@ public class MessageIntegrationTest exte
Connection connection = _testFixture.establishConnecton(testPeer);
connection.start();
- testPeer.expectBegin();
+ testPeer.expectBegin(true);
Session session = connection.createSession(false,
Session.AUTO_ACKNOWLEDGE);
Queue queue = session.createQueue("myQueue");
@@ -685,7 +685,7 @@ public class MessageIntegrationTest exte
try(TestAmqpPeer testPeer = new
TestAmqpPeer(IntegrationTestFixture.PORT);)
{
Connection connection = _testFixture.establishConnecton(testPeer);
- testPeer.expectBegin();
+ testPeer.expectBegin(true);
testPeer.expectSenderAttach();
Session session = connection.createSession(false,
Session.AUTO_ACKNOWLEDGE);
@@ -779,7 +779,7 @@ public class MessageIntegrationTest exte
Connection connection = _testFixture.establishConnecton(testPeer);
connection.start();
- testPeer.expectBegin();
+ testPeer.expectBegin(true);
Session session = connection.createSession(false,
Session.AUTO_ACKNOWLEDGE);
Queue queue = session.createQueue("myQueue");
@@ -864,7 +864,7 @@ public class MessageIntegrationTest exte
Connection connection = _testFixture.establishConnecton(testPeer);
connection.start();
- testPeer.expectBegin();
+ testPeer.expectBegin(true);
Session session = connection.createSession(false,
Session.AUTO_ACKNOWLEDGE);
Queue queue = session.createQueue("myQueue");
@@ -907,7 +907,7 @@ public class MessageIntegrationTest exte
try(TestAmqpPeer testPeer = new
TestAmqpPeer(IntegrationTestFixture.PORT);)
{
Connection connection = _testFixture.establishConnecton(testPeer);
- testPeer.expectBegin();
+ testPeer.expectBegin(true);
testPeer.expectSenderAttach();
Session session = connection.createSession(false,
Session.AUTO_ACKNOWLEDGE);
Modified:
qpid/jms/trunk/src/test/java/org/apache/qpid/jms/ObjectMessageIntegrationTest.java
URL:
http://svn.apache.org/viewvc/qpid/jms/trunk/src/test/java/org/apache/qpid/jms/ObjectMessageIntegrationTest.java?rev=1611583&r1=1611582&r2=1611583&view=diff
==============================================================================
---
qpid/jms/trunk/src/test/java/org/apache/qpid/jms/ObjectMessageIntegrationTest.java
(original)
+++
qpid/jms/trunk/src/test/java/org/apache/qpid/jms/ObjectMessageIntegrationTest.java
Fri Jul 18 10:41:27 2014
@@ -65,7 +65,7 @@ public class ObjectMessageIntegrationTes
try(TestAmqpPeer testPeer = new
TestAmqpPeer(IntegrationTestFixture.PORT);)
{
Connection connection = _testFixture.establishConnecton(testPeer);
- testPeer.expectBegin();
+ testPeer.expectBegin(true);
testPeer.expectSenderAttach();
Session session = connection.createSession(false,
Session.AUTO_ACKNOWLEDGE);
@@ -111,7 +111,7 @@ public class ObjectMessageIntegrationTes
Connection connection = _testFixture.establishConnecton(testPeer);
connection.start();
- testPeer.expectBegin();
+ testPeer.expectBegin(true);
Session session = connection.createSession(false,
Session.AUTO_ACKNOWLEDGE);
Queue queue = session.createQueue("myQueue");
@@ -159,7 +159,7 @@ public class ObjectMessageIntegrationTes
Connection connection = _testFixture.establishConnecton(testPeer);
connection.start();
- testPeer.expectBegin();
+ testPeer.expectBegin(true);
Session session = connection.createSession(false,
Session.AUTO_ACKNOWLEDGE);
Queue queue = session.createQueue("myQueue");
@@ -221,7 +221,7 @@ public class ObjectMessageIntegrationTes
try(TestAmqpPeer testPeer = new
TestAmqpPeer(IntegrationTestFixture.PORT);)
{
Connection connection = _testFixture.establishConnecton(testPeer);
- testPeer.expectBegin();
+ testPeer.expectBegin(true);
testPeer.expectSenderAttach();
Session session = connection.createSession(false,
Session.AUTO_ACKNOWLEDGE);
@@ -263,7 +263,7 @@ public class ObjectMessageIntegrationTes
Connection connection = _testFixture.establishConnecton(testPeer);
connection.start();
- testPeer.expectBegin();
+ testPeer.expectBegin(true);
Session session = connection.createSession(false,
Session.AUTO_ACKNOWLEDGE);
Queue queue = session.createQueue("myQueue");
Modified:
qpid/jms/trunk/src/test/java/org/apache/qpid/jms/SenderIntegrationTest.java
URL:
http://svn.apache.org/viewvc/qpid/jms/trunk/src/test/java/org/apache/qpid/jms/SenderIntegrationTest.java?rev=1611583&r1=1611582&r2=1611583&view=diff
==============================================================================
--- qpid/jms/trunk/src/test/java/org/apache/qpid/jms/SenderIntegrationTest.java
(original)
+++ qpid/jms/trunk/src/test/java/org/apache/qpid/jms/SenderIntegrationTest.java
Fri Jul 18 10:41:27 2014
@@ -58,7 +58,7 @@ public class SenderIntegrationTest exten
try(TestAmqpPeer testPeer = new
TestAmqpPeer(IntegrationTestFixture.PORT);)
{
Connection connection = _testFixture.establishConnecton(testPeer);
- testPeer.expectBegin();
+ testPeer.expectBegin(true);
testPeer.expectSenderAttach();
Session session = connection.createSession(false,
Session.AUTO_ACKNOWLEDGE);
@@ -87,7 +87,7 @@ public class SenderIntegrationTest exten
try(TestAmqpPeer testPeer = new
TestAmqpPeer(IntegrationTestFixture.PORT);)
{
Connection connection = _testFixture.establishConnecton(testPeer);
- testPeer.expectBegin();
+ testPeer.expectBegin(true);
testPeer.expectSenderAttach();
Session session = connection.createSession(false,
Session.AUTO_ACKNOWLEDGE);
@@ -120,7 +120,7 @@ public class SenderIntegrationTest exten
try(TestAmqpPeer testPeer = new
TestAmqpPeer(IntegrationTestFixture.PORT);)
{
Connection connection = _testFixture.establishConnecton(testPeer);
- testPeer.expectBegin();
+ testPeer.expectBegin(true);
testPeer.expectSenderAttach();
Session session = connection.createSession(false,
Session.AUTO_ACKNOWLEDGE);
@@ -151,7 +151,7 @@ public class SenderIntegrationTest exten
try(TestAmqpPeer testPeer = new
TestAmqpPeer(IntegrationTestFixture.PORT);)
{
Connection connection = _testFixture.establishConnecton(testPeer);
- testPeer.expectBegin();
+ testPeer.expectBegin(true);
testPeer.expectSenderAttach();
Session session = connection.createSession(false,
Session.AUTO_ACKNOWLEDGE);
@@ -183,7 +183,7 @@ public class SenderIntegrationTest exten
try(TestAmqpPeer testPeer = new
TestAmqpPeer(IntegrationTestFixture.PORT);)
{
Connection connection = _testFixture.establishConnecton(testPeer);
- testPeer.expectBegin();
+ testPeer.expectBegin(true);
testPeer.expectSenderAttach();
Session session = connection.createSession(false,
Session.AUTO_ACKNOWLEDGE);
@@ -224,7 +224,7 @@ public class SenderIntegrationTest exten
try(TestAmqpPeer testPeer = new
TestAmqpPeer(IntegrationTestFixture.PORT);)
{
Connection connection = _testFixture.establishConnecton(testPeer);
- testPeer.expectBegin();
+ testPeer.expectBegin(true);
testPeer.expectSenderAttach();
Session session = connection.createSession(false,
Session.AUTO_ACKNOWLEDGE);
@@ -259,7 +259,7 @@ public class SenderIntegrationTest exten
try(TestAmqpPeer testPeer = new
TestAmqpPeer(IntegrationTestFixture.PORT);)
{
Connection connection = _testFixture.establishConnecton(testPeer);
- testPeer.expectBegin();
+ testPeer.expectBegin(true);
testPeer.expectSenderAttach();
Session session = connection.createSession(false,
Session.AUTO_ACKNOWLEDGE);
@@ -297,7 +297,7 @@ public class SenderIntegrationTest exten
try(TestAmqpPeer testPeer = new
TestAmqpPeer(IntegrationTestFixture.PORT);)
{
Connection connection = _testFixture.establishConnecton(testPeer);
- testPeer.expectBegin();
+ testPeer.expectBegin(true);
testPeer.expectSenderAttach();
Session session = connection.createSession(false,
Session.AUTO_ACKNOWLEDGE);
Modified:
qpid/jms/trunk/src/test/java/org/apache/qpid/jms/SessionIntegrationTest.java
URL:
http://svn.apache.org/viewvc/qpid/jms/trunk/src/test/java/org/apache/qpid/jms/SessionIntegrationTest.java?rev=1611583&r1=1611582&r2=1611583&view=diff
==============================================================================
---
qpid/jms/trunk/src/test/java/org/apache/qpid/jms/SessionIntegrationTest.java
(original)
+++
qpid/jms/trunk/src/test/java/org/apache/qpid/jms/SessionIntegrationTest.java
Fri Jul 18 10:41:27 2014
@@ -52,7 +52,7 @@ public class SessionIntegrationTest exte
try(TestAmqpPeer testPeer = new
TestAmqpPeer(IntegrationTestFixture.PORT);)
{
Connection connection = _testFixture.establishConnecton(testPeer);
- testPeer.expectBegin();
+ testPeer.expectBegin(true);
Session session = connection.createSession(false,
Session.AUTO_ACKNOWLEDGE);
@@ -71,7 +71,7 @@ public class SessionIntegrationTest exte
Connection connection = _testFixture.establishConnecton(testPeer);
connection.start();
- testPeer.expectBegin();
+ testPeer.expectBegin(true);
Session session = connection.createSession(false,
Session.AUTO_ACKNOWLEDGE);
@@ -93,7 +93,7 @@ public class SessionIntegrationTest exte
try(TestAmqpPeer testPeer = new
TestAmqpPeer(IntegrationTestFixture.PORT);)
{
Connection connection = _testFixture.establishConnecton(testPeer);
- testPeer.expectBegin();
+ testPeer.expectBegin(true);
testPeer.expectSenderAttach();
Session session = connection.createSession(false,
Session.AUTO_ACKNOWLEDGE);
@@ -126,7 +126,7 @@ public class SessionIntegrationTest exte
Connection connection = _testFixture.establishConnecton(testPeer);
connection.start();
- testPeer.expectBegin();
+ testPeer.expectBegin(true);
Session session = connection.createSession(false,
Session.AUTO_ACKNOWLEDGE);
Queue queue = session.createQueue("myQueue");
@@ -154,7 +154,7 @@ public class SessionIntegrationTest exte
try(TestAmqpPeer testPeer = new
TestAmqpPeer(IntegrationTestFixture.PORT);)
{
Connection connection = _testFixture.establishConnecton(testPeer);
- testPeer.expectBegin();
+ testPeer.expectBegin(true);
testPeer.expectSenderAttach();
Session session = connection.createSession(false,
Session.AUTO_ACKNOWLEDGE);
@@ -186,7 +186,7 @@ public class SessionIntegrationTest exte
Connection connection = _testFixture.establishConnecton(testPeer);
connection.start();
- testPeer.expectBegin();
+ testPeer.expectBegin(true);
Session session = connection.createSession(false,
Session.AUTO_ACKNOWLEDGE);
Queue queue = session.createQueue("myQueue");
Modified:
qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java
URL:
http://svn.apache.org/viewvc/qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java?rev=1611583&r1=1611582&r2=1611583&view=diff
==============================================================================
---
qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java
(original)
+++
qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java
Fri Jul 18 10:41:27 2014
@@ -287,7 +287,7 @@ public class TestAmqpPeer implements Aut
null)));
}
- public void expectBegin()
+ public void expectBegin(boolean expectSessionFlow)
{
final BeginMatcher beginMatcher = new BeginMatcher()
.withRemoteChannel(nullValue())
@@ -314,6 +314,11 @@ public class TestAmqpPeer implements Aut
}));
addHandler(beginMatcher);
+
+ if(expectSessionFlow)
+ {
+ expectSessionFlow();
+ }
}
public void expectSenderAttach()
@@ -408,6 +413,15 @@ public class TestAmqpPeer implements Aut
addHandler(attachMatcher);
}
+ public void expectSessionFlow()
+ {
+ final FlowMatcher flowMatcher = new FlowMatcher()
+ .withLinkCredit(Matchers.nullValue())
+ .withHandle(Matchers.nullValue());
+
+ addHandler(flowMatcher);
+ }
+
public void expectLinkFlow()
{
final FlowMatcher flowMatcher = new FlowMatcher()
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
