Skip to content

detect custom Gradle test source sets in test import options #1660

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

Open
Develop-KIM wants to merge 1 commit into
base: main
Choose a base branch
from
+8 −1
Open

detect custom Gradle test source sets in test import options #1660

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion archunit/src/main/java/com/tngtech/archunit/core/importer/ImportOption.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ public boolean includes(Location location) {
};

static final PatternPredicate MAVEN_TEST_PATTERN = new PatternPredicate(".*/target/test-classes/.*");
static final PatternPredicate GRADLE_TEST_PATTERN = new PatternPredicate(".*/build/classes/([^/]+/)?test/.*");
static final PatternPredicate GRADLE_TEST_PATTERN = new PatternPredicate(".*/build/classes/([^/]+/)?(test|[^/]+Test)s?/.*");
static final PatternPredicate INTELLIJ_TEST_PATTERN = new PatternPredicate(".*/out/test/.*");
static final Predicate<Location> TEST_LOCATION = MAVEN_TEST_PATTERN.or(GRADLE_TEST_PATTERN).or(INTELLIJ_TEST_PATTERN);
static final Predicate<Location> NO_TEST_LOCATION = TEST_LOCATION.negate();
Expand All @@ -122,6 +122,8 @@ public boolean test(Location input) {
* Best effort {@link ImportOption} to check rules only on main classes.<br>
* NOTE: This excludes all class files residing in some directory
* ../target/test-classes/.., ../build/classes/test/.. or ../build/classes/someLang/test/.. (Maven/Gradle standard).
* This also covers custom Gradle test source sets that follow the {@code ...Test} naming convention,
* e.g. ../build/classes/someLang/integrationTest/...
* Thus it is just a best guess, how tests can be identified,
* in other environments, it might be necessary, to implement the correct {@link ImportOption} yourself.
*/
Expand Down
5 changes: 5 additions & 0 deletions archunit/src/test/java/com/tngtech/archunit/core/importer/ImportOptionsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,11 @@ private static List<FolderPattern> getFolderPatterns() {
new FolderPattern("build", "classes", "main").expectMainFolder(),
new FolderPattern("build", "classes", "java", "main").expectMainFolder(),
new FolderPattern("build", "classes", "java", "main", "my", "test").expectMainFolder(),
new FolderPattern("build", "classes", "java", "integrationTest").expectTestFolder(),
new FolderPattern("build", "classes", "otherlang", "functionalTest").expectTestFolder(),
new FolderPattern("build", "classes", "java", "e2eTest").expectTestFolder(),
new FolderPattern("build", "classes", "java", "tests").expectTestFolder(),
new FolderPattern("build", "classes", "java", "testFixtures").expectMainFolder(),

// Maven
new FolderPattern("target", "classes", "test").expectMainFolder(),
Expand Down