Author: alessio.soldano(a)jboss.com Date: 2010-07-01 03:42:38 -0400 (Thu, 01 Jul 2010) New Revision: 12557 Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumeScriptTestCase.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProvideScriptTestCase.java Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java Log: Split ScriptTestCase to be able to exclude just part of it Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java 2010-07-01 06:59:38 UTC (rev 12556) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java 2010-07-01 07:42:38 UTC (rev 12557) @@ -21,7 +21,6 @@ */ package org.jboss.test.ws.jaxws.smoke.tools; -import java.io.File; import org.jboss.wsf.test.JBossWSTest; /** @@ -35,20 +34,19 @@ * * @author Heiko.Braun(a)jboss.com */ -public class ScriptTestCase extends JBossWSTest +public abstract class ScriptTestCase extends JBossWSTest { - private static final String FS = System.getProperty("file.separator"); // '/' on unix, '\' on windows - private static final String PS = System.getProperty("path.separator"); // ':' on unix, ';' on windows - private static final String EXT = ":".equals( PS ) ? ".sh" : ".bat"; + protected static final String FS = System.getProperty("file.separator"); // '/' on unix, '\' on windows + protected static final String PS = System.getProperty("path.separator"); // ':' on unix, ';' on windows + protected static final String EXT = ":".equals( PS ) ? ".sh" : ".bat"; - private String WSDL_LOCATION = "jaxws" + FS + "smoke" + FS + "tools" + FS + "wsdl" + FS + "TestServiceCatalog.wsdl"; - private String ENDPOINT_CLASS; + protected String ENDPOINT_CLASS; - private String JBOSS_HOME; - private String CLASSES_DIR; - private String TEST_DIR; + protected String JBOSS_HOME; + protected String CLASSES_DIR; + protected String TEST_DIR; - private String origJavaHome; + protected String origJavaHome; protected void setUp() throws Exception { @@ -75,25 +73,4 @@ // reset surefire's JAVA_HOME System.setProperty("java.home", origJavaHome); } - - public void testWSConsumeFromCommandLine() throws Exception - { - // use absolute path for the output to be re-usable - String absWsdlLoc = getResourceFile(WSDL_LOCATION).getAbsolutePath(); - String absOutput = new File(TEST_DIR, "wsconsume" + FS + "java").getAbsolutePath(); - String command = JBOSS_HOME + FS + "bin" + FS + "wsconsume" + EXT + " -v -k -o " + absOutput + " " + absWsdlLoc; - executeCommand(command, "wsconsume"); - File javaSource = new File(TEST_DIR, "wsconsume" + FS + "java" + FS + "org" + FS + "openuri" + FS + "_2004" + FS + "_04" + FS + "helloworld" + FS + "EndpointInterface.java"); - assertTrue("Service endpoint interface not generated", javaSource.exists()); - } - - public void testWSProvideFromCommandLine() throws Exception - { - String absOutput = new File(TEST_DIR, "wsprovide" + FS + "java").getAbsolutePath(); - String command = JBOSS_HOME + FS + "bin" + FS + "wsprovide" + EXT + " -k -w -o " + absOutput + " --classpath " + CLASSES_DIR + " " + ENDPOINT_CLASS; - executeCommand(command, "wsprovide"); - File javaSource = new File(TEST_DIR, "wsprovide" + FS + "java" + FS + "org" + FS + "jboss" + FS + "test" + FS + "ws" + FS + "jaxws" + FS + "smoke" + FS + "tools" + FS + "jaxws" + FS + "AddResponse.java"); - assertTrue("Response wrapper not generated", javaSource.exists()); - } - } Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumeScriptTestCase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumeScriptTestCase.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumeScriptTestCase.java 2010-07-01 07:42:38 UTC (rev 12557) @@ -0,0 +1,51 @@ +/* + * 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; + +import java.io.File; + +/** + * [JBWS-1793] Provide a test case for the tools scripts that reside under JBOSS_HOME/bin + * + * http://jira.jboss.org/jira/browse/JBWS-1793 + * + * Test the wsprovide and wsconsume scripts that reside + * under JBOSS_HOME/bin. This basically verifies all dependencies are + * met to run the shell scripts. + * + * @author Heiko.Braun(a)jboss.com + */ +public class WSConsumeScriptTestCase extends ScriptTestCase +{ + private String WSDL_LOCATION = "jaxws" + FS + "smoke" + FS + "tools" + FS + "wsdl" + FS + "TestServiceCatalog.wsdl"; + + public void testWSConsumeFromCommandLine() throws Exception + { + // use absolute path for the output to be re-usable + String absWsdlLoc = getResourceFile(WSDL_LOCATION).getAbsolutePath(); + String absOutput = new File(TEST_DIR, "wsconsume" + FS + "java").getAbsolutePath(); + String command = JBOSS_HOME + FS + "bin" + FS + "wsconsume" + EXT + " -v -k -o " + absOutput + " " + absWsdlLoc; + executeCommand(command, "wsconsume"); + File javaSource = new File(TEST_DIR, "wsconsume" + FS + "java" + FS + "org" + FS + "openuri" + FS + "_2004" + FS + "_04" + FS + "helloworld" + FS + "EndpointInterface.java"); + assertTrue("Service endpoint interface not generated", javaSource.exists()); + } +} Property changes on: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumeScriptTestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProvideScriptTestCase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProvideScriptTestCase.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProvideScriptTestCase.java 2010-07-01 07:42:38 UTC (rev 12557) @@ -0,0 +1,49 @@ +/* + * 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; + +import java.io.File; + +/** + * [JBWS-1793] Provide a test case for the tools scripts that reside under JBOSS_HOME/bin + * + * http://jira.jboss.org/jira/browse/JBWS-1793 + * + * Test the wsprovide and wsconsume scripts that reside + * under JBOSS_HOME/bin. This basically verifies all dependencies are + * met to run the shell scripts. + * + * @author Heiko.Braun(a)jboss.com + */ +public class WSProvideScriptTestCase extends ScriptTestCase +{ + + public void testWSProvideFromCommandLine() throws Exception + { + String absOutput = new File(TEST_DIR, "wsprovide" + FS + "java").getAbsolutePath(); + String command = JBOSS_HOME + FS + "bin" + FS + "wsprovide" + EXT + " -k -w -o " + absOutput + " --classpath " + CLASSES_DIR + " " + ENDPOINT_CLASS; + executeCommand(command, "wsprovide"); + File javaSource = new File(TEST_DIR, "wsprovide" + FS + "java" + FS + "org" + FS + "jboss" + FS + "test" + FS + "ws" + FS + "jaxws" + FS + "smoke" + FS + "tools" + FS + "jaxws" + FS + "AddResponse.java"); + assertTrue("Response wrapper not generated", javaSource.exists()); + } + +} Property changes on: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProvideScriptTestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF