You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by sg...@apache.org on 2008/04/07 15:00:54 UTC
svn commit: r645486 -
/commons/sandbox/exec/trunk/src/test/java/org/apache/commons/exec/DefaultExecutorTest.java
Author: sgoeschl
Date: Mon Apr 7 06:00:54 2008
New Revision: 645486
URL: http://svn.apache.org/viewvc?rev=645486&view=rev
Log:
Removed an unused test
Modified:
commons/sandbox/exec/trunk/src/test/java/org/apache/commons/exec/DefaultExecutorTest.java
Modified: commons/sandbox/exec/trunk/src/test/java/org/apache/commons/exec/DefaultExecutorTest.java
URL: http://svn.apache.org/viewvc/commons/sandbox/exec/trunk/src/test/java/org/apache/commons/exec/DefaultExecutorTest.java?rev=645486&r1=645485&r2=645486&view=diff
==============================================================================
--- commons/sandbox/exec/trunk/src/test/java/org/apache/commons/exec/DefaultExecutorTest.java (original)
+++ commons/sandbox/exec/trunk/src/test/java/org/apache/commons/exec/DefaultExecutorTest.java Mon Apr 7 06:00:54 2008
@@ -295,40 +295,8 @@
* Test the proper handling of ProcessDestroyer for an asynchronous process.
* Since we do not terminate the process it will be terminated in the
* ShutdownHookProcessDestroyer implementation
- *
- * xxx
*/
- public void testExecuteAsyncWithProcessDestroyer1() throws Exception {
-
- CommandLine cl = new CommandLine(foreverTestScript);
- MockExecuteResultHandler handler = new MockExecuteResultHandler();
- ShutdownHookProcessDestroyer processDestroyer = new ShutdownHookProcessDestroyer();
- ExecuteWatchdog watchdog = new ExecuteWatchdog(Integer.MAX_VALUE);
-
- assertTrue(exec.getProcessDestroyer() == null);
- assertTrue(processDestroyer.size() == 0);
- assertTrue(processDestroyer.isAddedAsShutdownHook() == false);
-
- exec.setWatchdog(watchdog);
- exec.setProcessDestroyer(processDestroyer);
- exec.execute(cl, handler);
-
- // wait for script to run
- Thread.sleep(2000);
- assertNotNull(exec.getProcessDestroyer());
- assertTrue(processDestroyer.size() == 1);
- assertTrue(processDestroyer.isAddedAsShutdownHook() == true);
-
- watchdog.destroyProcess();
- assertTrue(watchdog.killedProcess());
- }
-
- /**
- * Test the proper handling of ProcessDestroyer for an asynchronous process.
- * Since we do not terminate the process it will be terminated in the
- * ShutdownHookProcessDestroyer implementation
- */
- public void _testExecuteAsyncWithProcessDestroyer2() throws Exception {
+ public void testExecuteAsyncWithProcessDestroyer() throws Exception {
CommandLine cl = new CommandLine(foreverTestScript);
MockExecuteResultHandler handler = new MockExecuteResultHandler();
@@ -349,7 +317,7 @@
assertTrue(processDestroyer.size() == 1);
assertTrue(processDestroyer.isAddedAsShutdownHook() == true);
- // teminate it
+ // teminate it and the process destroyer is detached
watchdog.destroyProcess();
assertTrue(watchdog.killedProcess());
Thread.sleep(100);