diff options
| author | Philip P. Moltmann <moltmann@google.com> | 2018-08-14 16:18:59 -0700 |
|---|---|---|
| committer | Philip P. Moltmann <moltmann@google.com> | 2018-08-21 23:49:26 +0000 |
| commit | 31b8dd0cbc0246fdab7ec2e9d1fd9fc822eac46d (patch) | |
| tree | 8cf99ff02592dbd8053b56f31fc604500444699c /src/main/java/org/mockito/internal/util | |
| parent | 9a6865609c1905059b4af3ea32a07e0cb30d4249 (diff) | |
| download | mockito-31b8dd0cbc0246fdab7ec2e9d1fd9fc822eac46d.tar.gz | |
Update mockito on AOSP to same version as on internal master
Bug: 109745050
Test: atest CtsMockingTestCases
CtsInlineMockingTestCases
CtsMockingDebuggableTestCases
CtsExtendedMockingTestCases
Change-Id: I1cbfd730f47be12d448b61509d2760ca60eea895
Merged-In: I76c21bca99a348d2a91e9bc5b3533f532baea246
Diffstat (limited to 'src/main/java/org/mockito/internal/util')
| -rw-r--r-- | src/main/java/org/mockito/internal/util/Primitives.java | 2 | ||||
| -rw-r--r-- | src/main/java/org/mockito/internal/util/concurrent/WeakConcurrentMap.java | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/main/java/org/mockito/internal/util/Primitives.java b/src/main/java/org/mockito/internal/util/Primitives.java index 4d813e3..80dd0af 100644 --- a/src/main/java/org/mockito/internal/util/Primitives.java +++ b/src/main/java/org/mockito/internal/util/Primitives.java @@ -44,7 +44,7 @@ public class Primitives { public static boolean isAssignableFromWrapper(Class<?> valueClass, Class<?> referenceType) { if(isPrimitiveOrWrapper(valueClass) && isPrimitiveOrWrapper(referenceType)) { - return Primitives.primitiveTypeOf(valueClass).isAssignableFrom(referenceType); + return Primitives.primitiveTypeOf(valueClass).isAssignableFrom(Primitives.primitiveTypeOf(referenceType)); } return false; } diff --git a/src/main/java/org/mockito/internal/util/concurrent/WeakConcurrentMap.java b/src/main/java/org/mockito/internal/util/concurrent/WeakConcurrentMap.java index b411a73..487d223 100644 --- a/src/main/java/org/mockito/internal/util/concurrent/WeakConcurrentMap.java +++ b/src/main/java/org/mockito/internal/util/concurrent/WeakConcurrentMap.java @@ -50,6 +50,7 @@ public class WeakConcurrentMap<K, V> extends ReferenceQueue<K> implements Runnab * @param key The key of the entry. * @return The value of the entry or the default value if it did not exist. */ + @SuppressWarnings("CollectionIncompatibleType") public V get(K key) { if (key == null) throw new NullPointerException(); V value = target.get(new LatentKey<K>(key)); @@ -69,6 +70,7 @@ public class WeakConcurrentMap<K, V> extends ReferenceQueue<K> implements Runnab * @param key The key of the entry. * @return {@code true} if the key already defines a value. */ + @SuppressWarnings("CollectionIncompatibleType") public boolean containsKey(K key) { if (key == null) throw new NullPointerException(); return target.containsKey(new LatentKey<K>(key)); @@ -88,6 +90,7 @@ public class WeakConcurrentMap<K, V> extends ReferenceQueue<K> implements Runnab * @param key The key of the entry. * @return The removed entry or {@code null} if it does not exist. */ + @SuppressWarnings("CollectionIncompatibleType") public V remove(K key) { if (key == null) throw new NullPointerException(); return target.remove(new LatentKey<K>(key)); |