Thread: [Pydev-cvs] org.python.pydev.parser/tests/org/python/pydev/parser/fastparser FastDefinitionsParser
Brought to you by:
fabioz
From: Fabio Z. <fa...@us...> - 2008-07-02 20:38:31
|
Update of /cvsroot/pydev/org.python.pydev.parser/tests/org/python/pydev/parser/fastparser In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27516/tests/org/python/pydev/parser/fastparser Modified Files: FastDefinitionsParserTest.java Log Message: Checking line and column on definitions parser Index: FastDefinitionsParserTest.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.parser/tests/org/python/pydev/parser/fastparser/FastDefinitionsParserTest.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FastDefinitionsParserTest.java 2 Jul 2008 20:18:53 -0000 1.2 --- FastDefinitionsParserTest.java 2 Jul 2008 20:38:39 -0000 1.3 *************** *** 27,31 **** FastDefinitionsParserTest test = new FastDefinitionsParserTest(); test.setUp(); ! test.testDefinitionsParser9(); // Timer timer = new Timer(); // test.parseFilesInDir(new File("D:/bin/Python251/Lib/site-packages/wx-2.8-msw-unicode"), true); --- 27,31 ---- FastDefinitionsParserTest test = new FastDefinitionsParserTest(); test.setUp(); ! test.testDefinitionsParser11(); // Timer timer = new Timer(); // test.parseFilesInDir(new File("D:/bin/Python251/Lib/site-packages/wx-2.8-msw-unicode"), true); *************** *** 105,108 **** --- 105,109 ---- assertEquals(2, m.body.length); ClassDef classDef = (ClassDef)m.body[0]; + assertEquals("Bar", ((NameTok)classDef.name).id); *************** *** 123,126 **** --- 124,130 ---- assertEquals(2, m.body.length); ClassDef classDefBar = (ClassDef)m.body[0]; + assertEquals(1, classDefBar.beginColumn); + assertEquals(1, classDefBar.beginLine); + assertEquals("Bar", ((NameTok)classDefBar.name).id); *************** *** 146,149 **** --- 150,156 ---- ClassDef classDefBar = (ClassDef)m.body[0]; + assertEquals(1, classDefBar.beginColumn); + assertEquals(1, classDefBar.beginLine); + assertEquals("Bar", ((NameTok)classDefBar.name).id); ClassDef classDefZoo = (ClassDef)classDefBar.body[0]; *************** *** 172,175 **** --- 179,185 ---- assertEquals(2, m.body.length); ClassDef classDefBar = (ClassDef)m.body[0]; + assertEquals(1, classDefBar.beginColumn); + assertEquals(1, classDefBar.beginLine); + assertEquals("Bar", ((NameTok)classDefBar.name).id); assertEquals("mGlobal", ((NameTok)((FunctionDef)m.body[1]).name).id); *************** *** 195,198 **** --- 205,211 ---- assertEquals(2, m.body.length); ClassDef classDefBar = (ClassDef)m.body[0]; + assertEquals(1, classDefBar.beginColumn); + assertEquals(1, classDefBar.beginLine); + assertEquals("Bar", ((NameTok)classDefBar.name).id); assertEquals("mGlobal", ((NameTok)((FunctionDef)m.body[1]).name).id); *************** *** 207,210 **** --- 220,258 ---- + public void testDefinitionsParser11() { + Module m = (Module) FastDefinitionsParser.parse( + "class Bar(object):\n" + + " class \tZoo\t(object):\n" + + " def m1(self):pass\n"+ + " def m2(self):pass\n"+ + " #def m3(self):pass\n"+ + " 'string'\n"+ + "def mGlobal(self):pass\n" + ); + assertEquals(2, m.body.length); + ClassDef classDefBar = (ClassDef)m.body[0]; + assertEquals(1, classDefBar.beginColumn); + assertEquals(1, classDefBar.beginLine); + + assertEquals("Bar", ((NameTok)classDefBar.name).id); + FunctionDef defGlobal = (FunctionDef)m.body[1]; + assertEquals("mGlobal", ((NameTok)(defGlobal).name).id); + assertEquals(1, defGlobal.beginColumn); + assertEquals(7, defGlobal.beginLine); + + ClassDef classDefZoo = (ClassDef)classDefBar.body[0]; + assertEquals("Zoo", ((NameTok)classDefZoo.name).id); + assertEquals(5, classDefZoo.beginColumn); + assertEquals(2, classDefZoo.beginLine); + + assertEquals(2, classDefZoo.body.length); + FunctionDef defM1 = (FunctionDef)classDefZoo.body[0]; + assertEquals("m1", ((NameTok)(defM1).name).id); + assertEquals(9, defM1.beginColumn); + assertEquals(3, defM1.beginLine); + + } + + public void testDefinitionsParser10() { Module m = (Module) FastDefinitionsParser.parse( |