[Pydev-cvs] org.python.pydev/tests_completions/org/python/pydev/editor/codecompletion/revisited/jython AbstractJythonWorkbenchTests.java, NONE, 1.1 JythonCompletionWithBuiltinsTestWorkbench.java, 1.2, 1.3 JythonCodeCompletionTestsBase.java, 1.1, 1.2 JythonFindDefinitionTestWorkbench.java, 1.2, 1.3

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

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

Modified Files:
	JythonCompletionWithBuiltinsTestWorkbench.java 
	JythonCodeCompletionTestsBase.java 
	JythonFindDefinitionTestWorkbench.java 
Added Files:
	AbstractJythonWorkbenchTests.java 
Log Message:
1st working implementation of code-completion for java classes in JDT projects.

Index: JythonFindDefinitionTestWorkbench.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/tests_completions/org/python/pydev/editor/codecompletion/revisited/jython/JythonFindDefinitionTestWorkbench.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** JythonFindDefinitionTestWorkbench.java	20 Oct 2007 23:26:15 -0000	1.2
--- JythonFindDefinitionTestWorkbench.java	6 Jan 2008 12:25:42 -0000	1.3
***************
*** 7,33 ****
  import org.python.pydev.core.FindInfo;
  import org.python.pydev.core.IModule;
- import org.python.pydev.editor.codecompletion.PyCodeCompletion;
  import org.python.pydev.editor.codecompletion.revisited.CompletionStateFactory;
- import org.python.pydev.editor.codecompletion.revisited.javaintegration.JavaClassModule;
  import org.python.pydev.editor.codecompletion.revisited.javaintegration.JavaDefinition;
  import org.python.pydev.editor.codecompletion.revisited.modules.AbstractModule;
- import org.python.pydev.editor.codecompletion.revisited.modules.CompiledModule;
  import org.python.pydev.editor.codecompletion.revisited.visitors.Definition;
  
