Skip to content

fix: support implicit @MethodSource to UnusedMethod #5210

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
wants to merge 1 commit into
base: master
Choose a base branch
from
+41 −7
Open

fix: support implicit @MethodSource to UnusedMethod #5210

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
12 changes: 8 additions & 4 deletions core/src/main/java/com/google/errorprone/bugpatterns/UnusedMethod.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,10 +303,14 @@ private void handleMethodSource(MethodTree tree) {
sym.getRawAttributes().stream()
.filter(a -> a.type.tsym.getQualifiedName().equals(name))
.findAny()
// get the annotation value array as a set of Names
.flatMap(a -> getAnnotationValue(a, "value"))
.map(
y -> asStrings(y).map(state::getName).map(Name::toString).collect(toImmutableSet()))
// get the annotation value array as a set of Names,
// normalizing unset value to the empty value
.map(a -> getAnnotationValue(a, "value")
.map(y -> asStrings(y).map(state::getName).map(Name::toString).collect(toImmutableSet()))
.orElse(ImmutableSet.of())
)
// if no explicit method sources were specified, use method name instead
.map(names -> names.isEmpty() ? Set.of(sym.name.toString()) : names)
// remove all potentially unused methods referenced by the @MethodSource
.ifPresent(
referencedNames ->
Expand Down
36 changes: 33 additions & 3 deletions core/src/test/java/com/google/errorprone/bugpatterns/UnusedMethodTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ public void methodSource() {
package org.junit.jupiter.params.provider;

public @interface MethodSource {
String[] value();
String[] value() default "";
}
""")
.addSourceLines(
Expand All @@ -339,6 +339,36 @@ private static Stream<String> parameters() {
.doTest();
}

@Test
public void implicitMethodSource() {
helper
.addSourceLines(
"MethodSource.java",
"""
package org.junit.jupiter.params.provider;

public @interface MethodSource {
String[] value() default "";
}
""")
.addSourceLines(
"Test.java",
"""
import java.util.stream.Stream;
import org.junit.jupiter.params.provider.MethodSource;

class Test {
@MethodSource
void test() {}

private static Stream<String> test() {
return Stream.of();
}
}
""")
.doTest();
}

@Test
public void qualifiedMethodSource() {
helper
Expand All @@ -348,7 +378,7 @@ public void qualifiedMethodSource() {
package org.junit.jupiter.params.provider;

public @interface MethodSource {
String[] value();
String[] value() default "";
}
""")
.addSourceLines(
Expand Down Expand Up @@ -378,7 +408,7 @@ public void nestedQualifiedMethodSource() {
package org.junit.jupiter.params.provider;

public @interface MethodSource {
String[] value();
String[] value() default "";
}
""")
.addSourceLines(
Expand Down