loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Automated g4 rollback of changelist 235153912.

Browse Source 
*** Reason for rollback ***

Breaks ExoPlayer's gradle build

*** Original change description ***

Migrate Mockito Matchers.{hamcrestMethods} to MockitoHamcrest.{hamcrestMethods}

All methods accepting a hamcrest Matcher in org.mockito.Matchers have been changed
to only accept an ArgumentMatcher. The corresponding methods are now available on
MockitoHamcrest.

For more information see http://go/mockito-2-lsc

Tested:
    TAP --sample for global presubmit queue
    http://test/OCL:235033293:BASE:234998256:1550793421835:c2ccbbda

***

PiperOrigin-RevId: 235186705
This commit is contained in:
olly 2019-02-22 15:12:10 +00:00 committed by Oliver Woodman
parent 6682580ad7
commit ff7f0304e5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,6 +17,7 @@ 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.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;
@ -43,7 +44,6 @@ import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.ArgumentMatcher; import org.mockito.ArgumentMatcher;
import org.mockito.Mock; import org.mockito.Mock;
import org.mockito.hamcrest.MockitoHamcrest;
import org.robolectric.RobolectricTestRunner; import org.robolectric.RobolectricTestRunner;
/** Unit test for {@link AdaptiveTrackSelection}. */ /** Unit test for {@link AdaptiveTrackSelection}. */
@ -276,7 +276,7 @@ public final class AdaptiveTrackSelectionTest {
}; };
verify(estimator) verify(estimator)
.getBitrates( .getBitrates(
MockitoHamcrest.argThat(matcher), argThat(matcher),
eq(Collections.emptyList()), eq(Collections.emptyList()),
eq(THREE_EMPTY_MEDIA_CHUNK_ITERATORS), eq(THREE_EMPTY_MEDIA_CHUNK_ITERATORS),
any()); any());