diff options
author | David Srbecky <dsrbecky@google.com> | 2021-02-24 18:09:21 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-24 18:09:21 +0000 |
commit | 23e304a839c5924c7ac7399076318adc511e9985 (patch) | |
tree | 81124de095a6b4a53b223d0f70cadde9744ee44a /src/main/java/org/junit/internal/matchers/TypeSafeMatcher.java | |
parent | d8911c6e959a1bda9b2b77d9aa0d35eea7a401f9 (diff) | |
parent | 565f36d28118dce0c0a08fe71924dcd25e039022 (diff) | |
download | junit-23e304a839c5924c7ac7399076318adc511e9985.tar.gz |
Merge changes from topic "revert-1601635-AIQYZOHWTP" am: 565f36d281
Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1605377
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1b6b1c8147b46e6c2a0ebd81a22edbb370082ded
Diffstat (limited to 'src/main/java/org/junit/internal/matchers/TypeSafeMatcher.java')
-rw-r--r-- | src/main/java/org/junit/internal/matchers/TypeSafeMatcher.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/org/junit/internal/matchers/TypeSafeMatcher.java b/src/main/java/org/junit/internal/matchers/TypeSafeMatcher.java index fb25982..4e2cc12 100644 --- a/src/main/java/org/junit/internal/matchers/TypeSafeMatcher.java +++ b/src/main/java/org/junit/internal/matchers/TypeSafeMatcher.java @@ -40,7 +40,7 @@ public abstract class TypeSafeMatcher<T> extends BaseMatcher<T> { } private static boolean isMatchesSafelyMethod(Method method) { - return "matchesSafely".equals(method.getName()) + return method.getName().equals("matchesSafely") && method.getParameterTypes().length == 1 && !method.isSynthetic(); } |