Author: alessio.soldano(a)jboss.com Date: 2009-09-03 05:09:14 -0400 (Thu, 03 Sep 2009) New Revision: 10653 Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/Runner.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/basic/BasicTest.java Log: Making server address configurable Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/Runner.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/Runner.java 2009-09-03 08:22:43 UTC (rev 10652) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/Runner.java 2009-09-03 09:09:14 UTC (rev 10653) @@ -53,8 +53,10 @@ private static long sleep = 1500; private static boolean verbose = false; - + private static String address = "localhost:8080"; + + public static class BenchmarkCallable implements Callable<Result> { private final BenchmarkTest test; @@ -94,7 +96,7 @@ private static BenchmarkTest parseArguments(String[] args) throws Exception { - String shortOpts = "t:r:s:i:vh"; + String shortOpts = "t:r:s:i:a:vh"; LongOpt[] longOpts = { new LongOpt("deployment", LongOpt.REQUIRED_ARGUMENT, null, 'd'), @@ -102,6 +104,7 @@ new LongOpt("runs", LongOpt.REQUIRED_ARGUMENT, null, 'r'), new LongOpt("sleep", LongOpt.REQUIRED_ARGUMENT, null, 's'), new LongOpt("iterations", LongOpt.REQUIRED_ARGUMENT, null, 'i'), + new LongOpt("address", LongOpt.REQUIRED_ARGUMENT, null, 'a'), new LongOpt("verbose", LongOpt.NO_ARGUMENT, null, 'v'), new LongOpt("help", LongOpt.NO_ARGUMENT, null, 'h') }; @@ -124,6 +127,9 @@ case 'i': iterations = Integer.parseInt(getopt.getOptarg()); break; + case 'a': + address = getopt.getOptarg(); + break; case 'v': verbose = true; break; @@ -167,6 +173,7 @@ out.println(" -h, --help Show this help message"); out.println(" -v, --verbose Show verbose results"); out.println(" -s, --sleep=<time-in-ms> How many millisecs to wait between runs"); + out.println(" -a, --address=<host:port> Server host:port"); out.println(" -r, --runs=<number-of-runs> How many runs to do"); out.println(" -i, --iterations=<num-of-iters> How many iterations to do in each run"); out.println(" -t, --threads=<number-of-threads> How many concurrent threads to create"); @@ -235,5 +242,10 @@ System.out.println("------------------------------------"); } + + public static String getServerAddress() + { + return address; + } } Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/basic/BasicTest.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/basic/BasicTest.java 2009-09-03 08:22:43 UTC (rev 10652) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/basic/BasicTest.java 2009-09-03 09:09:14 UTC (rev 10653) @@ -27,7 +27,7 @@ import javax.xml.ws.Service; import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest; -import org.jboss.wsf.test.JBossWSTestHelper; +import org.jboss.test.ws.jaxws.benchmark.Runner; /** * @@ -37,7 +37,7 @@ */ public class BasicTest implements BenchmarkTest { - private String endpointURL = "http://" + JBossWSTestHelper.getServerHost() + ":8080/jaxws-benchmark-basic/EndpointImpl"; + private String endpointURL = "http://" + Runner.getServerAddress() + "/jaxws-benchmark-basic/EndpointImpl"; private String targetNS = "http://basic.test.benchmark.jaxws.ws.test.jboss.org/"; public Object prepare() throws Exception