Author: richard.opalka(a)jboss.com Date: 2012-11-15 03:55:57 -0500 (Thu, 15 Nov 2012) New Revision: 16994 Removed: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/secureejb/ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefClientTestCase.java Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-samples-jaxrpc.xml Log: [JBWS-3565] removing obsolete test cases Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-samples-jaxrpc.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/ant-import/build-samples-jaxrpc.xml 2012-11-14 16:02:10 UTC (rev 16993) +++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-samples-jaxrpc.xml 2012-11-15 08:55:57 UTC (rev 16994) @@ -378,46 +378,6 @@ </metainf> </jar> - <!-- jaxrpc-samples-secureejb --> - <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-samples-secureejb.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationService.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationHome.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationRemote.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationImpl.class"/> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/secureejb/META-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="webservices.xml"/> - <include name="ejb-jar.xml"/> - <include name="jboss.xml"/> - <include name="jboss-ejb3.xml"/> - <include name="jboss-webservices.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-samples-secureejb-appclient.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationService.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationHome.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationRemote.class"/> - <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> - </fileset> - <manifest> - <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> - </manifest> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/secureejb/META-INF"> - <include name="application-client.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-samples-secureejb-appclient.ear"> - <fileset dir="${tests.output.dir}/test-libs"> - <include name="jaxrpc-samples-secureejb-appclient.jar"/> - </fileset> - </jar> - <!-- jaxrpc-samples-serviceref --> <war warfile="${tests.output.dir}/test-libs/jaxrpc-samples-serviceref.war" webxml="${tests.output.dir}/test-resources/jaxrpc/samples/serviceref/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> @@ -432,27 +392,6 @@ <include name="webservices.xml"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-samples-serviceref-appclient.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/serviceref/ApplicationClient.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/serviceref/TestEndpointService.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/serviceref/TestEndpoint.class"/> - <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> - </fileset> - <manifest> - <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> - </manifest> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/serviceref/META-INF"> - <include name="application-client.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-samples-serviceref-appclient.ear"> - <fileset dir="${tests.output.dir}/test-libs"> - <include name="jaxrpc-samples-serviceref-appclient.jar"/> - </fileset> - </jar> <war destfile="${tests.output.dir}/test-libs/jaxrpc-samples-serviceref-servlet-client.war" webxml="${tests.output.dir}/test-resources/jaxrpc/samples/serviceref/servlet-client/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> Deleted: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefClientTestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefClientTestCase.java 2012-11-14 16:02:10 UTC (rev 16993) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefClientTestCase.java 2012-11-15 08:55:57 UTC (rev 16994) @@ -1,94 +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.jaxrpc.samples.serviceref; - -import java.net.URL; - -import javax.naming.InitialContext; -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.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; - -/** - * Test the JAXRPC <service-ref> - * - * @author Thomas.Diesler(a)jboss.com - * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> - */ -public class ServiceRefClientTestCase extends JBossWSTest -{ - public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxrpc-samples-serviceref"; - - public static Test suite() - { - return new JBossWSTestSetup(ServiceRefClientTestCase.class, "jaxrpc-samples-serviceref.war, jaxrpc-samples-serviceref-appclient.ear#jaxrpc-samples-serviceref-appclient.jar"); - } - - public void testDynamicProxyNeg() throws Exception - { - URL wsdlURL = getResourceURL("jaxrpc/samples/serviceref/META-INF/wsdl/TestEndpoint.wsdl"); - 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 - { - InitialContext ctx = null; - try - { - ctx = getAppclientInitialContext(); - final TestEndpoint port1 = (TestEndpoint)((Service)ctx.lookup("java:service1")).getPort(TestEndpoint.class); - final TestEndpoint port2 = ((TestEndpointService)ctx.lookup("java:service2")).getTestEndpointPort(); - final String msg = "Hello World!"; - - assertEquals(msg, port1.echo(msg)); - assertEquals(msg, port2.echo(msg)); - } - finally - { - if (ctx != null) - { - ctx.close(); - } - } - } - -}