[Pydev-cvs] org.python.pydev/tests_completions/org/python/pydev/editor/codecompletion PythonCompletionCalltipsTest.java, 1.2, 1.3 PythonCompletionWithBuiltinsTest.java, 1.11, 1.12 PythonCompletionWithoutBuiltinsTest.java, 1.18, 1.19 PythonCompletion25Test.java, 1.3, 1.4

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

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

Modified Files:
	PythonCompletionCalltipsTest.java 
	PythonCompletionWithBuiltinsTest.java 
	PythonCompletionWithoutBuiltinsTest.java 
	PythonCompletion25Test.java 
Log Message:
__path__ not correctly found on some situations

Index: PythonCompletionWithoutBuiltinsTest.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/tests_completions/org/python/pydev/editor/codecompletion/PythonCompletionWithoutBuiltinsTest.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** PythonCompletionWithoutBuiltinsTest.java	9 Apr 2008 00:43:47 -0000	1.18
--- PythonCompletionWithoutBuiltinsTest.java	2 May 2008 13:42:01 -0000	1.19
***************
*** 41,45 ****
            PythonCompletionWithoutBuiltinsTest test = new PythonCompletionWithoutBuiltinsTest();
  	      test.setUp();
! 	      test.testInnerDefinition();
  	      test.tearDown();
            System.out.println("Finished");
--- 41,45 ----
            PythonCompletionWithoutBuiltinsTest test = new PythonCompletionWithoutBuiltinsTest();
  	      test.setUp();
! //	      test.testImportMultipleFromImport2();
  	      test.tearDown();
            System.out.println("Finished");
***************
*** 85,94 ****
  	    requestCompl("from testl"                          , "testlib");
  	    requestCompl("import testl"                        , "testlib");
! 	    requestCompl("from testlib import "                , new String[]{"__init__", "unittest"});
  	    requestCompl("from testlib import unittest, __in"  , new String[]{"__init__"});
  	    requestCompl("from testlib import unittest,__in"   , new String[]{"__init__"});
  	    requestCompl("from testlib import unittest ,__in"  , new String[]{"__init__"});
  	    requestCompl("from testlib import unittest , __in" , new String[]{"__init__"});
! 	    requestCompl("from testlib import unittest , "     , new String[]{"__init__", "unittest"});
  	    
  	    requestCompl("from testlib.unittest import  ", getTestLibUnittestTokens());
--- 85,94 ----
  	    requestCompl("from testl"                          , "testlib");
  	    requestCompl("import testl"                        , "testlib");
! 	    requestCompl("from testlib import "                , new String[]{"__init__", "unittest", "__path__"});
  	    requestCompl("from testlib import unittest, __in"  , new String[]{"__init__"});
  	    requestCompl("from testlib import unittest,__in"   , new String[]{"__init__"});
  	    requestCompl("from testlib import unittest ,__in"  , new String[]{"__init__"});
  	    requestCompl("from testlib import unittest , __in" , new String[]{"__init__"});
! 	    requestCompl("from testlib import unittest , "     , new String[]{"__init__", "unittest", "__path__"});
  	    
  	    requestCompl("from testlib.unittest import  ", getTestLibUnittestTokens());
***************
*** 215,219 ****
  	    String s = "from testlib import (\n";
  	    
! 	    requestCompl(s, new String[]{"__init__", "unittest"});
  	    
  	}
--- 215,219 ----
  	    String s = "from testlib import (\n";
  	    
! 	    requestCompl(s, new String[]{"__init__", "unittest", "__path__"});
  	    
  	}
***************
*** 225,228 ****
--- 225,229 ----
          return new String[]{
            "__init__"
+         , "__path__"
          , "anothertest"
          , "AnotherTest"
***************
*** 503,507 ****
  	    s = "import testlib.unittest.relative\n" +
  	    "testlib.";
! 	    requestCompl(s, -1, 0, new String[] { });
  	}
  	
--- 504,508 ----
  	    s = "import testlib.unittest.relative\n" +
  	    "testlib.";
! 	    requestCompl(s, -1, -1, new String[] {"__path__"});
  	}
  	

Index: PythonCompletionWithBuiltinsTest.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/tests_completions/org/python/pydev/editor/codecompletion/PythonCompletionWithBuiltinsTest.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** PythonCompletionWithBuiltinsTest.java	2 Mar 2008 20:00:46 -0000	1.11
--- PythonCompletionWithBuiltinsTest.java	2 May 2008 13:42:01 -0000	1.12
***************
*** 131,136 ****
  
          //check for builtins..3 (builtins should not be available because it is an import request for completions)
!         requestCompl("from testlib.unittest import  ", new String[]{"__init__", "anothertest"
!                 , "AnotherTest", "GUITest", "guitestcase", "main", "relative", "t", "TestCase", "testcase", "TestCaseAlias"
                  });
  
--- 131,136 ----
  
          //check for builtins..3 (builtins should not be available because it is an import request for completions)
!         requestCompl("from testlib.unittest import  ", new String[]{"__init__", "__path__", "anothertest"
!                 , "AnotherTest", "GUITest", "guitestcase", "main", "relative", "t", "TestCase", "testcase", "TestCaseAlias", 
                  });
  

Index: PythonCompletion25Test.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/tests_completions/org/python/pydev/editor/codecompletion/PythonCompletion25Test.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PythonCompletion25Test.java	5 Feb 2008 13:07:13 -0000	1.3
--- PythonCompletion25Test.java	2 May 2008 13:42:01 -0000	1.4
***************
*** 54,57 ****
--- 54,58 ----
          return new String[]{
            "__init__"
+         , "__path__"
          , "anothertest"
          , "AnotherTest"

Index: PythonCompletionCalltipsTest.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/tests_completions/org/python/pydev/editor/codecompletion/PythonCompletionCalltipsTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PythonCompletionCalltipsTest.java	5 Feb 2008 13:07:13 -0000	1.2
--- PythonCompletionCalltipsTest.java	2 May 2008 13:42:01 -0000	1.3
***************
*** 178,182 ****
              "calltips.";
          
!         requestCompl(s, s.length(), 1, new String[] {"method1(a, b)"});
      }
          
--- 178,182 ----
              "calltips.";
          
!         requestCompl(s, s.length(), 2, new String[] {"method1(a, b)", "__path__"});
      }