[Rubyeclipse-commit] org.rubypeople.rdt.debug.core.tests/src/org/rubypeople/rdt/debug/core/tests TC_DebuggerCommunicationTest.java,1.33,1.34

[Markus B. <mba...@us...>]

Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.debug.core.tests/src/org/rubypeople/rdt/debug/core/tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25775/src/org/rubypeople/rdt/debug/core/tests

Modified Files:
	TC_DebuggerCommunicationTest.java 
Log Message:
added timeout for the tests

Index: TC_DebuggerCommunicationTest.java
===================================================================
RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.debug.core.tests/src/org/rubypeople/rdt/debug/core/tests/TC_DebuggerCommunicationTest.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** TC_DebuggerCommunicationTest.java	18 Sep 2005 10:36:08 -0000	1.33
--- TC_DebuggerCommunicationTest.java	18 Sep 2005 12:27:23 -0000	1.34
***************
*** 8,13 ****
--- 8,15 ----
  import java.net.Socket;
  
+ import junit.framework.Assert;
  import junit.framework.TestCase;
  
+ import org.jruby.internal.runtime.ThreadService;
  import org.rubypeople.rdt.core.RubyCore;
  import org.rubypeople.rdt.internal.debug.core.ExceptionSuspensionPoint;
***************
*** 32,38 ****
  
  /*
! 	public static TestSuite suite() {
  
! 		TestSuite suite = new TestSuite();
  		//suite.addTest(new TC_DebuggerCommunicationTest("testConstants"));
  		//suite.addTest(new TC_DebuggerCommunicationTest("testConstantDefinedInBothClassAndSuperclass"));
--- 34,40 ----
  
  /*
! 	public static junit.framework.TestSuite suite() {
  
! 		junit.framework.TestSuite suite = new junit.framework.TestSuite();
  		//suite.addTest(new TC_DebuggerCommunicationTest("testConstants"));
  		//suite.addTest(new TC_DebuggerCommunicationTest("testConstantDefinedInBothClassAndSuperclass"));
***************
*** 48,53 ****
  		//suite.addTest(new TC_DebuggerCommunicationTest("testVariableInstanceNested"));				
  		//suite.addTest(new TC_DebuggerCommunicationTest("testStaticVariableInstanceNested"));			
! 		suite.addTest(new TC_DebuggerCommunicationTest("testException"));
! 		//suite.addTest(new TC_DebuggerCommunicationTest("testNameError"));
  		//suite.addTest(new TC_DebuggerCommunicationTest("testVariablesInObject"));	
  		//suite.addTest(new TC_DebuggerCommunicationTest("testStaticVariables"));		
--- 50,55 ----
  		//suite.addTest(new TC_DebuggerCommunicationTest("testVariableInstanceNested"));				
  		//suite.addTest(new TC_DebuggerCommunicationTest("testStaticVariableInstanceNested"));			
! 		//suite.addTest(new TC_DebuggerCommunicationTest("testException"));
! 		suite.addTest(new TC_DebuggerCommunicationTest("testNameError"));
  		//suite.addTest(new TC_DebuggerCommunicationTest("testVariablesInObject"));	
  		//suite.addTest(new TC_DebuggerCommunicationTest("testStaticVariables"));		
***************
*** 71,75 ****
  		return suite;
  	}
! */
  
  
--- 73,78 ----
  		return suite;
  	}
! 	*/
! 
  
  
***************
*** 91,94 ****
--- 94,98 ----
  		}
  	}
+ 	private static long TIMEOUT_MS = 20000 ;
  	private Process process;
  	private OutputRedirectorThread rubyStdoutRedirectorThread;
***************
*** 97,100 ****
--- 101,108 ----
  	private PrintWriter out;
  	private MultiReaderStrategy multiReaderStrategy;
+ 	
+ 	// for timeout handling
+ 	private Thread mainThread ;
+ 	private Thread timeoutThread ;
  
  	public TC_DebuggerCommunicationTest(String arg0) {
***************
*** 161,166 ****
--- 169,179 ----
  		else {
  		    // being run as "pure" JUnit Test without Eclipse running 
+ 			// getResource delivers a URL, so we get slashes as Fileseparator
  			includeDir = getClass().getResource("/").getFile();
  			includeDir += "../../org.rubypeople.rdt.launching/ruby" ;
+ 			// if on windows, remove a leading slash
+ 			if (includeDir.startsWith("/") && File.separatorChar == '\\') {
+ 				includeDir = includeDir.substring(1);
+ 			}
  		}
  		// the ruby interpreter on linux does not like quotes, so we use them only if really necessary
***************
*** 181,187 ****
--- 194,219 ----
  			throw new RuntimeException("Temp directory does not exist: " + getTmpDir());
  		}
+ 		// if a reader hangs, because the expected data from the ruby process
+ 		// does not arrive, it gets interrupted from the timeout watchdog.
+ 		mainThread = Thread.currentThread() ;
+ 		timeoutThread = new Thread() {
+ 			public void run() {
+ 				try {
+ 					while (true) {
+ 						System.out.println("Starting timeout watchdog.");
+ 						Thread.sleep(TIMEOUT_MS);
+ 						System.out.println("Timeout reached.");
+ 						mainThread.interrupt();
+ 					}
+ 				} catch (InterruptedException e) {
+ 					System.out.println("Watchdog deactivated.");
+ 				} 
+ 			}
+ 		} ;
+ 		timeoutThread.start() ;		
  	}
  
  	public void tearDown() throws Exception {
+ 		timeoutThread.interrupt() ;
  		if (process == null || socket == null) {
  			// here we go it there was an error in the creation of the process (process == null)
***************
*** 203,207 ****
  		rubyStdoutRedirectorThread.join();
  		System.out.println("..done");
! 		System.out.println("Waiting for stdout redirector thread..");
  		rubyStderrRedirectorThread.join();
  		System.out.println("..done");
--- 235,239 ----
  		rubyStdoutRedirectorThread.join();
  		System.out.println("..done");
! 		System.out.println("Waiting for stderr redirector thread..");
  		rubyStderrRedirectorThread.join();
  		System.out.println("..done");
***************
*** 239,243 ****
  		}
  	}
! 
  	public void testNameError() throws Exception {
  		createSocket(new String[] { "puts 'x'" });
--- 271,275 ----
  		}
  	}
! 	
  	public void testNameError() throws Exception {
  		createSocket(new String[] { "puts 'x'" });