Skip to content

Commit 7a8059e

Browse files
klueverError Prone Team
authored andcommitted
Remove references to EasyMock, which was deleted 3+ years ago (unknown commit).
Push `MOCKED_VAR` up to the base class. PiperOrigin-RevId: 903340783
1 parent 0124cb1 commit 7a8059e

3 files changed

Lines changed: 14 additions & 24 deletions

File tree

core/src/main/java/com/google/errorprone/bugpatterns/AbstractMockChecker.java

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
import java.util.Optional;
4343
import java.util.function.Function;
4444
import java.util.function.Supplier;
45-
import java.util.regex.Pattern;
4645
import java.util.stream.Collectors;
4746
import java.util.stream.Stream;
4847
import org.jspecify.annotations.Nullable;
@@ -212,21 +211,21 @@ public static TypeExtractor<VariableTree> fieldAnnotatedWithOneOf(
212211
}
213212

214213
/**
215-
* A TypeExtractor for method invocations that create a mock using Mockito.mock, Mockito.spy, or
216-
* EasyMock.create[...]Mock, extracting the type being mocked.
214+
* A {@link TypeExtractor} that extracts the type being mocked for method invocations that use
215+
* either {@code org.mockito.Mockito.mock(...)} or {@code org.mockito.Mockito.spy(...)}.
217216
*/
218217
public static final TypeExtractor<MethodInvocationTree> MOCKING_METHOD =
219218
extractFirstArg(
220-
Matchers.toType(
221-
MethodInvocationTree.class,
222-
Matchers.staticMethod().onClass("org.mockito.Mockito").namedAnyOf("mock", "spy")))
223-
.or(
224-
extractClassArg(
225-
Matchers.toType(
226-
MethodInvocationTree.class,
227-
Matchers.staticMethod()
228-
.onClass("org.easymock.EasyMock")
229-
.withNameMatching(Pattern.compile("^create.*Mock(Builder)?$")))));
219+
Matchers.toType(
220+
MethodInvocationTree.class,
221+
Matchers.staticMethod().onClass("org.mockito.Mockito").namedAnyOf("mock", "spy")));
222+
223+
/**
224+
* A {@link TypeExtractor} that extracts the type of a variable declaration that is annotated with
225+
* either {@code @org.mockito.Mock} or {@code @org.mockito.Spy}.
226+
*/
227+
public static final TypeExtractor<VariableTree> MOCKED_VAR =
228+
fieldAnnotatedWithOneOf(Stream.of("org.mockito.Mock", "org.mockito.Spy"));
230229

231230
@Override
232231
public final Description matchMethodInvocation(MethodInvocationTree tree, VisitorState state) {

core/src/main/java/com/google/errorprone/bugpatterns/DoNotMockAutoValue.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020

2121
import com.google.auto.value.AutoValue;
2222
import com.google.errorprone.BugPattern;
23-
import com.sun.source.tree.VariableTree;
24-
import java.util.stream.Stream;
2523

2624
/** Suggests not mocking AutoValue classes. */
2725
@BugPattern(
@@ -30,8 +28,6 @@
3028
+ " Construct a real instance of the class instead.",
3129
severity = WARNING)
3230
public final class DoNotMockAutoValue extends AbstractMockChecker<AutoValue> {
33-
private static final TypeExtractor<VariableTree> MOCKED_VAR =
34-
fieldAnnotatedWithOneOf(Stream.of("org.mockito.Mock", "org.mockito.Spy"));
3531

3632
public DoNotMockAutoValue() {
3733
super(

core/src/main/java/com/google/errorprone/bugpatterns/DoNotMockChecker.java

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,10 @@
1919
import com.google.errorprone.BugPattern;
2020
import com.google.errorprone.BugPattern.SeverityLevel;
2121
import com.google.errorprone.annotations.DoNotMock;
22-
import com.sun.source.tree.VariableTree;
23-
import java.util.stream.Stream;
2422

2523
/**
26-
* Points out if a Mockito or EasyMock mock is mocking an object that would be better off being
27-
* tested using an alternative instance.
24+
* Points out if a Mockito mock is mocking an object that would be better off being tested using an
25+
* alternative instance.
2826
*
2927
* @author amalloy@google.com (Alan Malloy)
3028
*/
@@ -35,9 +33,6 @@
3533
documentSuppression = false)
3634
public class DoNotMockChecker extends AbstractMockChecker<DoNotMock> {
3735

38-
private static final TypeExtractor<VariableTree> MOCKED_VAR =
39-
fieldAnnotatedWithOneOf(Stream.of("org.mockito.Mock", "org.mockito.Spy"));
40-
4136
public DoNotMockChecker() {
4237
super(MOCKED_VAR, MOCKING_METHOD, DoNotMock.class, DoNotMock::value);
4338
}

0 commit comments

Comments
 (0)