Author: alessio.soldano(a)jboss.com Date: 2008-07-25 06:16:27 -0400 (Fri, 25 Jul 2008) New Revision: 7909 Removed: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointServlet.java stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/endpoint/ Modified: stack/metro/trunk/modules/testsuite/metro-tests/scripts/metro-jars-jaxws.xml stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointTestCase.java Log: [JBWS-2128] Simplifying test Modified: stack/metro/trunk/modules/testsuite/metro-tests/scripts/metro-jars-jaxws.xml =================================================================== --- stack/metro/trunk/modules/testsuite/metro-tests/scripts/metro-jars-jaxws.xml 2008-07-24 16:54:42 UTC (rev 7908) +++ stack/metro/trunk/modules/testsuite/metro-tests/scripts/metro-jars-jaxws.xml 2008-07-25 10:16:27 UTC (rev 7909) @@ -24,18 +24,6 @@ <mkdir dir="${tests.output.dir}/test-libs"/> - <!-- jaxws-endpoint-servlet --> - <war warfile="${tests.output.dir}/test-libs/jaxws-endpoint-servlet.war" webxml="${tests.output.dir}/test-resources/jaxws/endpoint/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/endpoint/EndpointServlet.class"/> - <include name="org/jboss/test/ws/jaxws/endpoint/EndpointBean.class"/> - <include name="org/jboss/test/ws/jaxws/endpoint/EndpointInterface.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/endpoint/WEB-INF"> - <include name="wsdl/**"/> - </webinf> - </war> - <!-- jbws1869 --> <war warfile="${tests.output.dir}/test-libs/jaxws-jbws1869.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1869/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> Deleted: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointServlet.java =================================================================== --- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointServlet.java 2008-07-24 16:54:42 UTC (rev 7908) +++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointServlet.java 2008-07-25 10:16:27 UTC (rev 7909) @@ -1,111 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.endpoint; - -import java.io.IOException; -import java.io.PrintWriter; -import java.net.InetSocketAddress; -import java.net.URL; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; - -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.xml.namespace.QName; -import javax.xml.ws.Endpoint; -import javax.xml.ws.Service; -import javax.xml.ws.soap.SOAPBinding; - -import org.jboss.wsf.test.JBossWSTestHelper; - -import com.sun.net.httpserver.HttpContext; -import com.sun.net.httpserver.HttpServer; - -/** - * Test Endpoint deployment - * - * @author Thomas.Diesler(a)jboss.org - * @since 12-Jul-2006 - */ -public class EndpointServlet extends HttpServlet -{ - private Endpoint endpoint; - private HttpServer server; - public static final int port = 8877; - - @Override - public void init(ServletConfig config) throws ServletException - { - super.init(config); - - // Create the endpoint - EndpointBean epImpl = new EndpointBean(); - endpoint = Endpoint.create(SOAPBinding.SOAP11HTTP_BINDING, epImpl); - - try - { - // Create and start the HTTP server - server = HttpServer.create(new InetSocketAddress(port), 5); - } - catch (IOException e) - { - throw new ServletException(e); - } -// ExecutorService threads = Executors.newFixedThreadPool(5); -// server.setExecutor(threads); - server.start(); - - // Create the context and publish the endpoint - HttpContext context = server.createContext("/jaxws-endpoint"); - endpoint.publish(context); - } - - @Override - public void destroy() - { - // Stop the endpoint - endpoint.stop(); - server.stop(0); - - super.destroy(); - } - - protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException - { - // Create the port - URL wsdlURL = new URL("http://" + JBossWSTestHelper.getServerHost() + ":" + EndpointServlet.port + "/jaxws-endpoint?wsdl"); - QName qname = new QName("http://org.jboss.ws/jaxws/endpoint", "EndpointService"); - Service service = Service.create(wsdlURL, qname); - EndpointInterface port = (EndpointInterface)service.getPort(EndpointInterface.class); - - // Invoke the endpoint - String param = req.getParameter("param"); - String retStr = port.echo(param); - - // Return the result - PrintWriter pw = new PrintWriter(res.getWriter()); - pw.print(retStr); - } -} Modified: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointTestCase.java =================================================================== --- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointTestCase.java 2008-07-24 16:54:42 UTC (rev 7908) +++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointTestCase.java 2008-07-25 10:16:27 UTC (rev 7909) @@ -23,83 +23,54 @@ // $Id$ -import java.io.BufferedReader; -import java.io.File; -import java.io.InputStreamReader; +import java.net.InetSocketAddress; import java.net.URL; -import javax.management.Attribute; -import javax.management.MBeanServerConnection; -import javax.management.ObjectName; -import javax.wsdl.Definition; -import javax.wsdl.factory.WSDLFactory; -import javax.wsdl.xml.WSDLReader; import javax.xml.namespace.QName; +import javax.xml.ws.Endpoint; import javax.xml.ws.Service; +import javax.xml.ws.soap.SOAPBinding; -import junit.extensions.TestSetup; -import junit.framework.Test; - import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestHelper; -import org.jboss.wsf.test.JBossWSTestSetup; +import com.sun.net.httpserver.HttpContext; +import com.sun.net.httpserver.HttpServer; + /** - * Test JAXWS Endpoint deployment + * Test JAXWS Endpoint deployment in a JSE environment * - * @author Thomas.Diesler(a)jboss.org - * @since 29-Apr-2005 + * @author alessio.soldano(a)jboss.org + * @since 25-Jul-2008 */ public class EndpointTestCase extends JBossWSTest { - public static Test suite() + private static final int port = 8878; + + public void testJSEEndpointPublish() throws Exception { - return new TestSetup(new JBossWSTestSetup(EndpointTestCase.class, "jaxws-endpoint-servlet.war")) { + EndpointBean epImpl = new EndpointBean(); + Endpoint endpoint = Endpoint.create(SOAPBinding.SOAP11HTTP_BINDING, epImpl); - private Boolean useJBossWebLoader; - - protected void setUp() throws Exception - { - MBeanServerConnection server = JBossWSTestHelper.getServer(); - useJBossWebLoader = (Boolean)server.getAttribute(new ObjectName("jboss.web:service=WebServer"), "UseJBossWebLoader"); - server.setAttribute(new ObjectName("jboss.web:service=WebServer"), new Attribute("UseJBossWebLoader", Boolean.TRUE)); - super.setUp(); - } - - protected void tearDown() throws Exception - { - super.tearDown(); - MBeanServerConnection server = JBossWSTestHelper.getServer(); - server.setAttribute(new ObjectName("jboss.web:service=WebServer"), new Attribute("UseJBossWebLoader", useJBossWebLoader)); - } - }; - } - - public void testWSDLAccess() throws Exception - { - URL wsdlURL = new URL("http://" + getServerHost() + ":" + EndpointServlet.port + "/jaxws-endpoint?wsdl"); - WSDLReader wsdlReader = WSDLFactory.newInstance().newWSDLReader(); - Definition wsdlDefinition = wsdlReader.readWSDL(wsdlURL.toString()); - assertNotNull(wsdlDefinition); - } - - public void testClientAccess() throws Exception - { - // Create the port - URL wsdlURL = new URL("http://" + getServerHost() + ":" + EndpointServlet.port + "/jaxws-endpoint?wsdl"); + HttpServer server = HttpServer.create(new InetSocketAddress(port), 5); +// ExecutorService threads = Executors.newFixedThreadPool(5); +// server.setExecutor(threads); + server.start(); + + // Create the context and publish the endpoint + HttpContext context = server.createContext("/jaxws-endpoint"); + endpoint.publish(context); + + URL wsdlURL = new URL("http://" + getServerHost() + ":" + port + "/jaxws-endpoint?wsdl"); QName qname = new QName("http://org.jboss.ws/jaxws/endpoint", "EndpointService"); Service service = Service.create(wsdlURL, qname); EndpointInterface port = (EndpointInterface)service.getPort(EndpointInterface.class); + // Invoke the endpoint String helloWorld = "Hello world!"; Object retObj = port.echo(helloWorld); assertEquals(helloWorld, retObj); + + endpoint.stop(); + server.stop(0); } - - public void testServletAccess() throws Exception - { - URL url = new URL("http://" + getServerHost() + ":8080/jaxws-endpoint-servlet?param=hello-world"); - BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream())); - assertEquals("hello-world", br.readLine()); - } }