sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Automated g4 rollback of changelist 238625384.

Browse source 
*** Original change description ***

Allow exoplayer/v2 mockito2

***

PiperOrigin-RevId: 238626401
This commit is contained in:
olly 2019-03-15 12:37:15 +00:00 committed by Oliver Woodman
parent 07702cecdd
commit a291d6221f
5 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
RELEASENOTES.md
View file

@ -2,7 +2,6 @@
### dev-v2 (not yet released) ### ### dev-v2 (not yet released) ###
* Update to Mockito 2
* Add new `ExoPlaybackException` types for remote exceptions and out-of-memory * Add new `ExoPlaybackException` types for remote exceptions and out-of-memory
errors. errors.
* HLS: * HLS:

4
constants.gradle
View file

@ -18,8 +18,8 @@ project.ext {
minSdkVersion = 16 minSdkVersion = 16
targetSdkVersion = 28 targetSdkVersion = 28
compileSdkVersion = 28 compileSdkVersion = 28
dexmakerVersion = '2.21.0' dexmakerVersion = '1.2'
mockitoVersion = '2.25.0' mockitoVersion = '1.9.5'
robolectricVersion = '4.2' robolectricVersion = '4.2'
autoValueVersion = '1.6' autoValueVersion = '1.6'
checkerframeworkVersion = '2.5.0' checkerframeworkVersion = '2.5.0'

4
library/core/build.gradle
View file

@ -65,8 +65,8 @@ dependencies {
androidTestImplementation 'androidx.test.ext:junit:' + androidXTestVersion androidTestImplementation 'androidx.test.ext:junit:' + androidXTestVersion
androidTestImplementation 'androidx.test.ext:truth:' + androidXTestVersion androidTestImplementation 'androidx.test.ext:truth:' + androidXTestVersion
androidTestImplementation 'com.google.auto.value:auto-value-annotations:' + autoValueVersion androidTestImplementation 'com.google.auto.value:auto-value-annotations:' + autoValueVersion
androidTestImplementation 'com.linkedin.dexmaker:dexmaker:' + dexmakerVersion androidTestImplementation 'com.google.dexmaker:dexmaker:' + dexmakerVersion
androidTestImplementation 'com.linkedin.dexmaker:dexmaker-mockito:' + dexmakerVersion androidTestImplementation 'com.google.dexmaker:dexmaker-mockito:' + dexmakerVersion
androidTestImplementation 'org.mockito:mockito-core:' + mockitoVersion androidTestImplementation 'org.mockito:mockito-core:' + mockitoVersion
androidTestAnnotationProcessor 'com.google.auto.value:auto-value:' + autoValueVersion androidTestAnnotationProcessor 'com.google.auto.value:auto-value:' + autoValueVersion
testImplementation 'androidx.test:core:' + androidXTestVersion testImplementation 'androidx.test:core:' + androidXTestVersion

2
library/core/src/test/java/com/google/android/exoplayer2/drm/OfflineLicenseHelperTest.java
View file

@ -148,7 +148,7 @@ public class OfflineLicenseHelperTest {
private void setStubKeySetId(byte[] keySetId) private void setStubKeySetId(byte[] keySetId)
throws android.media.NotProvisionedException, android.media.DeniedByServerException { throws android.media.NotProvisionedException, android.media.DeniedByServerException {
when(mediaDrm.provideKeyResponse(any(byte[].class), any())).thenReturn(keySetId); when(mediaDrm.provideKeyResponse(any(byte[].class), any(byte[].class))).thenReturn(keySetId);
} }
private static void assertOfflineLicenseKeySetIdEqual( private static void assertOfflineLicenseKeySetIdEqual(

4
library/core/src/test/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelectionTest.java
View file

@ -16,8 +16,8 @@
package com.google.android.exoplayer2.trackselection; package com.google.android.exoplayer2.trackselection;
import static com.google.common.truth.Truth.assertThat; 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.any;
import static org.mockito.Matchers.argThat;
import static org.mockito.Matchers.eq; import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
@ -268,7 +268,7 @@ public final class AdaptiveTrackSelectionTest {
ArgumentMatcher<Format[]> matcher = ArgumentMatcher<Format[]> matcher =
new ArgumentMatcher<Format[]>() { new ArgumentMatcher<Format[]>() {
@Override @Override
public boolean matches(Format[] argument) { public boolean matches(Object argument) {
Format[] formats = (Format[]) argument; Format[] formats = (Format[]) argument;
return formats.length == 3 return formats.length == 3
&& Arrays.asList(formats).containsAll(Arrays.asList(format1, format2, format3)); && Arrays.asList(formats).containsAll(Arrays.asList(format1, format2, format3));