Update of /cvsroot/pydev/org.python.pydev/tests_navigator/org/python/pydev/navigator
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17414/tests_navigator/org/python/pydev/navigator
Modified Files:
PythonModelProviderTest.java WorkspaceRootStub.java
Log Message:
When the project root is in the pythonpath, the pydev project explorer is not able to gather its children.
bug: https://sourceforge.net/tracker/index.php?func=detail&aid=1960119&group_id=85796&atid=577329
Index: PythonModelProviderTest.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/tests_navigator/org/python/pydev/navigator/PythonModelProviderTest.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** PythonModelProviderTest.java 27 Apr 2008 17:28:05 -0000 1.8
--- PythonModelProviderTest.java 9 May 2008 01:10:13 -0000 1.9
***************
*** 17,20 ****
--- 17,21 ----
import org.python.pydev.core.TestDependent;
import org.python.pydev.navigator.elements.IWrappedResource;
+ import org.python.pydev.navigator.elements.PythonProjectSourceFolder;
import org.python.pydev.navigator.elements.PythonSourceFolder;
import org.python.pydev.plugin.nature.PythonNature;
***************
*** 27,31 ****
PythonModelProviderTest test = new PythonModelProviderTest();
test.setUp();
! test.testDontRemoveOtherPluginElements();
test.tearDown();
--- 28,32 ----
PythonModelProviderTest test = new PythonModelProviderTest();
test.setUp();
! test.testCreateChildrenInWrappedResource();
test.tearDown();
***************
*** 210,215 ****
fail("Could not find generated child");
}
! }
}
--- 211,243 ----
fail("Could not find generated child");
}
+ }
+
+
+ public void testCreateChildrenInWrappedResource() throws Exception {
+ final HashSet<String> pythonPathSet = new HashSet<String>();
+ pythonPathSet.add(TestDependent.TEST_PYSRC_NAVIGATOR_LOC+"projroot"); //root is the source
+ PythonNature nature = createNature(pythonPathSet);
! WorkspaceRootStub workspaceRootStub = new WorkspaceRootStub();
! project = new ProjectStub(new File(TestDependent.TEST_PYSRC_NAVIGATOR_LOC+"projroot"), nature);
! workspaceRootStub.addChild(project);
! project.setParent(workspaceRootStub);
!
!
! provider = new PythonModelProvider();
!
! HashSet<Object> currentChildren = new HashSet<Object>();
! currentChildren.add(project);
! provider.getPipelinedChildren(workspaceRootStub, currentChildren);
!
! assertEquals(1, currentChildren.size());
! PythonProjectSourceFolder projectSourceFolder = (PythonProjectSourceFolder) currentChildren.iterator().next();
!
! currentChildren = new HashSet<Object>();
! provider.getPipelinedChildren(projectSourceFolder, currentChildren);
!
! assertEquals(1, currentChildren.size());
! }
!
}
Index: WorkspaceRootStub.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/tests_navigator/org/python/pydev/navigator/WorkspaceRootStub.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** WorkspaceRootStub.java 8 Sep 2007 16:36:12 -0000 1.1
--- WorkspaceRootStub.java 9 May 2008 01:10:13 -0000 1.2
***************
*** 229,233 ****
public IContainer getParent() {
! throw new RuntimeException("Not implemented");
}
--- 229,233 ----
public IContainer getParent() {
! return null;
}
|
