Author: ruwan
Date: Mon Oct 29 06:06:51 2007
New Revision: 589613
URL: http://svn.apache.org/viewvc?rev=589613&view=rev
Log:
Fixing the clone and the iterate mediator tests
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
webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/eip/SplitTestHelperMediator.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=589613&r1=589612&r2=589613&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
Mon Oct 29 06:06:51 2007
@@ -44,7 +44,9 @@
"sequence=\"seqRef\"/><target
to=\"http://test\";><sequence><sequence " +
"key=\"seqRef\"/></sequence></target></clone>"));
clone.mediate(testCtx);
- Thread.sleep(1000);
+ while(helperMediator.getMediatedContext(1) == null) {
+ Thread.sleep(100);
+ }
MessageContext mediatedCtx = helperMediator.getMediatedContext(0);
String formerSAction = mediatedCtx.getSoapAction();
mediatedCtx = helperMediator.getMediatedContext(1);
@@ -62,7 +64,9 @@
"sequence=\"seqRef\"/><target
to=\"http://test\";><sequence><sequence " +
"key=\"seqRef\"/></sequence></target></clone>"));
assertTrue(clone.mediate(testCtx));
- Thread.sleep(1000);
+ while(helperMediator.getMediatedContext(1) == null) {
+ Thread.sleep(100);
+ }
MessageContext mediatedCtx = helperMediator.getMediatedContext(0);
assertTrue(mediatedCtx.getEnvelope().getBody().getFirstElement() ==
null);
String formerSAction = mediatedCtx.getSoapAction();
@@ -74,7 +78,6 @@
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=589613&r1=589612&r2=589613&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
Mon Oct 29 06:06:51 2007
@@ -50,8 +50,11 @@
Mediator iterate = fac.createMediator(createOMElement("<iterate " +
"expression=\"//original/itr\"
xmlns=\"http://ws.apache.org/ns/synapse\";>" +
"<target soapAction=\"urn:iterate\"
sequence=\"seqRef\"/></iterate>"));
+ helperMediator.clearMediatedContexts();
iterate.mediate(testCtx);
- Thread.sleep(2000);
+ while(helperMediator.getMediatedContext(1) == null) {
+ Thread.sleep(100);
+ }
MessageContext mediatedCtx = helperMediator.getMediatedContext(0);
assertEquals(mediatedCtx.getSoapAction(), "urn:iterate");
OMElement formerBody =
mediatedCtx.getEnvelope().getBody().getFirstElement();
@@ -59,7 +62,7 @@
assertEquals(mediatedCtx.getSoapAction(), "urn:iterate");
if (formerBody == null) {
assertEquals(mediatedCtx.getEnvelope()
- .getBody().getFirstElement().getText(),
"test-split-context-itr2-body");
+ .getBody().getFirstElement().getText(),
helperMediator.getCheckString());
}
}
@@ -69,7 +72,9 @@
"xmlns=\"http://ws.apache.org/ns/synapse\";><target
soapAction=\"urn:iterate\" " +
"sequence=\"seqRef\"/></iterate>"));
iterate.mediate(testCtx);
- Thread.sleep(2000);
+ while(helperMediator.getMediatedContext(1) == null) {
+ Thread.sleep(100);
+ }
MessageContext mediatedCtx = helperMediator.getMediatedContext(0);
assertEquals(mediatedCtx.getSoapAction(), "urn:iterate");
OMElement formerBody =
mediatedCtx.getEnvelope().getBody().getFirstElement();
@@ -77,7 +82,7 @@
assertEquals(mediatedCtx.getSoapAction(), "urn:iterate");
if (formerBody == null) {
assertEquals(mediatedCtx.getEnvelope().getBody()
- .getFirstElement().getFirstElement().getText(),
"test-split-context-itr2-body");
+ .getFirstElement().getFirstElement().getText(),
helperMediator.getCheckString());
}
}
}
Modified:
webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/eip/SplitTestHelperMediator.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/eip/SplitTestHelperMediator.java?rev=589613&r1=589612&r2=589613&view=diff
==============================================================================
---
webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/eip/SplitTestHelperMediator.java
(original)
+++
webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/eip/SplitTestHelperMediator.java
Mon Oct 29 06:06:51 2007
@@ -19,18 +19,26 @@
private List mediatedContext = new ArrayList();
int msgcount;
+ String checkString;
public boolean mediate(MessageContext synCtx) {
- if (msgcount == 0) {
- SOAPEnvelope envelope =
OMAbstractFactory.getSOAP11Factory().getDefaultEnvelope();
- try {
- synCtx.setEnvelope(envelope);
- } catch (AxisFault ignore) {
+ synchronized(this) {
+ if (msgcount == 0) {
+ SOAPEnvelope envelope =
OMAbstractFactory.getSOAP11Factory().getDefaultEnvelope();
+ try {
+ synCtx.setEnvelope(envelope);
+ } catch (AxisFault ignore) {
+ }
+ } else {
+ checkString =
synCtx.getEnvelope().getBody().getFirstElement().getText();
+ if ("".equals(checkString)) {
+ checkString =
synCtx.getEnvelope().getBody().getFirstElement().getFirstElement().getText();
+ }
}
+ mediatedContext.add(synCtx);
+ msgcount++;
+ return false;
}
- mediatedContext.add(synCtx);
- msgcount++;
- return false;
}
public MessageContext getMediatedContext(int position) {
@@ -43,6 +51,11 @@
public void clearMediatedContexts() {
mediatedContext.clear();
+ msgcount = 0;
+ }
+
+ public String getCheckString() {
+ return checkString;
}
public void init(SynapseEnvironment se) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
