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

Fix test build.

Browse source 
Builds now fail when raw generics are used.

PiperOrigin-RevId: 253969682
This commit is contained in:
tonihei 2019-06-19 12:07:33 +01:00 committed by Oliver Woodman
parent aaf57c76cf
commit ba5e2a4a77
2 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -19,7 +19,6 @@ import static com.google.common.truth.Truth.assertThat;
import static org.junit.Assert.fail; import static org.junit.Assert.fail;
import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
import android.util.Pair; import android.util.Pair;
@ -27,7 +26,6 @@ import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.drm.DrmInitData.SchemeData; import com.google.android.exoplayer2.drm.DrmInitData.SchemeData;
import java.util.HashMap; import java.util.HashMap;
import java.util.List;
import org.junit.After; import org.junit.After;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
@ -49,8 +47,7 @@ public class OfflineLicenseHelperTest {
public void setUp() throws Exception { public void setUp() throws Exception {
MockitoAnnotations.initMocks(this); MockitoAnnotations.initMocks(this);
when(mediaDrm.openSession()).thenReturn(new byte[] {1, 2, 3}); when(mediaDrm.openSession()).thenReturn(new byte[] {1, 2, 3});
when(mediaDrm.getKeyRequest( when(mediaDrm.getKeyRequest(any(), any(), anyInt(), any()))
nullable(byte[].class), nullable(List.class), anyInt(), nullable(HashMap.class)))
.thenReturn( .thenReturn(
new ExoMediaDrm.KeyRequest(/* data= */ new byte[0], /* licenseServerUrl= */ "")); new ExoMediaDrm.KeyRequest(/* data= */ new byte[0], /* licenseServerUrl= */ ""));
offlineLicenseHelper = offlineLicenseHelper =

6
library/core/src/test/java/com/google/android/exoplayer2/extractor/DefaultExtractorsFactoryTest.java
View file

@ -45,13 +45,13 @@ public final class DefaultExtractorsFactoryTest {
DefaultExtractorsFactory defaultExtractorsFactory = new DefaultExtractorsFactory(); DefaultExtractorsFactory defaultExtractorsFactory = new DefaultExtractorsFactory();
Extractor[] extractors = defaultExtractorsFactory.createExtractors(); Extractor[] extractors = defaultExtractorsFactory.createExtractors();
List<Class> listCreatedExtractorClasses = new ArrayList<>(); List<Class<?>> listCreatedExtractorClasses = new ArrayList<>();
for (Extractor extractor : extractors) { for (Extractor extractor : extractors) {
listCreatedExtractorClasses.add(extractor.getClass()); listCreatedExtractorClasses.add(extractor.getClass());
} }
Class[] expectedExtractorClassses = Class<?>[] expectedExtractorClassses =
new Class[] { new Class<?>[] {
MatroskaExtractor.class, MatroskaExtractor.class,
FragmentedMp4Extractor.class, FragmentedMp4Extractor.class,
Mp4Extractor.class, Mp4Extractor.class,