Author: alessio.soldano(a)jboss.com Date: 2009-07-01 03:43:41 -0400 (Wed, 01 Jul 2009) New Revision: 10270 Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endpoint/EndpointBean.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endpoint/EndpointInterface.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endpoint/EndpointTestCase.java Log: [JBWS-2112] Minor changes to the test Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endpoint/EndpointBean.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endpoint/EndpointBean.java 2009-06-30 16:49:45 UTC (rev 10269) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endpoint/EndpointBean.java 2009-07-01 07:43:41 UTC (rev 10270) @@ -37,8 +37,16 @@ ) public class EndpointBean implements EndpointInterface { + private int count; + public String echo(String input) { + count++; return input; } + + public int getCount() + { + return count; + } } Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endpoint/EndpointInterface.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endpoint/EndpointInterface.java 2009-06-30 16:49:45 UTC (rev 10269) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endpoint/EndpointInterface.java 2009-07-01 07:43:41 UTC (rev 10270) @@ -38,4 +38,6 @@ public interface EndpointInterface extends Remote { String echo(String input) throws RemoteException; + + public int getCount(); } Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endpoint/EndpointTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endpoint/EndpointTestCase.java 2009-06-30 16:49:45 UTC (rev 10269) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endpoint/EndpointTestCase.java 2009-07-01 07:43:41 UTC (rev 10270) @@ -40,13 +40,30 @@ { private static final int port = 8878; - public void testJSEEndpointPublish() throws Exception + public void test() throws Exception { - EndpointBean epImpl = new EndpointBean(); + String publishURL = "http://" + getServerHost() + ":" + port + "/jaxws-endpoint"; + Endpoint endpoint = publishEndpoint(new EndpointBean(), publishURL); + + String publishURL2 = "http://" + getServerHost() + ":" + port + "/jaxws-endpoint2"; + Endpoint endpoint2 = publishEndpoint(new EndpointBean(), publishURL2); + + invokeEndpoint(publishURL); + invokeEndpoint(publishURL2); + + endpoint.stop(); + endpoint2.stop(); + } + + private Endpoint publishEndpoint(EndpointBean epImpl, String publishURL) + { Endpoint endpoint = Endpoint.create(SOAPBinding.SOAP11HTTP_BINDING, epImpl); - String publishURL = "http://" + getServerHost() + ":" + port + "/jaxws-endpoint"; endpoint.publish(publishURL); - + return endpoint; + } + + private void invokeEndpoint(String publishURL) throws Exception + { URL wsdlURL = new URL(publishURL + "?wsdl"); QName qname = new QName("http://org.jboss.ws/jaxws/cxf/endpoint", "EndpointService"); Service service = Service.create(wsdlURL, qname); @@ -54,9 +71,11 @@ // Invoke the endpoint String helloWorld = "Hello world!"; + assertEquals(0, port.getCount()); Object retObj = port.echo(helloWorld); assertEquals(helloWorld, retObj); - - endpoint.stop(); + assertEquals(1, port.getCount()); + port.echo(helloWorld); + assertEquals(2, port.getCount()); } }