From 2959b5f9c2a0c6b26345a1020f1b66d81719ff11 Mon Sep 17 00:00:00 2001 From: olly Date: Fri, 15 Mar 2019 17:32:12 +0000 Subject: [PATCH] Roll forward of 238625384. PiperOrigin-RevId: 238666870 --- RELEASENOTES.md | 1 + constants.gradle | 4 ++-- library/core/build.gradle | 4 ++-- .../android/exoplayer2/drm/OfflineLicenseHelperTest.java | 2 +- .../exoplayer2/trackselection/AdaptiveTrackSelectionTest.java | 4 ++-- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 0394f8d83d..42ddce0b87 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -2,6 +2,7 @@ ### dev-v2 (not yet released) ### +* Update to Mockito 2 * Add new `ExoPlaybackException` types for remote exceptions and out-of-memory errors. * HLS: diff --git a/constants.gradle b/constants.gradle index 1d6cd4fd73..e164fb4446 100644 --- a/constants.gradle +++ b/constants.gradle @@ -18,8 +18,8 @@ project.ext { minSdkVersion = 16 targetSdkVersion = 28 compileSdkVersion = 28 - dexmakerVersion = '1.2' - mockitoVersion = '1.9.5' + dexmakerVersion = '2.21.0' + mockitoVersion = '2.25.0' robolectricVersion = '4.2' autoValueVersion = '1.6' checkerframeworkVersion = '2.5.0' diff --git a/library/core/build.gradle b/library/core/build.gradle index 7ae3497d71..deb9f24dce 100644 --- a/library/core/build.gradle +++ b/library/core/build.gradle @@ -65,8 +65,8 @@ dependencies { androidTestImplementation 'androidx.test.ext:junit:' + androidXTestVersion androidTestImplementation 'androidx.test.ext:truth:' + androidXTestVersion androidTestImplementation 'com.google.auto.value:auto-value-annotations:' + autoValueVersion - androidTestImplementation 'com.google.dexmaker:dexmaker:' + dexmakerVersion - androidTestImplementation 'com.google.dexmaker:dexmaker-mockito:' + dexmakerVersion + androidTestImplementation 'com.linkedin.dexmaker:dexmaker:' + dexmakerVersion + androidTestImplementation 'com.linkedin.dexmaker:dexmaker-mockito:' + dexmakerVersion androidTestImplementation 'org.mockito:mockito-core:' + mockitoVersion androidTestAnnotationProcessor 'com.google.auto.value:auto-value:' + autoValueVersion testImplementation 'androidx.test:core:' + androidXTestVersion diff --git a/library/core/src/test/java/com/google/android/exoplayer2/drm/OfflineLicenseHelperTest.java b/library/core/src/test/java/com/google/android/exoplayer2/drm/OfflineLicenseHelperTest.java index 52fbae784a..30dde1db57 100644 --- a/library/core/src/test/java/com/google/android/exoplayer2/drm/OfflineLicenseHelperTest.java +++ b/library/core/src/test/java/com/google/android/exoplayer2/drm/OfflineLicenseHelperTest.java @@ -148,7 +148,7 @@ public class OfflineLicenseHelperTest { private void setStubKeySetId(byte[] keySetId) throws android.media.NotProvisionedException, android.media.DeniedByServerException { - when(mediaDrm.provideKeyResponse(any(byte[].class), any(byte[].class))).thenReturn(keySetId); + when(mediaDrm.provideKeyResponse(any(byte[].class), any())).thenReturn(keySetId); } private static void assertOfflineLicenseKeySetIdEqual( diff --git a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelectionTest.java b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelectionTest.java index 666cb9815f..cb7ef40726 100644 --- a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelectionTest.java +++ b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelectionTest.java @@ -16,8 +16,8 @@ package com.google.android.exoplayer2.trackselection; import static com.google.common.truth.Truth.assertThat; +import static org.mockito.ArgumentMatchers.argThat; import static org.mockito.Matchers.any; -import static org.mockito.Matchers.argThat; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.mock; @@ -268,7 +268,7 @@ public final class AdaptiveTrackSelectionTest { ArgumentMatcher matcher = new ArgumentMatcher() { @Override - public boolean matches(Object argument) { + public boolean matches(Format[] argument) { Format[] formats = (Format[]) argument; return formats.length == 3 && Arrays.asList(formats).containsAll(Arrays.asList(format1, format2, format3));