From ff7f0304e583296f290d8d80d15ba4e213edf6ba Mon Sep 17 00:00:00 2001 From: olly Date: Fri, 22 Feb 2019 15:12:10 +0000 Subject: [PATCH] Automated g4 rollback of changelist 235153912. *** 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 --- .../exoplayer2/trackselection/AdaptiveTrackSelectionTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 260d3f03e9..bf6b935161 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 @@ -17,6 +17,7 @@ package com.google.android.exoplayer2.trackselection; import static com.google.common.truth.Truth.assertThat; 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; @@ -43,7 +44,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentMatcher; import org.mockito.Mock; -import org.mockito.hamcrest.MockitoHamcrest; import org.robolectric.RobolectricTestRunner; /** Unit test for {@link AdaptiveTrackSelection}. */ @@ -276,7 +276,7 @@ public final class AdaptiveTrackSelectionTest { }; verify(estimator) .getBitrates( - MockitoHamcrest.argThat(matcher), + argThat(matcher), eq(Collections.emptyList()), eq(THREE_EMPTY_MEDIA_CHUNK_ITERATORS), any());