Author: richard.opalka(a)jboss.com Date: 2008-09-25 09:42:13 -0400 (Thu, 25 Sep 2008) New Revision: 8226 Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws771/JBWS771TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/scripts/ScriptTestCase.java Log: [JBWS-2322] fixing tests Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws771/JBWS771TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws771/JBWS771TestCase.java 2008-09-25 13:30:51 UTC (rev 8225) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws771/JBWS771TestCase.java 2008-09-25 13:42:13 UTC (rev 8226) @@ -43,6 +43,7 @@ import junit.framework.Test; +import org.jboss.wsf.common.concurrent.CopyJob; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -57,6 +58,7 @@ 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 LS = System.getProperty("line.separator"); // '\n' on unix, '\r\n' on windows + private static final String EXT = ":".equals( PS ) ? ".sh" : ".bat"; private static final String TARGET_NAMESPACE = "http://jbws771.jaxws.ws.test.jboss.org/"; private static URL wsdlURL; @@ -156,7 +158,7 @@ { // use absolute path for the output to be re-usable String absOutput = createResourceFile("wsconsume" + FS + "java").getAbsolutePath(); - String command = JBOSS_HOME + FS + "bin" + FS + "wsconsume.sh -k -o " + absOutput + " --extension --binding=" + RESOURCES_DIR + FS + "jaxws" + FS + "jbws771" + FS + "binding.xml " + wsdlURL.toExternalForm(); + String command = JBOSS_HOME + FS + "bin" + FS + "wsconsume" + EXT + " -k -o " + absOutput + " --extension --binding=" + RESOURCES_DIR + FS + "jaxws" + FS + "jbws771" + FS + "binding.xml " + wsdlURL.toExternalForm(); Process p = executeCommand(command); // check status code @@ -187,12 +189,22 @@ private void checkStatusCode(Process p, String s) throws InterruptedException, IOException { + CopyJob job = new CopyJob(p.getInputStream(), System.out); + new Thread( job ).start(); + int status = -1; + try + { + status = p.waitFor(); + } + finally + { + job.kill(); + p.destroy(); + } + // check status code - int status = p.waitFor(); if (status != 0) { - System.out.println("Input stream"); - printStream(p.getInputStream()); System.out.println("Error stream"); printStream(p.getErrorStream()); } Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/scripts/ScriptTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/scripts/ScriptTestCase.java 2008-09-25 13:30:51 UTC (rev 8225) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/scripts/ScriptTestCase.java 2008-09-25 13:42:13 UTC (rev 8226) @@ -21,10 +21,14 @@ */ package org.jboss.test.ws.tools.scripts; +import java.io.BufferedReader; import java.io.File; import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.common.concurrent.CopyJob; /** * JBWS-1793: Provide a test case for the tools scripts that reside under JBOSS_HOME/bin @@ -37,6 +41,7 @@ private static final String PS = System.getProperty("path.separator"); // ':' on unix, ';' on windows private static final String LS = System.getProperty("line.separator"); // '\n' on unix, '\r\n' on windows private String TOOLS_CONFIG = getResourceFile("tools" + FS + "scripts" + FS + "wstools-config.xml").getAbsolutePath(); + private static final String EXT = ":".equals( PS ) ? ".sh" : ".bat"; private String JBOSS_HOME; private String JDK_HOME; @@ -59,7 +64,7 @@ File dest = createResourceFile("wstools" + FS + "java"); dest.mkdirs(); - String command = JBOSS_HOME + FS + "bin" + FS + "wstools.sh -config " + TOOLS_CONFIG + " -dest "+ dest.getAbsolutePath(); + String command = JBOSS_HOME + FS + "bin" + FS + "wstools" + EXT + " -config " + TOOLS_CONFIG + " -dest "+ dest.getAbsolutePath(); Process p = executeCommand(command); // check status code @@ -80,10 +85,42 @@ return p; } - private void assertStatusCode(Process p, String s) throws InterruptedException + private void assertStatusCode(Process p, String s) throws InterruptedException, IOException { + CopyJob job = new CopyJob(p.getInputStream(), System.out); + new Thread( job ).start(); + int status = -1; + try + { + status = p.waitFor(); + } + finally + { + job.kill(); + p.destroy(); + } + // check status code - int status = p.waitFor(); + if (status != 0) + { + System.out.println("Error stream"); + printStream(p.getErrorStream()); + } assertTrue(s + " did exit with status " + status, status == 0); } + + private void printStream(InputStream is) throws IOException + { + System.out.println(); + BufferedReader in = new BufferedReader(new InputStreamReader(is)); + StringBuffer buffer = new StringBuffer(); + String line; + while ((line = in.readLine()) != null) { + buffer.append(line + LS); + } + System.out.println(buffer.toString()); + System.out.println(); + System.out.println(); + } + }