! public class JythonFindDefinitionTestWorkbench extends JythonCodeCompletionTestsBase{
! 
!     
! 
!     /*
!      * @see TestCase#setUp()
!      */
!     protected void setUp() throws Exception {
!         super.setUp();
  
-         CompiledModule.COMPILED_MODULES_ENABLED = true;
-         this.restorePythonPath(false);
-         codeCompletion = new PyCodeCompletion();
-     
-     }
  
      public void testFind() throws Exception {
--- 7,18 ----
  import org.python.pydev.core.FindInfo;
  import org.python.pydev.core.IModule;
  import org.python.pydev.editor.codecompletion.revisited.CompletionStateFactory;
  import org.python.pydev.editor.codecompletion.revisited.javaintegration.JavaDefinition;
+ import org.python.pydev.editor.codecompletion.revisited.javaintegration.JavaZipClassModule;
  import org.python.pydev.editor.codecompletion.revisited.modules.AbstractModule;
  import org.python.pydev.editor.codecompletion.revisited.visitors.Definition;
  
! public class JythonFindDefinitionTestWorkbench extends AbstractJythonWorkbenchTests{
  
  
      public void testFind() throws Exception {
***************
*** 42,46 ****
          assertEquals(1, defs.length);
          assertEquals("", defs[0].value);
!         assertTrue(defs[0].module instanceof JavaClassModule);
          assertTrue(((JavaDefinition)defs[0]).javaElement != null);
          assertTrue(defs[0] instanceof JavaDefinition);
--- 27,31 ----
          assertEquals(1, defs.length);
          assertEquals("", defs[0].value);
!         assertTrue(defs[0].module instanceof JavaZipClassModule);
          assertTrue(((JavaDefinition)defs[0]).javaElement != null);
          assertTrue(defs[0] instanceof JavaDefinition);
***************
*** 58,62 ****
          assertEquals(1, defs.length);
          assertEquals("", defs[0].value);
!         assertTrue(defs[0].module instanceof JavaClassModule);
          IJavaElement javaElement = ((JavaDefinition)defs[0]).javaElement;
          assertTrue(javaElement != null);
--- 43,47 ----
          assertEquals(1, defs.length);
          assertEquals("", defs[0].value);
!         assertTrue(defs[0].module instanceof JavaZipClassModule);
          IJavaElement javaElement = ((JavaDefinition)defs[0]).javaElement;
          assertTrue(javaElement != null);
***************
*** 77,81 ****
          assertEquals(1, defs.length);
          assertEquals("asSubclass", defs[0].value);
!         assertTrue(defs[0].module instanceof JavaClassModule);
          IJavaElement javaElement = ((JavaDefinition)defs[0]).javaElement;
          assertTrue(javaElement != null);
--- 62,66 ----
          assertEquals(1, defs.length);
          assertEquals("asSubclass", defs[0].value);
!         assertTrue(defs[0].module instanceof JavaZipClassModule);
          IJavaElement javaElement = ((JavaDefinition)defs[0]).javaElement;
          assertTrue(javaElement != null);

--- NEW FILE: AbstractJythonWorkbenchTests.java ---
package org.python.pydev.editor.codecompletion.revisited.jython;

import org.python.pydev.editor.codecompletion.PyCodeCompletion;
import org.python.pydev.editor.codecompletion.revisited.modules.CompiledModule;

/**
 * Base class for code-completion on a workbench test.
 *
 * @author Fabio
 */
public abstract class AbstractJythonWorkbenchTests extends JythonCodeCompletionTestsBase{

    @Override
    protected void setUp() throws Exception {
        super.setUp();
        
        CompiledModule.COMPILED_MODULES_ENABLED = true;
        this.restorePythonPath(false);
        codeCompletion = new PyCodeCompletion();

    }
    
}

Index: JythonCodeCompletionTestsBase.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/tests_completions/org/python/pydev/editor/codecompletion/revisited/jython/JythonCodeCompletionTestsBase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** JythonCodeCompletionTestsBase.java	25 Mar 2007 16:08:58 -0000	1.1
--- JythonCodeCompletionTestsBase.java	6 Jan 2008 12:25:42 -0000	1.2
***************
*** 87,91 ****
      @Override
      protected void setInterpreterManager() {
!         PydevPlugin.setJythonInterpreterManager(new JythonInterpreterManagerStub(preferences));
      }
  
--- 87,91 ----
      @Override
      protected void setInterpreterManager() {
!         PydevPlugin.setJythonInterpreterManager(new JythonInterpreterManagerStub(getPreferences()));
      }
  

Index: JythonCompletionWithBuiltinsTestWorkbench.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/tests_completions/org/python/pydev/editor/codecompletion/revisited/jython/JythonCompletionWithBuiltinsTestWorkbench.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** JythonCompletionWithBuiltinsTestWorkbench.java	20 Oct 2007 23:26:15 -0000	1.2
--- JythonCompletionWithBuiltinsTestWorkbench.java	6 Jan 2008 12:25:42 -0000	1.3
***************
*** 7,16 ****
  
  import org.eclipse.jface.text.BadLocationException;
- import org.python.pydev.editor.codecompletion.PyCodeCompletion;
  import org.python.pydev.editor.codecompletion.revisited.modules.CompiledModule;
  import org.python.pydev.editor.codecompletion.shell.AbstractShell;
  import org.python.pydev.editor.codecompletion.shell.JythonShell;
  
! public class JythonCompletionWithBuiltinsTestWorkbench extends JythonCodeCompletionTestsBase{
      
      private static JythonShell shell;
--- 7,15 ----
  
  import org.eclipse.jface.text.BadLocationException;
  import org.python.pydev.editor.codecompletion.revisited.modules.CompiledModule;
  import org.python.pydev.editor.codecompletion.shell.AbstractShell;
  import org.python.pydev.editor.codecompletion.shell.JythonShell;
  
! public class JythonCompletionWithBuiltinsTestWorkbench extends AbstractJythonWorkbenchTests{
      
      private static JythonShell shell;
***************
*** 31,35 ****
      }
  
-     
      /*
       * @see TestCase#setUp()
--- 30,33 ----
***************
*** 37,44 ****
      protected void setUp() throws Exception {
          super.setUp();
! 
!         CompiledModule.COMPILED_MODULES_ENABLED = true;
!         this.restorePythonPath(false);
!         codeCompletion = new PyCodeCompletion();
  
          //we don't want to start it more than once
--- 35,39 ----
      protected void setUp() throws Exception {
          super.setUp();
!         
  
          //we don't want to start it more than once