[jbossws-commits] JBossWS SVN: r2467 - in branches/jbossws-1.2.0/jbossws-tests/src/main: java/org/jboss/test/ws/jaxrpc/wsse and 1 other directories.

Author: thomas.diesler(a)jboss.com Date: 2007-02-24 16:56:13 -0500 (Sat, 24 Feb 2007) New Revision: 2467 Added: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/ServiceRefClientTestCase.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/ServiceRefEJBTestCase.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/ServiceRefServletTestCase.java Removed: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/WebServiceRefClientTestCase.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/WebServiceRefEJBTestCase.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/WebServiceRefServletTestCase.java Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/WebClientTestCase.java branches/jbossws-1.2.0/jbossws-tests/src/main/resources/tests-jboss50-excludes.txt Log: Exclude interop tests from jboss50 Exclude jaxrpc/wsse tests from jboss50 Copied: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/ServiceRefClientTestCase.java (from rev 2466, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/WebServiceRefClientTestCase.java) =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/ServiceRefClientTestCase.java (rev 0) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/ServiceRefClientTestCase.java 2007-02-24 21:56:13 UTC (rev 2467) @@ -0,0 +1,104 @@ +/* + * 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.jaxrpc.serviceref; + +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.rpc.Service; +import javax.xml.rpc.ServiceException; +import javax.xml.rpc.ServiceFactory; + +import junit.framework.Test; + +import org.jboss.test.ws.JBossWSTest; +import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl; +import org.jboss.ws.metadata.wsdl.WSDLDefinitions; +import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; + +/** + * Test the JAXRPC <service-ref> + * + * @author Thomas.Diesler(a)jboss.com + * @since 23-Oct-2005 + */ +public class ServiceRefClientTestCase extends JBossWSTest +{ + public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxrpc-serviceref"; + + public static Test suite() + { + return JBossWSTestSetup.newTestSetup(ServiceRefClientTestCase.class, "jaxrpc-serviceref.war, jaxrpc-serviceref-client.jar"); + } + + public void testWSDLAccess() throws MalformedURLException + { + URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); + WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); + WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL); + assertNotNull(wsdlDefinitions); + } + + public void testDynamicProxy() throws Exception + { + URL wsdlURL = new File("resources/jaxrpc/serviceref/META-INF/wsdl/TestEndpoint.wsdl").toURL(); + URL mappingURL = new File("resources/jaxrpc/serviceref/META-INF/jaxrpc-mapping.xml").toURL(); + QName qname = new QName("http://org.jboss.ws/wsref", "TestEndpointService"); + Service service = new ServiceFactoryImpl().createService(wsdlURL, qname, mappingURL); + TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class); + + String helloWorld = "Hello World!"; + Object retObj = port.echo(helloWorld); + assertEquals(helloWorld, retObj); + } + + public void testDynamicProxyNeg() throws Exception + { + URL wsdlURL = new File("resources/jaxrpc/serviceref/META-INF/wsdl/TestEndpoint.wsdl").toURL(); + QName qname = new QName("http://org.jboss.ws/wsref", "TestEndpointService"); + Service service = ServiceFactory.newInstance().createService(wsdlURL, qname); + try + { + TestEndpoint port = (TestEndpoint)service.getPort(java.rmi.activation.Activator.class); + fail("Expected ServiceException, but got: " + port); + } + catch (ServiceException ex) + { + // this is tested by the CTS + } + catch (Exception ex) + { + fail("Expected ServiceException, but got: " + ex); + } + } + + public void testApplicationClient() throws Exception + { + String helloWorld = "Hello World!"; + ApplicationClient.encCtx = getInitialContext(); + ApplicationClient.main(new String[] { helloWorld }); + assertEquals(helloWorld, ApplicationClient.retStr); + } +} Copied: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/ServiceRefEJBTestCase.java (from rev 2466, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/WebServiceRefEJBTestCase.java) =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/ServiceRefEJBTestCase.java (rev 0) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/ServiceRefEJBTestCase.java 2007-02-24 21:56:13 UTC (rev 2467) @@ -0,0 +1,87 @@ +/* + * 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.jaxrpc.serviceref; + +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; + +import javax.naming.InitialContext; +import javax.xml.namespace.QName; +import javax.xml.rpc.Service; + +import junit.framework.Test; + +import org.jboss.test.ws.JBossWSTest; +import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl; +import org.jboss.ws.metadata.wsdl.WSDLDefinitions; +import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; + +/** + * Test the JAXRPC <service-ref> + * + * @author Thomas.Diesler(a)jboss.com + * @since 23-Oct-2005 + */ +public class ServiceRefEJBTestCase extends JBossWSTest +{ + public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxrpc-serviceref"; + + public static Test suite() + { + return JBossWSTestSetup.newTestSetup(ServiceRefEJBTestCase.class, "jaxrpc-serviceref.war, jaxrpc-serviceref-ejb-client.jar"); + } + + public void testWSDLAccess() throws MalformedURLException + { + URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); + WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); + WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL); + assertNotNull(wsdlDefinitions); + } + + public void testDynamicProxy() throws Exception + { + URL wsdlURL = new File("resources/jaxrpc/serviceref/META-INF/wsdl/TestEndpoint.wsdl").toURL(); + URL mappingURL = new File("resources/jaxrpc/serviceref/META-INF/jaxrpc-mapping.xml").toURL(); + QName qname = new QName("http://org.jboss.ws/wsref", "TestEndpointService"); + Service service = new ServiceFactoryImpl().createService(wsdlURL, qname, mappingURL); + TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class); + + String helloWorld = "Hello World!"; + Object retObj = port.echo(helloWorld); + assertEquals(helloWorld, retObj); + } + + public void testEJBClient() throws Exception + { + InitialContext iniCtx = getInitialContext(); + EJBRemoteHome ejbHome = (EJBRemoteHome)iniCtx.lookup("/ejb/EJBClient"); + EJBRemote ejbRemote = ejbHome.create(); + + String helloWorld = "Hello World!"; + Object retObj = ejbRemote.echo(helloWorld); + assertEquals(helloWorld, retObj); + + } +} Copied: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/ServiceRefServletTestCase.java (from rev 2466, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/WebServiceRefServletTestCase.java) =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/ServiceRefServletTestCase.java (rev 0) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/ServiceRefServletTestCase.java 2007-02-24 21:56:13 UTC (rev 2467) @@ -0,0 +1,84 @@ +/* + * 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.jaxrpc.serviceref; + +import java.io.BufferedReader; +import java.io.File; +import java.io.InputStreamReader; +import java.net.MalformedURLException; +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.rpc.Service; + +import junit.framework.Test; + +import org.jboss.test.ws.JBossWSTest; +import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl; +import org.jboss.ws.metadata.wsdl.WSDLDefinitions; +import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; + +/** + * Test the JAXRPC <service-ref> + * + * @author Thomas.Diesler(a)jboss.com + * @since 23-Oct-2005 + */ +public class ServiceRefServletTestCase extends JBossWSTest +{ + public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxrpc-serviceref"; + + public static Test suite() + { + return JBossWSTestSetup.newTestSetup(ServiceRefServletTestCase.class, "jaxrpc-serviceref.war, jaxrpc-serviceref-servlet-client.war"); + } + + public void testWSDLAccess() throws MalformedURLException + { + URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); + WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); + WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL); + assertNotNull(wsdlDefinitions); + } + + public void testDynamicProxy() throws Exception + { + URL wsdlURL = new File("resources/jaxrpc/serviceref/META-INF/wsdl/TestEndpoint.wsdl").toURL(); + URL mappingURL = new File("resources/jaxrpc/serviceref/META-INF/jaxrpc-mapping.xml").toURL(); + QName qname = new QName("http://org.jboss.ws/wsref", "TestEndpointService"); + Service service = new ServiceFactoryImpl().createService(wsdlURL, qname, mappingURL); + TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class); + + String helloWorld = "Hello World!"; + Object retObj = port.echo(helloWorld); + assertEquals(helloWorld, retObj); + } + + public void testServletClient() throws Exception + { + URL url = new URL(TARGET_ENDPOINT_ADDRESS + "-servlet-client?echo=HelloWorld"); + BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream())); + String retStr = br.readLine(); + assertEquals("HelloWorld", retStr); + } +} Deleted: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/WebServiceRefClientTestCase.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/WebServiceRefClientTestCase.java 2007-02-23 22:17:13 UTC (rev 2466) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/WebServiceRefClientTestCase.java 2007-02-24 21:56:13 UTC (rev 2467) @@ -1,104 +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.jaxrpc.serviceref; - -import java.io.File; -import java.net.MalformedURLException; -import java.net.URL; - -import javax.xml.namespace.QName; -import javax.xml.rpc.Service; -import javax.xml.rpc.ServiceException; -import javax.xml.rpc.ServiceFactory; - -import junit.framework.Test; - -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; -import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl; -import org.jboss.ws.metadata.wsdl.WSDLDefinitions; -import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; - -/** - * Test the JAXRPC <service-ref> - * - * @author Thomas.Diesler(a)jboss.com - * @since 23-Oct-2005 - */ -public class WebServiceRefClientTestCase extends JBossWSTest -{ - public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxrpc-serviceref"; - - public static Test suite() - { - return JBossWSTestSetup.newTestSetup(WebServiceRefClientTestCase.class, "jaxrpc-serviceref.war, jaxrpc-serviceref-client.jar"); - } - - public void testWSDLAccess() throws MalformedURLException - { - URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); - WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); - WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL); - assertNotNull(wsdlDefinitions); - } - - public void testDynamicProxy() throws Exception - { - URL wsdlURL = new File("resources/jaxrpc/serviceref/META-INF/wsdl/TestEndpoint.wsdl").toURL(); - URL mappingURL = new File("resources/jaxrpc/serviceref/META-INF/jaxrpc-mapping.xml").toURL(); - QName qname = new QName("http://org.jboss.ws/wsref", "TestEndpointService"); - Service service = new ServiceFactoryImpl().createService(wsdlURL, qname, mappingURL); - TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class); - - String helloWorld = "Hello World!"; - Object retObj = port.echo(helloWorld); - assertEquals(helloWorld, retObj); - } - - public void testDynamicProxyNeg() throws Exception - { - URL wsdlURL = new File("resources/jaxrpc/serviceref/META-INF/wsdl/TestEndpoint.wsdl").toURL(); - QName qname = new QName("http://org.jboss.ws/wsref", "TestEndpointService"); - Service service = ServiceFactory.newInstance().createService(wsdlURL, qname); - try - { - TestEndpoint port = (TestEndpoint)service.getPort(java.rmi.activation.Activator.class); - fail("Expected ServiceException, but got: " + port); - } - catch (ServiceException ex) - { - // this is tested by the CTS - } - catch (Exception ex) - { - fail("Expected ServiceException, but got: " + ex); - } - } - - public void testApplicationClient() throws Exception - { - String helloWorld = "Hello World!"; - ApplicationClient.encCtx = getInitialContext(); - ApplicationClient.main(new String[] { helloWorld }); - assertEquals(helloWorld, ApplicationClient.retStr); - } -} Deleted: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/WebServiceRefEJBTestCase.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/WebServiceRefEJBTestCase.java 2007-02-23 22:17:13 UTC (rev 2466) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/WebServiceRefEJBTestCase.java 2007-02-24 21:56:13 UTC (rev 2467) @@ -1,87 +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.jaxrpc.serviceref; - -import java.io.File; -import java.net.MalformedURLException; -import java.net.URL; - -import javax.naming.InitialContext; -import javax.xml.namespace.QName; -import javax.xml.rpc.Service; - -import junit.framework.Test; - -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; -import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl; -import org.jboss.ws.metadata.wsdl.WSDLDefinitions; -import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; - -/** - * Test the JAXRPC <service-ref> - * - * @author Thomas.Diesler(a)jboss.com - * @since 23-Oct-2005 - */ -public class WebServiceRefEJBTestCase extends JBossWSTest -{ - public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxrpc-serviceref"; - - public static Test suite() - { - return JBossWSTestSetup.newTestSetup(WebServiceRefEJBTestCase.class, "jaxrpc-serviceref.war, jaxrpc-serviceref-ejb-client.jar"); - } - - public void testWSDLAccess() throws MalformedURLException - { - URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); - WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); - WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL); - assertNotNull(wsdlDefinitions); - } - - public void testDynamicProxy() throws Exception - { - URL wsdlURL = new File("resources/jaxrpc/serviceref/META-INF/wsdl/TestEndpoint.wsdl").toURL(); - URL mappingURL = new File("resources/jaxrpc/serviceref/META-INF/jaxrpc-mapping.xml").toURL(); - QName qname = new QName("http://org.jboss.ws/wsref", "TestEndpointService"); - Service service = new ServiceFactoryImpl().createService(wsdlURL, qname, mappingURL); - TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class); - - String helloWorld = "Hello World!"; - Object retObj = port.echo(helloWorld); - assertEquals(helloWorld, retObj); - } - - public void testEJBClient() throws Exception - { - InitialContext iniCtx = getInitialContext(); - EJBRemoteHome ejbHome = (EJBRemoteHome)iniCtx.lookup("/ejb/EJBClient"); - EJBRemote ejbRemote = ejbHome.create(); - - String helloWorld = "Hello World!"; - Object retObj = ejbRemote.echo(helloWorld); - assertEquals(helloWorld, retObj); - - } -} Deleted: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/WebServiceRefServletTestCase.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/WebServiceRefServletTestCase.java 2007-02-23 22:17:13 UTC (rev 2466) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/serviceref/WebServiceRefServletTestCase.java 2007-02-24 21:56:13 UTC (rev 2467) @@ -1,84 +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.jaxrpc.serviceref; - -import java.io.BufferedReader; -import java.io.File; -import java.io.InputStreamReader; -import java.net.MalformedURLException; -import java.net.URL; - -import javax.xml.namespace.QName; -import javax.xml.rpc.Service; - -import junit.framework.Test; - -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; -import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl; -import org.jboss.ws.metadata.wsdl.WSDLDefinitions; -import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; - -/** - * Test the JAXRPC <service-ref> - * - * @author Thomas.Diesler(a)jboss.com - * @since 23-Oct-2005 - */ -public class WebServiceRefServletTestCase extends JBossWSTest -{ - public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxrpc-serviceref"; - - public static Test suite() - { - return JBossWSTestSetup.newTestSetup(WebServiceRefServletTestCase.class, "jaxrpc-serviceref.war, jaxrpc-serviceref-servlet-client.war"); - } - - public void testWSDLAccess() throws MalformedURLException - { - URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); - WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); - WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL); - assertNotNull(wsdlDefinitions); - } - - public void testDynamicProxy() throws Exception - { - URL wsdlURL = new File("resources/jaxrpc/serviceref/META-INF/wsdl/TestEndpoint.wsdl").toURL(); - URL mappingURL = new File("resources/jaxrpc/serviceref/META-INF/jaxrpc-mapping.xml").toURL(); - QName qname = new QName("http://org.jboss.ws/wsref", "TestEndpointService"); - Service service = new ServiceFactoryImpl().createService(wsdlURL, qname, mappingURL); - TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class); - - String helloWorld = "Hello World!"; - Object retObj = port.echo(helloWorld); - assertEquals(helloWorld, retObj); - } - - public void testServletClient() throws Exception - { - URL url = new URL(TARGET_ENDPOINT_ADDRESS + "-servlet-client?echo=HelloWorld"); - BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream())); - String retStr = br.readLine(); - assertEquals("HelloWorld", retStr); - } -} Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/WebClientTestCase.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/WebClientTestCase.java 2007-02-23 22:17:13 UTC (rev 2466) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/WebClientTestCase.java 2007-02-24 21:56:13 UTC (rev 2467) @@ -48,6 +48,12 @@ */ public void testWebClient() throws Exception { + if (isTargetJBoss50()) + { + System.out.println("FIXME: [JBWS-1330] Fix jaxrpc wsse tests for jbossws-5.0"); + return; + } + URL url = new URL("http://" + getServerHost() + ":8080/jaxrpc-wsse-rpc/RpcTestClientServlet?input=Hello"); BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream())); String res = br.readLine(); Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/tests-jboss50-excludes.txt =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/tests-jboss50-excludes.txt 2007-02-23 22:17:13 UTC (rev 2466) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/tests-jboss50-excludes.txt 2007-02-24 21:56:13 UTC (rev 2467) @@ -1,5 +1,5 @@ # Always excludes -#org/jboss/test/ws/interop/** +org/jboss/test/ws/interop/** org/jboss/test/ws/benchmark/** # Fix before JBoss50 goes final