Skip to content

Make ArchUnit compatible with Gradle test retry plugin #1713

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
oehme wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Make ArchUnit compatible with Gradle test retry plugin #1713

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
7 changes: 4 additions & 3 deletions ...t/junit5/engine/src/main/java/com/tngtech/archunit/junit/internal/ArchUnitTestEngine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,14 +118,15 @@ private void resolveRequestedPackages(EngineDiscoveryRequest discoveryRequest, U

private Stream<Class<?>> filterCandidatesAndLoadClasses(Stream<JavaClass> classes, EngineDiscoveryRequest discoveryRequest) {
return classes
.filter(isAllowedBy(discoveryRequest))
.filter(isAllowedBy(discoveryRequest, JavaClass::getName))
.filter(this::isArchUnitTestCandidate)
.flatMap(this::safelyReflect);
}

private void resolveRequestedClasses(EngineDiscoveryRequest discoveryRequest, UniqueId uniqueId, ArchUnitEngineDescriptor result) {
discoveryRequest.getSelectorsByType(ClassSelector.class).stream()
.map(ClassSelector::getJavaClass)
.filter(isAllowedBy(discoveryRequest, Class::getName))
.filter(this::isArchUnitTestCandidate)
.forEach(clazz -> ArchUnitTestDescriptor.resolve(
result, ElementResolver.create(result, uniqueId, clazz), cache.get()));
Expand Down Expand Up @@ -170,14 +171,14 @@ private Stream<JavaClass> discoverClasses(Function<ClassFileImporter, JavaClasse
});
}

private Predicate<JavaClass> isAllowedBy(EngineDiscoveryRequest discoveryRequest) {
private <T> Predicate<T> isAllowedBy(EngineDiscoveryRequest discoveryRequest, Function<T, String> nameOf) {
List<Predicate<String>> filters = Stream
.concat(discoveryRequest.getFiltersByType(ClassNameFilter.class).stream(),
discoveryRequest.getFiltersByType(PackageNameFilter.class).stream())
.map(Filter::toPredicate)
.collect(toList());

return javaClass -> filters.stream().allMatch(p -> p.test(javaClass.getName()));
return candidate -> filters.stream().allMatch(p -> p.test(nameOf.apply(candidate)));
}

private boolean isArchUnitTestCandidate(JavaClass javaClass) {
Expand Down
13 changes: 13 additions & 0 deletions ...nit5/engine/src/test/java/com/tngtech/archunit/junit/internal/ArchUnitTestEngineTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -742,6 +742,19 @@ void filtering_included_class_names() {
simpleRulesId(engineId));
}

@Test
void filtering_class_selectors_by_class_name() {
EngineDiscoveryTestRequest discoveryRequest = new EngineDiscoveryTestRequest()
.withClass(SimpleRuleField.class)
.withClass(SimpleRuleMethod.class)
.withClassNameFilter(excludeClassNamePatterns(".*Field.*"));

TestDescriptor rootDescriptor = testEngine.discover(discoveryRequest, engineId);

assertThat(toUniqueIds(rootDescriptor)).containsOnly(
engineId.append(CLASS_SEGMENT_TYPE, SimpleRuleMethod.class.getName()));
}

@Test
void filtering_excluded_packages() {
EngineDiscoveryTestRequest discoveryRequest = new EngineDiscoveryTestRequest()
Expand Down
7 changes: 4 additions & 3 deletions ...t/junit6/engine/src/main/java/com/tngtech/archunit/junit/internal/ArchUnitTestEngine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,14 +118,15 @@ private void resolveRequestedPackages(EngineDiscoveryRequest discoveryRequest, U

private Stream<Class<?>> filterCandidatesAndLoadClasses(Stream<JavaClass> classes, EngineDiscoveryRequest discoveryRequest) {
return classes
.filter(isAllowedBy(discoveryRequest))
.filter(isAllowedBy(discoveryRequest, JavaClass::getName))
.filter(this::isArchUnitTestCandidate)
.flatMap(this::safelyReflect);
}

private void resolveRequestedClasses(EngineDiscoveryRequest discoveryRequest, UniqueId uniqueId, ArchUnitEngineDescriptor result) {
discoveryRequest.getSelectorsByType(ClassSelector.class).stream()
.map(ClassSelector::getJavaClass)
.filter(isAllowedBy(discoveryRequest, Class::getName))
.filter(this::isArchUnitTestCandidate)
.forEach(clazz -> ArchUnitTestDescriptor.resolve(
result, ElementResolver.create(result, uniqueId, clazz), cache.get()));
Expand Down Expand Up @@ -170,14 +171,14 @@ private Stream<JavaClass> discoverClasses(Function<ClassFileImporter, JavaClasse
});
}

private Predicate<JavaClass> isAllowedBy(EngineDiscoveryRequest discoveryRequest) {
private <T> Predicate<T> isAllowedBy(EngineDiscoveryRequest discoveryRequest, Function<T, String> nameOf) {
List<Predicate<String>> filters = Stream
.concat(discoveryRequest.getFiltersByType(ClassNameFilter.class).stream(),
discoveryRequest.getFiltersByType(PackageNameFilter.class).stream())
.map(Filter::toPredicate)
.collect(toList());

return javaClass -> filters.stream().allMatch(p -> p.test(javaClass.getName()));
return candidate -> filters.stream().allMatch(p -> p.test(nameOf.apply(candidate)));
}

private boolean isArchUnitTestCandidate(JavaClass javaClass) {
Expand Down
13 changes: 13 additions & 0 deletions ...nit6/engine/src/test/java/com/tngtech/archunit/junit/internal/ArchUnitTestEngineTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -742,6 +742,19 @@ void filtering_included_class_names() {
simpleRulesId(engineId));
}

@Test
void filtering_class_selectors_by_class_name() {
EngineDiscoveryTestRequest discoveryRequest = new EngineDiscoveryTestRequest()
.withClass(SimpleRuleField.class)
.withClass(SimpleRuleMethod.class)
.withClassNameFilter(excludeClassNamePatterns(".*Field.*"));

TestDescriptor rootDescriptor = testEngine.discover(discoveryRequest, engineId);

assertThat(toUniqueIds(rootDescriptor)).containsOnly(
engineId.append(CLASS_SEGMENT_TYPE, SimpleRuleMethod.class.getName()));
}

@Test
void filtering_excluded_packages() {
EngineDiscoveryTestRequest discoveryRequest = new EngineDiscoveryTestRequest()
Expand Down