From a3224e41fed7827c7d5c8a4be8206b53dc967899 Mon Sep 17 00:00:00 2001 From: nash Date: Sun, 13 Sep 2009 22:26:03 +0000 Subject: Copy r809409, r809677 and r812443 changes from 1.5.1 branch to 1.x branch git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@814403 13f79535-47bb-0310-9956-ffa450edef68 --- .../test/java/domainmgr/DomainManagerBasicTestCase.java | 14 +++++++------- .../test/java/domainmgr/DomainManagerCallbackTestCase.java | 10 +++++----- .../test/java/domainmgr/DomainManagerErrorTestCase.java | 12 +++++------- .../java/domainmgr/DomainManagerTransactionTestCase.java | 12 +++++------- 4 files changed, 22 insertions(+), 26 deletions(-) (limited to 'branches/sca-java-1.x/itest') diff --git a/branches/sca-java-1.x/itest/domainmgr/basic/runtest/src/test/java/domainmgr/DomainManagerBasicTestCase.java b/branches/sca-java-1.x/itest/domainmgr/basic/runtest/src/test/java/domainmgr/DomainManagerBasicTestCase.java index 1f7a3443b3..46e5ab03af 100644 --- a/branches/sca-java-1.x/itest/domainmgr/basic/runtest/src/test/java/domainmgr/DomainManagerBasicTestCase.java +++ b/branches/sca-java-1.x/itest/domainmgr/basic/runtest/src/test/java/domainmgr/DomainManagerBasicTestCase.java @@ -38,7 +38,7 @@ public class DomainManagerBasicTestCase { private String home = System.getProperty("java.home"); private String classpath = System.getProperty("java.class.path"); - private Runtime runtime = Runtime.getRuntime(); + //private Runtime runtime = Runtime.getRuntime(); private BufferedReader domainErrReader; private BufferedReader domainOutReader; @@ -56,12 +56,12 @@ public class DomainManagerBasicTestCase { // from the "src/test/resources/domain/" directory. System.out.println("Starting domain manager"); String[] domainCommand = { - "\"" + home + "/bin/java\"", + "" + home + "/bin/java", "-cp", - "\"" + classpath + "\"", + "" + classpath + "", "org.apache.tuscany.sca.node.launcher.DomainManagerLauncher"}; String userdir = System.getProperty("user.dir"); - domainMgr = runtime.exec(domainCommand, null, new File(userdir + "/target/test-classes/domain/")); + domainMgr = Runtime.getRuntime().exec(domainCommand, null, new File(userdir + "/target/test-classes/domain/")); // Get the new process's stdin, stdout and stderr streams so that we // can monitor and control execution of the domain manager process. @@ -226,12 +226,12 @@ public class DomainManagerBasicTestCase { void start() throws Exception { System.out.println("Starting node " + nodeName); String[] nodeCommand = { - "\"" + home + "/bin/java\"", + "" + home + "/bin/java", "-cp", - "\"" + classpath + "\"", + "" + classpath + "", "org.apache.tuscany.sca.node.launcher.NodeLauncher", "http://localhost:9990/node-config/" + nodeName}; - nodeProcess = runtime.exec(nodeCommand, null, new File(nodeDir)); + nodeProcess = Runtime.getRuntime().exec(nodeCommand, null, new File(nodeDir)); // Get the new process's stdin, stdout and stderr streams so that we // can monitor and control execution of the test node process. diff --git a/branches/sca-java-1.x/itest/domainmgr/callback/runtest/src/test/java/domainmgr/DomainManagerCallbackTestCase.java b/branches/sca-java-1.x/itest/domainmgr/callback/runtest/src/test/java/domainmgr/DomainManagerCallbackTestCase.java index 157827f67e..71d165449d 100644 --- a/branches/sca-java-1.x/itest/domainmgr/callback/runtest/src/test/java/domainmgr/DomainManagerCallbackTestCase.java +++ b/branches/sca-java-1.x/itest/domainmgr/callback/runtest/src/test/java/domainmgr/DomainManagerCallbackTestCase.java @@ -58,9 +58,9 @@ public class DomainManagerCallbackTestCase { // from the "src/test/resources/domain/" directory. System.out.println("Starting domain manager"); String[] domainCommand = { - "\"" + home + "/bin/java\"", + "" + home + "/bin/java", "-cp", - "\"" + classpath + "\"", + "" + classpath + "", "org.apache.tuscany.sca.node.launcher.DomainManagerLauncher"}; String userdir = System.getProperty("user.dir"); domainMgr = runtime.exec(domainCommand, null, new File(userdir + "/target/test-classes/domain/")); @@ -115,7 +115,7 @@ public class DomainManagerCallbackTestCase { otherNode.checkNodeErr(); otherNode.checkNodeOut(); System.out.println("Sleeping ..."); - Thread.sleep(1000); + Thread.sleep(4000); otherNode.checkNodeErr(); otherNode.checkNodeOut(); assertEquals("-> someMethod -> receiveResult", tester.getResult()); @@ -232,9 +232,9 @@ public class DomainManagerCallbackTestCase { void start() throws Exception { System.out.println("Starting node " + nodeName); String[] nodeCommand = { - "\"" + home + "/bin/java\"", + "" + home + "/bin/java", "-cp", - "\"" + classpath + "\"", + "" + classpath + "", "org.apache.tuscany.sca.node.launcher.NodeLauncher", "http://localhost:9990/node-config/" + nodeName}; nodeProcess = runtime.exec(nodeCommand, null, new File(nodeDir)); diff --git a/branches/sca-java-1.x/itest/domainmgr/error/runtest/src/test/java/domainmgr/DomainManagerErrorTestCase.java b/branches/sca-java-1.x/itest/domainmgr/error/runtest/src/test/java/domainmgr/DomainManagerErrorTestCase.java index b744d092c5..23ffc440ab 100644 --- a/branches/sca-java-1.x/itest/domainmgr/error/runtest/src/test/java/domainmgr/DomainManagerErrorTestCase.java +++ b/branches/sca-java-1.x/itest/domainmgr/error/runtest/src/test/java/domainmgr/DomainManagerErrorTestCase.java @@ -23,9 +23,7 @@ import java.io.File; import java.io.InputStream; import java.io.InputStreamReader; import java.io.OutputStream; -import org.apache.tuscany.sca.node.SCAClient; -import org.apache.tuscany.sca.node.SCANode; -import org.apache.tuscany.sca.node.SCANodeFactory; + import org.junit.Test; /** @@ -56,9 +54,9 @@ public class DomainManagerErrorTestCase { // from the "src/test/resources/domain/" directory. System.out.println("Starting domain manager"); String[] domainCommand = { - "\"" + home + "/bin/java\"", + "" + home + "/bin/java", "-cp", - "\"" + classpath + "\"", + "" + classpath + "", "org.apache.tuscany.sca.node.launcher.DomainManagerLauncher"}; String userdir = System.getProperty("user.dir"); domainMgr = runtime.exec(domainCommand, null, new File(userdir + "/target/test-classes/domain/")); @@ -218,9 +216,9 @@ public class DomainManagerErrorTestCase { void start() throws Exception { System.out.println("Starting node " + nodeName); String[] nodeCommand = { - "\"" + home + "/bin/java\"", + "" + home + "/bin/java", "-cp", - "\"" + classpath + "\"", + "" + classpath + "", "org.apache.tuscany.sca.node.launcher.NodeLauncher", "http://localhost:9990/node-config/" + nodeName}; nodeProcess = runtime.exec(nodeCommand, null, new File(nodeDir)); diff --git a/branches/sca-java-1.x/itest/domainmgr/transaction/runtest/src/test/java/domainmgr/DomainManagerTransactionTestCase.java b/branches/sca-java-1.x/itest/domainmgr/transaction/runtest/src/test/java/domainmgr/DomainManagerTransactionTestCase.java index 5e641216dd..ef99628686 100644 --- a/branches/sca-java-1.x/itest/domainmgr/transaction/runtest/src/test/java/domainmgr/DomainManagerTransactionTestCase.java +++ b/branches/sca-java-1.x/itest/domainmgr/transaction/runtest/src/test/java/domainmgr/DomainManagerTransactionTestCase.java @@ -23,9 +23,7 @@ import java.io.File; import java.io.InputStream; import java.io.InputStreamReader; import java.io.OutputStream; -import org.apache.tuscany.sca.node.SCAClient; -import org.apache.tuscany.sca.node.SCANode; -import org.apache.tuscany.sca.node.SCANodeFactory; + import org.junit.Test; /** @@ -56,9 +54,9 @@ public class DomainManagerTransactionTestCase { // from the "src/test/resources/domain/" directory. System.out.println("Starting domain manager"); String[] domainCommand = { - "\"" + home + "/bin/java\"", + "" + home + "/bin/java", "-cp", - "\"" + classpath + "\"", + "" + classpath + "", "org.apache.tuscany.sca.node.launcher.DomainManagerLauncher"}; String userdir = System.getProperty("user.dir"); domainMgr = runtime.exec(domainCommand, null, new File(userdir + "/target/test-classes/domain/")); @@ -210,9 +208,9 @@ public class DomainManagerTransactionTestCase { void start() throws Exception { System.out.println("Starting node " + nodeName); String[] nodeCommand = { - "\"" + home + "/bin/java\"", + "" + home + "/bin/java", "-cp", - "\"" + classpath + "\"", + "" + classpath + "", "org.apache.tuscany.sca.node.launcher.NodeLauncher", "http://localhost:9990/node-config/" + nodeName}; nodeProcess = runtime.exec(nodeCommand, null, new File(nodeDir)); -- cgit v1.2.3