Thread: [Pydev-cvs] org.python.pydev.refactoring/tests/org/python/pydev/refactoring/tests/core IInputOutpu
Brought to you by:
fabioz
From: Fabio Z. <fa...@us...> - 2008-09-27 20:03:34
|
Update of /cvsroot/pydev/org.python.pydev.refactoring/tests/org/python/pydev/refactoring/tests/core In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21605/tests/org/python/pydev/refactoring/tests/core Modified Files: IInputOutputTestCase.java AllTests.java LexerTestCase.java IOTestCaseLexer.java AbstractIOTestCase.java AbstractIOTestSuite.java AbstractRewriterTestCase.java Log Message: Synching to latest changes: Pydev <ul> <li><strong>Editor</strong>: Cursor settings no longer overridden</li> <li><strong>Code-completion</strong>: If __all__ is defined with runtime elements (and not only in a single assign statement), it's ignored for code-completion purposes</li> <li><strong>Debugger</strong>: Pythonpath the same in debug and regular modes (sys.path[0] is the same directory as the file run)</li> <li><strong>Debugger</strong>: Persist choices done in the debugger when files from the debugger are not found</li> <li><strong>Interpreter config</strong>: "email" automatically added to the "forced builtins"</li> <li><strong>Parser</strong>: Correctly recognizing absolute import with 3 or more levels</li> <li><strong>Syntax check</strong>: Option to do only on active editor</li> </ul> Also: tabs changed for spaces Index: AbstractIOTestSuite.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.refactoring/tests/org/python/pydev/refactoring/tests/core/AbstractIOTestSuite.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** AbstractIOTestSuite.java 14 Mar 2008 01:30:11 -0000 1.10 --- AbstractIOTestSuite.java 27 Sep 2008 20:00:47 -0000 1.11 *************** *** 16,79 **** public abstract class AbstractIOTestSuite extends TestSuite { ! protected static String TESTDIR = "tests" + File.separator + "python" + File.separator + "rewriter"; ! // can be used to choose which test we want to run ! public static String FILE_FILTER = "^test.+\\.py$"; ! static{ ! // FILE_FILTER = "testExtractMethod12.py"; ! // FILE_FILTER = "testBoolOp.py"; ! // FILE_FILTER = "testDoubleAssign.py"; ! // FILE_FILTER = "testOverrideMethodsBuiltins.py"; ! // FILE_FILTER = "testDecorators2.py"; ! } ! protected void createTests() { ! File[] testFiles = getTestFiles(System.getProperty("testDir", TESTDIR)); ! if (testFiles == null) ! return; ! for (File testFile : testFiles) { ! this.addTest(createTest(testFile)); ! } ! } ! private IInputOutputTestCase createTest(File file) { ! String filename = file.getName(); ! String testCaseName = filename.substring(0, filename.length() - 3); ! IInputOutputTestCase testCase = createTestCase(testCaseName); ! IOTestCaseLexer lexer; ! try { ! lexer = new IOTestCaseLexer(new FileReader(file)); ! lexer.scan(); ! testCase.setFile(file); ! testCase.setSource(lexer.getSource()); ! testCase.setResult(lexer.getResult()); ! testCase.setConfig(lexer.getConfig()); ! } catch (Throwable e) { ! e.printStackTrace(); ! } ! return testCase; ! } ! protected abstract IInputOutputTestCase createTestCase(String testCaseName); ! private File[] getTestFiles(String path) { ! File dir = new File(path); ! File[] testFiles = dir.listFiles(new TestFilenameFilter()); ! return testFiles; ! } ! protected class TestFilenameFilter implements FilenameFilter { ! public boolean accept(File dir, String name) { ! return name.matches(System.getProperty("filter", FILE_FILTER)); ! } ! } } --- 16,79 ---- public abstract class AbstractIOTestSuite extends TestSuite { ! protected static String TESTDIR = "tests" + File.separator + "python" + File.separator + "rewriter"; ! // can be used to choose which test we want to run ! public static String FILE_FILTER = "^test.+\\.py$"; ! static{ ! // FILE_FILTER = "testExtractMethod12.py"; ! // FILE_FILTER = "testBoolOp.py"; ! // FILE_FILTER = "testDoubleAssign.py"; ! // FILE_FILTER = "testOverrideMethodsBuiltins.py"; ! // FILE_FILTER = "testDecorators2.py"; ! } ! protected void createTests() { ! File[] testFiles = getTestFiles(System.getProperty("testDir", TESTDIR)); ! if (testFiles == null) ! return; ! for (File testFile : testFiles) { ! this.addTest(createTest(testFile)); ! } ! } ! private IInputOutputTestCase createTest(File file) { ! String filename = file.getName(); ! String testCaseName = filename.substring(0, filename.length() - 3); ! IInputOutputTestCase testCase = createTestCase(testCaseName); ! IOTestCaseLexer lexer; ! try { ! lexer = new IOTestCaseLexer(new FileReader(file)); ! lexer.scan(); ! testCase.setFile(file); ! testCase.setSource(lexer.getSource()); ! testCase.setResult(lexer.getResult()); ! testCase.setConfig(lexer.getConfig()); ! } catch (Throwable e) { ! e.printStackTrace(); ! } ! return testCase; ! } ! protected abstract IInputOutputTestCase createTestCase(String testCaseName); ! private File[] getTestFiles(String path) { ! File dir = new File(path); ! File[] testFiles = dir.listFiles(new TestFilenameFilter()); ! return testFiles; ! } ! protected class TestFilenameFilter implements FilenameFilter { ! public boolean accept(File dir, String name) { ! return name.matches(System.getProperty("filter", FILE_FILTER)); ! } ! } } Index: AbstractRewriterTestCase.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.refactoring/tests/org/python/pydev/refactoring/tests/core/AbstractRewriterTestCase.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** AbstractRewriterTestCase.java 20 Oct 2007 19:31:03 -0000 1.5 --- AbstractRewriterTestCase.java 27 Sep 2008 20:00:47 -0000 1.6 *************** *** 9,23 **** public abstract class AbstractRewriterTestCase extends AbstractIOTestCase { ! public AbstractRewriterTestCase(String name) { ! this(name, false); ! } ! public AbstractRewriterTestCase(String name, boolean ignoreEmptyLines) { ! super(name, ignoreEmptyLines); ! } ! protected void runRewriter() throws Throwable { ! setTestGenerated(RewriterVisitor.reparsed(getSource(), "\n")); ! } } --- 9,23 ---- public abstract class AbstractRewriterTestCase extends AbstractIOTestCase { ! public AbstractRewriterTestCase(String name) { ! this(name, false); ! } ! public AbstractRewriterTestCase(String name, boolean ignoreEmptyLines) { ! super(name, ignoreEmptyLines); ! } ! protected void runRewriter() throws Throwable { ! setTestGenerated(RewriterVisitor.reparsed(getSource(), "\n")); ! } } Index: LexerTestCase.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.refactoring/tests/org/python/pydev/refactoring/tests/core/LexerTestCase.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** LexerTestCase.java 20 Oct 2007 17:18:32 -0000 1.3 --- LexerTestCase.java 27 Sep 2008 20:00:47 -0000 1.4 *************** *** 7,38 **** public class LexerTestCase extends TestCase { ! private IOTestCaseLexer scanner; ! @Override ! protected void setUp() throws Exception { ! this.scanner = new IOTestCaseLexer(new java.io.FileReader(TestDependent.TEST_PYDEV_REFACTORING_PLUGIN_LOC+"tests/python/core/testIOTestCaseLexer.py")); ! this.scanner.scan(); ! } ! public void testSource() { ! String text = scanner.getSource(); ! assertTrue(text.length() > 0); ! assertFalse(text.contains("##r")); ! assertFalse(text.contains("##c")); ! } ! public void testResult() { ! String text = scanner.getResult(); ! assertTrue(text.length() > 0); ! assertFalse(text.contains("##s")); ! assertFalse(text.contains("##c")); ! } ! public void testConfig() { ! String text = scanner.getConfig(); ! assertTrue(text.length() > 0); ! assertFalse(text.contains("'''")); ! assertFalse(text.contains("##s")); ! assertFalse(text.contains("##c")); ! } } --- 7,38 ---- public class LexerTestCase extends TestCase { ! private IOTestCaseLexer scanner; ! @Override ! protected void setUp() throws Exception { ! this.scanner = new IOTestCaseLexer(new java.io.FileReader(TestDependent.TEST_PYDEV_REFACTORING_PLUGIN_LOC+"tests/python/core/testIOTestCaseLexer.py")); ! this.scanner.scan(); ! } ! public void testSource() { ! String text = scanner.getSource(); ! assertTrue(text.length() > 0); ! assertFalse(text.contains("##r")); ! assertFalse(text.contains("##c")); ! } ! public void testResult() { ! String text = scanner.getResult(); ! assertTrue(text.length() > 0); ! assertFalse(text.contains("##s")); ! assertFalse(text.contains("##c")); ! } ! public void testConfig() { ! String text = scanner.getConfig(); ! assertTrue(text.length() > 0); ! assertFalse(text.contains("'''")); ! assertFalse(text.contains("##s")); ! assertFalse(text.contains("##c")); ! } } Index: IInputOutputTestCase.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.refactoring/tests/org/python/pydev/refactoring/tests/core/IInputOutputTestCase.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** IInputOutputTestCase.java 20 Oct 2007 19:31:03 -0000 1.4 --- IInputOutputTestCase.java 27 Sep 2008 20:00:47 -0000 1.5 *************** *** 14,31 **** public interface IInputOutputTestCase extends Test { ! void setSource(String line); ! void setResult(String line); ! void setConfig(String line); ! String getSource(); ! String getResult(); ! void setTestGenerated(String string); ! void setFile(File file); ! File getFile(); } --- 14,31 ---- public interface IInputOutputTestCase extends Test { ! void setSource(String line); ! void setResult(String line); ! void setConfig(String line); ! String getSource(); ! String getResult(); ! void setTestGenerated(String string); ! void setFile(File file); ! File getFile(); } Index: AbstractIOTestCase.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.refactoring/tests/org/python/pydev/refactoring/tests/core/AbstractIOTestCase.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** AbstractIOTestCase.java 20 Oct 2007 19:31:03 -0000 1.5 --- AbstractIOTestCase.java 27 Sep 2008 20:00:47 -0000 1.6 *************** *** 16,102 **** public abstract class AbstractIOTestCase extends TestCase implements IInputOutputTestCase { ! private static final String EMPTY = ""; ! private StringBuffer sourceLines = null; ! private StringBuffer resultLines = null; ! private StringBuffer configLines; ! private String generated; ! ! private File file; ! public AbstractIOTestCase(String name) { ! this(name, false); ! } ! @Override ! protected void setUp() throws Exception { ! PythonModuleManager.TESTING = true; ! } ! ! @Override ! protected void tearDown() throws Exception { ! PythonModuleManager.TESTING = false; ! } ! ! public AbstractIOTestCase(String name, boolean ignoreEmptyLines) { ! super(name); ! sourceLines = new StringBuffer(); ! resultLines = new StringBuffer(); ! configLines = new StringBuffer(); ! } ! public String getExpected() { ! return EMPTY.equals(getResult()) ? getSource() : getResult(); ! } ! public String getResult() { ! return getResultLines().toString().trim(); ! } ! public String getSource() { ! return getSourceLines().toString().trim(); ! } ! public void setSource(String line) { ! sourceLines.append(line); ! } ! public void setResult(String line) { ! resultLines.append(line); ! } ! public void setConfig(String line) { ! configLines.append(line); ! } ! private StringBuffer getResultLines() { ! return resultLines; ! } ! protected String getGenerated() { ! return generated.trim(); ! } ! protected String getConfig() { ! return configLines.toString().trim(); ! } ! private StringBuffer getSourceLines() { ! return sourceLines; ! } ! public void setTestGenerated(String source) { ! this.generated = source; ! } ! public void setFile(File file) { ! this.file = file; ! } ! public File getFile() { ! return file; ! } } --- 16,102 ---- public abstract class AbstractIOTestCase extends TestCase implements IInputOutputTestCase { ! private static final String EMPTY = ""; ! private StringBuffer sourceLines = null; ! private StringBuffer resultLines = null; ! private StringBuffer configLines; ! private String generated; ! ! private File file; ! public AbstractIOTestCase(String name) { ! this(name, false); ! } ! @Override ! protected void setUp() throws Exception { ! PythonModuleManager.TESTING = true; ! } ! ! @Override ! protected void tearDown() throws Exception { ! PythonModuleManager.TESTING = false; ! } ! ! public AbstractIOTestCase(String name, boolean ignoreEmptyLines) { ! super(name); ! sourceLines = new StringBuffer(); ! resultLines = new StringBuffer(); ! configLines = new StringBuffer(); ! } ! public String getExpected() { ! return EMPTY.equals(getResult()) ? getSource() : getResult(); ! } ! public String getResult() { ! return getResultLines().toString().trim(); ! } ! public String getSource() { ! return getSourceLines().toString().trim(); ! } ! public void setSource(String line) { ! sourceLines.append(line); ! } ! public void setResult(String line) { ! resultLines.append(line); ! } ! public void setConfig(String line) { ! configLines.append(line); ! } ! private StringBuffer getResultLines() { ! return resultLines; ! } ! protected String getGenerated() { ! return generated.trim(); ! } ! protected String getConfig() { ! return configLines.toString().trim(); ! } ! private StringBuffer getSourceLines() { ! return sourceLines; ! } ! public void setTestGenerated(String source) { ! this.generated = source; ! } ! public void setFile(File file) { ! this.file = file; ! } ! public File getFile() { ! return file; ! } } Index: IOTestCaseLexer.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.refactoring/tests/org/python/pydev/refactoring/tests/core/IOTestCaseLexer.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** IOTestCaseLexer.java 20 Oct 2007 19:31:03 -0000 1.3 --- IOTestCaseLexer.java 27 Sep 2008 20:00:47 -0000 1.4 *************** *** 15,626 **** class IOTestCaseLexer { ! /** This character denotes the end of file */ ! public static final int YYEOF = -1; ! /** initial size of the lookahead buffer */ ! private static final int ZZ_BUFFERSIZE = 16384; ! /** lexical states */ ! public static final int CONFIG = 2; [...1195 lines suppressed...] ! for (String arg : argv) { ! IOTestCaseLexer scanner = null; ! try { ! scanner = new IOTestCaseLexer(new java.io.FileReader(arg)); ! while (!scanner.zzAtEOF) ! scanner.yylex(); ! } catch (java.io.FileNotFoundException e) { ! System.out.println("File not found : \"" + arg + "\""); ! } catch (java.io.IOException e) { ! System.out.println("IO error scanning file \"" + arg + "\""); ! System.out.println(e); ! } catch (Exception e) { ! System.out.println("Unexpected exception:"); ! e.printStackTrace(); ! } ! } ! } ! } } Index: AllTests.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.refactoring/tests/org/python/pydev/refactoring/tests/core/AllTests.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** AllTests.java 20 Oct 2007 19:31:03 -0000 1.3 --- AllTests.java 27 Sep 2008 20:00:47 -0000 1.4 *************** *** 10,20 **** public class AllTests { ! public static Test suite() { ! TestSuite suite = new TestSuite("Test for org.python.pydev.refactoring.tests.core"); ! // $JUnit-BEGIN$ ! suite.addTestSuite(LexerTestCase.class); ! // $JUnit-END$ ! return suite; ! } } --- 10,20 ---- public class AllTests { ! public static Test suite() { ! TestSuite suite = new TestSuite("Test for org.python.pydev.refactoring.tests.core"); ! // $JUnit-BEGIN$ ! suite.addTestSuite(LexerTestCase.class); ! // $JUnit-END$ ! return suite; ! } } |