From 39b6759c98329e042418321072d2eb18e317a4e0 Mon Sep 17 00:00:00 2001 From: Evgen Vidolob Date: Thu, 12 May 2016 17:12:07 +0300 Subject: [PATCH] CHE-1141 fix java search in multimodule projects, fix test --- .../eclipse/jdt/internal/core/search/JavaSearchScope.java | 2 +- .../org/eclipse/che/plugin/maven/server/WorkspaceTest.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-jdt-ui/src/main/java/org/eclipse/jdt/internal/core/search/JavaSearchScope.java b/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-jdt-ui/src/main/java/org/eclipse/jdt/internal/core/search/JavaSearchScope.java index 86b2501d69..47b70a297f 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-jdt-ui/src/main/java/org/eclipse/jdt/internal/core/search/JavaSearchScope.java +++ b/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-jdt-ui/src/main/java/org/eclipse/jdt/internal/core/search/JavaSearchScope.java @@ -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); diff --git a/plugins/plugin-maven/che-plugin-maven-server/src/test/java/org/eclipse/che/plugin/maven/server/WorkspaceTest.java b/plugins/plugin-maven/che-plugin-maven-server/src/test/java/org/eclipse/che/plugin/maven/server/WorkspaceTest.java index 10213ba1cf..d941268990 100644 --- a/plugins/plugin-maven/che-plugin-maven-server/src/test/java/org/eclipse/che/plugin/maven/server/WorkspaceTest.java +++ b/plugins/plugin-maven/che-plugin-maven-server/src/test/java/org/eclipse/che/plugin/maven/server/WorkspaceTest.java @@ -121,9 +121,9 @@ public class WorkspaceTest extends BaseTest { List 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