seg_yinzy
/
che-server
mirror of https://github.com/eclipse-che/che-server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1241 from eclipse/CHE-1141 

CHE-1141 fix java search in multimodule projects, fix test
6.19.x
Evgen Vidolob 2016-05-12 17:34:06 +03:00
parent 002046336d 39b6759c98
commit e212d4e18e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-jdt-ui/src/main/java/org/eclipse/jdt/internal/core/search/JavaSearchScope.java
View File

@ -190,7 +190,7 @@ public class JavaSearchScope extends AbstractJavaSearchScope {
if ((includeMask & REFERENCED_PROJECTS) != 0) {
IPath path = entry.getPath();
if (pathToAdd == null || pathToAdd.equals(path)) {
JavaProject referencedProject = (JavaProject)model.getJavaProject(path.lastSegment());
JavaProject referencedProject = (JavaProject)model.getJavaProject(path.toOSString());
if (!projectsToBeAdded
.contains(referencedProject)) { // do not recurse if depending project was used to create the scope
add(referencedProject, null, includeMask, projectsToBeAdded, visitedProjects, cpEntry);

6
plugins/plugin-maven/che-plugin-maven-server/src/test/java/org/eclipse/che/plugin/maven/server/WorkspaceTest.java
View File

@ -121,9 +121,9 @@ public class WorkspaceTest extends BaseTest {
List<MavenArtifact> dependencies = mavenProject.getDependencies();
assertThat(dependencies).isNotNull().hasSize(2);
assertThat(dependencies).onProperty("artifactId").containsExactly("junit", "hamcrest-core");
assertThat(dependencies).onProperty("groupId").containsExactly("junit", "org.hamcrest");
assertThat(dependencies).onProperty("version").containsExactly("4.12", "1.3");
assertThat(dependencies).onProperty("artifactId").contains("junit", "hamcrest-core");
assertThat(dependencies).onProperty("groupId").contains("junit", "org.hamcrest");
assertThat(dependencies).onProperty("version").contains("4.12", "1.3");
}
@Test