diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/MavenDomUtil.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/MavenDomUtil.java index af2894e6a9ee..d2eda4339bb0 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/MavenDomUtil.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/MavenDomUtil.java @@ -327,7 +327,7 @@ public class MavenDomUtil { if (cachedValue == null || cachedValue.first != VirtualFileManager.getInstance().getModificationCount()) { Set set = null; - for (MavenResource resource : mavenProject.getResources()) { + for (MavenResource resource : ContainerUtil.concat(mavenProject.getResources(), mavenProject.getTestResources())) { if (!resource.isFiltered()) continue; VirtualFile resourceDir = LocalFileSystem.getInstance().findFileByPath(resource.getDirectory()); diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenFilteredPropertiesCompletionAndResolutionTest.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenFilteredPropertiesCompletionAndResolutionTest.java index e92d40b05c45..923936143f76 100644 --- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenFilteredPropertiesCompletionAndResolutionTest.java +++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenFilteredPropertiesCompletionAndResolutionTest.java @@ -48,6 +48,28 @@ public class MavenFilteredPropertiesCompletionAndResolutionTest extends MavenDom assertResolved(f, findTag("project.version")); } + public void testTestResourceProperties() throws Exception { + createProjectSubDir("res"); + + importProject("test" + + "project" + + "1" + + + "" + + " " + + " " + + " res" + + " true" + + " " + + " " + + ""); + + VirtualFile f = createProjectSubFile("res/foo.properties", + "foo=abc${project.version}abc"); + + assertResolved(f, findTag("project.version")); + } + public void testBasicAt() throws Exception { createProjectSubDir("res");