[Pydev-cvs] org.python.pydev/tests/org/python/pydev/runners SimplePythonRunnerTest.java, 1.4, 1.5 S
Brought to you by:
fabioz
From: Fabio Z. <fa...@us...> - 2008-05-21 01:38:03
|
Update of /cvsroot/pydev/org.python.pydev/tests/org/python/pydev/runners In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4510/tests/org/python/pydev/runners Modified Files: SimplePythonRunnerTest.java SimpleExeRunnerTest.java Log Message: - No longer using Runtime.exec(String), only Runtime.exec(String[]) - Updating the markers in a better (faster) way Index: SimpleExeRunnerTest.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev/tests/org/python/pydev/runners/SimpleExeRunnerTest.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** SimpleExeRunnerTest.java 5 Feb 2008 13:07:14 -0000 1.3 --- SimpleExeRunnerTest.java 21 May 2008 01:38:08 -0000 1.4 *************** *** 21,25 **** if(TestDependent.HAS_CYGWIN){ SimpleExeRunner runner = new SimpleExeRunner(); ! Tuple<String, String> tup = runner.runAndGetOutput(TestDependent.CYGWIN_CYGPATH_LOCATION, new String[]{TestDependent.CYGWIN_CYGPATH_LOCATION}, null); assertEquals(TestDependent.CYGWIN_UNIX_CYGPATH_LOCATION, tup.o1.trim()); assertEquals("", tup.o2); --- 21,26 ---- if(TestDependent.HAS_CYGWIN){ SimpleExeRunner runner = new SimpleExeRunner(); ! Tuple<String, String> tup = runner.runAndGetOutput(new String[] { TestDependent.CYGWIN_CYGPATH_LOCATION, ! TestDependent.CYGWIN_CYGPATH_LOCATION }, null, null, null); assertEquals(TestDependent.CYGWIN_UNIX_CYGPATH_LOCATION, tup.o1.trim()); assertEquals("", tup.o2); *************** *** 30,34 **** if(TestDependent.HAS_CYGWIN){ SimpleExeRunner runner = new SimpleExeRunner(); ! List<String> ret = runner.convertToCygwinPath(TestDependent.CYGWIN_CYGPATH_LOCATION, TestDependent.CYGWIN_CYGPATH_LOCATION, "c:\\foo"); assertEquals(2, ret.size()); ArrayList<String> expected = new ArrayList<String>(); --- 31,36 ---- if(TestDependent.HAS_CYGWIN){ SimpleExeRunner runner = new SimpleExeRunner(); ! List<String> ret = runner.convertToCygwinPath(TestDependent.CYGWIN_CYGPATH_LOCATION, ! TestDependent.CYGWIN_CYGPATH_LOCATION, "c:\\foo"); assertEquals(2, ret.size()); ArrayList<String> expected = new ArrayList<String>(); Index: SimplePythonRunnerTest.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev/tests/org/python/pydev/runners/SimplePythonRunnerTest.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** SimplePythonRunnerTest.java 15 Mar 2006 00:18:35 -0000 1.4 --- SimplePythonRunnerTest.java 21 May 2008 01:38:08 -0000 1.5 *************** *** 50,54 **** File relativePath = PydevPlugin.getBundleInfo().getRelativePath(new Path("PySrc/interpreterInfo.py")); ! String string = new SimplePythonRunner().runAndGetOutput(TestDependent.PYTHON_EXE+" "+relativePath.getCanonicalPath(), null).o1; assertNotNull(string); //System.out.println(string); --- 50,55 ---- File relativePath = PydevPlugin.getBundleInfo().getRelativePath(new Path("PySrc/interpreterInfo.py")); ! String string = new SimplePythonRunner().runAndGetOutput(new String[] { TestDependent.PYTHON_EXE, ! relativePath.getCanonicalPath() }, null, null, null).o1; assertNotNull(string); //System.out.println(string); |