Author: rsearls Date: 2014-12-25 21:15:25 -0500 (Thu, 25 Dec 2014) New Revision: 19268 Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumeScriptTestCase.java stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProvideScriptTestCase.java Log: arquillian migration tools test Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java 2014-12-26 01:16:36 UTC (rev 19267) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java 2014-12-26 02:15:25 UTC (rev 19268) @@ -22,8 +22,14 @@ package org.jboss.test.ws.jaxws.smoke.tools; import java.io.File; +import java.lang.Exception; import org.jboss.wsf.test.JBossWSTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.RunAsClient; +import org.jboss.arquillian.junit.Arquillian; /** * [JBWS-1793] Provide a test case for the tools scripts that reside under JBOSS_HOME/bin @@ -36,17 +42,18 @@ * * @author Heiko.Braun(a)jboss.com */ +(a)RunWith(Arquillian.class) public class ScriptTestCase extends JBossWSTest { - 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"; + public static final String FS = System.getProperty("file.separator"); // '/' on unix, '\' on windows + public static final String PS = System.getProperty("path.separator"); // ':' on unix, ';' on windows + public static final String EXT = ":".equals( PS ) ? ".sh" : ".bat"; - protected String ENDPOINT_CLASS; + public String ENDPOINT_CLASS; - protected String JBOSS_HOME; - protected String CLASSES_DIR; - protected String TEST_DIR; + public String JBOSS_HOME; + public String CLASSES_DIR; + public String TEST_DIR; protected void setUp() throws Exception { @@ -58,9 +65,12 @@ ENDPOINT_CLASS = "org.jboss.test.ws.jaxws.smoke.tools.CalculatorBean"; TEST_DIR = createResourceFile("..").getAbsolutePath(); } - - public void testScritpsAvailable() + + @Test + @RunAsClient + public void testScritpsAvailable() throws Exception { + setUp(); assertTrue(new File(JBOSS_HOME + FS + "bin" + FS + "wsprovide" + ".sh").exists()); assertTrue(new File(JBOSS_HOME + FS + "bin" + FS + "wsprovide" + ".bat").exists()); assertTrue(new File(JBOSS_HOME + FS + "bin" + FS + "wsconsume" + ".sh").exists()); Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumeScriptTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumeScriptTestCase.java 2014-12-26 01:16:36 UTC (rev 19267) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumeScriptTestCase.java 2014-12-26 02:15:25 UTC (rev 19268) @@ -22,6 +22,11 @@ package org.jboss.test.ws.jaxws.smoke.tools; import java.io.File; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.RunAsClient; +import org.jboss.arquillian.junit.Arquillian; /** * [JBWS-1793] Provide a test case for the tools scripts that reside under JBOSS_HOME/bin @@ -34,12 +39,16 @@ * * @author Heiko.Braun(a)jboss.com */ +(a)RunWith(Arquillian.class) public class WSConsumeScriptTestCase extends ScriptTestCase { private String WSDL_LOCATION = "jaxws" + FS + "smoke" + FS + "tools" + FS + "wsdl" + FS + "TestServiceCatalog.wsdl"; + @Test + @RunAsClient public void testWSConsumeFromCommandLine() throws Exception { + super.setUp(); // 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(); Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProvideScriptTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProvideScriptTestCase.java 2014-12-26 01:16:36 UTC (rev 19267) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProvideScriptTestCase.java 2014-12-26 02:15:25 UTC (rev 19268) @@ -22,6 +22,11 @@ package org.jboss.test.ws.jaxws.smoke.tools; import java.io.File; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.RunAsClient; +import org.jboss.arquillian.junit.Arquillian; /** * [JBWS-1793] Provide a test case for the tools scripts that reside under JBOSS_HOME/bin @@ -34,11 +39,14 @@ * * @author Heiko.Braun(a)jboss.com */ +(a)RunWith(Arquillian.class) public class WSProvideScriptTestCase extends ScriptTestCase { - + @Test + @RunAsClient public void testWSProvideFromCommandLine() throws Exception { + super.setUp(); 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");