You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@synapse.apache.org by hi...@apache.org on 2011/12/08 09:45:51 UTC
svn commit: r1211785 - in
/synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework:
./ clients/ tests/endpoint/ tests/message/
Author: hiranya
Date: Thu Dec 8 08:45:50 2011
New Revision: 1211785
URL: http://svn.apache.org/viewvc?rev=1211785&view=rev
Log:
Fixing some thread issues and minor refactoring
Modified:
synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/SampleClientResult.java
synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/SynapseTestCase.java
synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/clients/EventSampleClient.java
synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/clients/MTOMSwASampleClient.java
synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/clients/StockQuoteSampleClient.java
synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/endpoint/Sample50.java
synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/endpoint/Sample51.java
synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/endpoint/Sample52.java
synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/endpoint/Sample53.java
synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/endpoint/Sample54.java
synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/endpoint/Sample55.java
synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/endpoint/Sample56.java
synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/endpoint/Sample57.java
synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/endpoint/Sample58.java
synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/endpoint/Sample59.java
synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/message/Sample0.java
synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/message/Sample1.java
synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/message/Sample10.java
synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/message/Sample11.java
synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/message/Sample12.java
synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/message/Sample13.java
synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/message/Sample15.java
synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/message/Sample16.java
synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/message/Sample2.java
synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/message/Sample3.java
synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/message/Sample4.java
synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/message/Sample5.java
synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/message/Sample6.java
synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/message/Sample7.java
synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/message/Sample8.java
synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/message/Sample9.java
Modified: synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/SampleClientResult.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/SampleClientResult.java?rev=1211785&r1=1211784&r2=1211785&view=diff
==============================================================================
--- synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/SampleClientResult.java (original)
+++ synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/SampleClientResult.java Thu Dec 8 08:45:50 2011
@@ -25,21 +25,21 @@ import java.util.Properties;
*/
public class SampleClientResult {
- private boolean gotResponse;
+ private boolean responseReceived;
private boolean isFinished;
private Exception exception;
private Properties clientProperties = new Properties();
- public void setGotResponse(boolean gotResponse) {
- this.gotResponse = gotResponse;
+ public void setResponseReceived(boolean responseReceived) {
+ this.responseReceived = responseReceived;
}
public void setException(Exception exception) {
this.exception = exception;
}
- public boolean gotResponse() {
- return gotResponse;
+ public boolean responseReceived() {
+ return responseReceived;
}
public Exception getException() {
Modified: synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/SynapseTestCase.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/SynapseTestCase.java?rev=1211785&r1=1211784&r2=1211785&view=diff
==============================================================================
--- synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/SynapseTestCase.java (original)
+++ synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/SynapseTestCase.java Thu Dec 8 08:45:50 2011
@@ -488,4 +488,8 @@ public abstract class SynapseTestCase ex
public MTOMSwASampleClient getMTOMSwASampleClient() {
return new MTOMSwASampleClient(configuration.getClientConfig());
}
+
+ protected void assertResponseReceived(SampleClientResult result) {
+ assertTrue("Client did not receive the expected response", result.responseReceived());
+ }
}
\ No newline at end of file
Modified: synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/clients/EventSampleClient.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/clients/EventSampleClient.java?rev=1211785&r1=1211784&r2=1211785&view=diff
==============================================================================
--- synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/clients/EventSampleClient.java (original)
+++ synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/clients/EventSampleClient.java Thu Dec 8 08:45:50 2011
@@ -68,7 +68,7 @@ public class EventSampleClient {
private void initializeClient(String addUrl) throws Exception {
options = new Options();
clientResult = new SampleClientResult();
- clientResult.setGotResponse(false);
+ clientResult.setResponseReceived(false);
ConfigurationContext configContext;
configContext = ConfigurationContextFactory.
@@ -141,10 +141,10 @@ public class EventSampleClient {
new QName(eventingNamespace.getNamespaceURI(), "Identifier")).getText();
log.info("Subscription identifier: " + subId);
clientResult.addProperty("subId", subId);
- clientResult.setGotResponse(true);
+ clientResult.setResponseReceived(true);
} catch (Exception e) {
log.error("Fault Received : " + e.toString(), e);
- clientResult.setGotResponse(false);
+ clientResult.setResponseReceived(false);
clientResult.setException(e);
}
deInitializeClient();
@@ -195,10 +195,10 @@ public class EventSampleClient {
log.info("UnSubscribed to ID " + identifier);
Thread.sleep(1000);
log.info("UnSubscribe Response Received: " + response.toString());
- clientResult.setGotResponse(true);
+ clientResult.setResponseReceived(true);
} catch (Exception e) {
log.error("Fault Received : " + e.toString(), e);
- clientResult.setGotResponse(false);
+ clientResult.setResponseReceived(false);
clientResult.setException(e);
}
deInitializeClient();
@@ -258,10 +258,10 @@ public class EventSampleClient {
}
log.info("SynapseSubscription Renew Response Received: " + response.toString());
- clientResult.setGotResponse(true);
+ clientResult.setResponseReceived(true);
} catch (Exception e) {
log.error("Fault Received : " + e.toString(), e);
- clientResult.setGotResponse(false);
+ clientResult.setResponseReceived(false);
clientResult.setException(e);
}
deInitializeClient();
@@ -315,10 +315,10 @@ public class EventSampleClient {
}
log.info("GetStatus Response Received: " + response.toString());
- clientResult.setGotResponse(true);
+ clientResult.setResponseReceived(true);
} catch (Exception e) {
log.error("Fault Received : " + e.toString(), e);
- clientResult.setGotResponse(false);
+ clientResult.setResponseReceived(false);
clientResult.setException(e);
}
deInitializeClient();
@@ -351,10 +351,10 @@ public class EventSampleClient {
serviceClient.fireAndForget(payload);
log.info("Event sent to topic " + topic);
Thread.sleep(1000);
- clientResult.setGotResponse(true);
+ clientResult.setResponseReceived(true);
} catch (Exception e) {
log.error("Fault Received : " + e.toString(), e);
- clientResult.setGotResponse(false);
+ clientResult.setResponseReceived(false);
clientResult.setException(e);
}
deInitializeClient();
Modified: synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/clients/MTOMSwASampleClient.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/clients/MTOMSwASampleClient.java?rev=1211785&r1=1211784&r2=1211785&view=diff
==============================================================================
--- synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/clients/MTOMSwASampleClient.java (original)
+++ synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/clients/MTOMSwASampleClient.java Thu Dec 8 08:45:50 2011
@@ -114,10 +114,10 @@ public class MTOMSwASampleClient {
dest.close();
log.info("Saved response to file : " + tempFile.getAbsolutePath());
- clientResult.setGotResponse(true);
+ clientResult.setResponseReceived(true);
} catch (Exception e) {
log.error("Error invoking service", e);
- clientResult.setGotResponse(false);
+ clientResult.setResponseReceived(false);
clientResult.setException(e);
}
@@ -184,10 +184,10 @@ public class MTOMSwASampleClient {
log.info("Saved response to file : " + tempFile.getAbsolutePath());
- clientResult.setGotResponse(true);
+ clientResult.setResponseReceived(true);
} catch (Exception e) {
log.error("Error invoking service", e);
- clientResult.setGotResponse(false);
+ clientResult.setResponseReceived(false);
clientResult.setException(e);
}
Modified: synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/clients/StockQuoteSampleClient.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/clients/StockQuoteSampleClient.java?rev=1211785&r1=1211784&r2=1211785&view=diff
==============================================================================
--- synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/clients/StockQuoteSampleClient.java (original)
+++ synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/clients/StockQuoteSampleClient.java Thu Dec 8 08:45:50 2011
@@ -60,7 +60,7 @@ public class StockQuoteSampleClient {
private Options options;
private ServiceClient serviceClient;
- private SampleClientResult clientResult;
+ //private SampleClientResult clientResult;
private OMElement payload;
private OMElement response;
private boolean completed;
@@ -74,8 +74,8 @@ public class StockQuoteSampleClient {
String svcPolicy, long timeout) throws Exception {
log.info("initialing client config...");
options = new Options();
- clientResult = new SampleClientResult();
- clientResult.setGotResponse(false);
+ /*clientResult = new SampleClientResult();
+ clientResult.setResponseReceived(false);*/
payload = null;
log.info("creating axis2 configuration context using the repo: " + configuration.getClientRepo());
@@ -125,7 +125,7 @@ public class StockQuoteSampleClient {
serviceClient.setOptions(options);
}
- private void deInitializeClient() {
+ private void terminateClient() {
if (serviceClient != null) {
try {
log.info("cleaning up client");
@@ -137,9 +137,20 @@ public class StockQuoteSampleClient {
}
}
+ /**
+ * Invoke the sample client and send a standard quote request
+ *
+ * @param addUrl Addressing URL
+ * @param trpUrl Transport URL
+ * @param prxUrl Proxy URL
+ * @param symbol Stock symbol
+ * @param svcPolicy Client policy
+ * @return SampleClientResult containing the invocation outcome
+ */
public SampleClientResult requestStandardQuote(String addUrl, String trpUrl, String prxUrl,
String symbol, String svcPolicy) {
log.info("sending standard quote request");
+ SampleClientResult clientResult = new SampleClientResult();
try {
initializeClient(addUrl, trpUrl, prxUrl, svcPolicy, 10000);
@@ -149,22 +160,21 @@ public class StockQuoteSampleClient {
OMElement resultElement = serviceClient.sendReceive(payload);
log.info("Standard :: Stock price = $" +
StockQuoteHandler.parseStandardQuoteResponse(resultElement));
- clientResult.setGotResponse(true);
+ clientResult.setResponseReceived(true);
} catch (Exception e) {
log.error("Error invoking service", e);
- clientResult.setGotResponse(false);
+ clientResult.setResponseReceived(false);
clientResult.setException(e);
}
- deInitializeClient();
+ terminateClient();
return clientResult;
-
}
public SampleClientResult requestDualQuote(String addUrl, String trpUrl,
String prxUrl, String symbol) {
log.info("sending dual quote request");
-
+ SampleClientResult clientResult = new SampleClientResult();
try {
initializeClient(addUrl, trpUrl, prxUrl, null, 10000);
@@ -179,7 +189,7 @@ public class StockQuoteSampleClient {
if (isCompleted()) {
log.info("Standard dual channel :: Stock price = $" +
StockQuoteHandler.parseStandardQuoteResponse(getResponse()));
- clientResult.setGotResponse(true);
+ clientResult.setResponseReceived(true);
break;
} else {
Thread.sleep(100);
@@ -187,10 +197,10 @@ public class StockQuoteSampleClient {
}
} catch (Exception e) {
log.error("Error invoking service", e);
- clientResult.setGotResponse(false);
+ clientResult.setResponseReceived(false);
clientResult.setException(e);
}
- deInitializeClient();
+ terminateClient();
return clientResult;
}
@@ -198,7 +208,7 @@ public class StockQuoteSampleClient {
public SampleClientResult requestCustomQuote(String addUrl, String trpUrl,
String prxUrl, String symbol) {
log.info("sending custom quote request");
-
+ SampleClientResult clientResult = new SampleClientResult();
try {
initializeClient(addUrl, trpUrl, prxUrl, null, 10000);
@@ -207,22 +217,21 @@ public class StockQuoteSampleClient {
OMElement resultElement = serviceClient.sendReceive(payload);
log.info("Custom :: Stock price = $" +
StockQuoteHandler.parseCustomQuoteResponse(resultElement));
- clientResult.setGotResponse(true);
+ clientResult.setResponseReceived(true);
} catch (Exception e) {
log.error("Error invoking service", e);
- clientResult.setGotResponse(false);
+ clientResult.setResponseReceived(false);
clientResult.setException(e);
}
- deInitializeClient();
+ terminateClient();
return clientResult;
}
public SampleClientResult placeOrder(String addUrl, String trpUrl, String prxUrl, String symbol) {
log.info("sending fire and forget (place order) request");
-
+ SampleClientResult clientResult = new SampleClientResult();
try {
-
initializeClient(addUrl, trpUrl, prxUrl, null, 10000);
double price = getRandom(100, 0.9, true);
int quantity = (int) getRandom(10000, 1.0, true);
@@ -235,13 +244,13 @@ public class StockQuoteSampleClient {
log.info("Order placed for " + quantity
+ " shares of stock " + symbol
+ " at a price of $ " + price);
- clientResult.setGotResponse(true);
+ clientResult.setResponseReceived(true);
} catch (Exception e) {
log.error("Error invoking service", e);
- clientResult.setGotResponse(false);
+ clientResult.setResponseReceived(false);
clientResult.setException(e);
}
- deInitializeClient();
+ terminateClient();
return clientResult;
}
@@ -249,7 +258,7 @@ public class StockQuoteSampleClient {
public SampleClientResult requestRestQuote(String addUrl, String trpUrl,
String prxUrl, String symbol) {
log.info("sending rest request");
-
+ SampleClientResult clientResult = new SampleClientResult();
try {
initializeClient(addUrl, trpUrl, prxUrl, null, 10000);
@@ -260,13 +269,13 @@ public class StockQuoteSampleClient {
OMElement resultElement = serviceClient.sendReceive(payload);
log.info("Standard :: Stock price = $" +
StockQuoteHandler.parseStandardQuoteResponse(resultElement));
- clientResult.setGotResponse(true);
+ clientResult.setResponseReceived(true);
} catch (Exception e) {
log.error("Error invoking service", e);
- clientResult.setGotResponse(false);
+ clientResult.setResponseReceived(false);
clientResult.setException(e);
}
- deInitializeClient();
+ terminateClient();
return clientResult;
@@ -274,6 +283,7 @@ public class StockQuoteSampleClient {
public SampleClientResult sessionlessClient(String addUrl, String trpUrl, int iterations) {
+ SampleClientResult clientResult = new SampleClientResult();
try {
boolean infinite = iterations <= 0;
OMFactory fac = OMAbstractFactory.getOMFactory();
@@ -293,8 +303,8 @@ public class StockQuoteSampleClient {
OMElement responseElement = serviceClient.sendReceive(value);
String response = responseElement.getText();
- if (!clientResult.gotResponse()) {
- clientResult.setGotResponse(true);
+ if (!clientResult.responseReceived()) {
+ clientResult.setResponseReceived(true);
}
i++;
@@ -308,7 +318,7 @@ public class StockQuoteSampleClient {
clientResult.setFinished(true);
clientResult.setException(e);
}
- deInitializeClient();
+ terminateClient();
return clientResult;
}
@@ -317,11 +327,9 @@ public class StockQuoteSampleClient {
boolean infinite = false;
String session = null;
- clientResult = new SampleClientResult();
- clientResult.setGotResponse(false);
-
+ SampleClientResult clientResult = new SampleClientResult();
+ clientResult.setResponseReceived(false);
try {
-
SOAPEnvelope env1 = buildSoapEnvelope("c1", "v1");
SOAPEnvelope env2 = buildSoapEnvelope("c2", "v1");
SOAPEnvelope env3 = buildSoapEnvelope("c3", "v1");
@@ -368,8 +376,8 @@ public class StockQuoteSampleClient {
OMElement vElement =
responseEnvelope.getBody().getFirstChildWithName(new QName("Value"));
- if (!clientResult.gotResponse()) {
- clientResult.setGotResponse(true);
+ if (!clientResult.responseReceived()) {
+ clientResult.setResponseReceived(true);
}
log.info("Request: " + i + " with Session ID: " +
@@ -390,7 +398,7 @@ public class StockQuoteSampleClient {
clientResult.setFinished(true);
clientResult.setException(e);
}
- deInitializeClient();
+ terminateClient();
return clientResult;
}
Modified: synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/endpoint/Sample50.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/endpoint/Sample50.java?rev=1211785&r1=1211784&r2=1211785&view=diff
==============================================================================
--- synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/endpoint/Sample50.java (original)
+++ synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/endpoint/Sample50.java Thu Dec 8 08:45:50 2011
@@ -27,8 +27,8 @@ import org.apache.synapse.samples.framew
public class Sample50 extends SynapseTestCase {
private static final Log log = LogFactory.getLog(Sample50.class);
- SampleClientResult result;
- StockQuoteSampleClient client;
+
+ private StockQuoteSampleClient client;
public Sample50() {
super(50);
@@ -37,12 +37,10 @@ public class Sample50 extends SynapseTes
public void testRestToPox() {
- String ep = "http://localhost:8280/services/MTOMSwASampleService";
String trpUrl = "http://localhost:8280/services/StockQuote";
-
log.info("Running test: HTTP REST request ");
- result = client.requestRestQuote(null, trpUrl, null, "IBM");
- assertTrue("Client did not run successfully ", result.gotResponse());
+ SampleClientResult result = client.requestRestQuote(null, trpUrl, null, "IBM");
+ assertResponseReceived(result);
}
}
Modified: synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/endpoint/Sample51.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/endpoint/Sample51.java?rev=1211785&r1=1211784&r2=1211785&view=diff
==============================================================================
--- synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/endpoint/Sample51.java (original)
+++ synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/endpoint/Sample51.java Thu Dec 8 08:45:50 2011
@@ -30,8 +30,8 @@ import java.io.File;
public class Sample51 extends SynapseTestCase {
private static final Log log = LogFactory.getLog(Sample51.class);
- SampleClientResult result;
- MTOMSwASampleClient client;
+
+ private MTOMSwASampleClient client;
public Sample51() {
super(51);
@@ -44,8 +44,8 @@ public class Sample51 extends SynapseTes
String filename = FilenameUtils.normalize(
currentLocation + "repository/conf/sample/resources/mtom/asf-logo.gif");
log.info("Running test: MTOM optimization and request/response correlation ");
- result = client.sendUsingMTOM(filename, ep);
- assertTrue("Client did not run successfully ", result.gotResponse());
+ SampleClientResult result = client.sendUsingMTOM(filename, ep);
+ assertResponseReceived(result);
}
@@ -56,8 +56,8 @@ public class Sample51 extends SynapseTes
currentLocation + "repository/conf/sample/resources/mtom/asf-logo.gif");
log.info("Running test:SwA optimization and request/response correlation ");
- result = client.sendUsingSWA(filename, ep);
- assertTrue("Client did not run successfully ", result.gotResponse());
+ SampleClientResult result = client.sendUsingSWA(filename, ep);
+ assertResponseReceived(result);
}
}
Modified: synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/endpoint/Sample52.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/endpoint/Sample52.java?rev=1211785&r1=1211784&r2=1211785&view=diff
==============================================================================
--- synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/endpoint/Sample52.java (original)
+++ synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/endpoint/Sample52.java Thu Dec 8 08:45:50 2011
@@ -27,8 +27,8 @@ import org.apache.synapse.samples.framew
public class Sample52 extends SynapseTestCase {
private static final Log log = LogFactory.getLog(Sample52.class);
- SampleClientResult result;
- StockQuoteSampleClient client;
+
+ private StockQuoteSampleClient client;
public Sample52() {
super(52);
@@ -37,12 +37,11 @@ public class Sample52 extends SynapseTes
public void testSessionLessLB() {
- //String repo = getConfiguration().getClientConfig().getClientRepo();
String addUrl = "http://localhost:8280/services/LBService1";
log.info("Running test: Session-less load balancing between 3 endpoints");
- result = client.sessionlessClient(addUrl, null, 100);
- assertTrue("Client did not run successfully ", result.gotResponse());
+ SampleClientResult result = client.sessionlessClient(addUrl, null, 100);
+ assertResponseReceived(result);
}
Modified: synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/endpoint/Sample53.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/endpoint/Sample53.java?rev=1211785&r1=1211784&r2=1211785&view=diff
==============================================================================
--- synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/endpoint/Sample53.java (original)
+++ synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/endpoint/Sample53.java Thu Dec 8 08:45:50 2011
@@ -28,9 +28,10 @@ import org.apache.synapse.samples.framew
public class Sample53 extends SynapseTestCase {
private static final Log log = LogFactory.getLog(Sample53.class);
- SampleClientResult result;
- StockQuoteSampleClient client;
- String addUrl;
+
+ private SampleClientResult result;
+ private StockQuoteSampleClient client;
+ private String addUrl;
public Sample53() {
super(53);
@@ -71,7 +72,7 @@ public class Sample53 extends SynapseTes
}
}
- assertTrue("Did not receive a response", result.gotResponse());
+ assertResponseReceived(result);
Exception resultEx = result.getException();
assertNotNull("Did not receive expected error", resultEx);
log.info("Got an error as expected: " + resultEx.getMessage());
Modified: synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/endpoint/Sample54.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/endpoint/Sample54.java?rev=1211785&r1=1211784&r2=1211785&view=diff
==============================================================================
--- synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/endpoint/Sample54.java (original)
+++ synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/endpoint/Sample54.java Thu Dec 8 08:45:50 2011
@@ -24,28 +24,23 @@ import org.apache.synapse.samples.framew
import org.apache.synapse.samples.framework.SynapseTestCase;
import org.apache.synapse.samples.framework.clients.StockQuoteSampleClient;
-import java.util.concurrent.CountDownLatch;
-
public class Sample54 extends SynapseTestCase {
private static final Log log = LogFactory.getLog(Sample54.class);
- SampleClientResult result;
- StockQuoteSampleClient client;
- CountDownLatch latch;
+
+ private StockQuoteSampleClient client;
public Sample54() {
super(54);
client = getStockQuoteClient();
- latch = new CountDownLatch(1);
}
public void testSessionFullLB() {
String addUrl = "http://localhost:8280/services/LBService1";
-
log.info("Running test: Session affinity load balancing between 3 endpoints");
- result = client.statefulClient(addUrl,null, 100);
- assertTrue("Client did not run successfully ", result.gotResponse());
+ SampleClientResult result = client.statefulClient(addUrl,null, 100);
+ assertResponseReceived(result);
}
Modified: synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/endpoint/Sample55.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/endpoint/Sample55.java?rev=1211785&r1=1211784&r2=1211785&view=diff
==============================================================================
--- synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/endpoint/Sample55.java (original)
+++ synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/endpoint/Sample55.java Thu Dec 8 08:45:50 2011
@@ -27,9 +27,9 @@ import org.apache.synapse.samples.framew
public class Sample55 extends SynapseTestCase {
private static final Log log = LogFactory.getLog(Sample55.class);
- SampleClientResult result;
- StockQuoteSampleClient client;
- String addUrl;
+
+ private SampleClientResult result;
+ private StockQuoteSampleClient client;
public Sample55() {
super(55);
@@ -38,14 +38,14 @@ public class Sample55 extends SynapseTes
public void testSessionFullLBFailOver() {
- addUrl = "http://localhost:8280/services/LBService1";
-
+ final String addUrl = "http://localhost:8280/services/LBService1";
log.info("Running test: Failover sending among 3 endpoints");
new Thread(new Runnable() {
public void run() {
- result = client.statefulClient(addUrl,null, 200);
+ result = client.statefulClient(addUrl, null, 200);
}
}).start();
+
try {
Thread.sleep(2000);
} catch (InterruptedException e) {
@@ -59,6 +59,12 @@ public class Sample55 extends SynapseTes
}
- assertTrue("Did not receive a response", result.gotResponse());
+ while (!result.isFinished()) {
+ try {
+ Thread.sleep(1000);
+ } catch (InterruptedException e) {
+ }
+ }
+ assertTrue("Did not receive a response", result.responseReceived());
}
}
Modified: synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/endpoint/Sample56.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/endpoint/Sample56.java?rev=1211785&r1=1211784&r2=1211785&view=diff
==============================================================================
--- synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/endpoint/Sample56.java (original)
+++ synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/endpoint/Sample56.java Thu Dec 8 08:45:50 2011
@@ -27,8 +27,8 @@ import org.apache.synapse.samples.framew
public class Sample56 extends SynapseTestCase {
private static final Log log = LogFactory.getLog(Sample56.class);
- SampleClientResult result;
- StockQuoteSampleClient client;
+
+ private StockQuoteSampleClient client;
public Sample56() {
super(56);
@@ -40,8 +40,8 @@ public class Sample56 extends SynapseTes
String addUrl = "http://localhost:8280";
log.info("Running test: Smart Client mode");
- result = client.requestStandardQuote(addUrl, null, null, "IBM" ,null);
- assertTrue("Client did not run successfully ", result.gotResponse());
+ SampleClientResult result = client.requestStandardQuote(addUrl, null, null, "IBM" ,null);
+ assertResponseReceived(result);
}
Modified: synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/endpoint/Sample57.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/endpoint/Sample57.java?rev=1211785&r1=1211784&r2=1211785&view=diff
==============================================================================
--- synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/endpoint/Sample57.java (original)
+++ synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/endpoint/Sample57.java Thu Dec 8 08:45:50 2011
@@ -27,9 +27,9 @@ import org.apache.synapse.samples.framew
public class Sample57 extends SynapseTestCase {
private static final Log log = LogFactory.getLog(Sample57.class);
- SampleClientResult result;
- StockQuoteSampleClient client;
- String addUrl;
+
+ private SampleClientResult result;
+ private StockQuoteSampleClient client;
public Sample57() {
super(57);
@@ -37,7 +37,7 @@ public class Sample57 extends SynapseTes
}
public void testDynamicLB() {
- addUrl = "http://localhost:8280/services/LBService1";
+ final String addUrl = "http://localhost:8280/services/LBService1";
log.info("Running test: Dynamic load balancing between 3 nodes");
try {
@@ -50,18 +50,20 @@ public class Sample57 extends SynapseTes
result = client.sessionlessClient(addUrl, null, 500);
}
}).start();
-// try {
-// Thread.sleep(2000);
-// } catch (InterruptedException e) {
-//
-// }
-// getbESControllers().get("SampleServer0").stop();
-//
+
try {
Thread.sleep(3000);
} catch (InterruptedException e) {
}
+
+ while (!result.isFinished()) {
+ try {
+ Thread.sleep(1000);
+ } catch (InterruptedException e) {
+ }
+ }
+
new Thread(new Runnable() {
public void run() {
result = client.sessionlessClient(addUrl, null, 500);
@@ -73,6 +75,13 @@ public class Sample57 extends SynapseTes
}
- assertTrue("Did not receive a response", result.gotResponse());
+ while (!result.isFinished()) {
+ try {
+ Thread.sleep(1000);
+ } catch (InterruptedException e) {
+ }
+ }
+
+ assertResponseReceived(result);
}
}
Modified: synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/endpoint/Sample58.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/endpoint/Sample58.java?rev=1211785&r1=1211784&r2=1211785&view=diff
==============================================================================
--- synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/endpoint/Sample58.java (original)
+++ synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/endpoint/Sample58.java Thu Dec 8 08:45:50 2011
@@ -27,9 +27,10 @@ import org.apache.synapse.samples.framew
public class Sample58 extends SynapseTestCase {
private static final Log log = LogFactory.getLog(Sample58.class);
- SampleClientResult result;
- StockQuoteSampleClient client;
- String addUrl;
+
+ private SampleClientResult result;
+ private StockQuoteSampleClient client;
+
public Sample58() {
super(58);
@@ -38,11 +39,11 @@ public class Sample58 extends SynapseTes
public void testStaticLB() {
- addUrl = "http://localhost:8280/services/LBService1";
+ final String addUrl = "http://localhost:8280/services/LBService1";
new Thread(new Runnable() {
public void run() {
- result = client.sessionlessClient(addUrl,null, 200);
+ result = client.sessionlessClient(addUrl, null, 200);
}
}).start();
try {
Modified: synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/endpoint/Sample59.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/endpoint/Sample59.java?rev=1211785&r1=1211784&r2=1211785&view=diff
==============================================================================
--- synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/endpoint/Sample59.java (original)
+++ synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/endpoint/Sample59.java Thu Dec 8 08:45:50 2011
@@ -27,21 +27,20 @@ import org.apache.synapse.samples.framew
public class Sample59 extends SynapseTestCase {
private static final Log log = LogFactory.getLog(Sample59.class);
- SampleClientResult result;
- StockQuoteSampleClient client;
+
+ private StockQuoteSampleClient client;
public Sample59() {
super(59);
client = getStockQuoteClient();
}
-
public void testSessionLessLB() {
String addUrl = "http://localhost:8280/services/LBService1";
log.info("Running test: Weighted load balancing between 3 endpoints");
- result = client.sessionlessClient(addUrl,null, 100);
- assertTrue("Client did not run successfully ", result.gotResponse());
+ SampleClientResult result = client.sessionlessClient(addUrl, null, 100);
+ assertResponseReceived(result);
}
Modified: synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/message/Sample0.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/message/Sample0.java?rev=1211785&r1=1211784&r2=1211785&view=diff
==============================================================================
--- synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/message/Sample0.java (original)
+++ synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/message/Sample0.java Thu Dec 8 08:45:50 2011
@@ -27,8 +27,8 @@ import org.apache.synapse.samples.framew
public class Sample0 extends SynapseTestCase {
private static final Log log = LogFactory.getLog(Sample0.class);
- SampleClientResult result;
- StockQuoteSampleClient client;
+
+ private StockQuoteSampleClient client;
public Sample0() {
super(0);
@@ -41,8 +41,8 @@ public class Sample0 extends SynapseTest
String trpUrl = "http://localhost:8280/";
log.info("Running test: Smart Client mode");
- result = client.requestStandardQuote(addUrl, trpUrl, null, "IBM" ,null);
- assertTrue("Client did not run successfully ", result.gotResponse());
+ SampleClientResult result = client.requestStandardQuote(addUrl, trpUrl, null, "IBM" ,null);
+ assertResponseReceived(result);
}
@@ -51,8 +51,8 @@ public class Sample0 extends SynapseTest
String prxUrl = "http://localhost:8280/";
log.info("Running test: Using Synapse as a HTTP Proxy");
- result = client.requestStandardQuote(addUrl, null, prxUrl, "IBM", null);
- assertTrue("Client did not run successfully ", result.gotResponse());
+ SampleClientResult result = client.requestStandardQuote(addUrl, null, prxUrl, "IBM", null);
+ assertResponseReceived(result);
}
}
Modified: synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/message/Sample1.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/message/Sample1.java?rev=1211785&r1=1211784&r2=1211785&view=diff
==============================================================================
--- synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/message/Sample1.java (original)
+++ synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/message/Sample1.java Thu Dec 8 08:45:50 2011
@@ -27,8 +27,8 @@ import org.apache.synapse.samples.framew
public class Sample1 extends SynapseTestCase {
private static final Log log = LogFactory.getLog(Sample1.class);
- SampleClientResult result;
- StockQuoteSampleClient client;
+
+ private StockQuoteSampleClient client;
public Sample1() {
super(1);
@@ -40,8 +40,8 @@ public class Sample1 extends SynapseTest
String trpUrl = "http://localhost:8280/services/StockQuote";
log.info("Running test: Dumb Client mode");
- result = client.requestStandardQuote(null, trpUrl, null, "IBM" ,null);
- assertTrue("Client did not run successfully ", result.gotResponse());
+ SampleClientResult result = client.requestStandardQuote(null, trpUrl, null, "IBM" ,null);
+ assertResponseReceived(result);
}
}
Modified: synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/message/Sample10.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/message/Sample10.java?rev=1211785&r1=1211784&r2=1211785&view=diff
==============================================================================
--- synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/message/Sample10.java (original)
+++ synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/message/Sample10.java Thu Dec 8 08:45:50 2011
@@ -27,8 +27,7 @@ import org.apache.synapse.samples.framew
public class Sample10 extends SynapseTestCase {
private static final Log log = LogFactory.getLog(Sample10.class);
- SampleClientResult result;
- StockQuoteSampleClient client;
+ private StockQuoteSampleClient client;
public Sample10() {
super(10);
@@ -40,8 +39,8 @@ public class Sample10 extends SynapseTes
String trpUrl = "http://localhost:8280/";
log.info("Running test: Dynamic EndPoints with Registry");
- result = client.requestStandardQuote(null, trpUrl, null, "IBM", null);
- assertTrue("Client did not run successfully ", result.gotResponse());
+ SampleClientResult result = client.requestStandardQuote(null, trpUrl, null, "IBM", null);
+ assertResponseReceived(result);
}
}
Modified: synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/message/Sample11.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/message/Sample11.java?rev=1211785&r1=1211784&r2=1211785&view=diff
==============================================================================
--- synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/message/Sample11.java (original)
+++ synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/message/Sample11.java Thu Dec 8 08:45:50 2011
@@ -27,7 +27,6 @@ import org.apache.synapse.samples.framew
public class Sample11 extends SynapseTestCase {
private static final Log log = LogFactory.getLog(Sample11.class);
- SampleClientResult result;
StockQuoteSampleClient client;
public Sample11() {
@@ -41,8 +40,8 @@ public class Sample11 extends SynapseTes
String trpUrl = "http://localhost:8280";
log.info("Running test: Local Registry entry definitions, reusable endpoints and sequences");
- result = client.requestStandardQuote(addUrl, trpUrl, null, "IBM",null);
- assertTrue("Client did not run successfully ", result.gotResponse());
+ SampleClientResult result = client.requestStandardQuote(addUrl, trpUrl, null, "IBM",null);
+ assertResponseReceived(result);
}
}
Modified: synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/message/Sample12.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/message/Sample12.java?rev=1211785&r1=1211784&r2=1211785&view=diff
==============================================================================
--- synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/message/Sample12.java (original)
+++ synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/message/Sample12.java Thu Dec 8 08:45:50 2011
@@ -27,22 +27,20 @@ import org.apache.synapse.samples.framew
public class Sample12 extends SynapseTestCase {
private static final Log log = LogFactory.getLog(Sample12.class);
- SampleClientResult result;
- StockQuoteSampleClient client;
+ private StockQuoteSampleClient client;
public Sample12() {
super(12);
client = getStockQuoteClient();
}
-
public void testFireAndForget() {
String addUrl = "http://localhost:9000/services/SimpleStockQuoteService";
String trpUrl = "http://localhost:8280/";
log.info("Running test: One way messaging / fireAndForget through Synapse");
- result = client.placeOrder(addUrl, trpUrl, null, "IBM");
- assertTrue("Client did not run successfully ", result.gotResponse());
+ SampleClientResult result = client.placeOrder(addUrl, trpUrl, null, "IBM");
+ assertResponseReceived(result);
}
}
Modified: synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/message/Sample13.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/message/Sample13.java?rev=1211785&r1=1211784&r2=1211785&view=diff
==============================================================================
--- synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/message/Sample13.java (original)
+++ synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/message/Sample13.java Thu Dec 8 08:45:50 2011
@@ -27,8 +27,7 @@ import org.apache.synapse.samples.framew
public class Sample13 extends SynapseTestCase {
private static final Log log = LogFactory.getLog(Sample13.class);
- SampleClientResult result;
- StockQuoteSampleClient client;
+ private StockQuoteSampleClient client;
public Sample13() {
super(13);
@@ -41,8 +40,8 @@ public class Sample13 extends SynapseTes
String trpUrl = "http://localhost:8280/";
log.info("Running test: Dual channel invocation through Synapse");
- result = client.requestDualQuote(addUrl, trpUrl, null, "IBM");
- assertTrue("Client did not run successfully ", result.gotResponse());
+ SampleClientResult result = client.requestDualQuote(addUrl, trpUrl, null, "IBM");
+ assertResponseReceived(result);
}
}
Modified: synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/message/Sample15.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/message/Sample15.java?rev=1211785&r1=1211784&r2=1211785&view=diff
==============================================================================
--- synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/message/Sample15.java (original)
+++ synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/message/Sample15.java Thu Dec 8 08:45:50 2011
@@ -27,8 +27,7 @@ import org.apache.synapse.samples.framew
public class Sample15 extends SynapseTestCase {
private static final Log log = LogFactory.getLog(Sample15.class);
- SampleClientResult result;
- StockQuoteSampleClient client;
+ private StockQuoteSampleClient client;
public Sample15() {
super(15);
@@ -40,8 +39,8 @@ public class Sample15 extends SynapseTes
String trpUrl = "http://localhost:8280/services/StockQuote";
log.info("Running test: Message Enrichment through Synapse");
- result = client.requestStandardQuote(null, trpUrl, null, "IBM" ,null);
- assertTrue("Client did not run successfully ", result.gotResponse());
+ SampleClientResult result = client.requestStandardQuote(null, trpUrl, null, "IBM" ,null);
+ assertResponseReceived(result);
}
}
Modified: synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/message/Sample16.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/message/Sample16.java?rev=1211785&r1=1211784&r2=1211785&view=diff
==============================================================================
--- synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/message/Sample16.java (original)
+++ synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/message/Sample16.java Thu Dec 8 08:45:50 2011
@@ -27,8 +27,7 @@ import org.apache.synapse.samples.framew
public class Sample16 extends SynapseTestCase {
private static final Log log = LogFactory.getLog(Sample16.class);
- SampleClientResult result;
- StockQuoteSampleClient client;
+ private StockQuoteSampleClient client;
public Sample16() {
super(16);
@@ -41,8 +40,8 @@ public class Sample16 extends SynapseTes
String trpUrl = "http://localhost:8280/";
log.info("Running test: Introduction to dynamic and static keys ");
- result = client.requestCustomQuote(addUrl, trpUrl, null, "IBM");
- assertTrue("Client did not run successfully ", result.gotResponse());
+ SampleClientResult result = client.requestCustomQuote(addUrl, trpUrl, null, "IBM");
+ assertResponseReceived(result);
}
}
Modified: synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/message/Sample2.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/message/Sample2.java?rev=1211785&r1=1211784&r2=1211785&view=diff
==============================================================================
--- synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/message/Sample2.java (original)
+++ synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/message/Sample2.java Thu Dec 8 08:45:50 2011
@@ -27,8 +27,8 @@ import org.apache.synapse.samples.framew
public class Sample2 extends SynapseTestCase {
private static final Log log = LogFactory.getLog(Sample2.class);
- SampleClientResult result;
- StockQuoteSampleClient client;
+
+ private StockQuoteSampleClient client;
public Sample2() {
super(2);
@@ -41,10 +41,10 @@ public class Sample2 extends SynapseTest
String trpUrl = "http://localhost:8280";
log.info("Running test: CBR with the Switch-case mediator, using message properties");
- result = client.requestStandardQuote(addUrl, trpUrl, null, "IBM" ,null);
- assertTrue("Client did not run successfully ", result.gotResponse());
+ SampleClientResult result = client.requestStandardQuote(addUrl, trpUrl, null, "IBM" ,null);
+ assertResponseReceived(result);
result = client.requestStandardQuote(addUrl, trpUrl, null, "MSFT" ,null);
- assertTrue("Client did not run successfully ", result.gotResponse());
+ assertResponseReceived(result);
}
}
Modified: synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/message/Sample3.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/message/Sample3.java?rev=1211785&r1=1211784&r2=1211785&view=diff
==============================================================================
--- synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/message/Sample3.java (original)
+++ synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/message/Sample3.java Thu Dec 8 08:45:50 2011
@@ -27,8 +27,8 @@ import org.apache.synapse.samples.framew
public class Sample3 extends SynapseTestCase {
private static final Log log = LogFactory.getLog(Sample3.class);
- SampleClientResult result;
- StockQuoteSampleClient client;
+
+ private StockQuoteSampleClient client;
public Sample3() {
super(3);
@@ -41,8 +41,8 @@ public class Sample3 extends SynapseTest
String trpUrl = "http://localhost:8280";
log.info("Running test: Local Registry entry definitions, reusable endpoints and sequences");
- result = client.requestStandardQuote(addUrl, trpUrl, null, "IBM" ,null);
- assertTrue("Client did not run successfully ", result.gotResponse());
+ SampleClientResult result = client.requestStandardQuote(addUrl, trpUrl, null, "IBM" ,null);
+ assertResponseReceived(result);
}
}
Modified: synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/message/Sample4.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/message/Sample4.java?rev=1211785&r1=1211784&r2=1211785&view=diff
==============================================================================
--- synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/message/Sample4.java (original)
+++ synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/message/Sample4.java Thu Dec 8 08:45:50 2011
@@ -28,8 +28,8 @@ import org.apache.synapse.samples.framew
public class Sample4 extends SynapseTestCase {
private static final Log log = LogFactory.getLog(Sample4.class);
- SampleClientResult result;
- StockQuoteSampleClient client;
+
+ private StockQuoteSampleClient client;
public Sample4() {
super(4);
@@ -42,16 +42,18 @@ public class Sample4 extends SynapseTest
String trpUrl = "http://localhost:8280";
log.info("Running test: Introduction to error handling");
- result = client.requestStandardQuote(addUrl, trpUrl, null, "IBM" ,null);
- assertTrue("Did not get the correct response", result.gotResponse());
+ SampleClientResult result = client.requestStandardQuote(addUrl, trpUrl, null, "IBM" ,null);
+ assertResponseReceived(result);
+
result = client.requestStandardQuote(addUrl, trpUrl, null, "MSFT" ,null);
- assertFalse("Must not get a response", result.gotResponse());
+ assertFalse("Must not get a response", result.responseReceived());
Exception resultEx = result.getException();
assertNotNull("Did not receive expected error" , resultEx);
log.info("Got an error as expected: " + resultEx.getMessage());
assertTrue("Did not receive expected error", resultEx instanceof AxisFault);
+
result = client.requestStandardQuote(addUrl, trpUrl, null, "SUN" ,null);
- assertFalse("Must not get a response", result.gotResponse());
+ assertFalse("Must not get a response", result.responseReceived());
Exception resultEx2 = result.getException();
assertNotNull("Did not receive expected error" , resultEx);
log.info("Got an error as expected: " + resultEx.getMessage());
Modified: synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/message/Sample5.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/message/Sample5.java?rev=1211785&r1=1211784&r2=1211785&view=diff
==============================================================================
--- synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/message/Sample5.java (original)
+++ synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/message/Sample5.java Thu Dec 8 08:45:50 2011
@@ -29,8 +29,8 @@ import org.apache.synapse.samples.framew
public class Sample5 extends SynapseTestCase {
private static final Log log = LogFactory.getLog(Sample5.class);
- SampleClientResult result;
- StockQuoteSampleClient client;
+
+ private StockQuoteSampleClient client;
public Sample5() {
super(5);
@@ -43,11 +43,10 @@ public class Sample5 extends SynapseTest
String trpUrl = "http://localhost:8280";
String expectedError_MSFT = "bogus";
String expectedError_SUN = "Connection refused";
- String expectedError_IBM = "The input stream for an incoming message is null";
log.info("Running test: Creating SOAP fault messages and changing the direction of a message");
- result = client.requestStandardQuote(addUrl, trpUrl, null, "MSFT" ,null);
- assertFalse("Must not get a response", result.gotResponse());
+ SampleClientResult result = client.requestStandardQuote(addUrl, trpUrl, null, "MSFT" ,null);
+ assertFalse("Must not get a response", result.responseReceived());
Exception resultEx = result.getException();
assertNotNull("Did not receive expected error", resultEx);
log.info("Got an error as expected: " + resultEx.getMessage());
@@ -55,7 +54,7 @@ public class Sample5 extends SynapseTest
assertTrue("Did not receive expected error", resultEx.getMessage().indexOf(expectedError_MSFT)!=-1);
result = client.requestStandardQuote(addUrl, trpUrl, null, "SUN" ,null);
- assertFalse("Must not get a response", result.gotResponse());
+ assertFalse("Must not get a response", result.responseReceived());
resultEx = result.getException();
assertNotNull("Did not receive expected error", resultEx);
log.info("Got an error as expected: " + resultEx.getMessage());
@@ -63,7 +62,7 @@ public class Sample5 extends SynapseTest
assertTrue("Did not receive expected error", resultEx.getMessage().indexOf(expectedError_SUN)!=-1);
result = client.requestStandardQuote(addUrl, trpUrl, null, "IBM" ,null);
- assertFalse("Must not get a response", result.gotResponse());
+ assertFalse("Must not get a response", result.responseReceived());
resultEx = result.getException();
assertNotNull("Did not receive expected error", resultEx);
log.info("Got an error as expected: " + resultEx.getMessage());
Modified: synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/message/Sample6.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/message/Sample6.java?rev=1211785&r1=1211784&r2=1211785&view=diff
==============================================================================
--- synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/message/Sample6.java (original)
+++ synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/message/Sample6.java Thu Dec 8 08:45:50 2011
@@ -27,8 +27,8 @@ import org.apache.synapse.samples.framew
public class Sample6 extends SynapseTestCase {
private static final Log log = LogFactory.getLog(Sample6.class);
- SampleClientResult result;
- StockQuoteSampleClient client;
+
+ private StockQuoteSampleClient client;
public Sample6() {
super(6);
@@ -40,8 +40,8 @@ public class Sample6 extends SynapseTest
String trpUrl = "http://localhost:8280/";
log.info("Running test: Dumb Client mode ");
- result = client.requestStandardQuote(null, trpUrl, null, null ,null);
- assertTrue("Client did not run successfully ", result.gotResponse());
+ SampleClientResult result = client.requestStandardQuote(null, trpUrl, null, null ,null);
+ assertResponseReceived(result);
}
}
Modified: synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/message/Sample7.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/message/Sample7.java?rev=1211785&r1=1211784&r2=1211785&view=diff
==============================================================================
--- synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/message/Sample7.java (original)
+++ synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/message/Sample7.java Thu Dec 8 08:45:50 2011
@@ -28,8 +28,8 @@ import org.apache.synapse.samples.framew
public class Sample7 extends SynapseTestCase {
private static final Log log = LogFactory.getLog(Sample7.class);
- SampleClientResult result;
- StockQuoteSampleClient client;
+
+ private StockQuoteSampleClient client;
public Sample7() {
super(7);
@@ -43,8 +43,8 @@ public class Sample7 extends SynapseTest
String expectedError = "Invalid custom quote request";
log.info("Running test: Creating SOAP fault messages and changing the direction of a message");
- result = client.requestStandardQuote(addUrl, trpUrl, null, "IBM",null);
- assertFalse("Should not get a response", result.gotResponse());
+ SampleClientResult result = client.requestStandardQuote(addUrl, trpUrl, null, "IBM",null);
+ assertFalse("Should not get a response", result.responseReceived());
Exception resultEx = result.getException();
assertNotNull("Did not receive expected error", resultEx);
log.info("Got an error as expected: " + resultEx.getMessage());
Modified: synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/message/Sample8.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/message/Sample8.java?rev=1211785&r1=1211784&r2=1211785&view=diff
==============================================================================
--- synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/message/Sample8.java (original)
+++ synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/message/Sample8.java Thu Dec 8 08:45:50 2011
@@ -27,8 +27,8 @@ import org.apache.synapse.samples.framew
public class Sample8 extends SynapseTestCase {
private static final Log log = LogFactory.getLog(Sample8.class);
- SampleClientResult result;
- StockQuoteSampleClient client;
+
+ private StockQuoteSampleClient client;
public Sample8() {
super(8);
@@ -41,8 +41,8 @@ public class Sample8 extends SynapseTest
String trpUrl = "http://localhost:8280/";
log.info("Running test: Introduction to static and dynamic registry resources, and using XSLT transformations ");
- result = client.requestCustomQuote(addUrl, trpUrl, null, "IBM");
- assertTrue("Client did not run successfully ", result.gotResponse());
+ SampleClientResult result = client.requestCustomQuote(addUrl, trpUrl, null, "IBM");
+ assertResponseReceived(result);
}
}
Modified: synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/message/Sample9.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/message/Sample9.java?rev=1211785&r1=1211784&r2=1211785&view=diff
==============================================================================
--- synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/message/Sample9.java (original)
+++ synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/message/Sample9.java Thu Dec 8 08:45:50 2011
@@ -27,8 +27,8 @@ import org.apache.synapse.samples.framew
public class Sample9 extends SynapseTestCase {
private static final Log log = LogFactory.getLog(Sample9.class);
- SampleClientResult result;
- StockQuoteSampleClient client;
+
+ private StockQuoteSampleClient client;
public Sample9() {
super(9);
@@ -41,8 +41,8 @@ public class Sample9 extends SynapseTest
String trpUrl = "http://localhost:8280/";
log.info("Running test: Dynamic Sequences with Registry");
- result = client.requestStandardQuote(addUrl, trpUrl, null, "IBM" ,null);
- assertTrue("Client did not run successfully ", result.gotResponse());
+ SampleClientResult result = client.requestStandardQuote(addUrl, trpUrl, null, "IBM" ,null);
+ assertResponseReceived(result);
}
}