Thread: [Pydev-cvs] org.python.pydev.core/tests/org/python/pydev/core/docutils ImportHandleTest.java, 1.1,
Brought to you by:
fabioz
From: Fabio Z. <fa...@us...> - 2008-05-19 00:58:21
|
Update of /cvsroot/pydev/org.python.pydev.core/tests/org/python/pydev/core/docutils In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10132/tests/org/python/pydev/core/docutils Modified Files: ImportHandleTest.java Log Message: Auto-import grouping imports when possible Index: ImportHandleTest.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.core/tests/org/python/pydev/core/docutils/ImportHandleTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ImportHandleTest.java 18 May 2008 20:02:26 -0000 1.1 --- ImportHandleTest.java 19 May 2008 00:58:28 -0000 1.2 *************** *** 10,13 **** --- 10,25 ---- public class ImportHandleTest extends TestCase { + public static void main(String[] args) { + try { + ImportHandleTest test = new ImportHandleTest(); + test.setUp(); + test.testImportHandleInfo3(); + test.tearDown(); + junit.textui.TestRunner.run(ImportHandleTest.class); + } catch (Throwable e) { + e.printStackTrace(); + } + } + protected void setUp() throws Exception { super.setUp(); *************** *** 51,54 **** --- 63,98 ---- } + public void testImportHandleInfoLines() throws Exception { + ImportHandle importHandle = new ImportHandle(null, "from AAA import (BBB, \nCCC);from XXX import YYY", 0, 1); + List<ImportHandleInfo> importInfo = importHandle.getImportInfo(); + assertEquals(2, importInfo.size()); + assertEquals("AAA", importInfo.get(0).getFromImportStr()); + assertEquals("XXX", importInfo.get(1).getFromImportStr()); + assertEquals(0, importInfo.get(0).getStartLine()); + assertEquals(1, importInfo.get(0).getEndLine()); + assertEquals(1, importInfo.get(1).getStartLine()); + assertEquals(1, importInfo.get(1).getEndLine()); + assertTrue(importInfo.get(1).getStartedInMiddleOfLine()); + + } + + public void testImportHandleInfo3() throws Exception { + ImportHandle importHandle = new ImportHandle(null, "from wx.xrc import XML_ATTRIBUTE_NODE, XML_CDATA_SECTION_NODE,\\\n"+ + "XML_DOCUMENT_FRAG_NODE, XML_DOCUMENT_TYPE_NODE, XML_ELEMENT_NODE,\\\n"+ + "XML_COMMENT_NODE", 0, 0); + + List<ImportHandleInfo> importInfo = importHandle.getImportInfo(); + assertEquals(1, importInfo.size()); + assertEquals("wx.xrc", importInfo.get(0).getFromImportStr()); + ArrayList<String> lst = new ArrayList<String>(); + lst.add("XML_ATTRIBUTE_NODE"); + lst.add("XML_CDATA_SECTION_NODE"); + lst.add("XML_DOCUMENT_FRAG_NODE"); + lst.add("XML_DOCUMENT_TYPE_NODE"); + lst.add("XML_ELEMENT_NODE"); + lst.add("XML_COMMENT_NODE"); + assertEquals(lst, importInfo.get(0).getImportedStr()); + } + public void testImportHandleInfo() throws Exception { ImportHandle importHandle = new ImportHandle(null, "from AAA import BBB", 0, 0); *************** *** 89,92 **** --- 133,146 ---- assertEquals(comments, importInfo.get(0).getCommentsForImports()); + + importHandle = new ImportHandle(null, "from AAA.bbb.ccc import BBB", 0, 0); + importInfo = importHandle.getImportInfo(); + assertEquals(1, importInfo.size()); + assertEquals("AAA.bbb.ccc", importInfo.get(0).getFromImportStr()); + lst = new ArrayList<String>(); + lst.add("BBB"); + assertEquals(lst, importInfo.get(0).getImportedStr()); + + importHandle = new ImportHandle(null, "from AAA import (BBB, #, DDD as CCC\nKKK)", 0, 0); importInfo = importHandle.getImportInfo(); *************** *** 102,106 **** assertEquals(comments, importInfo.get(0).getCommentsForImports()); ! importHandle = new ImportHandle(null, "from .AAA import (BBB, #, DDD as CCC\nKKK)", 0, 0); importInfo = importHandle.getImportInfo(); assertEquals(1, importInfo.size()); --- 156,160 ---- assertEquals(comments, importInfo.get(0).getCommentsForImports()); ! importHandle = new ImportHandle(null, "from .AAA import (BBB, #, DDD as CCC\nKKK)", 0, 1); importInfo = importHandle.getImportInfo(); assertEquals(1, importInfo.size()); *************** *** 114,128 **** assertEquals(lst, importInfo.get(0).getImportedStr()); assertEquals(comments, importInfo.get(0).getCommentsForImports()); } public void testImportMatches() throws Exception { ImportHandle importHandle = new ImportHandle(null, "from AAA import BBB", 0, 0); ! assertFalse(importHandle.contains("from X import BBB")); ! assertFalse(importHandle.contains("from XXX import BBB")); ! assertFalse(importHandle.contains("from AAA import CCC")); ! assertTrue(importHandle.contains("from AAA import BBB")); importHandle = new ImportHandle(null, "from AAA import BBB;from XXX import YYY", 0, 0); ! assertTrue(importHandle.contains("from XXX import YYY")); } --- 168,184 ---- assertEquals(lst, importInfo.get(0).getImportedStr()); assertEquals(comments, importInfo.get(0).getCommentsForImports()); + assertEquals(0, importInfo.get(0).getStartLine()); + assertEquals(1, importInfo.get(0).getEndLine()); } public void testImportMatches() throws Exception { ImportHandle importHandle = new ImportHandle(null, "from AAA import BBB", 0, 0); ! assertFalse(importHandle.contains(new ImportHandle.ImportHandleInfo("from X import BBB"))); ! assertFalse(importHandle.contains(new ImportHandle.ImportHandleInfo("from XXX import BBB"))); ! assertFalse(importHandle.contains(new ImportHandle.ImportHandleInfo("from AAA import CCC"))); ! assertTrue(importHandle.contains(new ImportHandle.ImportHandleInfo("from AAA import BBB"))); importHandle = new ImportHandle(null, "from AAA import BBB;from XXX import YYY", 0, 0); ! assertTrue(importHandle.contains(new ImportHandle.ImportHandleInfo("from XXX import YYY"))); } |