[Pydev-cvs] org.python.pydev.parser/tests/org/python/pydev/parser PyParser25Test.java, 1.4, 1.5
Brought to you by:
fabioz
From: Fabio Z. <fa...@us...> - 2006-09-13 01:24:16
|
Update of /cvsroot/pydev/org.python.pydev.parser/tests/org/python/pydev/parser In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14715/tests/org/python/pydev/parser Modified Files: PyParser25Test.java Log Message: Added the try..except..finally construct for the python 2.5 grammar Index: PyParser25Test.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.parser/tests/org/python/pydev/parser/PyParser25Test.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** PyParser25Test.java 8 Sep 2006 01:25:33 -0000 1.4 --- PyParser25Test.java 13 Sep 2006 01:24:13 -0000 1.5 *************** *** 12,15 **** --- 12,17 ---- import org.python.pydev.parser.jython.ast.Module; import org.python.pydev.parser.jython.ast.NameTok; + import org.python.pydev.parser.jython.ast.TryExcept; + import org.python.pydev.parser.jython.ast.TryFinally; /** *************** *** 23,27 **** PyParser25Test test = new PyParser25Test(); test.setUp(); ! test.testNewRelativeImport2(); test.tearDown(); System.out.println("Finished"); --- 25,29 ---- PyParser25Test test = new PyParser25Test(); test.setUp(); ! test.testNewTryFinally(); test.tearDown(); System.out.println("Finished"); *************** *** 77,80 **** --- 79,107 ---- } + public void testNewTryFinally(){ + defaultVersion = IPythonNature.GRAMMAR_PYTHON_VERSION_2_5; + String str = "" + + "try:\n" + + " 'try'\n" + + "except:\n" + + " 'except'\n" + + "else:\n" + + " 'else'\n" + + "finally:\n" + + " 'finally'\n" + + "\n" + + ""; + //we'll actually treat this as a try..finally with a body with try..except..else + Module mod = (Module) parseLegalDocStr(str); + assertEquals(1, mod.body.length); + TryFinally f = (TryFinally) mod.body[0]; + + assertEquals(1, f.body.length); + TryExcept exc = (TryExcept) f.body[0]; + assertTrue(exc.orelse != null); + assertEquals(1, exc.handlers.length); + + } + /** * This test checks that the old version still gives an error |