mockito#2921: Android 26 compatibility

jfrantzius · Feb 26, 2023 · b8e1cd5 · b8e1cd5
1 parent 2f6cf4e
commit b8e1cd5
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/...in/java/org/mockito/internal/configuration/injection/filter/TypeBasedCandidateFilter.java b/...in/java/org/mockito/internal/configuration/injection/filter/TypeBasedCandidateFilter.java
@@ -33,7 +33,10 @@ public OngoingInjector filterCandidate(
                 Type genericType = candidateFieldToBeInjected.getGenericType();
                 // be more specific if generic type information is available
                 if (genericTypeToMock!=null || genericType!=null) {
-                    if (genericTypeToMock!=null && genericType!=null && genericTypeToMock.getTypeName().equals(genericType.getTypeName())) {
+                    // would rather like to use Type.getTypeName(), but that doesn't exist in Android SDK 26
+                    // which Mockito aims to maintain compatibility with.
+                    // Type.getTypeName() is documented to simply call Type.toString(), so use that instead
+                    if (genericTypeToMock!=null && genericType!=null && genericTypeToMock.toString().equals(genericType.toString())) {
                         mockTypeMatches.add(mock);
                     } // else: filter out mock, as generic types don't match
                 } else {