Author: chamikara
Date: Sun Apr 22 09:52:35 2007
New Revision: 531228
URL: http://svn.apache.org/viewvc?view=rev&rev=531228
Log:
Some changes to the RMScenarioTest - Omited the checking of the termination of
the response message in WSRM 1.0 sync
InOut case. Since we terminate with the SandeshaClient.terminateSequence
method, we send the Empty Body Last Message
but still the server has not corrected to respond with a LastMessage.
Modified:
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/scenarios/RMScenariosTest.java
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/scenarios/SerializableScenariosTest.java
Modified:
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/scenarios/RMScenariosTest.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/scenarios/RMScenariosTest.java?view=diff&rev=531228&r1=531227&r2=531228
==============================================================================
---
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/scenarios/RMScenariosTest.java
(original)
+++
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/scenarios/RMScenariosTest.java
Sun Apr 22 09:52:35 2007
@@ -36,13 +36,14 @@
import org.apache.sandesha2.client.SandeshaClientConstants;
import org.apache.sandesha2.client.SequenceReport;
import org.apache.sandesha2.util.SandeshaUtil;
+import org.apache.sandesha2.versions.RMVersionTest;
public class RMScenariosTest extends SandeshaTestCase {
private static boolean serverStarted = false;
private static ConfigurationContext configContext = null;
- protected String to = "http://127.0.0.1:"; + serverPort +
"/axis2/services/RMSampleService";
+ protected String to = "http://127.0.0.1:"; + 8070 +
"/axis2/services/RMSampleService";
protected String repoPath = "target" + File.separator + "repos" +
File.separator + "server";
protected String axis2_xml = "target" + File.separator + "repos" +
File.separator + "server" + File.separator + "server_axis2.xml";
@@ -86,16 +87,16 @@
public void testAsyncEcho() throws Exception {
// Test async echo with sync acks
Options clientOptions = new Options();
- runEcho(clientOptions, true, false, false);
+ runEcho(clientOptions, true, false, false,true);
// Test async echo with async acks
clientOptions = new Options();
- runEcho(clientOptions, true, true, false);
+ runEcho(clientOptions, true, true, false,true);
// Test async echo with async acks and offer
clientOptions = new Options();
clientOptions.setProperty(SandeshaClientConstants.OFFERED_SEQUENCE_ID,SandeshaUtil.getUUID());
- runEcho(clientOptions, true, true, false);
+ runEcho(clientOptions, true, true, false,true);
}
public void testSyncEcho() throws Exception {
@@ -103,17 +104,17 @@
Options clientOptions = new Options();
clientOptions.setProperty(SandeshaClientConstants.OFFERED_SEQUENCE_ID,SandeshaUtil.getUUID());
clientOptions.setProperty(SandeshaClientConstants.RM_SPEC_VERSION,Sandesha2Constants.SPEC_VERSIONS.v1_1);
- runEcho(clientOptions, false, false, false);
+ runEcho(clientOptions, false, false, true,true);
- // Test sync echo with an offer, and the 1.0 spec. In this case
the offer is automatic
+// // Test sync echo with an offer, and the 1.0 spec. In this case
the offer is automatic
clientOptions = new Options();
clientOptions.setProperty(SandeshaClientConstants.RM_SPEC_VERSION,Sandesha2Constants.SPEC_VERSIONS.v1_0);
- runEcho(clientOptions, false, false, true);
-
- // Test sync echo with no offer, and the 1.1 spec
+ runEcho(clientOptions, false, false, true,false);
+//
+// // Test sync echo with no offer, and the 1.1 spec
clientOptions = new Options();
clientOptions.setProperty(SandeshaClientConstants.RM_SPEC_VERSION,Sandesha2Constants.SPEC_VERSIONS.v1_1);
- runEcho(clientOptions, false, false, false);
+ runEcho(clientOptions, false, false, true,true);
}
public void runPing(boolean asyncAcks) throws Exception {
@@ -164,7 +165,7 @@
serviceClient.cleanup();
}
- public void runEcho(Options clientOptions, boolean asyncReply, boolean
asyncAcks, boolean explicitTermination) throws Exception {
+ public void runEcho(Options clientOptions, boolean asyncReply, boolean
asyncAcks, boolean explicitTermination, boolean checkInboundTermination) throws
Exception {
String sequenceKey = SandeshaUtil.getUUID();
@@ -196,12 +197,6 @@
clientOptions.setProperty(SandeshaClientConstants.AcksTo,acksTo);
}
- if (explicitTermination) {
-
clientOptions.setProperty(SandeshaClientConstants.AVOID_AUTO_TERMINATION,
Boolean.TRUE);
- } else {
-
clientOptions.setProperty(SandeshaClientConstants.AVOID_AUTO_TERMINATION,
Boolean.FALSE);
- }
-
// Establish a baseline count for inbound sequences
ArrayList oldIncomingReports =
SandeshaClient.getIncomingSequenceReports(configContext);
@@ -211,8 +206,14 @@
TestCallback callback2 = new TestCallback ("Callback 2");
serviceClient.sendReceiveNonBlocking
(getEchoOMBlock("echo2",sequenceKey),callback2);
- TestCallback callback3 = new TestCallback ("Callback 3");
- clientOptions.setProperty(SandeshaClientConstants.LAST_MESSAGE,
"true");
+ if (!explicitTermination
+ &&
+
!Sandesha2Constants.SPEC_VERSIONS.v1_1.equals(clientOptions.getProperty(SandeshaClientConstants.RM_SPEC_VERSION)))
{
+
+
clientOptions.setProperty(SandeshaClientConstants.LAST_MESSAGE, "true");
+ }
+
+ TestCallback callback3 = new TestCallback ("Callback 3");
serviceClient.sendReceiveNonBlocking
(getEchoOMBlock("echo3",sequenceKey),callback3);
if (explicitTermination) {
@@ -230,7 +231,6 @@
//assertions for the out sequence.
SequenceReport outgoingSequenceReport =
SandeshaClient.getOutgoingSequenceReport(serviceClient);
System.out.println("Checking Outbound Sequence:
" + outgoingSequenceReport.getSequenceID());
- assertEquals ("Outbound message count", 3,
outgoingSequenceReport.getCompletedMessages().size());
assertTrue("Outbound message #1",
outgoingSequenceReport.getCompletedMessages().contains(new Long(1)));
assertTrue("Outbound message #2",
outgoingSequenceReport.getCompletedMessages().contains(new Long(2)));
assertTrue("Outbound message #3",
outgoingSequenceReport.getCompletedMessages().contains(new Long(3)));
@@ -248,7 +248,10 @@
assertTrue("Inbound message #1",
incomingSequenceReport.getCompletedMessages().contains(new Long(1)));
assertTrue("Inbound message #2",
incomingSequenceReport.getCompletedMessages().contains(new Long(2)));
assertTrue("Inbound message #3",
incomingSequenceReport.getCompletedMessages().contains(new Long(3)));
- assertEquals("Inbound sequence status:
TERMINATED", SequenceReport.SEQUENCE_STATUS_TERMINATED,
incomingSequenceReport.getSequenceStatus());
+
+ if (checkInboundTermination)
+ assertEquals("Inbound sequence status:
TERMINATED", SequenceReport.SEQUENCE_STATUS_TERMINATED,
incomingSequenceReport.getSequenceStatus());
+
assertEquals("Inbound sequence direction: IN",
SequenceReport.SEQUENCE_DIRECTION_IN,
incomingSequenceReport.getSequenceDirection());
assertTrue("Callback #1",
callback1.isComplete());
Modified:
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/scenarios/SerializableScenariosTest.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/scenarios/SerializableScenariosTest.java?view=diff&rev=531228&r1=531227&r2=531228
==============================================================================
---
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/scenarios/SerializableScenariosTest.java
(original)
+++
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/scenarios/SerializableScenariosTest.java
Sun Apr 22 09:52:35 2007
@@ -40,6 +40,6 @@
Boolean.TRUE.toString());
// Run the echo test
- runEcho(clientOptions, true, true, false);
+ runEcho(clientOptions, true, true, false, true);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
