[Pydev-cvs] org.python.pydev/tests/org/python/pydev/editor/codecompletion/revisited ModuleTest.java,
Brought to you by:
fabioz
Menu
▾
▴
[Pydev-cvs] org.python.pydev/tests/org/python/pydev/editor/codecompletion/revisited ModuleTest.java,1.7,1.8 ASTManagerTest.java,1.16,1.17 PythonPathHelperTest.java,1.22,1.23
|
From: Fabio Z. <fa...@us...> - 2006-01-15 00:25:20
|
Update of /cvsroot/pydev/org.python.pydev/tests/org/python/pydev/editor/codecompletion/revisited In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10471/tests/org/python/pydev/editor/codecompletion/revisited Modified Files: ModuleTest.java ASTManagerTest.java PythonPathHelperTest.java Log Message: Index: ASTManagerTest.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev/tests/org/python/pydev/editor/codecompletion/revisited/ASTManagerTest.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** ASTManagerTest.java 30 Sep 2005 16:29:27 -0000 1.16 --- ASTManagerTest.java 15 Jan 2006 00:25:10 -0000 1.17 *************** *** 8,11 **** --- 8,14 ---- import org.eclipse.core.runtime.CoreException; import org.eclipse.jface.text.Document; + import org.python.pydev.core.ICodeCompletionASTManager; + import org.python.pydev.core.ICompletionState; + import org.python.pydev.core.IToken; import org.python.pydev.editor.codecompletion.revisited.modules.CompiledModule; import org.python.pydev.plugin.BundleInfo; *************** *** 20,24 **** public class ASTManagerTest extends CodeCompletionTestsBase { ! private CompletionState state; private String token; private int line; --- 23,27 ---- public class ASTManagerTest extends CodeCompletionTestsBase { ! private ICompletionState state; private String token; private int line; Index: ModuleTest.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev/tests/org/python/pydev/editor/codecompletion/revisited/ModuleTest.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** ModuleTest.java 9 Jul 2005 01:05:50 -0000 1.7 --- ModuleTest.java 15 Jan 2006 00:25:10 -0000 1.8 *************** *** 10,13 **** --- 10,15 ---- import org.eclipse.jface.text.Document; import org.python.parser.SimpleNode; + import org.python.pydev.core.IModule; + import org.python.pydev.core.IToken; import org.python.pydev.editor.codecompletion.revisited.modules.AbstractModule; import org.python.pydev.parser.PyParser; *************** *** 25,29 **** Object[] obj = PyParser.reparseDocument(new PyParser.ParserInfo(new Document(getDoc1()), false, null)); SimpleNode n = (SimpleNode)obj[0]; ! AbstractModule module = AbstractModule.createModule(n); IToken[] globalTokens = module.getGlobalTokens(); --- 27,31 ---- Object[] obj = PyParser.reparseDocument(new PyParser.ParserInfo(new Document(getDoc1()), false, null)); SimpleNode n = (SimpleNode)obj[0]; ! IModule module = AbstractModule.createModule(n); IToken[] globalTokens = module.getGlobalTokens(); Index: PythonPathHelperTest.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev/tests/org/python/pydev/editor/codecompletion/revisited/PythonPathHelperTest.java,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** PythonPathHelperTest.java 8 Nov 2005 17:42:48 -0000 1.22 --- PythonPathHelperTest.java 15 Jan 2006 00:25:10 -0000 1.23 *************** *** 9,12 **** --- 9,15 ---- import org.eclipse.jface.text.Document; + import org.python.pydev.core.ICodeCompletionASTManager; + import org.python.pydev.core.ICompletionState; + import org.python.pydev.core.IToken; import org.python.pydev.core.TestDependent; import org.python.pydev.editor.codecompletion.revisited.modules.CompiledModule; *************** *** 76,80 **** IToken[] comps = null; Document doc = new Document(sDoc); ! CompletionState state = new CompletionState(line,col, token, nature); comps = ((ICodeCompletionASTManager)nature.getAstManager()).getCompletionsForToken(doc, state); assertEquals(9, comps.length); --- 79,83 ---- IToken[] comps = null; Document doc = new Document(sDoc); ! ICompletionState state = new CompletionState(line,col, token, nature); comps = ((ICodeCompletionASTManager)nature.getAstManager()).getCompletionsForToken(doc, state); assertEquals(9, comps.length); *************** *** 102,106 **** IToken[] comps = null; Document doc = new Document(sDoc); ! CompletionState state = new CompletionState(line,col, token, nature); ICodeCompletionASTManager a = (ICodeCompletionASTManager)nature.getAstManager(); comps = a.getCompletionsForToken(doc, state); --- 105,109 ---- IToken[] comps = null; Document doc = new Document(sDoc); ! ICompletionState state = new CompletionState(line,col, token, nature); ICodeCompletionASTManager a = (ICodeCompletionASTManager)nature.getAstManager(); comps = a.getCompletionsForToken(doc, state); *************** *** 121,125 **** IToken[] comps = null; Document doc = new Document(sDoc); ! CompletionState state = new CompletionState(line,col, token, nature); ICodeCompletionASTManager a = (ICodeCompletionASTManager)nature.getAstManager(); comps = a.getCompletionsForToken(doc, state); --- 124,128 ---- IToken[] comps = null; Document doc = new Document(sDoc); ! ICompletionState state = new CompletionState(line,col, token, nature); ICodeCompletionASTManager a = (ICodeCompletionASTManager)nature.getAstManager(); comps = a.getCompletionsForToken(doc, state); *************** *** 142,146 **** IToken[] comps = null; Document doc = new Document(sDoc); ! CompletionState state = new CompletionState(line,col, token, nature); comps = ((ICodeCompletionASTManager)nature.getAstManager()).getCompletionsForToken(doc, state); assertTrue(comps.length > 5); --- 145,149 ---- IToken[] comps = null; Document doc = new Document(sDoc); ! ICompletionState state = new CompletionState(line,col, token, nature); comps = ((ICodeCompletionASTManager)nature.getAstManager()).getCompletionsForToken(doc, state); assertTrue(comps.length > 5); *************** *** 163,167 **** IToken[] comps = null; Document doc = new Document(sDoc); ! CompletionState state = new CompletionState(line,col, token, nature); comps = ((ICodeCompletionASTManager)nature.getAstManager()).getCompletionsForToken(doc, state); ASTManagerTest.assertIsIn("SetWidget", comps); --- 166,170 ---- IToken[] comps = null; Document doc = new Document(sDoc); ! ICompletionState state = new CompletionState(line,col, token, nature); comps = ((ICodeCompletionASTManager)nature.getAstManager()).getCompletionsForToken(doc, state); ASTManagerTest.assertIsIn("SetWidget", comps); *************** *** 185,189 **** IToken[] comps = null; Document doc = new Document(sDoc); ! CompletionState state = new CompletionState(line,col, token, nature); comps = ((ICodeCompletionASTManager)nature.getAstManager()).getCompletionsForToken(doc, state); assertTrue(comps.length > 5); --- 188,192 ---- IToken[] comps = null; Document doc = new Document(sDoc); ! ICompletionState state = new CompletionState(line,col, token, nature); comps = ((ICodeCompletionASTManager)nature.getAstManager()).getCompletionsForToken(doc, state); assertTrue(comps.length > 5); *************** *** 206,210 **** IToken[] comps = null; Document doc = new Document(sDoc); ! CompletionState state = new CompletionState(line,col, token, nature); comps = ((ICodeCompletionASTManager)nature.getAstManager()).getCompletionsForToken(doc, state); assertEquals(9, comps.length); --- 209,213 ---- IToken[] comps = null; Document doc = new Document(sDoc); ! ICompletionState state = new CompletionState(line,col, token, nature); comps = ((ICodeCompletionASTManager)nature.getAstManager()).getCompletionsForToken(doc, state); assertEquals(9, comps.length); *************** *** 233,237 **** IToken[] comps = null; Document doc = new Document(sDoc); ! CompletionState state = new CompletionState(line,col, token, nature); comps = ((ICodeCompletionASTManager)nature.getAstManager()).getCompletionsForToken(doc, state); assertTrue(comps.length > 5); --- 236,240 ---- IToken[] comps = null; Document doc = new Document(sDoc); ! ICompletionState state = new CompletionState(line,col, token, nature); comps = ((ICodeCompletionASTManager)nature.getAstManager()).getCompletionsForToken(doc, state); assertTrue(comps.length > 5); *************** *** 255,259 **** IToken[] comps = null; Document doc = new Document(sDoc); ! CompletionState state = new CompletionState(line,col, token, nature); comps = ((ICodeCompletionASTManager)nature.getAstManager()).getCompletionsForToken(doc, state); ASTManagerTest.assertIsIn("test1", comps); --- 258,262 ---- IToken[] comps = null; Document doc = new Document(sDoc); ! ICompletionState state = new CompletionState(line,col, token, nature); comps = ((ICodeCompletionASTManager)nature.getAstManager()).getCompletionsForToken(doc, state); ASTManagerTest.assertIsIn("test1", comps); |