MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-50429 Maven: properties usages are not resolved in filtered test resources

Browse Source
This commit is contained in:
Sergey Evdokimov
2012-12-25 18:15:04 +04:00
parent 58f342ef42
commit 5770bdefce
2 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/MavenDomUtil.java
+1 -1
View File
@@ -327,7 +327,7 @@ public class MavenDomUtil {
if (cachedValue == null || cachedValue.first != VirtualFileManager.getInstance().getModificationCount()) {
Set<VirtualFile> 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());
plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenFilteredPropertiesCompletionAndResolutionTest.java
+22
View File
@@ -48,6 +48,28 @@ public class MavenFilteredPropertiesCompletionAndResolutionTest extends MavenDom
assertResolved(f, findTag("project.version"));
}
public void testTestResourceProperties() throws Exception {
createProjectSubDir("res");
importProject("<groupId>test</groupId>" +
"<artifactId>project</artifactId>" +
"<version>1</version>" +
"<build>" +
" <testResources>" +
" <testResource>" +
" <directory>res</directory>" +
" <filtering>true</filtering>" +
" </testResource>" +
" </testResources>" +
"</build>");
VirtualFile f = createProjectSubFile("res/foo.properties",
"foo=abc${project<caret>.version}abc");
assertResolved(f, findTag("project.version"));
}
public void testBasicAt() throws Exception {
createProjectSubDir("res");