[Pydev-cvs] org.python.pydev/tests/org/python/pydev/editor/codecompletion/revisited PythonPathHelperTest.java, 1.28, 1.29 ASTManagerTest.java, 1.19, 1.20

[Fabio Z. <fa...@us...>]

Update of /cvsroot/pydev/org.python.pydev/tests/org/python/pydev/editor/codecompletion/revisited
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12852/tests/org/python/pydev/editor/codecompletion/revisited

Modified Files:
	PythonPathHelperTest.java ASTManagerTest.java 
Log Message:
Completion on parameters

Index: ASTManagerTest.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/tests/org/python/pydev/editor/codecompletion/revisited/ASTManagerTest.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** ASTManagerTest.java	7 Jun 2006 00:31:41 -0000	1.19
--- ASTManagerTest.java	24 Sep 2006 01:03:16 -0000	1.20
***************
*** 74,78 ****
          		"        pass         \n";
          doc = new Document(sDoc);
!         state = new CompletionState(line,col, token, nature);
          comps = getManager().getCompletionsForToken(doc, state);
          assertEquals(1, comps.length);
--- 74,78 ----
          		"        pass         \n";
          doc = new Document(sDoc);
!         state = new CompletionState(line,col, token, nature,"");
          comps = getManager().getCompletionsForToken(doc, state);
          assertEquals(1, comps.length);
***************
*** 95,99 ****
  		token = "";
  		doc = new Document(sDoc);
!         state = new CompletionState(line,col, token, nature);
          comps = getManager().getCompletionsForToken(doc, state);
          assertEquals(3, comps.length);
--- 95,99 ----
  		token = "";
  		doc = new Document(sDoc);
!         state = new CompletionState(line,col, token, nature,"");
          comps = getManager().getCompletionsForToken(doc, state);
          assertEquals(3, comps.length);
***************
*** 120,124 ****
  		token = "";
  		doc = new Document(sDoc);
!         state = new CompletionState(line,col, token, nature);
          comps = getManager().getCompletionsForToken(doc, state);
          assertEquals(4, comps.length);
--- 120,124 ----
  		token = "";
  		doc = new Document(sDoc);
!         state = new CompletionState(line,col, token, nature,"");
          comps = getManager().getCompletionsForToken(doc, state);
          assertEquals(4, comps.length);
***************
*** 146,150 ****
  		token = "";
  		doc = new Document(sDoc);
!         state = new CompletionState(line,col, token, nature);
          comps = getManager().getCompletionsForToken(doc, state);
          assertEquals(3, comps.length);
--- 146,150 ----
  		token = "";
  		doc = new Document(sDoc);
!         state = new CompletionState(line,col, token, nature,"");
          comps = getManager().getCompletionsForToken(doc, state);
          assertEquals(3, comps.length);
***************
*** 166,170 ****
  		token = "Classe1";
  		doc = new Document(sDoc);
!         state = new CompletionState(line,col, token, nature);
          comps = getManager().getCompletionsForToken(doc, state);
          assertEquals(2, comps.length);
--- 166,170 ----
  		token = "Classe1";
  		doc = new Document(sDoc);
!         state = new CompletionState(line,col, token, nature,"");
          comps = getManager().getCompletionsForToken(doc, state);
          assertEquals(2, comps.length);
***************
*** 186,190 ****
  		token = "Classe1";
  		doc = new Document(sDoc);
!         state = new CompletionState(line,col, token, nature);
          comps = getManager().getCompletionsForToken(doc, state);
          assertEquals(3, comps.length);
--- 186,190 ----
  		token = "Classe1";
  		doc = new Document(sDoc);
!         state = new CompletionState(line,col, token, nature,"");
          comps = getManager().getCompletionsForToken(doc, state);
          assertEquals(3, comps.length);
***************
*** 211,215 ****
  		token = "LinkedList";
  		doc = new Document(sDoc);
!         state = new CompletionState(line,col, token, nature);
          comps = getManager().getCompletionsForToken(doc, state);
          assertIsIn("first", comps);
--- 211,215 ----
  		token = "LinkedList";
  		doc = new Document(sDoc);
!         state = new CompletionState(line,col, token, nature,"");
          comps = getManager().getCompletionsForToken(doc, state);
          assertIsIn("first", comps);
***************
*** 227,231 ****
  			"class B(A):pass          \n";
          doc = new Document(sDoc);
