Skip to content

Fixed integration tests discovering themselves #43

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
merged 3 commits into from
Mar 17, 2025
Merged

Fixed integration tests discovering themselves #43

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dcfaabd
Fixed integration tests discovering themselves
mmaehren Mar 17, 2025
d972beb
Merge branch 'main' into fix/testDiscovery
mmaehren Mar 17, 2025
a813def
Ran formatter and adjusted descriptions
mmaehren Mar 17, 2025
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
102 changes: 68 additions & 34 deletions src/main/java/de/rub/nds/anvilcore/execution/TestRunner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import java.util.List;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.junit.jupiter.engine.descriptor.ClassBasedTestDescriptor;
import org.junit.jupiter.engine.descriptor.MethodBasedTestDescriptor;
import org.junit.platform.engine.FilterResult;
import org.junit.platform.engine.TestSource;
Expand Down Expand Up @@ -85,41 +86,9 @@ public void runTests() {
builder.filters(TagFilter.includeTags(config.getTags()));
}
if (!config.getProfiles().isEmpty()) {
ProfileResolver profileResolver = new ProfileResolver(config.getProfileFolder());
List<String> ids = profileResolver.resolve(config.getProfiles());
builder.filters(
(PostDiscoveryFilter)
descriptor -> {
if (descriptor instanceof MethodBasedTestDescriptor) {
MethodBasedTestDescriptor md =
(MethodBasedTestDescriptor) descriptor;
Method method = md.getTestMethod();
String anvilTestId = null;
if (method.isAnnotationPresent(AnvilTest.class)) {
anvilTestId = method.getAnnotation(AnvilTest.class).id();
} else if (method.isAnnotationPresent(
NonCombinatorialAnvilTest.class)) {
anvilTestId =
method.getAnnotation(
NonCombinatorialAnvilTest.class)
.id();
} else {
LOGGER.warn("Method {} has no ID", method);
}
if (anvilTestId != null) {
if (ids.contains(anvilTestId)) {
return FilterResult.included("Profile includes ID");
} else {
return FilterResult.excluded(
"Profile does not include ID");
}
}
return FilterResult.excluded("Method has no ID");
}
return FilterResult.included(
"Method is not instance of MethodBasedTestDescriptor");
});
restrictToProfile(builder);
}
restrictToAnvilTests(builder);
LauncherDiscoveryRequest request = builder.build();
AnvilTestWatcher anvilTestWatcher = new AnvilTestWatcher();

Expand Down Expand Up @@ -163,4 +132,69 @@ public void runTests() {
}
}
}

private void restrictToProfile(LauncherDiscoveryRequestBuilder builder) {
ProfileResolver profileResolver = new ProfileResolver(config.getProfileFolder());
List<String> ids = profileResolver.resolve(config.getProfiles());
builder.filters(
(PostDiscoveryFilter)
descriptor -> {
if (descriptor instanceof MethodBasedTestDescriptor) {
MethodBasedTestDescriptor md =
(MethodBasedTestDescriptor) descriptor;
Method method = md.getTestMethod();
String anvilTestId = null;
if (method.isAnnotationPresent(AnvilTest.class)) {
anvilTestId = method.getAnnotation(AnvilTest.class).id();
} else if (method.isAnnotationPresent(
NonCombinatorialAnvilTest.class)) {
anvilTestId =
method.getAnnotation(NonCombinatorialAnvilTest.class)
.id();
} else {
LOGGER.warn("Method {} has no ID", method);
}
if (anvilTestId != null) {
if (ids.contains(anvilTestId)) {
return FilterResult.included("Profile includes ID");
} else {
return FilterResult.excluded("Profile does not include ID");
}
}
return FilterResult.excluded("Method has no ID");
}
return FilterResult.included(
"Method is not instance of MethodBasedTestDescriptor");
});
}

private void restrictToAnvilTests(LauncherDiscoveryRequestBuilder builder) {
builder.filters(
(PostDiscoveryFilter)
descriptor -> {
if (descriptor instanceof MethodBasedTestDescriptor) {
MethodBasedTestDescriptor md =
(MethodBasedTestDescriptor) descriptor;
Method method = md.getTestMethod();
if (method.isAnnotationPresent(AnvilTest.class)
|| method.isAnnotationPresent(
NonCombinatorialAnvilTest.class)) {
return FilterResult.included("");
} else {
return FilterResult.excluded("Method is not an AnvilTest");
}
} else if (descriptor instanceof ClassBasedTestDescriptor) {
ClassBasedTestDescriptor cd = (ClassBasedTestDescriptor) descriptor;
if (cd.getTestClass().isAnnotationPresent(AnvilTest.class)
|| cd.getTestClass()
.isAnnotationPresent(
NonCombinatorialAnvilTest.class)) {
return FilterResult.included("");
} else {
return FilterResult.excluded("Class is not an AnvilTest");
}
}
return FilterResult.excluded("Test is not an AnvilTest");
});
}
}