Skip to content

Mark test resources as test resources in IntelliJ #1134

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bulldozer-bot merged 2 commits into from
Dec 19, 2019
Merged

Mark test resources as test resources in IntelliJ #1134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0dd6424
Mark test resources as test resources in IntelliJ
pkoenig10 Dec 19, 2019
cc5df93
Add generated changelog entries
pkoenig10 Dec 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions changelog/@unreleased/pr-1134.v2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
type: fix
fix:
description: The `baseline-idea` plugin now correctly marks test resources as test
resources in IntelliJ.
links:
- https://github.com/palantir/gradle-baseline/pull/1134
19 changes: 0 additions & 19 deletions gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/BaselineIdea.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ class BaselineIdea extends AbstractBaselinePlugin {
}

// Configure Idea module
markResourcesDirs(ideaModuleModel)
moveProjectReferencesToEnd(ideaModuleModel)
}

Expand Down Expand Up @@ -281,24 +280,6 @@ class BaselineIdea extends AbstractBaselinePlugin {
return base.appendNode(name, attributes + defaults)
}

/**
* By default the Idea plugin marks resources dirs as source dirs.
*/
private void markResourcesDirs(IdeaModel ideaModel) {
ideaModel.module.iml.withXml {
def node = it.asNode()
def content = node.component.find { it.'@name' == 'NewModuleRootManager' }.content[0]
content.sourceFolder.each { sourceFolder ->
if(sourceFolder.@url?.endsWith('/resources')) {
sourceFolder.attributes().with {
boolean isTestSource = (remove('isTestSource') == 'true')
put('type', isTestSource ? 'java-test-resource' : 'java-resource')
}
}
}
}
}

/**
* By default, IntelliJ and Gradle have different classpath behaviour with subprojects.
*
Expand Down