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=488931&r1=488930&r2=488931 ============================================================================== --- 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 Tue Dec 19 22:35:09 2006 @@ -19,7 +19,6 @@ import java.io.File; import org.apache.axiom.soap.SOAP11Constants; -import org.apache.axis2.AxisFault; import org.apache.axis2.addressing.AddressingConstants; import org.apache.axis2.addressing.EndpointReference; import org.apache.axis2.client.Options; @@ -45,61 +44,25 @@ startServer(repoPath, axis2_xml); } - public void testAddressingFinal () throws AxisFault,InterruptedException { - - String to = "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"; - - ConfigurationContext configContext = ConfigurationContextFactory.createConfigurationContextFromFileSystem(repoPath,axis2_xml); - - //clientOptions.setSoapVersionURI(SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI); + public void testAddressingFinal() throws Exception { Options clientOptions = new Options (); - clientOptions.setAction(pingAction); - clientOptions.setSoapVersionURI(SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI); - - clientOptions.setTo(new EndpointReference (to)); - - String sequenceKey = "sequence1"; - clientOptions.setProperty(SandeshaClientConstants.SEQUENCE_KEY,sequenceKey); - - //setting the addressing version as Final clientOptions.setProperty(AddressingConstants.WS_ADDRESSING_VERSION,AddressingConstants.Final.WSA_NAMESPACE); - - ServiceClient serviceClient = new ServiceClient (configContext,null); - //serviceClient. - - serviceClient.setOptions(clientOptions); - - clientOptions.setProperty(SandeshaClientConstants.LAST_MESSAGE, "true"); - serviceClient.fireAndForget(getPingOMBlock("ping3")); - - 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(); + runAddressingTest(clientOptions); } - public void testAddressingSubmission () throws AxisFault,InterruptedException { - + public void testAddressingSubmission() throws Exception { + Options clientOptions = new Options (); + clientOptions.setProperty(AddressingConstants.WS_ADDRESSING_VERSION,AddressingConstants.Submission.WSA_NAMESPACE); + runAddressingTest(clientOptions); + } + + public void testAddressingNone() throws Exception { + Options clientOptions = new Options (); + clientOptions.setProperty(AddressingConstants.DISABLE_ADDRESSING_FOR_OUT_MESSAGES, Boolean.TRUE); + runAddressingTest(clientOptions); + } + + private void runAddressingTest(Options clientOptions) throws Exception { String to = "http://127.0.0.1:"; + serverPort + "/axis2/services/RMSampleService"; String repoPath = "target" + File.separator + "repos" + File.separator + "client"; @@ -107,26 +70,17 @@ ConfigurationContext configContext = ConfigurationContextFactory.createConfigurationContextFromFileSystem(repoPath,axis2_xml); - //clientOptions.setSoapVersionURI(SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI); - Options clientOptions = new Options (); clientOptions.setAction(pingAction); clientOptions.setSoapVersionURI(SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI); - clientOptions.setTo(new EndpointReference (to)); - String sequenceKey = "sequence1"; clientOptions.setProperty(SandeshaClientConstants.SEQUENCE_KEY,sequenceKey); - - //setting the addressing version as Submission - clientOptions.setProperty(AddressingConstants.WS_ADDRESSING_VERSION,AddressingConstants.Submission.WSA_NAMESPACE); + clientOptions.setProperty(SandeshaClientConstants.LAST_MESSAGE, "true"); ServiceClient serviceClient = new ServiceClient (configContext,null); - //serviceClient. - serviceClient.setOptions(clientOptions); - clientOptions.setProperty(SandeshaClientConstants.LAST_MESSAGE, "true"); - serviceClient.fireAndForget(getPingOMBlock("ping3")); + serviceClient.fireAndForget(getPingOMBlock("ping")); long limit = System.currentTimeMillis() + waitTime; Error lastError = null; @@ -150,5 +104,4 @@ configContext.getListenerManager().stop(); serviceClient.cleanup(); } - }
Modified: webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/wsrm/CreateSequenceResponseTest.java URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/wsrm/CreateSequenceResponseTest.java?view=diff&rev=488931&r1=488930&r2=488931 ============================================================================== --- webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/wsrm/CreateSequenceResponseTest.java (original) +++ webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/wsrm/CreateSequenceResponseTest.java Tue Dec 19 22:35:09 2006 @@ -16,13 +16,11 @@ package org.apache.sandesha2.wsrm; -import org.apache.sandesha2.SandeshaException; import org.apache.sandesha2.SandeshaTestCase; import org.apache.sandesha2.Sandesha2Constants; import org.apache.axiom.soap.SOAPEnvelope; import org.apache.axiom.soap.SOAPFactory; import org.apache.axis2.AxisFault; -import org.apache.axis2.addressing.AddressingConstants; import org.apache.axis2.addressing.EndpointReference; import org.apache.axiom.om.OMAbstractFactory; import org.apache.axiom.om.OMElement; @@ -33,7 +31,7 @@ SOAPFactory factory = OMAbstractFactory.getSOAP11Factory(); String rmNamespaceValue = Sandesha2Constants.SPEC_2005_02.NS_URI; - String addressingNamespaceValue = AddressingConstants.Final.WSA_NAMESPACE; + String addressingNamespaceValue = Sandesha2Constants.SPEC_2005_02.ADDRESSING_NS_URI; public CreateSequenceResponseTest() { super("CreateSequenceResponseTest"); @@ -41,7 +39,7 @@ } public void testFromOMElement() throws AxisFault { - CreateSequenceResponse res = new CreateSequenceResponse(rmNamespaceValue,addressingNamespaceValue); + CreateSequenceResponse res = new CreateSequenceResponse(rmNamespaceValue); SOAPEnvelope env = getSOAPEnvelope("", "CreateSequenceResponse.xml"); res.fromOMElement(env.getBody()); @@ -55,16 +53,15 @@ } public void testToSOAPEnvelope() throws AxisFault { - CreateSequenceResponse res = new CreateSequenceResponse(rmNamespaceValue,addressingNamespaceValue); + CreateSequenceResponse res = new CreateSequenceResponse(rmNamespaceValue); Identifier identifier = new Identifier(rmNamespaceValue); identifier.setIndentifer("uuid:88754b00-161a-11da-b6d6-8198de3c47c5"); res.setIdentifier(identifier); - Accept accept = new Accept(rmNamespaceValue,addressingNamespaceValue); - AcksTo acksTo = new AcksTo(rmNamespaceValue,addressingNamespaceValue); - Address address = new Address(addressingNamespaceValue); - acksTo.setAddress (new EndpointReference ("http://localhost:8070/axis/services/TestService";)); + EndpointReference epr = new EndpointReference ("http://localhost:8070/axis/services/TestService";); + Accept accept = new Accept(rmNamespaceValue); + AcksTo acksTo = new AcksTo(epr, rmNamespaceValue, addressingNamespaceValue); accept.setAcksTo(acksTo); res.setAccept(accept); Modified: webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/wsrm/CreateSequenceTest.java URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/wsrm/CreateSequenceTest.java?view=diff&rev=488931&r1=488930&r2=488931 ============================================================================== --- webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/wsrm/CreateSequenceTest.java (original) +++ webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/wsrm/CreateSequenceTest.java Tue Dec 19 22:35:09 2006 @@ -23,17 +23,15 @@ import org.apache.axiom.soap.SOAPEnvelope; import org.apache.axiom.soap.SOAPFactory; import org.apache.axis2.AxisFault; -import org.apache.axis2.addressing.AddressingConstants; import org.apache.axis2.addressing.EndpointReference; import org.apache.sandesha2.Sandesha2Constants; -import org.apache.sandesha2.SandeshaException; import org.apache.sandesha2.SandeshaTestCase; public class CreateSequenceTest extends SandeshaTestCase { SOAPFactory factory = OMAbstractFactory.getSOAP11Factory(); String rmNamespaceValue = Sandesha2Constants.SPEC_2005_02.NS_URI; - String addressingNamespaceValue = AddressingConstants.Final.WSA_NAMESPACE; + String addressingNamespaceValue = Sandesha2Constants.SPEC_2005_02.ADDRESSING_NS_URI; public CreateSequenceTest() { super("CreateSequenceTest"); @@ -41,7 +39,7 @@ public void testfromOMElement() throws AxisFault { - CreateSequence createSequence = new CreateSequence(rmNamespaceValue,addressingNamespaceValue); + CreateSequence createSequence = new CreateSequence(rmNamespaceValue); createSequence.fromOMElement(getSOAPEnvelope("", "CreateSequence.xml").getBody()); AcksTo acksTo = createSequence.getAcksTo(); @@ -54,10 +52,10 @@ } public void testToSOAPEnvelope() throws AxisFault { - CreateSequence createSequence = new CreateSequence(rmNamespaceValue,addressingNamespaceValue); + CreateSequence createSequence = new CreateSequence(rmNamespaceValue); - AcksTo acksTo = new AcksTo(rmNamespaceValue,addressingNamespaceValue); - acksTo.setAddress(new EndpointReference("http://127.0.0.1:9090/axis/services/RMService";)); + EndpointReference epr = new EndpointReference("http://127.0.0.1:9090/axis/services/RMService";); + AcksTo acksTo = new AcksTo(epr, rmNamespaceValue, addressingNamespaceValue); createSequence.setAcksTo(acksTo); SequenceOffer sequenceOffer = new SequenceOffer(rmNamespaceValue); Modified: webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/wsrm/MakeConnectionTest.java URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/wsrm/MakeConnectionTest.java?view=diff&rev=488931&r1=488930&r2=488931 ============================================================================== --- webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/wsrm/MakeConnectionTest.java (original) +++ webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/wsrm/MakeConnectionTest.java Tue Dec 19 22:35:09 2006 @@ -24,7 +24,6 @@ import org.apache.axiom.soap.SOAPFactory; import org.apache.axis2.AxisFault; import org.apache.axis2.addressing.AddressingConstants; -import org.apache.axis2.addressing.EndpointReference; import org.apache.sandesha2.Sandesha2Constants; import org.apache.sandesha2.SandeshaException; import org.apache.sandesha2.SandeshaTestCase; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
