Modified: webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/scenarios/AnonymousPingTest.java URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/scenarios/AnonymousPingTest.java?view=diff&rev=480595&r1=480594&r2=480595 ============================================================================== --- webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/scenarios/AnonymousPingTest.java (original) +++ webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/scenarios/AnonymousPingTest.java Wed Nov 29 07:23:40 2006 @@ -18,12 +18,6 @@ import java.io.File; -import junit.framework.TestCase; - -import org.apache.axiom.om.OMAbstractFactory; -import org.apache.axiom.om.OMElement; -import org.apache.axiom.om.OMFactory; -import org.apache.axiom.om.OMNamespace; import org.apache.axiom.soap.SOAP11Constants; import org.apache.axis2.AxisFault; import org.apache.axis2.addressing.EndpointReference; @@ -31,11 +25,6 @@ import org.apache.axis2.client.ServiceClient; import org.apache.axis2.context.ConfigurationContext; import org.apache.axis2.context.ConfigurationContextFactory; -import org.apache.axis2.context.MessageContextConstants; -import org.apache.axis2.transport.http.SimpleHTTPServer; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.sandesha2.SandeshaException; import org.apache.sandesha2.SandeshaTestCase; import org.apache.sandesha2.client.SandeshaClient; import org.apache.sandesha2.client.SandeshaClientConstants; @@ -43,58 +32,22 @@ public class AnonymousPingTest extends SandeshaTestCase { - SimpleHTTPServer httpServer = null; - private final String applicationNamespaceName = "http://tempuri.org/";; - private final String ping = "ping"; - private final String Text = "Text"; - - private Log log = LogFactory.getLog(getClass()); - int serverPort = DEFAULT_SERVER_TEST_PORT; - public AnonymousPingTest () { super ("AnonymousPingTest"); } - public void setUp () throws AxisFault { - + public void setUp () throws Exception { + super.setUp(); + String repoPath = "target" + File.separator + "repos" + File.separator + "server"; String axis2_xml = "target" + File.separator + "repos" + File.separator + "server" + File.separator + "server_axis2.xml"; - - ConfigurationContext configContext = ConfigurationContextFactory.createConfigurationContextFromFileSystem(repoPath,axis2_xml); - - String serverPortStr = getTestProperty("test.server.port"); - if (serverPortStr!=null) { - try { - serverPort = Integer.parseInt(serverPortStr); - } catch (NumberFormatException e) { - log.error(e); - } - } - httpServer = new SimpleHTTPServer (configContext,serverPort); - httpServer.start(); - try { - Thread.sleep(300); - } catch (InterruptedException e) { - throw new SandeshaException ("sleep interupted"); - } - } - - public void tearDown () throws SandeshaException { - if (httpServer!=null) - httpServer.stop(); - - try { - Thread.sleep(300); - } catch (InterruptedException e) { - throw new SandeshaException ("sleep interupted"); - } + startServer(repoPath, axis2_xml); } public void testSyncPing () throws AxisFault,InterruptedException { String to = "http://127.0.0.1:"; + serverPort + "/axis2/services/RMSampleService"; - String transportTo = "http://127.0.0.1:"; + serverPort + "/axis2/services/RMSampleService"; String repoPath = "target" + File.separator + "repos" + File.separator + "client"; String axis2_xml = "target" + File.separator + "repos" + File.separator + "client" + File.separator + "client_axis2.xml"; @@ -106,7 +59,6 @@ clientOptions.setSoapVersionURI(SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI); clientOptions.setTo(new EndpointReference (to)); - clientOptions.setProperty(MessageContextConstants.TRANSPORT_URL,transportTo); String sequenceKey = "sequence1"; clientOptions.setProperty(SandeshaClientConstants.SEQUENCE_KEY,sequenceKey); @@ -119,28 +71,28 @@ clientOptions.setProperty(SandeshaClientConstants.LAST_MESSAGE, "true"); serviceClient.fireAndForget(getPingOMBlock("ping1")); - Thread.sleep(10000); - - 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); - + long limit = System.currentTimeMillis() + waitTime; + Error lastError = null; + while(System.currentTimeMillis() < limit) { + Thread.sleep(tickTime); // Try the assertions each tick interval, until they pass or we time out + + try { + 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); + + lastError = null; + break; + } catch(Error e) { + lastError = e; + } + } + + if(lastError != null) throw lastError; configContext.getListenerManager().stop(); serviceClient.cleanup(); } - private OMElement getPingOMBlock(String text) { - OMFactory fac = OMAbstractFactory.getOMFactory(); - OMNamespace namespace = fac.createOMNamespace(applicationNamespaceName,"ns1"); - OMElement pingElem = fac.createOMElement(ping, namespace); - OMElement textElem = fac.createOMElement(Text, namespace); - - textElem.setText(text); - pingElem.addChild(textElem); - - return pingElem; - } - }
Modified: webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/scenarios/OptionalReliabilityTest.java URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/scenarios/OptionalReliabilityTest.java?view=diff&rev=480595&r1=480594&r2=480595 ============================================================================== --- webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/scenarios/OptionalReliabilityTest.java (original) +++ webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/scenarios/OptionalReliabilityTest.java Wed Nov 29 07:23:40 2006 @@ -3,27 +3,14 @@ import java.io.File; import java.util.List; -import javax.xml.namespace.QName; - -import org.apache.axiom.om.OMAbstractFactory; import org.apache.axiom.om.OMElement; -import org.apache.axiom.om.OMFactory; -import org.apache.axiom.om.OMNamespace; -import org.apache.axiom.soap.SOAPBody; import org.apache.axis2.AxisFault; import org.apache.axis2.Constants; import org.apache.axis2.addressing.EndpointReference; import org.apache.axis2.client.Options; import org.apache.axis2.client.ServiceClient; -import org.apache.axis2.client.async.AsyncResult; -import org.apache.axis2.client.async.Callback; import org.apache.axis2.context.ConfigurationContext; import org.apache.axis2.context.ConfigurationContextFactory; -import org.apache.axis2.context.MessageContextConstants; -import org.apache.axis2.transport.http.SimpleHTTPServer; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.sandesha2.SandeshaException; import org.apache.sandesha2.SandeshaTestCase; import org.apache.sandesha2.client.SandeshaClient; import org.apache.sandesha2.client.SandeshaClientConstants; @@ -31,63 +18,21 @@ public class OptionalReliabilityTest extends SandeshaTestCase { - SimpleHTTPServer httpServer = null; - - private final static String applicationNamespaceName = "http://tempuri.org/";; - private final static String echoString = "echoString"; - private final static String ping = "ping"; - private final static String Text = "Text"; - private final static String Sequence = "Sequence"; - private final static String echoStringResponse = "echoStringResponse"; - private final static String EchoStringReturn = "EchoStringReturn"; - int serverPort = DEFAULT_SERVER_TEST_PORT; - private Log log = LogFactory.getLog(getClass()); - public OptionalReliabilityTest() { super ("OptionalReliabilityTest"); } - public void setUp () throws AxisFault { - + public void setUp () throws Exception { + super.setUp(); + String repoPath = "target" + File.separator + "repos" + File.separator + "server"; String axis2_xml = "target" + File.separator + "repos" + File.separator + "server" + File.separator + "server_axis2.xml"; - - ConfigurationContext configContext = ConfigurationContextFactory.createConfigurationContextFromFileSystem(repoPath,axis2_xml); - - String serverPortStr = getTestProperty("test.server.port"); - if (serverPortStr!=null) { - - try { - serverPort = Integer.parseInt(serverPortStr); - } catch (NumberFormatException e) { - log.error(e); - } - } - - httpServer = new SimpleHTTPServer (configContext,serverPort); - httpServer.start(); - try { - Thread.sleep(300); - } catch (InterruptedException e) { - throw new SandeshaException ("sleep interupted"); - } + startServer(repoPath, axis2_xml); } - public void tearDown () throws SandeshaException { - if (httpServer!=null) - httpServer.stop(); - - try { - Thread.sleep(300); - } catch (InterruptedException e) { - throw new SandeshaException ("sleep interupted"); - } - } - - public void testPing () throws AxisFault, InterruptedException { + public void testPing () throws Exception { String to = "http://127.0.0.1:"; + serverPort + "/axis2/services/RMSampleService"; - String transportTo = "http://127.0.0.1:"; + serverPort + "/axis2/services/RMSampleService"; String repoPath = "target" + File.separator + "repos" + File.separator + "client"; String axis2_xml = "target" + File.separator + "repos" + File.separator + "client" + File.separator + "client_axis2.xml"; @@ -98,13 +43,12 @@ Options clientOptions = new Options (); clientOptions.setAction("ping"); clientOptions.setTo(new EndpointReference (to)); - clientOptions.setProperty(MessageContextConstants.TRANSPORT_URL,transportTo); clientOptions.setProperty(SandeshaClientConstants.UNRELIABLE_MESSAGE, "true"); serviceClient.setOptions(clientOptions); serviceClient.fireAndForget(getPingOMBlock("echo1")); - //assertions for the out sequence. + //assertions for the out sequence. SequenceReport sequenceReport = SandeshaClient.getOutgoingSequenceReport(serviceClient); assertTrue(sequenceReport.getCompletedMessages().isEmpty()); @@ -118,7 +62,6 @@ public void testSyncEcho () throws AxisFault, InterruptedException { String to = "http://127.0.0.1:"; + serverPort + "/axis2/services/RMSampleService"; - String transportTo = "http://127.0.0.1:"; + serverPort + "/axis2/services/RMSampleService"; String repoPath = "target" + File.separator + "repos" + File.separator + "client"; String axis2_xml = "target" + File.separator + "repos" + File.separator + "client" + File.separator + "client_axis2.xml"; @@ -129,7 +72,6 @@ Options clientOptions = new Options (); clientOptions.setAction("echo"); clientOptions.setTo(new EndpointReference (to)); - clientOptions.setProperty(MessageContextConstants.TRANSPORT_URL,transportTo); clientOptions.setProperty(SandeshaClientConstants.UNRELIABLE_MESSAGE,"true"); serviceClient.setOptions(clientOptions); @@ -139,7 +81,7 @@ String echoStr = checkEchoOMBlock(result); assertEquals(echoStr, "echo1"); - //assertions for the out sequence. + //assertions for the out sequence. SequenceReport sequenceReport = SandeshaClient.getOutgoingSequenceReport(serviceClient); assertTrue(sequenceReport.getCompletedMessages().isEmpty()); @@ -153,7 +95,6 @@ public void testAsyncEcho () throws AxisFault, InterruptedException { String to = "http://127.0.0.1:"; + serverPort + "/axis2/services/RMSampleService"; - String transportTo = "http://127.0.0.1:"; + serverPort + "/axis2/services/RMSampleService"; String repoPath = "target" + File.separator + "repos" + File.separator + "client"; String axis2_xml = "target" + File.separator + "repos" + File.separator + "client" + File.separator + "client_axis2.xml"; @@ -164,7 +105,6 @@ Options clientOptions = new Options (); clientOptions.setAction("echo"); clientOptions.setTo(new EndpointReference (to)); - clientOptions.setProperty(MessageContextConstants.TRANSPORT_URL,transportTo); clientOptions.setProperty(SandeshaClientConstants.UNRELIABLE_MESSAGE,"true"); clientOptions.setTransportInProtocol(Constants.TRANSPORT_HTTP); clientOptions.setUseSeparateListener(true); @@ -173,96 +113,34 @@ TestCallback callback1 = new TestCallback ("Callback 1"); serviceClient.sendReceiveNonBlocking (getEchoOMBlock("echo1", "async"),callback1); - Thread.sleep(4000); - - //assertions for the out sequence. - SequenceReport sequenceReport = SandeshaClient.getOutgoingSequenceReport(serviceClient); - assertTrue(sequenceReport.getCompletedMessages().isEmpty()); - - assertTrue(callback1.isComplete()); - assertEquals(callback1.getResult(),"echo1"); - - //assertions for the in sequence - List inboundReports = SandeshaClient.getIncomingSequenceReports(configContext); - assertTrue(inboundReports.isEmpty()); - - configContext.getListenerManager().stop(); - serviceClient.cleanup(); - } - - private static OMElement getEchoOMBlock(String text, String appSeq) { - OMFactory fac = OMAbstractFactory.getOMFactory(); - OMNamespace applicationNamespace = fac.createOMNamespace(applicationNamespaceName,"ns1"); - OMElement echoStringElement = fac.createOMElement(echoString, applicationNamespace); - OMElement textElem = fac.createOMElement(Text,applicationNamespace); - OMElement sequenceElem = fac.createOMElement(Sequence,applicationNamespace); - - textElem.setText(text); - sequenceElem.setText(appSeq); - echoStringElement.addChild(textElem); - echoStringElement.addChild(sequenceElem); - - return echoStringElement; - } - - private static OMElement getPingOMBlock(String text) { - OMFactory fac = OMAbstractFactory.getOMFactory(); - OMNamespace namespace = fac.createOMNamespace(applicationNamespaceName,"ns1"); - OMElement pingElem = fac.createOMElement(ping, namespace); - OMElement textElem = fac.createOMElement(Text, namespace); - - textElem.setText(text); - pingElem.addChild(textElem); - - return pingElem; - } - - private static String checkEchoOMBlock(OMElement response) { - assertEquals(response.getNamespace().getName(), applicationNamespaceName); - assertEquals(response.getLocalName(), echoStringResponse); - - OMElement echoStringReturnElem = response.getFirstChildWithName(new QName (applicationNamespaceName,EchoStringReturn)); - assertNotNull(echoStringReturnElem); - - String resultStr = echoStringReturnElem.getText(); - - return resultStr; - } - - class TestCallback extends Callback { - - String name = null; - boolean completed = false; - boolean errorRported = false; - String resultStr; - - public boolean isCompleted() { - return completed; - } - - public boolean isErrorRported() { - return errorRported; + long limit = System.currentTimeMillis() + waitTime; + Error lastError = null; + while(System.currentTimeMillis() < limit) { + Thread.sleep(tickTime); // Try the assertions each tick interval, until they pass or we time out + + try { + //assertions for the out sequence. + SequenceReport sequenceReport = SandeshaClient.getOutgoingSequenceReport(serviceClient); + assertTrue(sequenceReport.getCompletedMessages().isEmpty()); + + assertTrue(callback1.isComplete()); + assertEquals(callback1.getResult(),"echo1"); + + //assertions for the in sequence + List inboundReports = SandeshaClient.getIncomingSequenceReports(configContext); + assertTrue(inboundReports.isEmpty()); + + lastError = null; + break; + } catch(Error e) { + lastError = e; + } } - public String getResult () { - return resultStr; - } - - public TestCallback (String name) { - this.name = name; - } - - public void onComplete(AsyncResult result) { - //System.out.println("On Complete Called for " + text); - SOAPBody body = result.getResponseEnvelope().getBody(); - this.resultStr = checkEchoOMBlock(body.getFirstElement()); - completed = true; - } + if(lastError != null) throw lastError; - public void onError (Exception e) { - e.printStackTrace(); - errorRported = true; - } + configContext.getListenerManager().stop(); + serviceClient.cleanup(); } - + } Modified: webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/security/SecurityTest.java URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/security/SecurityTest.java?view=diff&rev=480595&r1=480594&r2=480595 ============================================================================== --- webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/security/SecurityTest.java (original) +++ webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/security/SecurityTest.java Wed Nov 29 07:23:40 2006 @@ -24,15 +24,11 @@ import org.apache.axis2.client.ServiceClient; import org.apache.axis2.context.ConfigurationContext; import org.apache.axis2.context.ConfigurationContextFactory; -import org.apache.axis2.context.MessageContextConstants; -import org.apache.axis2.transport.http.SimpleHTTPServer; import org.apache.sandesha2.Sandesha2Constants; -import org.apache.sandesha2.SandeshaException; import org.apache.sandesha2.SandeshaTestCase; import org.apache.sandesha2.client.SandeshaClient; import org.apache.sandesha2.client.SandeshaClientConstants; import org.apache.sandesha2.client.SequenceReport; -import org.apache.sandesha2.util.SandeshaUtil; /** * Low-level testcases for the Security handling. This test mostly checks that the code can @@ -41,9 +37,6 @@ */ public class SecurityTest extends SandeshaTestCase { - private int serverPort = DEFAULT_SERVER_TEST_PORT; - private SimpleHTTPServer httpServer; - public SecurityTest(String name) { super(name); } @@ -54,25 +47,7 @@ String repoPath = "target" + File.separator + "repos" + File.separator + "secure-server"; String axis2_xml = repoPath + File.separator + "server_axis2.xml"; - ConfigurationContext configContext = ConfigurationContextFactory.createConfigurationContextFromFileSystem(repoPath,axis2_xml); - - String serverPortStr = getTestProperty("test.server.port"); - if(serverPortStr != null) serverPort = Integer.parseInt(serverPortStr); - - httpServer = new SimpleHTTPServer (configContext,serverPort); - httpServer.start(); - Thread.sleep(300); - - } - - public void tearDown () throws Exception { - if (httpServer!=null) { - httpServer.stop(); - httpServer = null; - } - - Thread.sleep(300); - super.tearDown(); + startServer(repoPath, axis2_xml); } // Test the create sequence flow for the 2 spec versions @@ -98,7 +73,6 @@ Options clientOptions = new Options (); clientOptions.setTo(new EndpointReference (to)); - clientOptions.setProperty(MessageContextConstants.TRANSPORT_URL,to); // clientOptions.setProperty(SandeshaClientConstants.SEQUENCE_KEY,sequenceKey); @@ -108,14 +82,25 @@ String sequenceKey = SandeshaClient.createSequence(serviceClient,false); clientOptions.setProperty(SandeshaClientConstants.SEQUENCE_KEY, sequenceKey); - SequenceReport sequenceReport = null; - for(int i = 0; i < 15; i++) { - Thread.sleep(1000); - sequenceReport = SandeshaClient.getOutgoingSequenceReport(serviceClient); - if(sequenceReport.getSequenceID() != null) break; + long limit = System.currentTimeMillis() + waitTime; + Error lastError = null; + while(System.currentTimeMillis() < limit) { + Thread.sleep(tickTime); // Try the assertions each tick interval, until they pass or we time out + + try { + SequenceReport sequenceReport = SandeshaClient.getOutgoingSequenceReport(serviceClient); + assertNotNull(sequenceReport); + assertTrue(sequenceReport.isSecureSequence()); + + lastError = null; + break; + } catch(Error e) { + lastError = e; + } } - assertTrue(sequenceReport.isSecureSequence()); - + + if(lastError != null) throw lastError; + configContext.getListenerManager().stop(); serviceClient.cleanup(); } Modified: webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/versions/AddressingVersionTest.java URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/versions/AddressingVersionTest.java?view=diff&rev=480595&r1=480594&r2=480595 ============================================================================== --- webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/versions/AddressingVersionTest.java (original) +++ webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/versions/AddressingVersionTest.java Wed Nov 29 07:23:40 2006 @@ -18,10 +18,6 @@ import java.io.File; -import org.apache.axiom.om.OMAbstractFactory; -import org.apache.axiom.om.OMElement; -import org.apache.axiom.om.OMFactory; -import org.apache.axiom.om.OMNamespace; import org.apache.axiom.soap.SOAP11Constants; import org.apache.axis2.AxisFault; import org.apache.axis2.addressing.AddressingConstants; @@ -30,11 +26,6 @@ import org.apache.axis2.client.ServiceClient; import org.apache.axis2.context.ConfigurationContext; import org.apache.axis2.context.ConfigurationContextFactory; -import org.apache.axis2.context.MessageContextConstants; -import org.apache.axis2.transport.http.SimpleHTTPServer; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.sandesha2.SandeshaException; import org.apache.sandesha2.SandeshaTestCase; import org.apache.sandesha2.client.SandeshaClient; import org.apache.sandesha2.client.SandeshaClientConstants; @@ -43,58 +34,20 @@ public class AddressingVersionTest extends SandeshaTestCase { - SimpleHTTPServer httpServer = null; - private final String applicationNamespaceName = "http://tempuri.org/";; - private final String ping = "ping"; - private final String Text = "Text"; - int serverPort = DEFAULT_SERVER_TEST_PORT; - private Log log = LogFactory.getLog(getClass()); - public AddressingVersionTest () { super ("AddressingVersionTest"); } - public void setUp () throws AxisFault { - + public void setUp () throws Exception { + super.setUp(); String repoPath = "target" + File.separator + "repos" + File.separator + "server"; String axis2_xml = "target" + File.separator + "repos" + File.separator + "server" + File.separator + "server_axis2.xml"; - - - ConfigurationContext configContext = ConfigurationContextFactory.createConfigurationContextFromFileSystem(repoPath,axis2_xml); - String serverPortStr = getTestProperty("test.server.port"); - if (serverPortStr!=null) { - - try { - serverPort = Integer.parseInt(serverPortStr); - } catch (NumberFormatException e) { - log.error(e); - } - } - - httpServer = new SimpleHTTPServer (configContext,serverPort); - httpServer.start(); - try { - Thread.sleep(300); - } catch (InterruptedException e) { - throw new SandeshaException ("sleep interupted"); - } - } - - public void tearDown () throws SandeshaException { - if (httpServer!=null) - httpServer.stop(); - - try { - Thread.sleep(300); - } catch (InterruptedException e) { - throw new SandeshaException ("sleep interupted"); - } + startServer(repoPath, axis2_xml); } public void testAddressingFinal () throws AxisFault,InterruptedException { String to = "http://127.0.0.1:"; + serverPort + "/axis2/services/RMSampleService"; - String transportTo = "http://127.0.0.1:"; + serverPort + "/axis2/services/RMSampleService"; String repoPath = "target" + File.separator + "repos" + File.separator + "client"; String axis2_xml = "target" + File.separator + "repos" + File.separator + "client" + File.separator + "client_axis2.xml"; @@ -106,7 +59,6 @@ clientOptions.setSoapVersionURI(SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI); clientOptions.setTo(new EndpointReference (to)); - clientOptions.setProperty(MessageContextConstants.TRANSPORT_URL,transportTo); String sequenceKey = "sequence1"; clientOptions.setProperty(SandeshaClientConstants.SEQUENCE_KEY,sequenceKey); @@ -122,13 +74,25 @@ clientOptions.setProperty(SandeshaClientConstants.LAST_MESSAGE, "true"); serviceClient.fireAndForget(getPingOMBlock("ping3")); - Thread.sleep(10000); - - 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); - + long limit = System.currentTimeMillis() + waitTime; + Error lastError = null; + while(System.currentTimeMillis() < limit) { + Thread.sleep(tickTime); // Try the assertions each tick interval, until they pass or we time out + + try { + 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); + + lastError = null; + break; + } catch(Error e) { + lastError = e; + } + } + if(lastError != null) throw lastError; + configContext.getListenerManager().stop(); serviceClient.cleanup(); } @@ -136,7 +100,6 @@ public void testAddressingSubmission () throws AxisFault,InterruptedException { String to = "http://127.0.0.1:"; + serverPort + "/axis2/services/RMSampleService"; - String transportTo = "http://127.0.0.1:"; + serverPort + "/axis2/services/RMSampleService"; String repoPath = "target" + File.separator + "repos" + File.separator + "client"; String axis2_xml = "target" + File.separator + "repos" + File.separator + "client" + File.separator + "client_axis2.xml"; @@ -148,7 +111,6 @@ clientOptions.setSoapVersionURI(SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI); clientOptions.setTo(new EndpointReference (to)); - clientOptions.setProperty(MessageContextConstants.TRANSPORT_URL,transportTo); String sequenceKey = "sequence1"; clientOptions.setProperty(SandeshaClientConstants.SEQUENCE_KEY,sequenceKey); @@ -164,26 +126,27 @@ clientOptions.setProperty(SandeshaClientConstants.LAST_MESSAGE, "true"); serviceClient.fireAndForget(getPingOMBlock("ping3")); - Thread.sleep(10000); - - 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); - + long limit = System.currentTimeMillis() + waitTime; + Error lastError = null; + while(System.currentTimeMillis() < limit) { + Thread.sleep(tickTime); // Try the assertions each tick interval, until they pass or we time out + + try { + 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); + + lastError = null; + break; + } catch(Error e) { + lastError = e; + } + } + if(lastError != null) throw lastError; + configContext.getListenerManager().stop(); serviceClient.cleanup(); } - private OMElement getPingOMBlock(String text) { - OMFactory fac = OMAbstractFactory.getOMFactory(); - OMNamespace namespace = fac.createOMNamespace(applicationNamespaceName,"ns1"); - OMElement pingElem = fac.createOMElement(ping, namespace); - OMElement textElem = fac.createOMElement(Text, namespace); - - textElem.setText(text); - pingElem.addChild(textElem); - - return pingElem; - } } Modified: webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/versions/RMVersionTest.java URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/versions/RMVersionTest.java?view=diff&rev=480595&r1=480594&r2=480595 ============================================================================== --- webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/versions/RMVersionTest.java (original) +++ webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/versions/RMVersionTest.java Wed Nov 29 07:23:40 2006 @@ -18,23 +18,13 @@ import java.io.File; -import org.apache.axiom.om.OMAbstractFactory; -import org.apache.axiom.om.OMElement; -import org.apache.axiom.om.OMFactory; -import org.apache.axiom.om.OMNamespace; import org.apache.axiom.soap.SOAP11Constants; -import org.apache.axis2.AxisFault; import org.apache.axis2.addressing.EndpointReference; import org.apache.axis2.client.Options; import org.apache.axis2.client.ServiceClient; import org.apache.axis2.context.ConfigurationContext; import org.apache.axis2.context.ConfigurationContextFactory; -import org.apache.axis2.context.MessageContextConstants; -import org.apache.axis2.transport.http.SimpleHTTPServer; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.sandesha2.Sandesha2Constants; -import org.apache.sandesha2.SandeshaException; import org.apache.sandesha2.SandeshaTestCase; import org.apache.sandesha2.client.SandeshaClient; import org.apache.sandesha2.client.SandeshaClientConstants; @@ -42,59 +32,20 @@ public class RMVersionTest extends SandeshaTestCase { - - SimpleHTTPServer httpServer = null; - private final String applicationNamespaceName = "http://tempuri.org/";; - private final String ping = "ping"; - private final String Text = "Text"; - int serverPort = DEFAULT_SERVER_TEST_PORT; - private Log log = LogFactory.getLog(getClass()); - public RMVersionTest () { super ("RMVersionTest"); } - public void setUp () throws AxisFault { - + public void setUp () throws Exception { + super.setUp(); String repoPath = "target" + File.separator + "repos" + File.separator + "server"; String axis2_xml = "target" + File.separator + "repos" + File.separator + "server" + File.separator + "server_axis2.xml"; - - - ConfigurationContext configContext = ConfigurationContextFactory.createConfigurationContextFromFileSystem(repoPath,axis2_xml); - String serverPortStr = getTestProperty("test.server.port"); - if (serverPortStr!=null) { - - try { - serverPort = Integer.parseInt(serverPortStr); - } catch (NumberFormatException e) { - log.error(e); - } - } - - httpServer = new SimpleHTTPServer (configContext,serverPort); - httpServer.start(); - try { - Thread.sleep(300); - } catch (InterruptedException e) { - throw new SandeshaException ("sleep interupted"); - } + startServer(repoPath, axis2_xml); } - public void tearDown () throws SandeshaException { - if (httpServer!=null) - httpServer.stop(); - - try { - Thread.sleep(300); - } catch (InterruptedException e) { - throw new SandeshaException ("sleep interupted"); - } - } - - public void testRMSubmission () throws AxisFault,InterruptedException { + public void testRMSubmission () throws Exception { String to = "http://127.0.0.1:"; + serverPort + "/axis2/services/RMSampleService"; - String transportTo = "http://127.0.0.1:"; + serverPort + "/axis2/services/RMSampleService"; String repoPath = "target" + File.separator + "repos" + File.separator + "client"; String axis2_xml = "target" + File.separator + "repos" + File.separator + "client" + File.separator + "client_axis2.xml"; @@ -106,7 +57,6 @@ clientOptions.setSoapVersionURI(SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI); clientOptions.setTo(new EndpointReference (to)); - clientOptions.setProperty(MessageContextConstants.TRANSPORT_URL,transportTo); String sequenceKey = "sequence1"; clientOptions.setProperty(SandeshaClientConstants.SEQUENCE_KEY,sequenceKey); @@ -122,21 +72,32 @@ clientOptions.setProperty(SandeshaClientConstants.LAST_MESSAGE, "true"); serviceClient.fireAndForget(getPingOMBlock("ping3")); - Thread.sleep(10000); - - 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); - + long limit = System.currentTimeMillis() + waitTime; + Error lastError = null; + while(System.currentTimeMillis() < limit) { + Thread.sleep(tickTime); // Try the assertions each tick interval, until they pass or we time out + + try { + 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); + + lastError = null; + break; + } catch(Error e) { + lastError = e; + } + } + if(lastError != null) throw lastError; + configContext.getListenerManager().stop(); serviceClient.cleanup(); } - public void testRMOASIS () throws AxisFault,InterruptedException { + public void testRMOASIS () throws Exception { String to = "http://127.0.0.1:"; + serverPort + "/axis2/services/RMSampleService"; - String transportTo = "http://127.0.0.1:"; + serverPort + "/axis2/services/RMSampleService"; String repoPath = "target" + File.separator + "repos" + File.separator + "client"; String axis2_xml = "target" + File.separator + "repos" + File.separator + "client" + File.separator + "client_axis2.xml"; @@ -148,7 +109,6 @@ clientOptions.setSoapVersionURI(SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI); clientOptions.setTo(new EndpointReference (to)); - clientOptions.setProperty(MessageContextConstants.TRANSPORT_URL,transportTo); String sequenceKey = "sequence1"; clientOptions.setProperty(SandeshaClientConstants.SEQUENCE_KEY,sequenceKey); @@ -163,30 +123,48 @@ serviceClient.fireAndForget(getPingOMBlock("ping3")); - Thread.sleep(5000); + // Wait for the sequence to start up + long limit = System.currentTimeMillis() + waitTime; + Error lastError = null; + while(System.currentTimeMillis() < limit) { + Thread.sleep(tickTime); // Try the assertions each tick interval, until they pass or we time out + + try { + SequenceReport sequenceReport = SandeshaClient.getOutgoingSequenceReport(serviceClient); + assertTrue(sequenceReport.getCompletedMessages().contains(new Long(1))); + assertEquals(sequenceReport.getSequenceStatus(),SequenceReport.SEQUENCE_STATUS_ESTABLISHED); + assertEquals(sequenceReport.getSequenceDirection(),SequenceReport.SEQUENCE_DIRECTION_OUT); + + lastError = null; + break; + } catch(Error e) { + lastError = e; + } + } + if(lastError != null) throw lastError; SandeshaClient.terminateSequence(serviceClient); - Thread.sleep(5000); - - 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); - + limit = System.currentTimeMillis() + waitTime; + while(System.currentTimeMillis() < limit) { + Thread.sleep(tickTime); // Try the assertions each tick interval, until they pass or we time out + + try { + 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); + + lastError = null; + break; + } catch(Error e) { + lastError = e; + } + } + if(lastError != null) throw lastError; + configContext.getListenerManager().stop(); serviceClient.cleanup(); } - private OMElement getPingOMBlock(String text) { - OMFactory fac = OMAbstractFactory.getOMFactory(); - OMNamespace namespace = fac.createOMNamespace(applicationNamespaceName,"ns1"); - OMElement pingElem = fac.createOMElement(ping, namespace); - OMElement textElem = fac.createOMElement(Text, namespace); - - textElem.setText(text); - pingElem.addChild(textElem); - - return pingElem; - } } Modified: webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/versions/SOAPVersionTest.java URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/versions/SOAPVersionTest.java?view=diff&rev=480595&r1=480594&r2=480595 ============================================================================== --- webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/versions/SOAPVersionTest.java (original) +++ webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/versions/SOAPVersionTest.java Wed Nov 29 07:23:40 2006 @@ -18,10 +18,6 @@ import java.io.File; -import org.apache.axiom.om.OMAbstractFactory; -import org.apache.axiom.om.OMElement; -import org.apache.axiom.om.OMFactory; -import org.apache.axiom.om.OMNamespace; import org.apache.axiom.soap.SOAP11Constants; import org.apache.axiom.soap.SOAP12Constants; import org.apache.axis2.AxisFault; @@ -30,11 +26,6 @@ import org.apache.axis2.client.ServiceClient; import org.apache.axis2.context.ConfigurationContext; import org.apache.axis2.context.ConfigurationContextFactory; -import org.apache.axis2.context.MessageContextConstants; -import org.apache.axis2.transport.http.SimpleHTTPServer; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.sandesha2.SandeshaException; import org.apache.sandesha2.SandeshaTestCase; import org.apache.sandesha2.client.SandeshaClient; import org.apache.sandesha2.client.SandeshaClientConstants; @@ -42,59 +33,20 @@ public class SOAPVersionTest extends SandeshaTestCase { - - SimpleHTTPServer httpServer = null; - private final String applicationNamespaceName = "http://tempuri.org/";; - private final String ping = "ping"; - private final String Text = "Text"; - int serverPort = DEFAULT_SERVER_TEST_PORT; - private Log log = LogFactory.getLog(getClass()); - public SOAPVersionTest () { super ("SOAPVersionTest"); } - public void setUp () throws AxisFault { - + public void setUp () throws Exception { + super.setUp(); String repoPath = "target" + File.separator + "repos" + File.separator + "server"; String axis2_xml = "target" + File.separator + "repos" + File.separator + "server" + File.separator + "server_axis2.xml"; - - - ConfigurationContext configContext = ConfigurationContextFactory.createConfigurationContextFromFileSystem(repoPath,axis2_xml); - String serverPortStr = getTestProperty("test.server.port"); - if (serverPortStr!=null) { - - try { - serverPort = Integer.parseInt(serverPortStr); - } catch (NumberFormatException e) { - log.error(e); - } - } - - httpServer = new SimpleHTTPServer (configContext,serverPort); - httpServer.start(); - try { - Thread.sleep(300); - } catch (InterruptedException e) { - throw new SandeshaException ("sleep interupted"); - } - } - - public void tearDown () throws SandeshaException { - if (httpServer!=null) - httpServer.stop(); - - try { - Thread.sleep(300); - } catch (InterruptedException e) { - throw new SandeshaException ("sleep interupted"); - } + startServer(repoPath, axis2_xml); } - public void testSOAP11 () throws AxisFault,InterruptedException { + public void testSOAP11 () throws Exception { String to = "http://127.0.0.1:"; + serverPort + "/axis2/services/RMSampleService"; - String transportTo = "http://127.0.0.1:"; + serverPort + "/axis2/services/RMSampleService"; String repoPath = "target" + File.separator + "repos" + File.separator + "client"; String axis2_xml = "target" + File.separator + "repos" + File.separator + "client" + File.separator + "client_axis2.xml"; @@ -104,7 +56,6 @@ Options clientOptions = new Options (); clientOptions.setTo(new EndpointReference (to)); - clientOptions.setProperty(MessageContextConstants.TRANSPORT_URL,transportTo); String sequenceKey = "sequence1"; clientOptions.setProperty(SandeshaClientConstants.SEQUENCE_KEY,sequenceKey); @@ -120,13 +71,25 @@ clientOptions.setProperty(SandeshaClientConstants.LAST_MESSAGE, "true"); serviceClient.fireAndForget(getPingOMBlock("ping3")); - Thread.sleep(10000); - - 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); - + long limit = System.currentTimeMillis() + waitTime; + Error lastError = null; + while(System.currentTimeMillis() < limit) { + Thread.sleep(tickTime); // Try the assertions each tick interval, until they pass or we time out + + try { + 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); + + lastError = null; + break; + } catch(Error e) { + lastError = e; + } + } + if(lastError != null) throw lastError; + configContext.getListenerManager().stop(); serviceClient.cleanup(); } @@ -134,7 +97,6 @@ public void testSOAP12 () throws AxisFault,InterruptedException { String to = "http://127.0.0.1:"; + serverPort + "/axis2/services/RMSampleService"; - String transportTo = "http://127.0.0.1:"; + serverPort + "/axis2/services/RMSampleService"; String repoPath = "target" + File.separator + "repos" + File.separator + "client"; String axis2_xml = "target" + File.separator + "repos" + File.separator + "client" + File.separator + "client_axis2.xml"; @@ -145,7 +107,6 @@ clientOptions.setSoapVersionURI(SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI); clientOptions.setTo(new EndpointReference (to)); - clientOptions.setProperty(MessageContextConstants.TRANSPORT_URL,transportTo); String sequenceKey = "sequence1"; clientOptions.setProperty(SandeshaClientConstants.SEQUENCE_KEY,sequenceKey); @@ -161,26 +122,27 @@ clientOptions.setProperty(SandeshaClientConstants.LAST_MESSAGE, "true"); serviceClient.fireAndForget(getPingOMBlock("ping3")); - Thread.sleep(10000); - - 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); - + long limit = System.currentTimeMillis() + waitTime; + Error lastError = null; + while(System.currentTimeMillis() < limit) { + Thread.sleep(tickTime); // Try the assertions each tick interval, until they pass or we time out + + try { + 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); + + lastError = null; + break; + } catch(Error e) { + lastError = e; + } + } + if(lastError != null) throw lastError; + configContext.getListenerManager().stop(); serviceClient.cleanup(); } - private OMElement getPingOMBlock(String text) { - OMFactory fac = OMAbstractFactory.getOMFactory(); - OMNamespace namespace = fac.createOMNamespace(applicationNamespaceName,"ns1"); - OMElement pingElem = fac.createOMElement(ping, namespace); - OMElement textElem = fac.createOMElement(Text, namespace); - - textElem.setText(text); - pingElem.addChild(textElem); - - return pingElem; - } } Modified: webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/workers/ForceInboundDispatchTest.java URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/workers/ForceInboundDispatchTest.java?view=diff&rev=480595&r1=480594&r2=480595 ============================================================================== --- webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/workers/ForceInboundDispatchTest.java (original) +++ webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/workers/ForceInboundDispatchTest.java Wed Nov 29 07:23:40 2006 @@ -2,10 +2,6 @@ import java.io.File; -import org.apache.axiom.om.OMAbstractFactory; -import org.apache.axiom.om.OMElement; -import org.apache.axiom.om.OMFactory; -import org.apache.axiom.om.OMNamespace; import org.apache.axiom.soap.SOAP11Constants; import org.apache.axis2.AxisFault; import org.apache.axis2.addressing.EndpointReference; @@ -13,12 +9,7 @@ import org.apache.axis2.client.ServiceClient; import org.apache.axis2.context.ConfigurationContext; import org.apache.axis2.context.ConfigurationContextFactory; -import org.apache.axis2.context.MessageContextConstants; -import org.apache.axis2.transport.http.SimpleHTTPServer; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.sandesha2.Sandesha2Constants; -import org.apache.sandesha2.SandeshaException; import org.apache.sandesha2.SandeshaTestCase; import org.apache.sandesha2.client.SandeshaClient; import org.apache.sandesha2.client.SandeshaClientConstants; @@ -27,64 +18,25 @@ import org.apache.sandesha2.storage.beans.SequencePropertyBean; import org.apache.sandesha2.util.RangeString; import org.apache.sandesha2.util.SandeshaUtil; -import org.apache.sandesha2.workers.Invoker; public class ForceInboundDispatchTest extends SandeshaTestCase { - SimpleHTTPServer httpServer = null; - private final String applicationNamespaceName = "http://tempuri.org/";; - private final String ping = "ping"; - private final String Text = "Text"; - - private Log log = LogFactory.getLog(getClass()); - int serverPort = DEFAULT_SERVER_TEST_PORT; - ConfigurationContext serverConfigCtx = null; public ForceInboundDispatchTest () { super ("ForceDispatchTest"); } - public void setUp () throws AxisFault { - + public void setUp () throws Exception { + super.setUp(); String repoPath = "target" + File.separator + "repos" + File.separator + "server"; String axis2_xml = "target" + File.separator + "repos" + File.separator + "server" + File.separator + "server_axis2.xml"; - - serverConfigCtx = ConfigurationContextFactory.createConfigurationContextFromFileSystem(repoPath,axis2_xml); - - String serverPortStr = getTestProperty("test.server.port"); - if (serverPortStr!=null) { - try { - serverPort = Integer.parseInt(serverPortStr); - } catch (NumberFormatException e) { - log.error(e); - } - } - - httpServer = new SimpleHTTPServer (serverConfigCtx,serverPort); - httpServer.start(); - try { - Thread.sleep(300); - } catch (InterruptedException e) { - throw new SandeshaException ("sleep interupted"); - } - } - - public void tearDown () throws SandeshaException { - if (httpServer!=null) - httpServer.stop(); - - try { - Thread.sleep(300); - } catch (InterruptedException e) { - throw new SandeshaException ("sleep interupted"); - } + serverConfigCtx = startServer(repoPath, axis2_xml); } public void testForceInvoke () throws AxisFault,InterruptedException { String to = "http://127.0.0.1:"; + serverPort + "/axis2/services/RMSampleService"; - String transportTo = "http://127.0.0.1:"; + serverPort + "/axis2/services/RMSampleService"; String repoPath = "target" + File.separator + "repos" + File.separator + "client"; String axis2_xml = "target" + File.separator + "repos" + File.separator + "client" + File.separator + "client_axis2.xml"; @@ -95,7 +47,6 @@ clientOptions.setSoapVersionURI(SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI); clientOptions.setTo(new EndpointReference (to)); - clientOptions.setProperty(MessageContextConstants.TRANSPORT_URL,transportTo); String sequenceKey = "sequence1"; clientOptions.setProperty(SandeshaClientConstants.SEQUENCE_KEY,sequenceKey); @@ -156,7 +107,6 @@ public void testForceInvokeWithDiscardGaps () throws AxisFault,InterruptedException { String to = "http://127.0.0.1:"; + serverPort + "/axis2/services/RMSampleService"; - String transportTo = "http://127.0.0.1:"; + serverPort + "/axis2/services/RMSampleService"; String repoPath = "target" + File.separator + "repos" + File.separator + "client"; String axis2_xml = "target" + File.separator + "repos" + File.separator + "client" + File.separator + "client_axis2.xml"; @@ -167,7 +117,6 @@ clientOptions.setSoapVersionURI(SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI); clientOptions.setTo(new EndpointReference (to)); - clientOptions.setProperty(MessageContextConstants.TRANSPORT_URL,transportTo); String sequenceKey = "sequence1"; clientOptions.setProperty(SandeshaClientConstants.SEQUENCE_KEY,sequenceKey); @@ -202,16 +151,4 @@ } - private OMElement getPingOMBlock(String text) { - OMFactory fac = OMAbstractFactory.getOMFactory(); - OMNamespace namespace = fac.createOMNamespace(applicationNamespaceName,"ns1"); - OMElement pingElem = fac.createOMElement(ping, namespace); - OMElement textElem = fac.createOMElement(Text, namespace); - - textElem.setText(text); - pingElem.addChild(textElem); - - return pingElem; - } - } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
