Author: ruwan
Date: Wed Oct 10 21:45:43 2007
New Revision: 583679
URL: http://svn.apache.org/viewvc?rev=583679&view=rev
Log:
Fixing the clone and iterate mediator test according to the non-blocking
behavious
Modified:
webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/eip/CloneMediatorTest.java
webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/eip/IterateMediatorTest.java
Modified:
webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/eip/CloneMediatorTest.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/eip/CloneMediatorTest.java?rev=583679&r1=583678&r2=583679&view=diff
==============================================================================
---
webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/eip/CloneMediatorTest.java
(original)
+++
webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/eip/CloneMediatorTest.java
Wed Oct 10 21:45:43 2007
@@ -46,10 +46,14 @@
clone.mediate(testCtx);
Thread.sleep(1000);
MessageContext mediatedCtx = helperMediator.getMediatedContext(0);
- assertEquals(mediatedCtx.getSoapAction(), "urn:clone");
+ String formerSAction = mediatedCtx.getSoapAction();
mediatedCtx = helperMediator.getMediatedContext(1);
- assertEquals(mediatedCtx.getSoapAction(), "urn:test");
- assertEquals(mediatedCtx.getTo().getAddress(), "http://test";);
+ if ("urn:clone".equals(formerSAction)) {
+ assertEquals(mediatedCtx.getSoapAction(), "urn:test");
+ assertEquals(mediatedCtx.getTo().getAddress(), "http://test";);
+ } else {
+ assertEquals(mediatedCtx.getSoapAction(), "urn:clone");
+ }
}
public void testClonningWithContinueParent() throws Exception {
@@ -58,13 +62,17 @@
"sequence=\"seqRef\"/><target
to=\"http://test\";><sequence><sequence " +
"key=\"seqRef\"/></sequence></target></clone>"));
assertTrue(clone.mediate(testCtx));
- Thread.sleep(1000);
+ Thread.sleep(1000);
MessageContext mediatedCtx = helperMediator.getMediatedContext(0);
assertTrue(mediatedCtx.getEnvelope().getBody().getFirstElement() ==
null);
- assertEquals(mediatedCtx.getSoapAction(), "urn:clone");
+ String formerSAction = mediatedCtx.getSoapAction();
mediatedCtx = helperMediator.getMediatedContext(1);
- assertEquals(mediatedCtx.getSoapAction(), "urn:test");
- assertEquals(mediatedCtx.getTo().getAddress(), "http://test";);
+ if ("urn:clone".equals(formerSAction)) {
+ assertEquals(mediatedCtx.getSoapAction(), "urn:test");
+ assertEquals(mediatedCtx.getTo().getAddress(), "http://test";);
+ } else {
+ assertEquals(mediatedCtx.getSoapAction(), "urn:clone");
+ }
assertEquals(testCtx.getSoapAction(), "urn:test");
assertTrue(testCtx.getEnvelope().getBody().getFirstElement() != null);
assertEquals(testCtx.getTo(), null);
Modified:
webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/eip/IterateMediatorTest.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/eip/IterateMediatorTest.java?rev=583679&r1=583678&r2=583679&view=diff
==============================================================================
---
webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/eip/IterateMediatorTest.java
(original)
+++
webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/eip/IterateMediatorTest.java
Wed Oct 10 21:45:43 2007
@@ -24,9 +24,10 @@
import org.apache.synapse.MessageContext;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.om.OMAbstractFactory;
+import org.apache.axiom.om.OMElement;
/**
- *
+ *
*/
public class IterateMediatorTest extends AbstractSplitMediatorTestCase {
@@ -34,8 +35,7 @@
super.setUp();
SOAPEnvelope envelope =
OMAbstractFactory.getSOAP11Factory().getDefaultEnvelope();
envelope.getBody().addChild(createOMElement("<original>" +
- "<itr>test-split-context-itr1-body</itr>" +
- "<itr>test-split-context-itr2-body</itr>" +
+ "<itr>test-split-context-itr1-body</itr>" +
"<itr>test-split-context-itr2-body</itr>" +
"</original>"));
testCtx.setEnvelope(envelope);
fac = new IterateMediatorFactory();
@@ -51,13 +51,16 @@
"expression=\"//original/itr\"
xmlns=\"http://ws.apache.org/ns/synapse\";>" +
"<target soapAction=\"urn:iterate\"
sequence=\"seqRef\"/></iterate>"));
iterate.mediate(testCtx);
- Thread.sleep(1000);
+ Thread.sleep(1000);
MessageContext mediatedCtx = helperMediator.getMediatedContext(0);
assertEquals(mediatedCtx.getSoapAction(), "urn:iterate");
+ OMElement formerBody =
mediatedCtx.getEnvelope().getBody().getFirstElement();
mediatedCtx = helperMediator.getMediatedContext(1);
assertEquals(mediatedCtx.getSoapAction(), "urn:iterate");
- assertEquals(mediatedCtx.getEnvelope()
- .getBody().getFirstElement().getText(),
"test-split-context-itr2-body");
+ if (formerBody == null) {
+ assertEquals(mediatedCtx.getEnvelope()
+ .getBody().getFirstElement().getText(),
"test-split-context-itr2-body");
+ }
}
public void testIterationWithPreservePayload() throws Exception {
@@ -66,12 +69,15 @@
"xmlns=\"http://ws.apache.org/ns/synapse\";><target
soapAction=\"urn:iterate\" " +
"sequence=\"seqRef\"/></iterate>"));
iterate.mediate(testCtx);
- Thread.sleep(1000);
+ Thread.sleep(1000);
MessageContext mediatedCtx = helperMediator.getMediatedContext(0);
assertEquals(mediatedCtx.getSoapAction(), "urn:iterate");
+ OMElement formerBody =
mediatedCtx.getEnvelope().getBody().getFirstElement();
mediatedCtx = helperMediator.getMediatedContext(1);
assertEquals(mediatedCtx.getSoapAction(), "urn:iterate");
- assertEquals(mediatedCtx.getEnvelope().getBody()
- .getFirstElement().getFirstElement().getText(),
"test-split-context-itr2-body");
+ if (formerBody == null) {
+ assertEquals(mediatedCtx.getEnvelope().getBody()
+ .getFirstElement().getFirstElement().getText(),
"test-split-context-itr2-body");
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
