[jbossws-commits] JBossWS SVN: r15011 - in stack/cxf/trunk/modules/testsuite: cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype and 2 other directories.

Author: alessio.soldano(a)jboss.com Date: 2011-09-15 10:34:58 -0400 (Thu, 15 Sep 2011) New Revision: 15011 Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/MixedTypeTestCase.java stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/mixtype/WEB-INF/jbossws-cxf.xml stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/mixtype/WEB-INF/web.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/MixedTypeTestCase.java stack/cxf/trunk/modules/testsuite/pom.xml Log: [JBWS-3352] Fixing and enabling tests Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/MixedTypeTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/MixedTypeTestCase.java 2011-09-15 13:39:41 UTC (rev 15010) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/MixedTypeTestCase.java 2011-09-15 14:34:58 UTC (rev 15011) @@ -33,7 +33,7 @@ public class MixedTypeTestCase extends JBossWSTest { - private final String endpointURL = "http://" + getServerHost() + ":8080/jaxws-cxf-mixtype"; + private final String endpointURL = "http://" + getServerHost() + ":8080/mixtype/jaxws-cxf-mixtype"; private final String ejbEndpointURL = "http://" + getServerHost() + ":8080/mixtype/EJBServiceOne/EJBEndpointOne"; private String targetNS = "http://org.jboss.ws.jaxws.cxf/mixtype"; @@ -45,14 +45,12 @@ public void testEndpoint() throws Exception { - URL wsdlOneURL = new URL(endpointURL + "?wsdl"); QName serviceOneName = new QName(targetNS, "ServiceOne"); Service serviceOne = Service.create(wsdlOneURL, serviceOneName); - EndpointOne endpoint = (EndpointOne)serviceOne.getPort(EndpointOne.class); + EndpointOne endpoint = (EndpointOne)serviceOne.getPort(new QName(targetNS, "EndpointOnePort"), EndpointOne.class); assertEquals("mixedType", endpoint.echo("mixedType")); - - + assertEquals(1, endpoint.getCount()); } public void testEJBEndpoint() throws Exception @@ -60,8 +58,9 @@ URL wsdlOneURL = new URL(ejbEndpointURL + "?wsdl"); QName serviceOneName = new QName(targetNS, "EJBServiceOne"); Service serviceOne = Service.create(wsdlOneURL, serviceOneName); - EndpointOne endpoint = (EndpointOne)serviceOne.getPort(EndpointOne.class); + EndpointOne endpoint = (EndpointOne)serviceOne.getPort(new QName(targetNS, "EJBEndpointOnePort"), EndpointOne.class); assertEquals("mixedType", endpoint.echo("mixedType")); + assertEquals(1, endpoint.getCount()); } Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/mixtype/WEB-INF/jbossws-cxf.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/mixtype/WEB-INF/jbossws-cxf.xml 2011-09-15 13:39:41 UTC (rev 15010) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/mixtype/WEB-INF/jbossws-cxf.xml 2011-09-15 14:34:58 UTC (rev 15011) @@ -4,8 +4,13 @@ http://www.w3.org/2006/07/ws-policy http://www.w3.org/2006/07/ws-policy.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd'> - <jaxws:endpoint id='EndpointService' address='http://@jboss.bind.address@:8080/jaxws-cxf-mixtype' + <!-- Please note the context-root / path needs to match the values specified in the web.xml / jboss-web.xml descriptors --> + <jaxws:endpoint id='EndpointService' address='http://@jboss.bind.address@:8080/mixtype/jaxws-cxf-mixtype' implementor='org.jboss.test.ws.jaxws.cxf.mixtype.EndpointOneImpl'> </jaxws:endpoint> + <jaxws:endpoint id='EJBEndpointService' address='http://@jboss.bind.address@:8080/mixtype/EJBServiceOne/EJBEndpointOne' + implementor='org.jboss.test.ws.jaxws.cxf.mixtype.EndpointOneEJB3Impl'> + </jaxws:endpoint> + </beans> Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/mixtype/WEB-INF/web.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/mixtype/WEB-INF/web.xml 2011-09-15 13:39:41 UTC (rev 15010) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/mixtype/WEB-INF/web.xml 2011-09-15 14:34:58 UTC (rev 15011) @@ -9,6 +9,6 @@ </servlet> <servlet-mapping> <servlet-name>Ep1Servlet</servlet-name> - <url-pattern>/ServiceOne/EndpointOne</url-pattern> + <url-pattern>/jaxws-cxf-mixtype</url-pattern> </servlet-mapping> </web-app> Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/MixedTypeTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/MixedTypeTestCase.java 2011-09-15 13:39:41 UTC (rev 15010) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/MixedTypeTestCase.java 2011-09-15 14:34:58 UTC (rev 15011) @@ -22,6 +22,7 @@ package org.jboss.test.ws.jaxws.cxf.mixtype; import java.net.URL; +import java.util.Iterator; import javax.xml.namespace.QName; import javax.xml.ws.Service; @@ -49,10 +50,9 @@ URL wsdlOneURL = new URL(endpointURL + "?wsdl"); QName serviceOneName = new QName(targetNS, "ServiceOne"); Service serviceOne = Service.create(wsdlOneURL, serviceOneName); - EndpointOne endpoint = (EndpointOne)serviceOne.getPort(EndpointOne.class); + EndpointOne endpoint = (EndpointOne)serviceOne.getPort(new QName(targetNS, "EndpointOnePort"), EndpointOne.class); assertEquals("mixedType", endpoint.echo("mixedType")); - - + assertEquals(1, endpoint.getCount()); } public void testEJBEndpoint() throws Exception @@ -60,8 +60,9 @@ URL wsdlOneURL = new URL(ejbEndpointURL + "?wsdl"); QName serviceOneName = new QName(targetNS, "EJBServiceOne"); Service serviceOne = Service.create(wsdlOneURL, serviceOneName); - EndpointOne endpoint = (EndpointOne)serviceOne.getPort(EndpointOne.class); + EndpointOne endpoint = (EndpointOne)serviceOne.getPort(new QName(targetNS, "EJBEndpointOnePort"), EndpointOne.class); assertEquals("mixedType", endpoint.echo("mixedType")); + assertEquals(1, endpoint.getCount()); } Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2011-09-15 13:39:41 UTC (rev 15010) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-09-15 14:34:58 UTC (rev 15011) @@ -736,9 +736,6 @@ <!-- # [AS7-1322] Implemented on AS 7.0.1 or greater only --> <exclude>org/jboss/test/ws/publish/EndpointPublishTestCase*</exclude> - <!-- # Mixed type deployment --> - <exclude>org/jboss/test/ws/jaxws/cxf/mixtype/**</exclude> - </excludes> </configuration> </plugin> @@ -913,9 +910,6 @@ <!-- # [AS7-1322] Implemented on AS 7.0.1 or greater only --> <exclude>org/jboss/test/ws/publish/EndpointPublishTestCase*</exclude> - <!-- # Mixed type deployment --> - <exclude>org/jboss/test/ws/jaxws/cxf/mixtype/**</exclude> - </excludes> </configuration> </plugin> @@ -1104,9 +1098,6 @@ <!-- # [AS7-1322] Implemented on AS 7.0.1 or greater only --> <exclude>org/jboss/test/ws/publish/EndpointPublishTestCase*</exclude> - <!-- # Mixed type deployment --> - <exclude>org/jboss/test/ws/jaxws/cxf/mixtype/**</exclude> - </excludes> </configuration> </plugin> @@ -1294,8 +1285,6 @@ <!-- Former JMS endpoint functionalities replaced by SOAP-over-JMS on AS7 --> <exclude>org/jboss/test/ws/jaxws/samples/**/jmstransport/**</exclude> - <!-- # Mixed type deployment --> - <exclude>org/jboss/test/ws/jaxws/cxf/mixtype/**</exclude> </excludes> </configuration> </plugin>