You are viewing a plain text version of this content. The canonical link for it is here.
Posted to sandesha-dev@ws.apache.org by ch...@apache.org on 2006/04/24 08:52:18 UTC
svn commit: r396457 - in
/webservices/sandesha/trunk/test/src/org/apache/sandesha2: ./ scenarios/
versions/
Author: chamikara
Date: Sun Apr 23 23:52:16 2006
New Revision: 396457
URL: http://svn.apache.org/viewcvs?rev=396457&view=rev
Log:
Fixed a bug in test cases - ServiceClient.finalizeInvoke should be called correctly
Modified:
webservices/sandesha/trunk/test/src/org/apache/sandesha2/MessageRetransmissionTest.java
webservices/sandesha/trunk/test/src/org/apache/sandesha2/SandeshaClientTest.java
webservices/sandesha/trunk/test/src/org/apache/sandesha2/SandeshaReportsTest.java
webservices/sandesha/trunk/test/src/org/apache/sandesha2/SquenceOfferTest.java
webservices/sandesha/trunk/test/src/org/apache/sandesha2/scenarios/AddressableEchoTest.java
webservices/sandesha/trunk/test/src/org/apache/sandesha2/scenarios/AddressablePingTest.java
webservices/sandesha/trunk/test/src/org/apache/sandesha2/scenarios/AnonymousAckEchoTest.java
webservices/sandesha/trunk/test/src/org/apache/sandesha2/scenarios/AnonymousPingTest.java
webservices/sandesha/trunk/test/src/org/apache/sandesha2/versions/AddressingVersionTest.java
webservices/sandesha/trunk/test/src/org/apache/sandesha2/versions/RMVersionTest.java
webservices/sandesha/trunk/test/src/org/apache/sandesha2/versions/SOAPVersionTest.java
Modified: webservices/sandesha/trunk/test/src/org/apache/sandesha2/MessageRetransmissionTest.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/test/src/org/apache/sandesha2/MessageRetransmissionTest.java?rev=396457&r1=396456&r2=396457&view=diff
==============================================================================
--- webservices/sandesha/trunk/test/src/org/apache/sandesha2/MessageRetransmissionTest.java (original)
+++ webservices/sandesha/trunk/test/src/org/apache/sandesha2/MessageRetransmissionTest.java Sun Apr 23 23:52:16 2006
@@ -105,14 +105,13 @@
Thread.sleep(7000);
- serviceClient.finalizeInvoke();
-
SequenceReport sequenceReport = SandeshaClient.getOutgoingSequenceReport(serviceClient);
assertTrue(sequenceReport.getCompletedMessages().contains(new Long(1)));
assertTrue(sequenceReport.getCompletedMessages().contains(new Long(2)));
assertEquals(sequenceReport.getSequenceStatus(),SequenceReport.SEQUENCE_STATUS_TERMINATED);
assertEquals(sequenceReport.getSequenceDirection(),SequenceReport.SEQUENCE_DIRECTION_OUT);
+ serviceClient.finalizeInvoke();
}
private OMElement getPingOMBlock(String text) {
Modified: webservices/sandesha/trunk/test/src/org/apache/sandesha2/SandeshaClientTest.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/test/src/org/apache/sandesha2/SandeshaClientTest.java?rev=396457&r1=396456&r2=396457&view=diff
==============================================================================
--- webservices/sandesha/trunk/test/src/org/apache/sandesha2/SandeshaClientTest.java (original)
+++ webservices/sandesha/trunk/test/src/org/apache/sandesha2/SandeshaClientTest.java Sun Apr 23 23:52:16 2006
@@ -105,6 +105,8 @@
SequenceReport sequenceReport = SandeshaClient.getOutgoingSequenceReport(serviceClient);
assertNotNull(sequenceReport.getSequenceID());
+
+ serviceClient.finalizeInvoke();
}
// public void testCreateSequenceWithoutOffer () {
Modified: webservices/sandesha/trunk/test/src/org/apache/sandesha2/SandeshaReportsTest.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/test/src/org/apache/sandesha2/SandeshaReportsTest.java?rev=396457&r1=396456&r2=396457&view=diff
==============================================================================
--- webservices/sandesha/trunk/test/src/org/apache/sandesha2/SandeshaReportsTest.java (original)
+++ webservices/sandesha/trunk/test/src/org/apache/sandesha2/SandeshaReportsTest.java Sun Apr 23 23:52:16 2006
@@ -130,7 +130,6 @@
Thread.sleep(10000);
- serviceClient.finalizeInvoke();
//testing outgoing sequence reports
SequenceReport sequenceReport = SandeshaClient.getOutgoingSequenceReport(serviceClient);
@@ -150,6 +149,8 @@
assertNotNull(incomingSequenceReport.getInternalSequenceID());
assertEquals(incomingSequenceReport.getSequenceID(),incomingSequenceReport.getInternalSequenceID()); //for the incoming side, internalSequenceID==sequenceID
+
+ serviceClient.finalizeInvoke();
}
public void testRMReport () throws AxisFault,InterruptedException {
@@ -221,6 +222,8 @@
assertEquals(sequence1Report.getSequenceStatus(),SequenceReport.SEQUENCE_STATUS_TERMINATED);
assertEquals(sequence2Report.getSequenceStatus(),SequenceReport.SEQUENCE_STATUS_ESTABLISHED);
+
+ serviceClient.finalizeInvoke();
}
private static OMElement getEchoOMBlock(String text, String sequenceKey) {
Modified: webservices/sandesha/trunk/test/src/org/apache/sandesha2/SquenceOfferTest.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/test/src/org/apache/sandesha2/SquenceOfferTest.java?rev=396457&r1=396456&r2=396457&view=diff
==============================================================================
--- webservices/sandesha/trunk/test/src/org/apache/sandesha2/SquenceOfferTest.java (original)
+++ webservices/sandesha/trunk/test/src/org/apache/sandesha2/SquenceOfferTest.java Sun Apr 23 23:52:16 2006
@@ -129,7 +129,6 @@
Thread.sleep(12000);
- serviceClient.finalizeInvoke();
//assertions for the out sequence.
SequenceReport sequenceReport = SandeshaClient.getOutgoingSequenceReport(serviceClient);
@@ -148,6 +147,8 @@
ArrayList incomingSeqList = rmReport.getIncomingSequenceList();
assertEquals(incomingSeqList.size(),1);
assertEquals(incomingSeqList.get(0),offeredSequenceID);
+
+ serviceClient.finalizeInvoke();
}
private static OMElement getEchoOMBlock(String text, String sequenceKey) {
Modified: webservices/sandesha/trunk/test/src/org/apache/sandesha2/scenarios/AddressableEchoTest.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/test/src/org/apache/sandesha2/scenarios/AddressableEchoTest.java?rev=396457&r1=396456&r2=396457&view=diff
==============================================================================
--- webservices/sandesha/trunk/test/src/org/apache/sandesha2/scenarios/AddressableEchoTest.java (original)
+++ webservices/sandesha/trunk/test/src/org/apache/sandesha2/scenarios/AddressableEchoTest.java Sun Apr 23 23:52:16 2006
@@ -105,7 +105,6 @@
Thread.sleep(12000);
- serviceClient.finalizeInvoke();
//assertions for the out sequence.
SequenceReport sequenceReport = SandeshaClient.getOutgoingSequenceReport(serviceClient);
@@ -118,6 +117,8 @@
assertTrue(callback2.isComplete());
assertEquals(callback1.getResult(),"echo1");
assertEquals(callback2.getResult(),"echo1echo2");
+
+ serviceClient.finalizeInvoke();
}
public void testAsyncEchoWithOffer () throws AxisFault, InterruptedException {
@@ -162,7 +163,6 @@
Thread.sleep(12000);
- serviceClient.finalizeInvoke();
//assertions for the out sequence.
SequenceReport sequenceReport = SandeshaClient.getOutgoingSequenceReport(serviceClient);
@@ -175,6 +175,8 @@
assertTrue(callback2.isComplete());
assertEquals(callback1.getResult(),"echo1");
assertEquals(callback2.getResult(),"echo1echo2");
+
+ serviceClient.finalizeInvoke();
}
private static OMElement getEchoOMBlock(String text, String sequenceKey) {
Modified: webservices/sandesha/trunk/test/src/org/apache/sandesha2/scenarios/AddressablePingTest.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/test/src/org/apache/sandesha2/scenarios/AddressablePingTest.java?rev=396457&r1=396456&r2=396457&view=diff
==============================================================================
--- webservices/sandesha/trunk/test/src/org/apache/sandesha2/scenarios/AddressablePingTest.java (original)
+++ webservices/sandesha/trunk/test/src/org/apache/sandesha2/scenarios/AddressablePingTest.java Sun Apr 23 23:52:16 2006
@@ -119,8 +119,6 @@
} catch (InterruptedException e) {
e.printStackTrace();
}
-
- serviceClient.finalizeInvoke();
SequenceReport sequenceReport = SandeshaClient.getOutgoingSequenceReport(serviceClient);
assertTrue(sequenceReport.getCompletedMessages().contains(new Long(1)));
@@ -128,6 +126,7 @@
assertEquals(sequenceReport.getSequenceStatus(),SequenceReport.SEQUENCE_STATUS_TERMINATED);
assertEquals(sequenceReport.getSequenceDirection(),SequenceReport.SEQUENCE_DIRECTION_OUT);
+ serviceClient.finalizeInvoke();
}
private OMElement getPingOMBlock(String text) {
Modified: webservices/sandesha/trunk/test/src/org/apache/sandesha2/scenarios/AnonymousAckEchoTest.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/test/src/org/apache/sandesha2/scenarios/AnonymousAckEchoTest.java?rev=396457&r1=396456&r2=396457&view=diff
==============================================================================
--- webservices/sandesha/trunk/test/src/org/apache/sandesha2/scenarios/AnonymousAckEchoTest.java (original)
+++ webservices/sandesha/trunk/test/src/org/apache/sandesha2/scenarios/AnonymousAckEchoTest.java Sun Apr 23 23:52:16 2006
@@ -103,7 +103,6 @@
Thread.sleep(10000);
- serviceClient.finalizeInvoke();
//assertions for the out sequence.
SequenceReport sequenceReport = SandeshaClient.getOutgoingSequenceReport(serviceClient);
@@ -113,7 +112,9 @@
assertEquals(sequenceReport.getSequenceDirection(),SequenceReport.SEQUENCE_DIRECTION_OUT);
assertEquals(callback1.getResult(),"echo1");
- assertEquals(callback2.getResult(),"echo1echo2");
+ assertEquals(callback2.getResult(),"echo1echo2");
+
+ serviceClient.finalizeInvoke();
}
private static OMElement getEchoOMBlock(String text, String sequenceKey) {
Modified: webservices/sandesha/trunk/test/src/org/apache/sandesha2/scenarios/AnonymousPingTest.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/test/src/org/apache/sandesha2/scenarios/AnonymousPingTest.java?rev=396457&r1=396456&r2=396457&view=diff
==============================================================================
--- webservices/sandesha/trunk/test/src/org/apache/sandesha2/scenarios/AnonymousPingTest.java (original)
+++ webservices/sandesha/trunk/test/src/org/apache/sandesha2/scenarios/AnonymousPingTest.java Sun Apr 23 23:52:16 2006
@@ -109,15 +109,14 @@
serviceClient.fireAndForget(getPingOMBlock("ping3"));
Thread.sleep(5000);
-
- Thread.sleep(10000);
- serviceClient.finalizeInvoke();
SequenceReport sequenceReport = SandeshaClient.getOutgoingSequenceReport(serviceClient);
assertTrue(sequenceReport.getCompletedMessages().contains(new Long(1)));
assertTrue(sequenceReport.getCompletedMessages().contains(new Long(2)));
assertEquals(sequenceReport.getSequenceStatus(),SequenceReport.SEQUENCE_STATUS_TERMINATED);
assertEquals(sequenceReport.getSequenceDirection(),SequenceReport.SEQUENCE_DIRECTION_OUT);
+
+ serviceClient.finalizeInvoke();
}
private OMElement getPingOMBlock(String text) {
Modified: webservices/sandesha/trunk/test/src/org/apache/sandesha2/versions/AddressingVersionTest.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/test/src/org/apache/sandesha2/versions/AddressingVersionTest.java?rev=396457&r1=396456&r2=396457&view=diff
==============================================================================
--- webservices/sandesha/trunk/test/src/org/apache/sandesha2/versions/AddressingVersionTest.java (original)
+++ webservices/sandesha/trunk/test/src/org/apache/sandesha2/versions/AddressingVersionTest.java Sun Apr 23 23:52:16 2006
@@ -91,13 +91,13 @@
serviceClient.fireAndForget(getPingOMBlock("ping3"));
Thread.sleep(7000);
- serviceClient.finalizeInvoke();
SequenceReport sequenceReport = SandeshaClient.getOutgoingSequenceReport(serviceClient);
assertTrue(sequenceReport.getCompletedMessages().contains(new Long(1)));
assertEquals(sequenceReport.getSequenceStatus(),SequenceReport.SEQUENCE_STATUS_TERMINATED);
assertEquals(sequenceReport.getSequenceDirection(),SequenceReport.SEQUENCE_DIRECTION_OUT);
+ serviceClient.finalizeInvoke();
}
public void testAddressingSubmission () throws AxisFault,InterruptedException {
@@ -132,13 +132,13 @@
serviceClient.fireAndForget(getPingOMBlock("ping3"));
Thread.sleep(7000);
- serviceClient.finalizeInvoke();
SequenceReport sequenceReport = SandeshaClient.getOutgoingSequenceReport(serviceClient);
assertTrue(sequenceReport.getCompletedMessages().contains(new Long(1)));
assertEquals(sequenceReport.getSequenceStatus(),SequenceReport.SEQUENCE_STATUS_TERMINATED);
assertEquals(sequenceReport.getSequenceDirection(),SequenceReport.SEQUENCE_DIRECTION_OUT);
+ serviceClient.finalizeInvoke();
}
private OMElement getPingOMBlock(String text) {
Modified: webservices/sandesha/trunk/test/src/org/apache/sandesha2/versions/RMVersionTest.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/test/src/org/apache/sandesha2/versions/RMVersionTest.java?rev=396457&r1=396456&r2=396457&view=diff
==============================================================================
--- webservices/sandesha/trunk/test/src/org/apache/sandesha2/versions/RMVersionTest.java (original)
+++ webservices/sandesha/trunk/test/src/org/apache/sandesha2/versions/RMVersionTest.java Sun Apr 23 23:52:16 2006
@@ -90,13 +90,13 @@
serviceClient.fireAndForget(getPingOMBlock("ping3"));
Thread.sleep(5000);
- serviceClient.finalizeInvoke();
SequenceReport sequenceReport = SandeshaClient.getOutgoingSequenceReport(serviceClient);
assertTrue(sequenceReport.getCompletedMessages().contains(new Long(1)));
assertEquals(sequenceReport.getSequenceStatus(),SequenceReport.SEQUENCE_STATUS_TERMINATED);
assertEquals(sequenceReport.getSequenceDirection(),SequenceReport.SEQUENCE_DIRECTION_OUT);
+ serviceClient.finalizeInvoke();
}
public void testRMOASIS () throws AxisFault,InterruptedException {
@@ -131,13 +131,13 @@
serviceClient.fireAndForget(getPingOMBlock("ping3"));
Thread.sleep(5000);
- serviceClient.finalizeInvoke();
SequenceReport sequenceReport = SandeshaClient.getOutgoingSequenceReport(serviceClient);
assertTrue(sequenceReport.getCompletedMessages().contains(new Long(1)));
assertEquals(sequenceReport.getSequenceStatus(),SequenceReport.SEQUENCE_STATUS_TERMINATED);
assertEquals(sequenceReport.getSequenceDirection(),SequenceReport.SEQUENCE_DIRECTION_OUT);
+ serviceClient.finalizeInvoke();
}
private OMElement getPingOMBlock(String text) {
Modified: webservices/sandesha/trunk/test/src/org/apache/sandesha2/versions/SOAPVersionTest.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/test/src/org/apache/sandesha2/versions/SOAPVersionTest.java?rev=396457&r1=396456&r2=396457&view=diff
==============================================================================
--- webservices/sandesha/trunk/test/src/org/apache/sandesha2/versions/SOAPVersionTest.java (original)
+++ webservices/sandesha/trunk/test/src/org/apache/sandesha2/versions/SOAPVersionTest.java Sun Apr 23 23:52:16 2006
@@ -89,13 +89,13 @@
serviceClient.fireAndForget(getPingOMBlock("ping3"));
Thread.sleep(5000);
- serviceClient.finalizeInvoke();
SequenceReport sequenceReport = SandeshaClient.getOutgoingSequenceReport(serviceClient);
assertTrue(sequenceReport.getCompletedMessages().contains(new Long(1)));
assertEquals(sequenceReport.getSequenceStatus(),SequenceReport.SEQUENCE_STATUS_TERMINATED);
assertEquals(sequenceReport.getSequenceDirection(),SequenceReport.SEQUENCE_DIRECTION_OUT);
+ serviceClient.finalizeInvoke();
}
public void testSOAP12 () throws AxisFault,InterruptedException {
@@ -129,13 +129,13 @@
serviceClient.fireAndForget(getPingOMBlock("ping3"));
Thread.sleep(5000);
- serviceClient.finalizeInvoke();
SequenceReport sequenceReport = SandeshaClient.getOutgoingSequenceReport(serviceClient);
assertTrue(sequenceReport.getCompletedMessages().contains(new Long(1)));
assertEquals(sequenceReport.getSequenceStatus(),SequenceReport.SEQUENCE_STATUS_TERMINATED);
assertEquals(sequenceReport.getSequenceDirection(),SequenceReport.SEQUENCE_DIRECTION_OUT);
+ serviceClient.finalizeInvoke();
}
private OMElement getPingOMBlock(String text) {
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org