!         state = new CompletionState(line,col, token, nature);
          comps = getManager().getCompletionsForToken(doc, state);
          assertEquals(0, comps.length); //no tokens returned
--- 227,231 ----
  			"class B(A):pass          \n";
          doc = new Document(sDoc);
!         state = new CompletionState(line,col, token, nature,"");
          comps = getManager().getCompletionsForToken(doc, state);
          assertEquals(0, comps.length); //no tokens returned
***************
*** 242,246 ****
  			"\n";
          doc = new Document(sDoc);
!         state = new CompletionState(line,col, token, nature);
          comps = getManager().getCompletionsForToken(doc, state);
          assertEquals(1, comps.length);
--- 242,246 ----
  			"\n";
          doc = new Document(sDoc);
!         state = new CompletionState(line,col, token, nature,"");
          comps = getManager().getCompletionsForToken(doc, state);
          assertEquals(1, comps.length);
***************
*** 257,261 ****
          col = sDoc.length()-3;
          doc = new Document(sDoc);
!         state = new CompletionState(line,col, token, nature);
          comps = getManager().getCompletionsForToken(doc, state);
          assertEquals(1, comps.length );
--- 257,261 ----
          col = sDoc.length()-3;
          doc = new Document(sDoc);
!         state = new CompletionState(line,col, token, nature,"");
          comps = getManager().getCompletionsForToken(doc, state);
          assertEquals(1, comps.length );
***************
*** 271,275 ****
          		"    print                     \n";
          doc = new Document(sDoc);
!         state = new CompletionState(line,col, token, nature);
          comps = getManager().getCompletionsForToken(doc, state);
          assertEquals(3, comps.length );
--- 271,275 ----
          		"    print                     \n";
          doc = new Document(sDoc);
!         state = new CompletionState(line,col, token, nature,"");
          comps = getManager().getCompletionsForToken(doc, state);
          assertEquals(3, comps.length );
***************
*** 287,291 ****
          		"        print                    \n";
          doc = new Document(sDoc);
!         state = new CompletionState(line,col, token, nature);
          comps = getManager().getCompletionsForToken(doc, state);
          assertEquals(4, comps.length );
--- 287,291 ----
          		"        print                    \n";
          doc = new Document(sDoc);
!         state = new CompletionState(line,col, token, nature,"");
          comps = getManager().getCompletionsForToken(doc, state);
          assertEquals(4, comps.length );
***************
*** 305,309 ****
          		"        print                    \n";
          doc = new Document(sDoc);
!         state = new CompletionState(line,col, token, nature);
          comps = getManager().getCompletionsForToken(doc, state);
          assertEquals(5, comps.length );
--- 305,309 ----
          		"        print                    \n";
          doc = new Document(sDoc);
!         state = new CompletionState(line,col, token, nature,"");
          comps = getManager().getCompletionsForToken(doc, state);
          assertEquals(5, comps.length );
***************
*** 325,329 ****
          		"        ignoreLineAfter = 5      \n";
          doc = new Document(sDoc);
!         state = new CompletionState(line,col, token, nature);
          comps = getManager().getCompletionsForToken(doc, state);
          assertEquals(5, comps.length );
--- 325,329 ----
          		"        ignoreLineAfter = 5      \n";
          doc = new Document(sDoc);
!         state = new CompletionState(line,col, token, nature,"");
          comps = getManager().getCompletionsForToken(doc, state);
          assertEquals(5, comps.length );

Index: PythonPathHelperTest.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/tests/org/python/pydev/editor/codecompletion/revisited/PythonPathHelperTest.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** PythonPathHelperTest.java	29 Apr 2006 18:43:01 -0000	1.28
--- PythonPathHelperTest.java	24 Sep 2006 01:03:16 -0000	1.29
***************
*** 81,85 ****
          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);
--- 81,85 ----
          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);
***************
*** 107,111 ****
          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);
--- 107,111 ----
          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);
***************
*** 126,130 ****
          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);
--- 126,130 ----
          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);
***************
*** 147,151 ****
  		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);
--- 147,151 ----
  		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);
***************
*** 168,172 ****
  		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);
--- 168,172 ----
  		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);
***************
*** 190,194 ****
  		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);
--- 190,194 ----
  		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);
***************
*** 211,215 ****
          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);
--- 211,215 ----
          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);
***************
*** 238,242 ****
  		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);
--- 238,242 ----
  		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);
***************
*** 260,264 ****
  		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);
--- 260,264 ----
  		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);