[jbossws-commits] JBossWS SVN: r13852 - shared-testsuite/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools.

Author: alessio.soldano(a)jboss.com Date: 2011-03-04 17:00:29 -0500 (Fri, 04 Mar 2011) New Revision: 13852 Added: shared-testsuite/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCaseForked.java shared-testsuite/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCaseForked.java Removed: shared-testsuite/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java shared-testsuite/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCase.java Log: [JBWS-3238] Renaming tests Deleted: shared-testsuite/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java =================================================================== --- shared-testsuite/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java 2011-03-04 15:42:59 UTC (rev 13851) +++ shared-testsuite/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java 2011-03-04 22:00:29 UTC (rev 13852) @@ -1,186 +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.smoke.tools; - -/** - * Test the WSContractConsumer API across different implementations. - * NOTE: All tests expect to be executed below 'output/tests'. - * - * @author Heiko.Braun(a)jboss.com - * @author alessio.soldano(a)jboss.com - */ -public class WSConsumerTestCase extends PluginBase implements WSConsumerPluginDelegate -{ - - /** - * Recreates a tools delegate for every test - * @throws Exception - */ - protected void setUp() throws Exception - { - - // JBWS-2175 - setupClasspath(); - - Class<?> wscClass = Thread.currentThread().getContextClassLoader().loadClass("org.jboss.test.ws.jaxws.smoke.tools.WSConsumerPlugin"); - setDelegate(wscClass); - } - - - protected void tearDown() throws Exception - { - restoreClasspath(); - } - - /** - * Specifies the JAX-WS and JAXB binding files to use on import operations. - * See http://java.sun.com/webservices/docs/2.0/jaxws/customizations.html - */ - public void testBindingFiles() throws Exception - { - dispatch("testBindingFiles"); - - } - - /** - * Sets the OASIS XML Catalog file to use for entity resolution. - * - */ - public void testCatalog() throws Exception - { - dispatch("testCatalog"); - } - - /** - * Sets the main output directory. If the directory does not exist, it will be created. org.jboss.test.ws.jaxws.smoke.tools - * - */ - public void testOutputDirectory() throws Exception - { - dispatch("testOutputDirectory"); - } - - /** - * Sets the source directory. This directory will contain any generated Java source. - * If the directory does not exist, it will be created. If not specified, - * the output directory will be used instead. - * - */ - public void testSourceDirectory() throws Exception - { - dispatch("testSourceDirectory"); - } - - - /** - *JBWS-3193 - * If there are "-n" and "-s" flag, without "-k", the generated - * artifacts should be placed in output directory - */ - public void testNocompileNoKeep() throws Exception - { - dispatch("testNocompileNoKeep"); - } - - /** - * Enables/Disables Java source generation. - * - */ - public void testGenerateSource() throws Exception - { - testTargetPackage(); - } - - /** - * Sets the target package for generated source. If not specified the default - * is based off of the XML namespace. - * - */ - public void testTargetPackage() throws Exception - { - dispatch("testTargetPackage"); - } - - /** - * Sets the @(a)WebService.wsdlLocation and @(a)WebServiceClient.wsdlLocation attributes to a custom value. - * - */ - public void testWsdlLocation() throws Exception - { - dispatch("testWsdlLocation"); - } - - /** - * Sets the PrintStream to use for status feedback. - * The simplest example would be to use System.out. - */ - public void testMessageStream() throws Exception - { - dispatch("testMessageStream"); - } - - /** - * Sets the additional classpath to use if/when invoking the Java compiler. - * Typically an implementation will use the system <code>java.class.path</code> - * property. So for most normal applications this method is not needed. However, - * if this API is being used from an isolated classloader, then it needs to - * be called in order to reference all jars that are required by the - * implementation. - * - */ - public void testAdditionalCompilerClassPath() - { - // JBWS-1773 WSContractConsumer.setAdditionalCompilerClassPath() method is tested in wsconsume ant task - // that is invoked on each test run. See WSConsumeTask.java for more information how this is tested. - } - - /** - * Set the target JAX-WS specification target. Defaults to <code>2.0</code> - */ - public void testTarget() throws Exception - { - dispatch("testTarget"); - - } - - /** - * Tests the SOAP 1.2 binding extension - * - */ - public void testSOAP12Extension() throws Exception - { - dispatch("testSOAP12Extension"); - } - - /** - * Test the implicit header generation support - */ - public void testAdditionalHeaders() throws Exception - { - dispatch("testAdditionalHeaders"); - } - - protected boolean filtered(String jarName) - { - return false; - } -} Added: shared-testsuite/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCaseForked.java =================================================================== --- shared-testsuite/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCaseForked.java (rev 0) +++ shared-testsuite/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCaseForked.java 2011-03-04 22:00:29 UTC (rev 13852) @@ -0,0 +1,186 @@ +/* + * 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.smoke.tools; + +/** + * Test the WSContractConsumer API across different implementations. + * NOTE: All tests expect to be executed below 'output/tests'. + * + * @author Heiko.Braun(a)jboss.com + * @author alessio.soldano(a)jboss.com + */ +public class WSConsumerTestCaseForked extends PluginBase implements WSConsumerPluginDelegate +{ + + /** + * Recreates a tools delegate for every test + * @throws Exception + */ + protected void setUp() throws Exception + { + + // JBWS-2175 + setupClasspath(); + + Class<?> wscClass = Thread.currentThread().getContextClassLoader().loadClass("org.jboss.test.ws.jaxws.smoke.tools.WSConsumerPlugin"); + setDelegate(wscClass); + } + + + protected void tearDown() throws Exception + { + restoreClasspath(); + } + + /** + * Specifies the JAX-WS and JAXB binding files to use on import operations. + * See http://java.sun.com/webservices/docs/2.0/jaxws/customizations.html + */ + public void testBindingFiles() throws Exception + { + dispatch("testBindingFiles"); + + } + + /** + * Sets the OASIS XML Catalog file to use for entity resolution. + * + */ + public void testCatalog() throws Exception + { + dispatch("testCatalog"); + } + + /** + * Sets the main output directory. If the directory does not exist, it will be created. org.jboss.test.ws.jaxws.smoke.tools + * + */ + public void testOutputDirectory() throws Exception + { + dispatch("testOutputDirectory"); + } + + /** + * Sets the source directory. This directory will contain any generated Java source. + * If the directory does not exist, it will be created. If not specified, + * the output directory will be used instead. + * + */ + public void testSourceDirectory() throws Exception + { + dispatch("testSourceDirectory"); + } + + + /** + *JBWS-3193 + * If there are "-n" and "-s" flag, without "-k", the generated + * artifacts should be placed in output directory + */ + public void testNocompileNoKeep() throws Exception + { + dispatch("testNocompileNoKeep"); + } + + /** + * Enables/Disables Java source generation. + * + */ + public void testGenerateSource() throws Exception + { + testTargetPackage(); + } + + /** + * Sets the target package for generated source. If not specified the default + * is based off of the XML namespace. + * + */ + public void testTargetPackage() throws Exception + { + dispatch("testTargetPackage"); + } + + /** + * Sets the @(a)WebService.wsdlLocation and @(a)WebServiceClient.wsdlLocation attributes to a custom value. + * + */ + public void testWsdlLocation() throws Exception + { + dispatch("testWsdlLocation"); + } + + /** + * Sets the PrintStream to use for status feedback. + * The simplest example would be to use System.out. + */ + public void testMessageStream() throws Exception + { + dispatch("testMessageStream"); + } + + /** + * Sets the additional classpath to use if/when invoking the Java compiler. + * Typically an implementation will use the system <code>java.class.path</code> + * property. So for most normal applications this method is not needed. However, + * if this API is being used from an isolated classloader, then it needs to + * be called in order to reference all jars that are required by the + * implementation. + * + */ + public void testAdditionalCompilerClassPath() + { + // JBWS-1773 WSContractConsumer.setAdditionalCompilerClassPath() method is tested in wsconsume ant task + // that is invoked on each test run. See WSConsumeTask.java for more information how this is tested. + } + + /** + * Set the target JAX-WS specification target. Defaults to <code>2.0</code> + */ + public void testTarget() throws Exception + { + dispatch("testTarget"); + + } + + /** + * Tests the SOAP 1.2 binding extension + * + */ + public void testSOAP12Extension() throws Exception + { + dispatch("testSOAP12Extension"); + } + + /** + * Test the implicit header generation support + */ + public void testAdditionalHeaders() throws Exception + { + dispatch("testAdditionalHeaders"); + } + + protected boolean filtered(String jarName) + { + return false; + } +} Deleted: shared-testsuite/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCase.java =================================================================== --- shared-testsuite/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCase.java 2011-03-04 15:42:59 UTC (rev 13851) +++ shared-testsuite/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCase.java 2011-03-04 22:00:29 UTC (rev 13852) @@ -1,101 +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.smoke.tools; - -/** - * @author Heiko.Braun(a)jboss.com - */ -public class WSProviderTestCase extends PluginBase implements WSProviderPluginDelegate -{ - /** - * Recreates a tools delegate for every test - * @throws Exception - */ - protected void setUp() throws Exception - { - - setupClasspath(); - - Class<?> wspClass = Thread.currentThread().getContextClassLoader() - .loadClass("org.jboss.test.ws.jaxws.smoke.tools.WSProviderPlugin"); - setDelegate(wspClass); - } - - - protected void tearDown() throws Exception - { - restoreClasspath(); - } - - public void testGenerateWsdl() throws Exception - { - dispatch("testGenerateWsdl"); - } - - public void testGenerateWsdlWithExtension() throws Exception - { - dispatch("testGenerateWsdlWithExtension"); - } - - public void testGenerateSource() throws Exception - { - dispatch("testGenerateSource"); - } - - public void testOutputDirectory() throws Exception - { - dispatch("testOutputDirectory"); - } - - public void testResourceDirectory() throws Exception - { - dispatch("testResourceDirectory"); - } - - public void testSourceDirectory() throws Exception - { - dispatch("testSourceDirectory"); - } - - public void testClassLoader() throws Exception - { - dispatch("testClassLoader"); - } - - public void testMessageStream() throws Exception - { - dispatch("testMessageStream"); - } - - /** - * Filter sun jaxws implementation because it clashes - * with the native one (ServiceLoader...) - * @param jarName - * @return - */ - protected boolean filtered(String jarName) - { - return (isIntegrationNative() && - (jarName.indexOf("jaxws-rt")!=-1 || jarName.indexOf("jaxws-tools")!=-1) - ); - } -} Added: shared-testsuite/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCaseForked.java =================================================================== --- shared-testsuite/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCaseForked.java (rev 0) +++ shared-testsuite/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCaseForked.java 2011-03-04 22:00:29 UTC (rev 13852) @@ -0,0 +1,101 @@ +/* + * 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.smoke.tools; + +/** + * @author Heiko.Braun(a)jboss.com + */ +public class WSProviderTestCaseForked extends PluginBase implements WSProviderPluginDelegate +{ + /** + * Recreates a tools delegate for every test + * @throws Exception + */ + protected void setUp() throws Exception + { + + setupClasspath(); + + Class<?> wspClass = Thread.currentThread().getContextClassLoader() + .loadClass("org.jboss.test.ws.jaxws.smoke.tools.WSProviderPlugin"); + setDelegate(wspClass); + } + + + protected void tearDown() throws Exception + { + restoreClasspath(); + } + + public void testGenerateWsdl() throws Exception + { + dispatch("testGenerateWsdl"); + } + + public void testGenerateWsdlWithExtension() throws Exception + { + dispatch("testGenerateWsdlWithExtension"); + } + + public void testGenerateSource() throws Exception + { + dispatch("testGenerateSource"); + } + + public void testOutputDirectory() throws Exception + { + dispatch("testOutputDirectory"); + } + + public void testResourceDirectory() throws Exception + { + dispatch("testResourceDirectory"); + } + + public void testSourceDirectory() throws Exception + { + dispatch("testSourceDirectory"); + } + + public void testClassLoader() throws Exception + { + dispatch("testClassLoader"); + } + + public void testMessageStream() throws Exception + { + dispatch("testMessageStream"); + } + + /** + * Filter sun jaxws implementation because it clashes + * with the native one (ServiceLoader...) + * @param jarName + * @return + */ + protected boolean filtered(String jarName) + { + return (isIntegrationNative() && + (jarName.indexOf("jaxws-rt")!=-1 || jarName.indexOf("jaxws-tools")!=-1) + ); + } +}