Author: asoldano Date: 2015-01-08 05:53:26 -0500 (Thu, 08 Jan 2015) New Revision: 19345 Removed: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/WSDLPublishTestCase.java Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java Log: Fix deployment name clash (we can't have two or more tests relying on the same deployment as that breaks parallel test execution) Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java 2015-01-08 10:05:41 UTC (rev 19344) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java 2015-01-08 10:53:26 UTC (rev 19345) @@ -1,6 +1,6 @@ /* * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * Copyright 2015, Red Hat Middleware LLC, and individual contributors * as indicated by the @author tags. See the copyright.txt file in the * distribution for a full listing of individual contributors. * @@ -22,6 +22,7 @@ package org.jboss.test.ws.jaxws.samples.eardeployment; import java.io.File; +import java.io.IOException; import java.net.URL; import javax.wsdl.Definition; @@ -42,6 +43,7 @@ import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.jboss.ws.common.IOUtils; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestHelper; import org.junit.Test; @@ -51,13 +53,22 @@ * Test ear deployment * * [JBWS-1616] Verify correct bahaviour of @WebService.wsdlLocation + * + * ---- + * + * Test the wsdl is published to local filesystem; this test assumes + * client and server share the filesystem * * @author Thomas.Diesler(a)jboss.org * @author <a href="mailto:richard.opalka@jboss.org">Richard Opalka</a> + * @author <a href="mailto:alessio.soldano@jboss.com">Alessio Soldano</a> */ @RunWith(Arquillian.class) public class EarTestCase extends JBossWSTest { + private File wsdlFileDir; + private static long testStart = System.currentTimeMillis(); + @ArquillianResource private URL baseURL; @@ -134,7 +145,69 @@ String retObj = port.echo(helloWorld); assertEquals(helloWorld, retObj); } + + @Test + @RunAsClient + public void testEJB3EndpointPublishedWsdl() throws Exception + { + String soapAddress = "http://" + baseURL.getHost() + ":8080/earejb3/EndpointService/Endpoint"; + QName serviceName = new QName("http://eardeployment.jaxws/", "EndpointService"); + + File file = new File(getWsdlFileDir().getAbsolutePath() + File.separator + "jaxws-samples-eardeployment.ear" + File.separator + + "jaxws-samples-eardeployment-ejb3.jar" + File.separator + "Endpoint.wsdl"); + + assertTrue("Wsdl file not found", file.exists()); + assertTrue("Stale wsdl file found", file.lastModified() > testStart - 1000); + + URL wsdlUrl = file.toURI().toURL(); + + Service service = Service.create(wsdlUrl, serviceName); + Endpoint port = service.getPort(Endpoint.class); + BindingProvider bp = (BindingProvider)port; + bp.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, soapAddress); + + String helloWorld = "Hello world!"; + String retObj = port.echo(helloWorld); + assertEquals(helloWorld, retObj); + } + + @Test + @RunAsClient + public void testJSEEndpointPublishedWsdl() throws Exception + { + String soapAddress = baseURL + "JSEBean"; + QName serviceName = new QName("http://eardeployment.jaxws/", "EndpointService"); + + File file = new File(getWsdlFileDir().getAbsolutePath() + File.separator + "jaxws-samples-eardeployment.ear" + File.separator + + "jaxws-samples-eardeployment-pojo.war" + File.separator + "Endpoint.wsdl"); + + assertTrue("Wsdl file not found", file.exists()); + assertTrue("Stale wsdl file found", file.lastModified() > testStart - 1000); + + URL wsdlUrl = file.toURI().toURL(); + + Service service = Service.create(wsdlUrl, serviceName); + Endpoint port = service.getPort(Endpoint.class); + + BindingProvider bp = (BindingProvider)port; + bp.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, soapAddress); + + String helloWorld = "Hello world!"; + String retObj = port.echo(helloWorld); + assertEquals(helloWorld, retObj); + } + + private File getWsdlFileDir() throws IOException + { + if (wsdlFileDir == null) + { + URL url = new URL("http://" + baseURL.getHost() + ":8080/earjse/support"); + wsdlFileDir = new File(IOUtils.readAndCloseStream(url.openStream()), "wsdl"); + } + return wsdlFileDir; + } + private Definition getWSDLDefinition(String wsdlLocation) throws Exception { WSDLFactory wsdlFactory = WSDLFactory.newInstance(); Deleted: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/WSDLPublishTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/WSDLPublishTestCase.java 2015-01-08 10:05:41 UTC (rev 19344) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/WSDLPublishTestCase.java 2015-01-08 10:53:26 UTC (rev 19345) @@ -1,123 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxws.samples.eardeployment; - -import java.io.File; -import java.io.IOException; -import java.net.URL; - -import javax.xml.namespace.QName; -import javax.xml.ws.BindingProvider; -import javax.xml.ws.Service; - -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.container.test.api.RunAsClient; -import org.jboss.arquillian.junit.Arquillian; -import org.jboss.arquillian.test.api.ArquillianResource; -import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; -import org.jboss.ws.common.IOUtils; -import org.jboss.wsf.test.JBossWSTest; -import org.junit.Test; -import org.junit.runner.RunWith; - -/** - * Test the wsdl is published to local filesystem; this test assumes - * client and server share the filesystem. - * - * @author alessio.soldano(a)jboss.com - */ -(a)RunWith(Arquillian.class) -public class WSDLPublishTestCase extends JBossWSTest -{ - private File wsdlFileDir; - private static long testStart = System.currentTimeMillis(); - - @ArquillianResource - private URL baseURL; - - @Deployment(testable = false) - public static EnterpriseArchive createDeployment() { - return EarTestCase.createDeployment(); - } - - @Test - @RunAsClient - public void testEJB3Endpoint() throws Exception - { - String soapAddress = "http://" + baseURL.getHost() + ":8080/earejb3/EndpointService/Endpoint"; - QName serviceName = new QName("http://eardeployment.jaxws/", "EndpointService"); - - File file = new File(getWsdlFileDir().getAbsolutePath() + File.separator + "jaxws-samples-eardeployment.ear" + File.separator - + "jaxws-samples-eardeployment-ejb3.jar" + File.separator + "Endpoint.wsdl"); - - assertTrue("Wsdl file not found", file.exists()); - assertTrue("Stale wsdl file found", file.lastModified() > testStart - 1000); - - URL wsdlUrl = file.toURI().toURL(); - - Service service = Service.create(wsdlUrl, serviceName); - Endpoint port = service.getPort(Endpoint.class); - - BindingProvider bp = (BindingProvider)port; - bp.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, soapAddress); - - String helloWorld = "Hello world!"; - String retObj = port.echo(helloWorld); - assertEquals(helloWorld, retObj); - } - - @Test - @RunAsClient - public void testJSEEndpoint() throws Exception - { - String soapAddress = baseURL + "JSEBean"; - QName serviceName = new QName("http://eardeployment.jaxws/", "EndpointService"); - - File file = new File(getWsdlFileDir().getAbsolutePath() + File.separator + "jaxws-samples-eardeployment.ear" + File.separator - + "jaxws-samples-eardeployment-pojo.war" + File.separator + "Endpoint.wsdl"); - - assertTrue("Wsdl file not found", file.exists()); - assertTrue("Stale wsdl file found", file.lastModified() > testStart - 1000); - - URL wsdlUrl = file.toURI().toURL(); - - Service service = Service.create(wsdlUrl, serviceName); - Endpoint port = service.getPort(Endpoint.class); - - BindingProvider bp = (BindingProvider)port; - bp.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, soapAddress); - - String helloWorld = "Hello world!"; - String retObj = port.echo(helloWorld); - assertEquals(helloWorld, retObj); - } - - private File getWsdlFileDir() throws IOException - { - if (wsdlFileDir == null) - { - URL url = new URL("http://" + baseURL.getHost() + ":8080/earjse/support"); - wsdlFileDir = new File(IOUtils.readAndCloseStream(url.openStream()), "wsdl"); - } - return wsdlFileDir; - } -}