fixed warnings arising with up-to-date errorprone

mockito · Oct 2, 2019 · 17d6d0f · 17d6d0f
1 parent 96830b9
commit 17d6d0f
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 8 deletions.
diff --git a/src/test/java/org/mockito/internal/matchers/EqualityTest.java b/src/test/java/org/mockito/internal/matchers/EqualityTest.java
@@ -36,5 +36,11 @@ private final class BadEquals {
         public boolean equals(Object oth) {
             throw new RuntimeException();
         }
+
+        @Override
+        public int hashCode()
+        {
+            return 1;
+        }
     }
 }
diff --git a/src/test/java/org/mockito/internal/util/collections/IdentitySetTest.java b/src/test/java/org/mockito/internal/util/collections/IdentitySetTest.java
@@ -29,6 +29,11 @@ class Fake {
         public boolean equals(Object obj) {
             return true;
         }
+        @Override
+        public int hashCode()
+        {
+          return 1;
+        }
     }
 
     @Test

diff --git a/src/test/java/org/mockito/internal/util/reflection/GenericMetadataSupportTest.java b/src/test/java/org/mockito/internal/util/reflection/GenericMetadataSupportTest.java
@@ -17,6 +17,7 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -289,23 +290,26 @@ public Type getOwnerType() {
                 return ownerType;
             }
 
+            @Override
             public boolean equals(Object other) {
                 if (other instanceof ParameterizedType) {
                     ParameterizedType otherParamType = (ParameterizedType) other;
                     if (this == otherParamType) {
                         return true;
-                    } else {
-                        return equals(ownerType, otherParamType.getOwnerType())
-                               && equals(rawType, otherParamType.getRawType())
-                               && Arrays.equals(actualTypeArguments, otherParamType.getActualTypeArguments());
                     }
-                } else {
-                    return false;
+                    return Objects.equals(ownerType,  otherParamType.getOwnerType())
+                           && Objects.equals(rawType,  otherParamType.getRawType())
+                           && Arrays.equals(actualTypeArguments, otherParamType.getActualTypeArguments());
                 }
+                return false;
             }
 
-            private boolean equals(Object a, Object b) {
-                return (a == b) || (a != null && a.equals(b));
+            @Override
+            public int hashCode()
+            {
+              return (ownerType==null ? 0: ownerType.hashCode())
+                + 3 * (rawType==null ? 0: rawType.hashCode())
+                + 9 * Arrays.hashCode(actualTypeArguments);
             }
         };
     }