From 04106da932fd9fb64ae4792f5cffce04f78c7a89 Mon Sep 17 00:00:00 2001 From: ibaker Date: Thu, 18 May 2023 17:53:37 +0100 Subject: [PATCH] Allow `mock(Random.class)` to work with Java 17 https://stackoverflow.com/questions/70993863/mockito-can-not-mock-random-in-java-17 #minor-release PiperOrigin-RevId: 533161221 --- .../media3/exoplayer/dash/BaseUrlExclusionListTest.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libraries/exoplayer_dash/src/test/java/androidx/media3/exoplayer/dash/BaseUrlExclusionListTest.java b/libraries/exoplayer_dash/src/test/java/androidx/media3/exoplayer/dash/BaseUrlExclusionListTest.java index 845cdedeea..4e98d8b6ca 100644 --- a/libraries/exoplayer_dash/src/test/java/androidx/media3/exoplayer/dash/BaseUrlExclusionListTest.java +++ b/libraries/exoplayer_dash/src/test/java/androidx/media3/exoplayer/dash/BaseUrlExclusionListTest.java @@ -24,6 +24,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; +import static org.mockito.Mockito.withSettings; import androidx.media3.exoplayer.dash.manifest.BaseUrl; import androidx.test.ext.junit.runners.AndroidJUnit4; @@ -61,7 +62,7 @@ public class BaseUrlExclusionListTest { @Test public void selectBaseUrl_excludeByPriority_excludesAllBaseUrlsOfSamePriority() { - Random mockRandom = mock(Random.class); + Random mockRandom = mock(Random.class, withSettings().withoutAnnotations()); when(mockRandom.nextInt(anyInt())).thenReturn(0); BaseUrlExclusionList baseUrlExclusionList = new BaseUrlExclusionList(mockRandom); List baseUrls = @@ -89,7 +90,7 @@ public class BaseUrlExclusionListTest { /* url= */ "a", /* serviceLocation= */ "a", /* priority= */ 1, /* weight= */ 99), new BaseUrl( /* url= */ "b", /* serviceLocation= */ "b", /* priority= */ 1, /* weight= */ 1)); - Random mockRandom = mock(Random.class); + Random mockRandom = mock(Random.class, withSettings().withoutAnnotations()); when(mockRandom.nextInt(anyInt())).thenReturn(99); assertThat(new BaseUrlExclusionList(mockRandom).selectBaseUrl(baseUrls)) @@ -114,7 +115,7 @@ public class BaseUrlExclusionListTest { /* url= */ "a/a", /* serviceLocation= */ "a", /* priority= */ 1, /* weight= */ 99), new BaseUrl( /* url= */ "b/a", /* serviceLocation= */ "b", /* priority= */ 1, /* weight= */ 1)); - Random mockRandom = mock(Random.class); + Random mockRandom = mock(Random.class, withSettings().withoutAnnotations()); BaseUrlExclusionList baseUrlExclusionList = new BaseUrlExclusionList(mockRandom); when(mockRandom.nextInt(anyInt())).thenReturn(99);