Skip to content
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.

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

Consider declaring class for Enclosed tests in Categories #1663

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Expand Up @@ -278,6 +278,7 @@ private static Set<Class<?>> categories(Description description) {
Set<Class<?>> categories= new HashSet<Class<?>>();
Collections.addAll(categories, directCategories(description));
Collections.addAll(categories, directCategories(parentDescription(description)));
Collections.addAll(categories, directCategories(declaringDescription(description)));
return categories;
}

Expand All @@ -286,6 +287,14 @@ private static Description parentDescription(Description description) {
return testClass == null ? null : Description.createSuiteDescription(testClass);
}

private static Description declaringDescription(Description description) {
Class<?> testClass = description.getTestClass();
if (testClass != null) {
testClass = testClass.getDeclaringClass();
}
return testClass == null ? null : Description.createSuiteDescription(testClass);
}

private static Class<?>[] directCategories(Description description) {
if (description == null) {
return new Class<?>[0];
Expand Down