Thread: [Pydev-cvs] org.python.pydev.parser/tests/org/python/pydev/parser PyParserTestBase.java,NONE,1.1 PyP
Brought to you by:
fabioz
From: Fabio Z. <fa...@us...> - 2005-10-26 14:56:45
|
Update of /cvsroot/pydev/org.python.pydev.parser/tests/org/python/pydev/parser In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7500/tests/org/python/pydev/parser Modified Files: PyParserTest.java Added Files: PyParserTestBase.java Log Message: --- NEW FILE: PyParserTestBase.java --- package org.python.pydev.parser; import org.eclipse.jface.text.Document; import org.eclipse.jface.text.IDocument; import org.python.parser.ParseException; import org.python.parser.SimpleNode; import org.python.parser.Token; import org.python.pydev.core.IPythonNature; import junit.framework.TestCase; public class PyParserTestBase extends TestCase { protected PyParser parser; protected void setUp() throws Exception { PyParser.ACCEPT_NULL_EDITOR = true; PyParser.ENABLE_TRACING = true; ParseException.verboseExceptions = true; parser = new PyParser(); super.setUp(); } protected void tearDown() throws Exception { PyParser.ACCEPT_NULL_EDITOR = false; PyParser.ENABLE_TRACING = false; ParseException.verboseExceptions = false; super.tearDown(); } /** * @param s * @return */ protected SimpleNode parseLegalDocStr(String s, Object ... additionalErrInfo) { Document doc = new Document(s); return parseLegalDoc(doc, additionalErrInfo); } /** * @param additionalErrInfo * @param parser */ protected SimpleNode parseLegalDoc(IDocument doc, Object[] additionalErrInfo) { parser.setDocument(doc, false); Object[] objects = parser.reparseDocument((IPythonNature)null); Object err = objects[1]; if(err != null){ String s = ""; for (int i = 0; i < additionalErrInfo.length; i++) { s += additionalErrInfo[i]; } if (err instanceof ParseException) { ParseException parseErr = (ParseException) err; Token token = parseErr.currentToken; if(token != null){ fail("Expected no error, received: "+err+" "+s+" line:"+token.beginLine+ " col:"+token.beginColumn); } } fail("Expected no error, received: "+err+" "+s); } assertNotNull(objects[0]); return (SimpleNode) objects[0]; } } Index: PyParserTest.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.parser/tests/org/python/pydev/parser/PyParserTest.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** PyParserTest.java 26 Sep 2005 01:24:07 -0000 1.9 --- PyParserTest.java 26 Oct 2005 14:56:32 -0000 1.10 *************** *** 6,25 **** import java.io.File; - import org.eclipse.jface.text.Document; - import org.eclipse.jface.text.IDocument; - import org.python.parser.ParseException; import org.python.parser.SimpleNode; - import org.python.parser.Token; import org.python.parser.ast.ClassDef; import org.python.parser.ast.FunctionDef; import org.python.parser.ast.Module; import org.python.parser.ast.Name; - import org.python.pydev.core.IPythonNature; import org.python.pydev.core.REF; import org.python.pydev.core.TestDependent; ! import junit.framework.TestCase; ! ! public class PyParserTest extends TestCase { public static void main(String[] args) { --- 6,18 ---- import java.io.File; import org.python.parser.SimpleNode; import org.python.parser.ast.ClassDef; import org.python.parser.ast.FunctionDef; import org.python.parser.ast.Module; import org.python.parser.ast.Name; import org.python.pydev.core.REF; import org.python.pydev.core.TestDependent; ! public class PyParserTest extends PyParserTestBase{ public static void main(String[] args) { *************** *** 36,55 **** } - private PyParser parser; - - protected void setUp() throws Exception { - PyParser.ACCEPT_NULL_EDITOR = true; - PyParser.ENABLE_TRACING = true; - ParseException.verboseExceptions = true; - parser = new PyParser(); - super.setUp(); - } - - protected void tearDown() throws Exception { - PyParser.ACCEPT_NULL_EDITOR = false; - PyParser.ENABLE_TRACING = false; - ParseException.verboseExceptions = false; - super.tearDown(); - } public void testCorrectArgs() { --- 29,32 ---- *************** *** 281,320 **** } - /** - * @param s - * @return - */ - private SimpleNode parseLegalDocStr(String s, Object ... additionalErrInfo) { - Document doc = new Document(s); - return parseLegalDoc(doc, additionalErrInfo); - } - - /** - * @param additionalErrInfo - * @param parser - */ - private SimpleNode parseLegalDoc(IDocument doc, Object[] additionalErrInfo) { - parser.setDocument(doc, false); - Object[] objects = parser.reparseDocument((IPythonNature)null); - Object err = objects[1]; - if(err != null){ - String s = ""; - for (int i = 0; i < additionalErrInfo.length; i++) { - s += additionalErrInfo[i]; - } - if (err instanceof ParseException) { - ParseException parseErr = (ParseException) err; - - Token token = parseErr.currentToken; - if(token != null){ - fail("Expected no error, received: "+err+" "+s+" line:"+token.beginLine+ " col:"+token.beginColumn); - } - } - - fail("Expected no error, received: "+err+" "+s); - } - assertNotNull(objects[0]); - return (SimpleNode) objects[0]; - } - } --- 258,260 ---- |