diff options
author | david_williams | 2005-08-31 16:06:31 +0000 |
---|---|---|
committer | david_williams | 2005-08-31 16:06:31 +0000 |
commit | 9bf085d2c205da5c5b5b39c646f9c2e9653186ce (patch) | |
tree | 674275cd624bcf8d4bf3c055b253a858a3edb0bd /tests | |
parent | 716b972d218937ab85bfa9dd4b9b80a8b5fca917 (diff) | |
download | webtools.webservices-9bf085d2c205da5c5b5b39c646f9c2e9653186ce.tar.gz webtools.webservices-9bf085d2c205da5c5b5b39c646f9c2e9653186ce.tar.xz webtools.webservices-9bf085d2c205da5c5b5b39c646f9c2e9653186ce.zip |
[106794] Echo.java message may be hanging JUnit tests?
Diffstat (limited to 'tests')
3 files changed, 11 insertions, 4 deletions
diff --git a/tests/org.eclipse.jst.ws.tests/readme.txt b/tests/org.eclipse.jst.ws.tests/readme.txt index 09cdd8bcb..832954656 100644 --- a/tests/org.eclipse.jst.ws.tests/readme.txt +++ b/tests/org.eclipse.jst.ws.tests/readme.txt @@ -1,5 +1,5 @@ The arguments to be passed in are: --Detools_perf_ctrl="log=d:/perflogs/v6001;testd=51" -Dtomcat.server.v50=E:\\Tomcat\\Tomcat5.0 +-Dorg.eclipse.jst.server.tomcat.50=E:\\Tomcat\\Tomcat5.0 -, where etools_perf_crtl is the log output directory and test id, and tomcat.server.v50 is the install directory of your Tomcat v5.0 server. +, where "org.eclipse.jst.server.tomcat.50" is the install directory of your Tomcat v5.0 server. diff --git a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/AllWSJUnitTests.java b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/AllWSJUnitTests.java index 2560807d4..dca872603 100644 --- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/AllWSJUnitTests.java +++ b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/AllWSJUnitTests.java @@ -5,6 +5,7 @@ import junit.framework.TestCase; import junit.framework.TestResult; import junit.framework.TestSuite; import junit.textui.TestRunner; +import org.eclipse.jst.ws.tests.util.JUnitUtils; /** * This class is to run all the unittest tests. @@ -27,6 +28,7 @@ public class AllWSJUnitTests extends TestCase implements WSJUnitConstants new AllWSJUnitTests().runMain(args); } + public Object runMain(Object args) { Object result = null; @@ -37,7 +39,6 @@ public class AllWSJUnitTests extends TestCase implements WSJUnitConstants parseArgs(args); testRunner = new TestRunner(System.out); - Test suite = suite(); TestResult testResult = testRunner.doRun(suite, false); @@ -53,6 +54,8 @@ public class AllWSJUnitTests extends TestCase implements WSJUnitConstants public static Test suite() { + JUnitUtils.enableOverwrite(true); + TestSuite testSuite = new TestSuite(); testSuite.addTest( ComponentCreationTests.suite() ); testSuite.addTest( J2EEUtilsTests.suite() ); diff --git a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/ResourceUtilsTests.java b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/ResourceUtilsTests.java index c8309e63f..4c049387f 100644 --- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/ResourceUtilsTests.java +++ b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/ResourceUtilsTests.java @@ -4,6 +4,7 @@ import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; +import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IFolder; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; @@ -48,7 +49,10 @@ public class ResourceUtilsTests extends TestCase implements WSJUnitConstants{ EclipseProgressMonitor monitor = new EclipseProgressMonitor(); EclipseEnvironment env = new EclipseEnvironment( null, resourceContext, monitor, handler ); - JUnitUtils.copyTestData("BUJava/src", folder, env); + IFile file = folder.getFile(new Path("foo/Echo.java")); + if (!file.exists()) { + JUnitUtils.copyTestData("BUJava/src", folder, env); + } } catch (Exception ex){ ex.printStackTrace(); |