From c75f553abd8037a6adf01e9824c46240258a94b9 Mon Sep 17 00:00:00 2001
From: Erhard Pointl <epeee@users.noreply.github.com>
Date: Wed, 17 Jun 2020 23:00:13 +0200
Subject: [PATCH] Update errorprone to 2.4.0 for Java 14 support (#1951)

---
 gradle/dependencies.gradle                                    | 2 +-
 gradle/errorprone.gradle                                      | 4 ----
 src/test/java/org/mockito/internal/matchers/EqualityTest.java | 1 +
 .../mockito/internal/util/collections/IdentitySetTest.java    | 1 +
 .../internal/util/reflection/GenericMetadataSupportTest.java  | 1 +
 src/test/java/org/mockitousage/matchers/MatchersTest.java     | 1 +
 6 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
index 8fc97e4c92..d165c85a20 100644
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -6,7 +6,7 @@ def versions = [:]
 
 versions.bytebuddy = '1.10.10'
 versions.junitJupiter = '5.4.2'
-versions.errorprone = '2.3.2'
+versions.errorprone = '2.4.0'
 
 libraries.junit4 = 'junit:junit:4.12'
 libraries.junitJupiterApi = "org.junit.jupiter:junit-jupiter-api:${versions.junitJupiter}"
diff --git a/gradle/errorprone.gradle b/gradle/errorprone.gradle
index 43c8633fcd..1d9cf7428e 100644
--- a/gradle/errorprone.gradle
+++ b/gradle/errorprone.gradle
@@ -10,7 +10,3 @@ if (JavaVersion.current() == JavaVersion.VERSION_1_8) {
 dependencies {
     errorprone libraries.errorprone
 }
-
-tasks.named("compileTestJava").configure {
-    options.errorprone.errorproneArgs << "-Xep:MockitoCast:OFF"
-}
diff --git a/src/test/java/org/mockito/internal/matchers/EqualityTest.java b/src/test/java/org/mockito/internal/matchers/EqualityTest.java
index 6f0f71be20..5002701d2f 100644
--- a/src/test/java/org/mockito/internal/matchers/EqualityTest.java
+++ b/src/test/java/org/mockito/internal/matchers/EqualityTest.java
@@ -31,6 +31,7 @@ public void shouldKnowIfObjectsAreEqual() throws Exception {
         assertFalse(areEqual(new int[] {1}, new double[] {1.0}));
     }
 
+    @SuppressWarnings("EqualsHashCode")
     private final class BadEquals {
         @Override
         public boolean equals(Object oth) {
diff --git a/src/test/java/org/mockito/internal/util/collections/IdentitySetTest.java b/src/test/java/org/mockito/internal/util/collections/IdentitySetTest.java
index 462a6fc4d5..5c44ee9846 100644
--- a/src/test/java/org/mockito/internal/util/collections/IdentitySetTest.java
+++ b/src/test/java/org/mockito/internal/util/collections/IdentitySetTest.java
@@ -24,6 +24,7 @@ public void shouldWork() throws Exception {
         assertFalse(set.contains(new Object()));
     }
 
+    @SuppressWarnings("EqualsHashCode")
     class Fake {
         @Override
         public boolean equals(Object obj) {
diff --git a/src/test/java/org/mockito/internal/util/reflection/GenericMetadataSupportTest.java b/src/test/java/org/mockito/internal/util/reflection/GenericMetadataSupportTest.java
index c7985fd713..15574acf46 100644
--- a/src/test/java/org/mockito/internal/util/reflection/GenericMetadataSupportTest.java
+++ b/src/test/java/org/mockito/internal/util/reflection/GenericMetadataSupportTest.java
@@ -272,6 +272,7 @@ public void can_extract_interface_type_from_bounds_on_terminal_typeVariable() {
                   ).isEmpty();
     }
 
+    @SuppressWarnings("EqualsHashCode")
     private ParameterizedType parameterizedTypeOf(final Class<?> rawType, final Class<?> ownerType, final Type... actualTypeArguments) {
         return new ParameterizedType() {
             @Override
diff --git a/src/test/java/org/mockitousage/matchers/MatchersTest.java b/src/test/java/org/mockitousage/matchers/MatchersTest.java
index 25f49da5d5..71cc1ff621 100644
--- a/src/test/java/org/mockitousage/matchers/MatchersTest.java
+++ b/src/test/java/org/mockitousage/matchers/MatchersTest.java
@@ -340,6 +340,7 @@ public void should_use_smart_equals_for_primitive_arrays() throws Exception {
         verify(mock).objectArgMethod(new int[]{1, 2});
     }
 
+    @SuppressWarnings("ReturnValueIgnored")
     @Test(expected = ArgumentsAreDifferent.class)
     public void array_equals_should_throw_ArgumentsAreDifferentException_for_non_matching_arguments() {
         List<Object> list = Mockito.mock(List.class);