Skip to content

SDK / exoplayer

Go to a project
Commit 8e80acd1 by tonihei Committed by Oliver Woodman
Options

Use androidx.test and extensions. 

This replaces the deprecated usages of RobolectricTestRunner and
RuntimeEnvironent and fully migrates the tests to androidx.

PiperOrigin-RevId: 238011667
parent 9c6c74d5
Expand all
Inline Side-by-side
Showing with 325 additions and 358 deletions
constants.gradle
...@@ -18,15 +18,12 @@ project.ext { ...@@ -18,15 +18,12 @@ project.ext {
minSdkVersion = 16 minSdkVersion = 16
targetSdkVersion = 28 targetSdkVersion = 28
compileSdkVersion = 28 compileSdkVersion = 28
testSupportLibraryVersion = '0.5'
dexmakerVersion = '1.2' dexmakerVersion = '1.2'
mockitoVersion = '1.9.5' mockitoVersion = '1.9.5'
junitVersion = '4.12' robolectricVersion = '4.2'
truthVersion = '0.42'
robolectricVersion = '4.1'
autoValueVersion = '1.6' autoValueVersion = '1.6'
checkerframeworkVersion = '2.5.0' checkerframeworkVersion = '2.5.0'
testRunnerVersion = '1.1.0-alpha3' androidXTestVersion = '1.1.0'
modulePrefix = ':' modulePrefix = ':'
if (gradle.ext.has('exoplayerModulePrefix')) { if (gradle.ext.has('exoplayerModulePrefix')) {
modulePrefix += gradle.ext.exoplayerModulePrefix modulePrefix += gradle.ext.exoplayerModulePrefix
......
extensions/cast/build.gradle
...@@ -37,10 +37,6 @@ dependencies { ...@@ -37,10 +37,6 @@ dependencies {
implementation project(modulePrefix + 'library-ui') implementation project(modulePrefix + 'library-ui')
compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
compileOnly 'org.checkerframework:checker-compat-qual:' + checkerframeworkVersion compileOnly 'org.checkerframework:checker-compat-qual:' + checkerframeworkVersion
testImplementation project(modulePrefix + 'testutils')
testImplementation 'junit:junit:' + junitVersion
testImplementation 'org.mockito:mockito-core:' + mockitoVersion
testImplementation 'org.robolectric:robolectric:' + robolectricVersion
testImplementation project(modulePrefix + 'testutils-robolectric') testImplementation project(modulePrefix + 'testutils-robolectric')
} }
......
extensions/cast/src/test/java/com/google/android/exoplayer2/ext/cast/CastTimelineTrackerTest.java
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
*/ */
package com.google.android.exoplayer2.ext.cast; package com.google.android.exoplayer2.ext.cast;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.testutil.TimelineAsserts; import com.google.android.exoplayer2.testutil.TimelineAsserts;
import com.google.android.exoplayer2.util.MimeTypes; import com.google.android.exoplayer2.util.MimeTypes;
...@@ -25,10 +26,9 @@ import java.util.ArrayList; ...@@ -25,10 +26,9 @@ import java.util.ArrayList;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.Mockito; import org.mockito.Mockito;
import org.robolectric.RobolectricTestRunner;
/** Tests for {@link CastTimelineTracker}. */ /** Tests for {@link CastTimelineTracker}. */
@RunWith(RobolectricTestRunner.class) @RunWith(AndroidJUnit4.class)
public class CastTimelineTrackerTest { public class CastTimelineTrackerTest {
private static final long DURATION_1_MS = 1000; private static final long DURATION_1_MS = 1000;
......
extensions/cast/src/test/java/com/google/android/exoplayer2/ext/cast/MediaItemTest.java
...@@ -18,6 +18,7 @@ package com.google.android.exoplayer2.ext.cast; ...@@ -18,6 +18,7 @@ package com.google.android.exoplayer2.ext.cast;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import android.net.Uri; import android.net.Uri;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.util.MimeTypes; import com.google.android.exoplayer2.util.MimeTypes;
import java.util.Arrays; import java.util.Arrays;
...@@ -26,10 +27,9 @@ import java.util.List; ...@@ -26,10 +27,9 @@ import java.util.List;
import java.util.UUID; import java.util.UUID;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
/** Test for {@link MediaItem}. */ /** Test for {@link MediaItem}. */
@RunWith(RobolectricTestRunner.class) @RunWith(AndroidJUnit4.class)
public class MediaItemTest { public class MediaItemTest {
@Test @Test
......
extensions/cronet/src/test/java/com/google/android/exoplayer2/ext/cronet/ByteArrayUploadDataProviderTest.java
...@@ -19,6 +19,7 @@ import static com.google.common.truth.Truth.assertThat; ...@@ -19,6 +19,7 @@ import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.times; import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import java.io.IOException; import java.io.IOException;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.util.Arrays; import java.util.Arrays;
...@@ -28,10 +29,9 @@ import org.junit.Test; ...@@ -28,10 +29,9 @@ import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.Mock; import org.mockito.Mock;
import org.mockito.MockitoAnnotations; import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
/** Tests for {@link ByteArrayUploadDataProvider}. */ /** Tests for {@link ByteArrayUploadDataProvider}. */
@RunWith(RobolectricTestRunner.class) @RunWith(AndroidJUnit4.class)
public final class ByteArrayUploadDataProviderTest { public final class ByteArrayUploadDataProviderTest {
private static final byte[] TEST_DATA = new byte[] {1, 2, 3, 4, 5, 6, 7, 8, 9, 10}; private static final byte[] TEST_DATA = new byte[] {1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
......
extensions/cronet/src/test/java/com/google/android/exoplayer2/ext/cronet/CronetDataSourceTest.java
...@@ -31,6 +31,7 @@ import static org.mockito.Mockito.when; ...@@ -31,6 +31,7 @@ import static org.mockito.Mockito.when;
import android.net.Uri; import android.net.Uri;
import android.os.ConditionVariable; import android.os.ConditionVariable;
import android.os.SystemClock; import android.os.SystemClock;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.upstream.DataSpec; import com.google.android.exoplayer2.upstream.DataSpec;
import com.google.android.exoplayer2.upstream.HttpDataSource; import com.google.android.exoplayer2.upstream.HttpDataSource;
...@@ -62,10 +63,9 @@ import org.junit.Test; ...@@ -62,10 +63,9 @@ import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.Mock; import org.mockito.Mock;
import org.mockito.MockitoAnnotations; import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
/** Tests for {@link CronetDataSource}. */ /** Tests for {@link CronetDataSource}. */
@RunWith(RobolectricTestRunner.class) @RunWith(AndroidJUnit4.class)
public final class CronetDataSourceTest { public final class CronetDataSourceTest {
private static final int TEST_CONNECT_TIMEOUT_MS = 100; private static final int TEST_CONNECT_TIMEOUT_MS = 100;
......
extensions/ffmpeg/build.gradle
...@@ -41,7 +41,6 @@ dependencies { ...@@ -41,7 +41,6 @@ dependencies {
implementation 'androidx.annotation:annotation:1.0.1' implementation 'androidx.annotation:annotation:1.0.1'
compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
testImplementation project(modulePrefix + 'testutils-robolectric') testImplementation project(modulePrefix + 'testutils-robolectric')
testImplementation 'junit:junit:' + junitVersion
} }
ext { ext {
......
extensions/ffmpeg/src/test/java/com/google/android/exoplayer2/ext/ffmpeg/DefaultRenderersFactoryTest.java
...@@ -15,14 +15,14 @@ ...@@ -15,14 +15,14 @@
*/ */
package com.google.android.exoplayer2.ext.ffmpeg; package com.google.android.exoplayer2.ext.ffmpeg;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.testutil.DefaultRenderersFactoryAsserts; import com.google.android.exoplayer2.testutil.DefaultRenderersFactoryAsserts;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
/** Unit test for {@link DefaultRenderersFactoryTest} with {@link FfmpegAudioRenderer}. */ /** Unit test for {@link DefaultRenderersFactoryTest} with {@link FfmpegAudioRenderer}. */
@RunWith(RobolectricTestRunner.class) @RunWith(AndroidJUnit4.class)
public final class DefaultRenderersFactoryTest { public final class DefaultRenderersFactoryTest {
@Test @Test
......
extensions/flac/build.gradle
...@@ -41,9 +41,8 @@ dependencies { ...@@ -41,9 +41,8 @@ dependencies {
implementation project(modulePrefix + 'library-core') implementation project(modulePrefix + 'library-core')
implementation 'androidx.annotation:annotation:1.0.1' implementation 'androidx.annotation:annotation:1.0.1'
androidTestImplementation project(modulePrefix + 'testutils') androidTestImplementation project(modulePrefix + 'testutils')
androidTestImplementation 'androidx.test:runner:' + testRunnerVersion androidTestImplementation 'androidx.test:runner:' + androidXTestVersion
testImplementation project(modulePrefix + 'testutils-robolectric') testImplementation project(modulePrefix + 'testutils-robolectric')
testImplementation 'org.robolectric:robolectric:' + robolectricVersion
} }
ext { ext {
......
extensions/flac/src/androidTest/AndroidManifest.xml
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
package="com.google.android.exoplayer2.ext.flac.test"> package="com.google.android.exoplayer2.ext.flac.test">
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-sdk/>
<application android:debuggable="true" <application android:debuggable="true"
android:allowBackup="false" android:allowBackup="false"
......
extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacBinarySearchSeekerTest.java
...@@ -16,22 +16,26 @@ ...@@ -16,22 +16,26 @@
package com.google.android.exoplayer2.ext.flac; package com.google.android.exoplayer2.ext.flac;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static org.junit.Assert.fail;
import android.test.InstrumentationTestCase; import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.extractor.SeekMap; import com.google.android.exoplayer2.extractor.SeekMap;
import com.google.android.exoplayer2.testutil.FakeExtractorInput; import com.google.android.exoplayer2.testutil.FakeExtractorInput;
import com.google.android.exoplayer2.testutil.TestUtil; import com.google.android.exoplayer2.testutil.TestUtil;
import java.io.IOException; import java.io.IOException;
import org.junit.Before;
import org.junit.runner.RunWith;
/** Unit test for {@link FlacBinarySearchSeeker}. */ /** Unit test for {@link FlacBinarySearchSeeker}. */
public final class FlacBinarySearchSeekerTest extends InstrumentationTestCase { @RunWith(AndroidJUnit4.class)
public final class FlacBinarySearchSeekerTest {
private static final String NOSEEKTABLE_FLAC = "bear_no_seek.flac"; private static final String NOSEEKTABLE_FLAC = "bear_no_seek.flac";
private static final int DURATION_US = 2_741_000; private static final int DURATION_US = 2_741_000;
@Override @Before
protected void setUp() throws Exception { public void setUp() {
super.setUp();
if (!FlacLibrary.isAvailable()) { if (!FlacLibrary.isAvailable()) {
fail("Flac library not available."); fail("Flac library not available.");
} }
...@@ -39,7 +43,8 @@ public final class FlacBinarySearchSeekerTest extends InstrumentationTestCase { ...@@ -39,7 +43,8 @@ public final class FlacBinarySearchSeekerTest extends InstrumentationTestCase {
public void testGetSeekMap_returnsSeekMapWithCorrectDuration() public void testGetSeekMap_returnsSeekMapWithCorrectDuration()
throws IOException, FlacDecoderException, InterruptedException { throws IOException, FlacDecoderException, InterruptedException {
byte[] data = TestUtil.getByteArray(getInstrumentation().getContext(), NOSEEKTABLE_FLAC); byte[] data =
TestUtil.getByteArray(ApplicationProvider.getApplicationContext(), NOSEEKTABLE_FLAC);
FakeExtractorInput input = new FakeExtractorInput.Builder().setData(data).build(); FakeExtractorInput input = new FakeExtractorInput.Builder().setData(data).build();
FlacDecoderJni decoderJni = new FlacDecoderJni(); FlacDecoderJni decoderJni = new FlacDecoderJni();
...@@ -57,7 +62,8 @@ public final class FlacBinarySearchSeekerTest extends InstrumentationTestCase { ...@@ -57,7 +62,8 @@ public final class FlacBinarySearchSeekerTest extends InstrumentationTestCase {
public void testSetSeekTargetUs_returnsSeekPending() public void testSetSeekTargetUs_returnsSeekPending()
throws IOException, FlacDecoderException, InterruptedException { throws IOException, FlacDecoderException, InterruptedException {
byte[] data = TestUtil.getByteArray(getInstrumentation().getContext(), NOSEEKTABLE_FLAC); byte[] data =
TestUtil.getByteArray(ApplicationProvider.getApplicationContext(), NOSEEKTABLE_FLAC);
FakeExtractorInput input = new FakeExtractorInput.Builder().setData(data).build(); FakeExtractorInput input = new FakeExtractorInput.Builder().setData(data).build();
FlacDecoderJni decoderJni = new FlacDecoderJni(); FlacDecoderJni decoderJni = new FlacDecoderJni();
......
extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacExtractorSeekTest.java
...@@ -16,11 +16,13 @@ ...@@ -16,11 +16,13 @@
package com.google.android.exoplayer2.ext.flac; package com.google.android.exoplayer2.ext.flac;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static org.junit.Assert.fail;
import android.content.Context; import android.content.Context;
import android.net.Uri; import android.net.Uri;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import android.test.InstrumentationTestCase; import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.extractor.DefaultExtractorInput; import com.google.android.exoplayer2.extractor.DefaultExtractorInput;
import com.google.android.exoplayer2.extractor.Extractor; import com.google.android.exoplayer2.extractor.Extractor;
...@@ -38,9 +40,12 @@ import com.google.android.exoplayer2.util.Util; ...@@ -38,9 +40,12 @@ import com.google.android.exoplayer2.util.Util;
import java.io.IOException; import java.io.IOException;
import java.util.List; import java.util.List;
import java.util.Random; import java.util.Random;
import org.junit.Before;
import org.junit.runner.RunWith;
/** Seeking tests for {@link FlacExtractor} when the FLAC stream does not have a SEEKTABLE. */ /** Seeking tests for {@link FlacExtractor} when the FLAC stream does not have a SEEKTABLE. */
public final class FlacExtractorSeekTest extends InstrumentationTestCase { @RunWith(AndroidJUnit4.class)
public final class FlacExtractorSeekTest {
private static final String NO_SEEKTABLE_FLAC = "bear_no_seek.flac"; private static final String NO_SEEKTABLE_FLAC = "bear_no_seek.flac";
private static final int DURATION_US = 2_741_000; private static final int DURATION_US = 2_741_000;
...@@ -54,18 +59,18 @@ public final class FlacExtractorSeekTest extends InstrumentationTestCase { ...@@ -54,18 +59,18 @@ public final class FlacExtractorSeekTest extends InstrumentationTestCase {
private PositionHolder positionHolder; private PositionHolder positionHolder;
private long totalInputLength; private long totalInputLength;
@Override @Before
protected void setUp() throws Exception { public void setUp() throws Exception {
super.setUp();
if (!FlacLibrary.isAvailable()) { if (!FlacLibrary.isAvailable()) {
fail("Flac library not available."); fail("Flac library not available.");
} }
expectedOutput = new FakeExtractorOutput(); expectedOutput = new FakeExtractorOutput();
extractAllSamplesFromFileToExpectedOutput(getInstrumentation().getContext(), NO_SEEKTABLE_FLAC); extractAllSamplesFromFileToExpectedOutput(
ApplicationProvider.getApplicationContext(), NO_SEEKTABLE_FLAC);
expectedTrackOutput = expectedOutput.trackOutputs.get(0); expectedTrackOutput = expectedOutput.trackOutputs.get(0);
dataSource = dataSource =
new DefaultDataSourceFactory(getInstrumentation().getContext(), "UserAgent") new DefaultDataSourceFactory(ApplicationProvider.getApplicationContext(), "UserAgent")
.createDataSource(); .createDataSource();
totalInputLength = readInputLength(); totalInputLength = readInputLength();
positionHolder = new PositionHolder(); positionHolder = new PositionHolder();
......
extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacExtractorTest.java
...@@ -15,17 +15,20 @@ ...@@ -15,17 +15,20 @@
*/ */
package com.google.android.exoplayer2.ext.flac; package com.google.android.exoplayer2.ext.flac;
import android.test.InstrumentationTestCase; import static org.junit.Assert.fail;
import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.testutil.ExtractorAsserts; import com.google.android.exoplayer2.testutil.ExtractorAsserts;
import org.junit.Before;
import org.junit.runner.RunWith;
/** /** Unit test for {@link FlacExtractor}. */
* Unit test for {@link FlacExtractor}. @RunWith(AndroidJUnit4.class)
*/ public class FlacExtractorTest {
public class FlacExtractorTest extends InstrumentationTestCase {
@Override @Before
protected void setUp() throws Exception { public void setUp() throws Exception {
super.setUp();
if (!FlacLibrary.isAvailable()) { if (!FlacLibrary.isAvailable()) {
fail("Flac library not available."); fail("Flac library not available.");
} }
...@@ -33,11 +36,11 @@ public class FlacExtractorTest extends InstrumentationTestCase { ...@@ -33,11 +36,11 @@ public class FlacExtractorTest extends InstrumentationTestCase {
public void testExtractFlacSample() throws Exception { public void testExtractFlacSample() throws Exception {
ExtractorAsserts.assertBehavior( ExtractorAsserts.assertBehavior(
FlacExtractor::new, "bear.flac", getInstrumentation().getContext()); FlacExtractor::new, "bear.flac", ApplicationProvider.getApplicationContext());
} }
public void testExtractFlacSampleWithId3Header() throws Exception { public void testExtractFlacSampleWithId3Header() throws Exception {
ExtractorAsserts.assertBehavior( ExtractorAsserts.assertBehavior(
FlacExtractor::new, "bear_with_id3.flac", getInstrumentation().getContext()); FlacExtractor::new, "bear_with_id3.flac", ApplicationProvider.getApplicationContext());
} }
} }
extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacPlaybackTest.java
...@@ -15,13 +15,13 @@ ...@@ -15,13 +15,13 @@
*/ */
package com.google.android.exoplayer2.ext.flac; package com.google.android.exoplayer2.ext.flac;
import static androidx.test.InstrumentationRegistry.getContext;
import static org.junit.Assert.fail; import static org.junit.Assert.fail;
import android.content.Context; import android.content.Context;
import android.net.Uri; import android.net.Uri;
import android.os.Looper; import android.os.Looper;
import androidx.test.runner.AndroidJUnit4; import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.ExoPlaybackException; import com.google.android.exoplayer2.ExoPlaybackException;
import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.ExoPlayer;
import com.google.android.exoplayer2.ExoPlayerFactory; import com.google.android.exoplayer2.ExoPlayerFactory;
...@@ -56,7 +56,7 @@ public class FlacPlaybackTest { ...@@ -56,7 +56,7 @@ public class FlacPlaybackTest {
private void playUri(String uri) throws Exception { private void playUri(String uri) throws Exception {
TestPlaybackRunnable testPlaybackRunnable = TestPlaybackRunnable testPlaybackRunnable =
new TestPlaybackRunnable(Uri.parse(uri), getContext()); new TestPlaybackRunnable(Uri.parse(uri), ApplicationProvider.getApplicationContext());
Thread thread = new Thread(testPlaybackRunnable); Thread thread = new Thread(testPlaybackRunnable);
thread.start(); thread.start();
thread.join(); thread.join();
......
extensions/flac/src/test/java/com/google/android/exoplayer2/ext/flac/DefaultExtractorsFactoryTest.java
...@@ -17,6 +17,7 @@ package com.google.android.exoplayer2.ext.flac; ...@@ -17,6 +17,7 @@ package com.google.android.exoplayer2.ext.flac;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.extractor.DefaultExtractorsFactory; import com.google.android.exoplayer2.extractor.DefaultExtractorsFactory;
import com.google.android.exoplayer2.extractor.Extractor; import com.google.android.exoplayer2.extractor.Extractor;
import com.google.android.exoplayer2.extractor.amr.AmrExtractor; import com.google.android.exoplayer2.extractor.amr.AmrExtractor;
...@@ -35,10 +36,9 @@ import java.util.ArrayList; ...@@ -35,10 +36,9 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
/** Unit test for {@link DefaultExtractorsFactory}. */ /** Unit test for {@link DefaultExtractorsFactory}. */
@RunWith(RobolectricTestRunner.class) @RunWith(AndroidJUnit4.class)
public final class DefaultExtractorsFactoryTest { public final class DefaultExtractorsFactoryTest {
@Test @Test
......
extensions/flac/src/test/java/com/google/android/exoplayer2/ext/flac/DefaultRenderersFactoryTest.java
...@@ -15,14 +15,14 @@ ...@@ -15,14 +15,14 @@
*/ */
package com.google.android.exoplayer2.ext.flac; package com.google.android.exoplayer2.ext.flac;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.testutil.DefaultRenderersFactoryAsserts; import com.google.android.exoplayer2.testutil.DefaultRenderersFactoryAsserts;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
/** Unit test for {@link DefaultRenderersFactoryTest} with {@link LibflacAudioRenderer}. */ /** Unit test for {@link DefaultRenderersFactoryTest} with {@link LibflacAudioRenderer}. */
@RunWith(RobolectricTestRunner.class) @RunWith(AndroidJUnit4.class)
public final class DefaultRenderersFactoryTest { public final class DefaultRenderersFactoryTest {
@Test @Test
......
extensions/ima/build.gradle
...@@ -35,10 +35,6 @@ dependencies { ...@@ -35,10 +35,6 @@ dependencies {
api 'com.google.ads.interactivemedia.v3:interactivemedia:3.10.6' api 'com.google.ads.interactivemedia.v3:interactivemedia:3.10.6'
implementation project(modulePrefix + 'library-core') implementation project(modulePrefix + 'library-core')
implementation 'com.google.android.gms:play-services-ads:17.1.3' implementation 'com.google.android.gms:play-services-ads:17.1.3'
testImplementation 'com.google.truth:truth:' + truthVersion
testImplementation 'junit:junit:' + junitVersion
testImplementation 'org.mockito:mockito-core:' + mockitoVersion
testImplementation 'org.robolectric:robolectric:' + robolectricVersion
testImplementation project(modulePrefix + 'testutils-robolectric') testImplementation project(modulePrefix + 'testutils-robolectric')
} }
......
extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoaderTest.java
...@@ -26,6 +26,8 @@ import androidx.annotation.Nullable; ...@@ -26,6 +26,8 @@ import androidx.annotation.Nullable;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.FrameLayout; import android.widget.FrameLayout;
import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.ads.interactivemedia.v3.api.Ad; import com.google.ads.interactivemedia.v3.api.Ad;
import com.google.ads.interactivemedia.v3.api.AdDisplayContainer; import com.google.ads.interactivemedia.v3.api.AdDisplayContainer;
import com.google.ads.interactivemedia.v3.api.AdEvent; import com.google.ads.interactivemedia.v3.api.AdEvent;
...@@ -54,11 +56,9 @@ import org.junit.runner.RunWith; ...@@ -54,11 +56,9 @@ import org.junit.runner.RunWith;
import org.mockito.InOrder; import org.mockito.InOrder;
import org.mockito.Mock; import org.mockito.Mock;
import org.mockito.MockitoAnnotations; import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
/** Test for {@link ImaAdsLoader}. */ /** Test for {@link ImaAdsLoader}. */
@RunWith(RobolectricTestRunner.class) @RunWith(AndroidJUnit4.class)
public class ImaAdsLoaderTest { public class ImaAdsLoaderTest {
private static final long CONTENT_DURATION_US = 10 * C.MICROS_PER_SECOND; private static final long CONTENT_DURATION_US = 10 * C.MICROS_PER_SECOND;
...@@ -95,8 +95,8 @@ public class ImaAdsLoaderTest { ...@@ -95,8 +95,8 @@ public class ImaAdsLoaderTest {
adDisplayContainer, adDisplayContainer,
fakeAdsRequest, fakeAdsRequest,
fakeAdsLoader); fakeAdsLoader);
adViewGroup = new FrameLayout(RuntimeEnvironment.application); adViewGroup = new FrameLayout(ApplicationProvider.getApplicationContext());
adOverlayView = new View(RuntimeEnvironment.application); adOverlayView = new View(ApplicationProvider.getApplicationContext());
adViewProvider = adViewProvider =
new AdsLoader.AdViewProvider() { new AdsLoader.AdViewProvider() {
@Override @Override
...@@ -237,7 +237,7 @@ public class ImaAdsLoaderTest { ...@@ -237,7 +237,7 @@ public class ImaAdsLoaderTest {
adsLoaderListener = new TestAdsLoaderListener(fakeExoPlayer, contentTimeline, adDurationsUs); adsLoaderListener = new TestAdsLoaderListener(fakeExoPlayer, contentTimeline, adDurationsUs);
when(adsManager.getAdCuePoints()).thenReturn(Arrays.asList(cuePoints)); when(adsManager.getAdCuePoints()).thenReturn(Arrays.asList(cuePoints));
imaAdsLoader = imaAdsLoader =
new ImaAdsLoader.Builder(RuntimeEnvironment.application) new ImaAdsLoader.Builder(ApplicationProvider.getApplicationContext())
.setImaFactory(testImaFactory) .setImaFactory(testImaFactory)
.setImaSdkSettings(imaSdkSettings) .setImaSdkSettings(imaSdkSettings)
.buildForAdTag(TEST_URI); .buildForAdTag(TEST_URI);
......
extensions/opus/build.gradle
...@@ -40,8 +40,8 @@ android { ...@@ -40,8 +40,8 @@ android {
dependencies { dependencies {
implementation project(modulePrefix + 'library-core') implementation project(modulePrefix + 'library-core')
testImplementation project(modulePrefix + 'testutils-robolectric') testImplementation project(modulePrefix + 'testutils-robolectric')
testImplementation 'junit:junit:' + junitVersion androidTestImplementation 'androidx.test:runner:' + androidXTestVersion
androidTestImplementation 'androidx.test:runner:' + testRunnerVersion androidTestImplementation 'androidx.test.ext:junit:' + androidXTestVersion
} }
ext { ext {
......
extensions/opus/src/androidTest/AndroidManifest.xml
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
package="com.google.android.exoplayer2.ext.opus.test"> package="com.google.android.exoplayer2.ext.opus.test">
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-sdk/>
<application android:debuggable="true" <application android:debuggable="true"
android:allowBackup="false" android:allowBackup="false"
......
extensions/opus/src/androidTest/java/com/google/android/exoplayer2/ext/opus/OpusPlaybackTest.java
...@@ -15,13 +15,13 @@ ...@@ -15,13 +15,13 @@
*/ */
package com.google.android.exoplayer2.ext.opus; package com.google.android.exoplayer2.ext.opus;
import static androidx.test.InstrumentationRegistry.getContext;
import static org.junit.Assert.fail; import static org.junit.Assert.fail;
import android.content.Context; import android.content.Context;
import android.net.Uri; import android.net.Uri;
import android.os.Looper; import android.os.Looper;
import androidx.test.runner.AndroidJUnit4; import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.ExoPlaybackException; import com.google.android.exoplayer2.ExoPlaybackException;
import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.ExoPlayer;
import com.google.android.exoplayer2.ExoPlayerFactory; import com.google.android.exoplayer2.ExoPlayerFactory;
...@@ -56,7 +56,7 @@ public class OpusPlaybackTest { ...@@ -56,7 +56,7 @@ public class OpusPlaybackTest {
private void playUri(String uri) throws Exception { private void playUri(String uri) throws Exception {
TestPlaybackRunnable testPlaybackRunnable = TestPlaybackRunnable testPlaybackRunnable =
new TestPlaybackRunnable(Uri.parse(uri), getContext()); new TestPlaybackRunnable(Uri.parse(uri), ApplicationProvider.getApplicationContext());
Thread thread = new Thread(testPlaybackRunnable); Thread thread = new Thread(testPlaybackRunnable);
thread.start(); thread.start();
thread.join(); thread.join();
......
extensions/opus/src/test/java/com/google/android/exoplayer2/ext/opus/DefaultRenderersFactoryTest.java
...@@ -15,14 +15,14 @@ ...@@ -15,14 +15,14 @@
*/ */
package com.google.android.exoplayer2.ext.opus; package com.google.android.exoplayer2.ext.opus;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.testutil.DefaultRenderersFactoryAsserts; import com.google.android.exoplayer2.testutil.DefaultRenderersFactoryAsserts;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
/** Unit test for {@link DefaultRenderersFactoryTest} with {@link LibopusAudioRenderer}. */ /** Unit test for {@link DefaultRenderersFactoryTest} with {@link LibopusAudioRenderer}. */
@RunWith(RobolectricTestRunner.class) @RunWith(AndroidJUnit4.class)
public final class DefaultRenderersFactoryTest { public final class DefaultRenderersFactoryTest {
@Test @Test
......
extensions/rtmp/build.gradle
...@@ -34,8 +34,7 @@ dependencies { ...@@ -34,8 +34,7 @@ dependencies {
implementation project(modulePrefix + 'library-core') implementation project(modulePrefix + 'library-core')
implementation 'net.butterflytv.utils:rtmp-client:3.0.1' implementation 'net.butterflytv.utils:rtmp-client:3.0.1'
implementation 'androidx.annotation:annotation:1.0.1' implementation 'androidx.annotation:annotation:1.0.1'
testImplementation 'junit:junit:' + junitVersion testImplementation project(modulePrefix + 'testutils-robolectric')
testImplementation 'org.robolectric:robolectric:' + robolectricVersion
} }
ext { ext {
......
extensions/rtmp/src/test/java/com/google/android/exoplayer2/ext/rtmp/DefaultDataSourceTest.java
...@@ -16,23 +16,25 @@ ...@@ -16,23 +16,25 @@
package com.google.android.exoplayer2.ext.rtmp; package com.google.android.exoplayer2.ext.rtmp;
import android.net.Uri; import android.net.Uri;
import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.upstream.DataSpec; import com.google.android.exoplayer2.upstream.DataSpec;
import com.google.android.exoplayer2.upstream.DefaultDataSource; import com.google.android.exoplayer2.upstream.DefaultDataSource;
import java.io.IOException; import java.io.IOException;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
/** Unit test for {@link DefaultDataSource} with RTMP URIs. */ /** Unit test for {@link DefaultDataSource} with RTMP URIs. */
@RunWith(RobolectricTestRunner.class) @RunWith(AndroidJUnit4.class)
public final class DefaultDataSourceTest { public final class DefaultDataSourceTest {
@Test @Test
public void openRtmpDataSpec_instantiatesRtmpDataSourceViaReflection() throws IOException { public void openRtmpDataSpec_instantiatesRtmpDataSourceViaReflection() throws IOException {
DefaultDataSource dataSource = DefaultDataSource dataSource =
new DefaultDataSource( new DefaultDataSource(
RuntimeEnvironment.application, "userAgent", /* allowCrossProtocolRedirects= */ false); ApplicationProvider.getApplicationContext(),
"userAgent",
/* allowCrossProtocolRedirects= */ false);
DataSpec dataSpec = new DataSpec(Uri.parse("rtmp://test.com/stream")); DataSpec dataSpec = new DataSpec(Uri.parse("rtmp://test.com/stream"));
try { try {
dataSource.open(dataSpec); dataSource.open(dataSpec);
......
extensions/vp9/build.gradle
...@@ -41,9 +41,9 @@ dependencies { ...@@ -41,9 +41,9 @@ dependencies {
implementation project(modulePrefix + 'library-core') implementation project(modulePrefix + 'library-core')
implementation 'androidx.annotation:annotation:1.0.1' implementation 'androidx.annotation:annotation:1.0.1'
testImplementation project(modulePrefix + 'testutils-robolectric') testImplementation project(modulePrefix + 'testutils-robolectric')
testImplementation 'junit:junit:' + junitVersion androidTestImplementation 'androidx.test:runner:' + androidXTestVersion
androidTestImplementation 'androidx.test:runner:' + testRunnerVersion androidTestImplementation 'androidx.test.ext:junit:' + androidXTestVersion
androidTestImplementation 'com.google.truth:truth:' + truthVersion androidTestImplementation 'androidx.test.ext:truth:' + androidXTestVersion
} }
ext { ext {
......
extensions/vp9/src/androidTest/AndroidManifest.xml
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
package="com.google.android.exoplayer2.ext.vp9.test"> package="com.google.android.exoplayer2.ext.vp9.test">
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-sdk/>
<application android:debuggable="true" <application android:debuggable="true"
android:allowBackup="false" android:allowBackup="false"
......
extensions/vp9/src/androidTest/java/com/google/android/exoplayer2/ext/vp9/VpxPlaybackTest.java
...@@ -15,14 +15,14 @@ ...@@ -15,14 +15,14 @@
*/ */
package com.google.android.exoplayer2.ext.vp9; package com.google.android.exoplayer2.ext.vp9;
import static androidx.test.InstrumentationRegistry.getContext;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static org.junit.Assert.fail; import static org.junit.Assert.fail;
import android.content.Context; import android.content.Context;
import android.net.Uri; import android.net.Uri;
import android.os.Looper; import android.os.Looper;
import androidx.test.runner.AndroidJUnit4; import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.ExoPlaybackException; import com.google.android.exoplayer2.ExoPlaybackException;
import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.ExoPlayer;
import com.google.android.exoplayer2.ExoPlayerFactory; import com.google.android.exoplayer2.ExoPlayerFactory;
...@@ -89,7 +89,7 @@ public class VpxPlaybackTest { ...@@ -89,7 +89,7 @@ public class VpxPlaybackTest {
private void playUri(String uri) throws Exception { private void playUri(String uri) throws Exception {
TestPlaybackRunnable testPlaybackRunnable = TestPlaybackRunnable testPlaybackRunnable =
new TestPlaybackRunnable(Uri.parse(uri), getContext()); new TestPlaybackRunnable(Uri.parse(uri), ApplicationProvider.getApplicationContext());
Thread thread = new Thread(testPlaybackRunnable); Thread thread = new Thread(testPlaybackRunnable);
thread.start(); thread.start();
thread.join(); thread.join();
......
extensions/vp9/src/test/java/com/google/android/exoplayer2/ext/vp9/DefaultRenderersFactoryTest.java
...@@ -15,14 +15,14 @@ ...@@ -15,14 +15,14 @@
*/ */
package com.google.android.exoplayer2.ext.vp9; package com.google.android.exoplayer2.ext.vp9;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.testutil.DefaultRenderersFactoryAsserts; import com.google.android.exoplayer2.testutil.DefaultRenderersFactoryAsserts;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
/** Unit test for {@link DefaultRenderersFactoryTest} with {@link LibvpxVideoRenderer}. */ /** Unit test for {@link DefaultRenderersFactoryTest} with {@link LibvpxVideoRenderer}. */
@RunWith(RobolectricTestRunner.class) @RunWith(AndroidJUnit4.class)
public final class DefaultRenderersFactoryTest { public final class DefaultRenderersFactoryTest {
@Test @Test
......
library/core/build.gradle
...@@ -61,15 +61,17 @@ dependencies { ...@@ -61,15 +61,17 @@ dependencies {
implementation 'androidx.annotation:annotation:1.0.1' implementation 'androidx.annotation:annotation:1.0.1'
compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
compileOnly 'org.checkerframework:checker-compat-qual:' + checkerframeworkVersion compileOnly 'org.checkerframework:checker-compat-qual:' + checkerframeworkVersion
androidTestImplementation 'androidx.test:runner:' + testRunnerVersion androidTestImplementation 'androidx.test:runner:' + androidXTestVersion
androidTestImplementation 'androidx.test.ext:junit:' + 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.google.dexmaker:dexmaker:' + dexmakerVersion androidTestImplementation 'com.google.dexmaker:dexmaker:' + dexmakerVersion
androidTestImplementation 'com.google.dexmaker:dexmaker-mockito:' + dexmakerVersion androidTestImplementation 'com.google.dexmaker:dexmaker-mockito:' + dexmakerVersion
androidTestImplementation 'com.google.truth:truth:' + truthVersion
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 'com.google.truth:truth:' + truthVersion testImplementation 'androidx.test:core:' + androidXTestVersion
testImplementation 'junit:junit:' + junitVersion testImplementation 'androidx.test.ext:junit:' + androidXTestVersion
testImplementation 'androidx.test.ext:truth:' + androidXTestVersion
testImplementation 'org.mockito:mockito-core:' + mockitoVersion testImplementation 'org.mockito:mockito-core:' + mockitoVersion
testImplementation 'org.robolectric:robolectric:' + robolectricVersion testImplementation 'org.robolectric:robolectric:' + robolectricVersion
testImplementation 'com.google.auto.value:auto-value-annotations:' + autoValueVersion testImplementation 'com.google.auto.value:auto-value-annotations:' + autoValueVersion
......
library/core/src/androidTest/AndroidManifest.xml
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
package="com.google.android.exoplayer2.core.test"> package="com.google.android.exoplayer2.core.test">
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-sdk/>
<application android:debuggable="true" <application android:debuggable="true"
android:allowBackup="false" android:allowBackup="false"
......
library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/ContentDataSourceTest.java
...@@ -29,7 +29,7 @@ import android.os.ParcelFileDescriptor; ...@@ -29,7 +29,7 @@ import android.os.ParcelFileDescriptor;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.test.InstrumentationRegistry; import androidx.test.InstrumentationRegistry;
import androidx.test.runner.AndroidJUnit4; import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.testutil.TestUtil; import com.google.android.exoplayer2.testutil.TestUtil;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
......
library/core/src/test/java/com/google/android/exoplayer2/CTest.java
...@@ -19,14 +19,12 @@ import static com.google.common.truth.Truth.assertThat; ...@@ -19,14 +19,12 @@ import static com.google.common.truth.Truth.assertThat;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.media.MediaCodec; import android.media.MediaCodec;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
/** /** Unit test for {@link C}. */
* Unit test for {@link C}. @RunWith(AndroidJUnit4.class)
*/
@RunWith(RobolectricTestRunner.class)
public class CTest { public class CTest {
@SuppressLint("InlinedApi") @SuppressLint("InlinedApi")
......
library/core/src/test/java/com/google/android/exoplayer2/DefaultLoadControlTest.java
...@@ -17,15 +17,15 @@ package com.google.android.exoplayer2; ...@@ -17,15 +17,15 @@ package com.google.android.exoplayer2;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.DefaultLoadControl.Builder; import com.google.android.exoplayer2.DefaultLoadControl.Builder;
import com.google.android.exoplayer2.upstream.DefaultAllocator; import com.google.android.exoplayer2.upstream.DefaultAllocator;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
/** Unit tests for {@link DefaultLoadControl}. */ /** Unit tests for {@link DefaultLoadControl}. */
@RunWith(RobolectricTestRunner.class) @RunWith(AndroidJUnit4.class)
public class DefaultLoadControlTest { public class DefaultLoadControlTest {
private static final float SPEED = 1f; private static final float SPEED = 1f;
......
library/core/src/test/java/com/google/android/exoplayer2/DefaultMediaClockTest.java
...@@ -22,6 +22,7 @@ import static org.mockito.Mockito.verify; ...@@ -22,6 +22,7 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.MockitoAnnotations.initMocks; import static org.mockito.MockitoAnnotations.initMocks;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.DefaultMediaClock.PlaybackParameterListener; import com.google.android.exoplayer2.DefaultMediaClock.PlaybackParameterListener;
import com.google.android.exoplayer2.testutil.FakeClock; import com.google.android.exoplayer2.testutil.FakeClock;
import com.google.android.exoplayer2.testutil.FakeMediaClockRenderer; import com.google.android.exoplayer2.testutil.FakeMediaClockRenderer;
...@@ -29,12 +30,9 @@ import org.junit.Before; ...@@ -29,12 +30,9 @@ import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.Mock; import org.mockito.Mock;
import org.robolectric.RobolectricTestRunner;
/** /** Unit test for {@link DefaultMediaClock}. */
* Unit test for {@link DefaultMediaClock}. @RunWith(AndroidJUnit4.class)
*/
@RunWith(RobolectricTestRunner.class)
public class DefaultMediaClockTest { public class DefaultMediaClockTest {
private static final long TEST_POSITION_US = 123456789012345678L; private static final long TEST_POSITION_US = 123456789012345678L;
......
library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java
...@@ -22,6 +22,8 @@ import android.content.Context; ...@@ -22,6 +22,8 @@ import android.content.Context;
import android.graphics.SurfaceTexture; import android.graphics.SurfaceTexture;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import android.view.Surface; import android.view.Surface;
import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.Player.DiscontinuityReason; import com.google.android.exoplayer2.Player.DiscontinuityReason;
import com.google.android.exoplayer2.Player.EventListener; import com.google.android.exoplayer2.Player.EventListener;
import com.google.android.exoplayer2.Timeline.Window; import com.google.android.exoplayer2.Timeline.Window;
...@@ -66,12 +68,10 @@ import java.util.concurrent.atomic.AtomicReference; ...@@ -66,12 +68,10 @@ import java.util.concurrent.atomic.AtomicReference;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config; import org.robolectric.annotation.Config;
/** Unit test for {@link ExoPlayer}. */ /** Unit test for {@link ExoPlayer}. */
@RunWith(RobolectricTestRunner.class) @RunWith(AndroidJUnit4.class)
@Config(shadows = {RobolectricUtil.CustomLooper.class, RobolectricUtil.CustomMessageQueue.class}) @Config(shadows = {RobolectricUtil.CustomLooper.class, RobolectricUtil.CustomMessageQueue.class})
public final class ExoPlayerTest { public final class ExoPlayerTest {
...@@ -86,7 +86,7 @@ public final class ExoPlayerTest { ...@@ -86,7 +86,7 @@ public final class ExoPlayerTest {
@Before @Before
public void setUp() { public void setUp() {
context = RuntimeEnvironment.application; context = ApplicationProvider.getApplicationContext();
} }
/** /**
......
library/core/src/test/java/com/google/android/exoplayer2/FormatTest.java
...@@ -21,6 +21,7 @@ import static com.google.android.exoplayer2.util.MimeTypes.VIDEO_WEBM; ...@@ -21,6 +21,7 @@ import static com.google.android.exoplayer2.util.MimeTypes.VIDEO_WEBM;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import android.os.Parcel; import android.os.Parcel;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.drm.DrmInitData; import com.google.android.exoplayer2.drm.DrmInitData;
import com.google.android.exoplayer2.metadata.Metadata; import com.google.android.exoplayer2.metadata.Metadata;
import com.google.android.exoplayer2.metadata.id3.TextInformationFrame; import com.google.android.exoplayer2.metadata.id3.TextInformationFrame;
...@@ -32,12 +33,9 @@ import java.util.Collections; ...@@ -32,12 +33,9 @@ import java.util.Collections;
import java.util.List; import java.util.List;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
/** /** Unit test for {@link Format}. */
* Unit test for {@link Format}. @RunWith(AndroidJUnit4.class)
*/
@RunWith(RobolectricTestRunner.class)
public final class FormatTest { public final class FormatTest {
private static final List<byte[]> INIT_DATA; private static final List<byte[]> INIT_DATA;
......
library/core/src/test/java/com/google/android/exoplayer2/MediaPeriodQueueTest.java
...@@ -20,6 +20,7 @@ import static org.junit.Assert.assertNull; ...@@ -20,6 +20,7 @@ import static org.junit.Assert.assertNull;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import android.net.Uri; import android.net.Uri;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.source.MediaSource; import com.google.android.exoplayer2.source.MediaSource;
import com.google.android.exoplayer2.source.MediaSource.MediaPeriodId; import com.google.android.exoplayer2.source.MediaSource.MediaPeriodId;
import com.google.android.exoplayer2.source.SinglePeriodTimeline; import com.google.android.exoplayer2.source.SinglePeriodTimeline;
...@@ -30,10 +31,9 @@ import com.google.android.exoplayer2.upstream.Allocator; ...@@ -30,10 +31,9 @@ import com.google.android.exoplayer2.upstream.Allocator;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
/** Unit tests for {@link MediaPeriodQueue}. */ /** Unit tests for {@link MediaPeriodQueue}. */
@RunWith(RobolectricTestRunner.class) @RunWith(AndroidJUnit4.class)
public final class MediaPeriodQueueTest { public final class MediaPeriodQueueTest {
private static final long CONTENT_DURATION_US = 30 * C.MICROS_PER_SECOND; private static final long CONTENT_DURATION_US = 30 * C.MICROS_PER_SECOND;
......
library/core/src/test/java/com/google/android/exoplayer2/TimelineTest.java
...@@ -15,15 +15,15 @@ ...@@ -15,15 +15,15 @@
*/ */
package com.google.android.exoplayer2; package com.google.android.exoplayer2;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.testutil.FakeTimeline; import com.google.android.exoplayer2.testutil.FakeTimeline;
import com.google.android.exoplayer2.testutil.FakeTimeline.TimelineWindowDefinition; import com.google.android.exoplayer2.testutil.FakeTimeline.TimelineWindowDefinition;
import com.google.android.exoplayer2.testutil.TimelineAsserts; import com.google.android.exoplayer2.testutil.TimelineAsserts;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
/** Unit test for {@link Timeline}. */ /** Unit test for {@link Timeline}. */
@RunWith(RobolectricTestRunner.class) @RunWith(AndroidJUnit4.class)
public class TimelineTest { public class TimelineTest {
@Test @Test
......
library/core/src/test/java/com/google/android/exoplayer2/analytics/AnalyticsCollectorTest.java
...@@ -21,6 +21,8 @@ import android.os.Handler; ...@@ -21,6 +21,8 @@ import android.os.Handler;
import android.os.SystemClock; import android.os.SystemClock;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import android.view.Surface; import android.view.Surface;
import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.ExoPlaybackException; import com.google.android.exoplayer2.ExoPlaybackException;
import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.Format;
import com.google.android.exoplayer2.PlaybackParameters; import com.google.android.exoplayer2.PlaybackParameters;
...@@ -56,12 +58,10 @@ import java.util.Iterator; ...@@ -56,12 +58,10 @@ import java.util.Iterator;
import java.util.List; import java.util.List;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config; import org.robolectric.annotation.Config;
/** Integration test for {@link AnalyticsCollector}. */ /** Integration test for {@link AnalyticsCollector}. */
@RunWith(RobolectricTestRunner.class) @RunWith(AndroidJUnit4.class)
@Config(shadows = {RobolectricUtil.CustomLooper.class, RobolectricUtil.CustomMessageQueue.class}) @Config(shadows = {RobolectricUtil.CustomLooper.class, RobolectricUtil.CustomMessageQueue.class})
public final class AnalyticsCollectorTest { public final class AnalyticsCollectorTest {
...@@ -727,7 +727,7 @@ public final class AnalyticsCollectorTest { ...@@ -727,7 +727,7 @@ public final class AnalyticsCollectorTest {
.setRenderersFactory(renderersFactory) .setRenderersFactory(renderersFactory)
.setAnalyticsListener(listener) .setAnalyticsListener(listener)
.setActionSchedule(actionSchedule) .setActionSchedule(actionSchedule)
.build(RuntimeEnvironment.application) .build(ApplicationProvider.getApplicationContext())
.start() .start()
.blockUntilActionScheduleFinished(TIMEOUT_MS) .blockUntilActionScheduleFinished(TIMEOUT_MS)
.blockUntilEnded(TIMEOUT_MS); .blockUntilEnded(TIMEOUT_MS);
......
library/core/src/test/java/com/google/android/exoplayer2/audio/Ac3UtilTest.java
...@@ -17,13 +17,13 @@ package com.google.android.exoplayer2.audio; ...@@ -17,13 +17,13 @@ package com.google.android.exoplayer2.audio;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.util.Util;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
/** Unit tests for {@link Ac3Util}. */ /** Unit tests for {@link Ac3Util}. */
@RunWith(RobolectricTestRunner.class) @RunWith(AndroidJUnit4.class)
public final class Ac3UtilTest { public final class Ac3UtilTest {
private static final int TRUEHD_SYNCFRAME_SAMPLE_COUNT = 40; private static final int TRUEHD_SYNCFRAME_SAMPLE_COUNT = 40;
......
library/core/src/test/java/com/google/android/exoplayer2/audio/AudioFocusManagerTest.java
...@@ -24,20 +24,20 @@ import static org.junit.Assert.fail; ...@@ -24,20 +24,20 @@ import static org.junit.Assert.fail;
import android.content.Context; import android.content.Context;
import android.media.AudioFocusRequest; import android.media.AudioFocusRequest;
import android.media.AudioManager; import android.media.AudioManager;
import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.Player; import com.google.android.exoplayer2.Player;
import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.util.Util;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.Shadows; import org.robolectric.Shadows;
import org.robolectric.annotation.Config; import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowAudioManager; import org.robolectric.shadows.ShadowAudioManager;
/** Unit tests for {@link AudioFocusManager}. */ /** Unit tests for {@link AudioFocusManager}. */
@RunWith(RobolectricTestRunner.class) @RunWith(AndroidJUnit4.class)
public class AudioFocusManagerTest { public class AudioFocusManagerTest {
private static final int NO_COMMAND_RECEIVED = ~PLAYER_COMMAND_WAIT_FOR_CALLBACK; private static final int NO_COMMAND_RECEIVED = ~PLAYER_COMMAND_WAIT_FOR_CALLBACK;
...@@ -49,10 +49,12 @@ public class AudioFocusManagerTest { ...@@ -49,10 +49,12 @@ public class AudioFocusManagerTest {
@Before @Before
public void setUp() { public void setUp() {
audioManager = audioManager =
(AudioManager) RuntimeEnvironment.application.getSystemService(Context.AUDIO_SERVICE); (AudioManager)
ApplicationProvider.getApplicationContext().getSystemService(Context.AUDIO_SERVICE);
testPlayerControl = new TestPlayerControl(); testPlayerControl = new TestPlayerControl();
audioFocusManager = new AudioFocusManager(RuntimeEnvironment.application, testPlayerControl); audioFocusManager =
new AudioFocusManager(ApplicationProvider.getApplicationContext(), testPlayerControl);
} }
@Test @Test
......
library/core/src/test/java/com/google/android/exoplayer2/audio/DefaultAudioSinkTest.java
...@@ -19,6 +19,7 @@ import static com.google.common.truth.Truth.assertThat; ...@@ -19,6 +19,7 @@ import static com.google.common.truth.Truth.assertThat;
import static org.robolectric.annotation.Config.NEWEST_SDK; import static org.robolectric.annotation.Config.NEWEST_SDK;
import static org.robolectric.annotation.Config.OLDEST_SDK; import static org.robolectric.annotation.Config.OLDEST_SDK;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.PlaybackParameters; import com.google.android.exoplayer2.PlaybackParameters;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
...@@ -27,7 +28,6 @@ import java.util.Arrays; ...@@ -27,7 +28,6 @@ import java.util.Arrays;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.annotation.Config; import org.robolectric.annotation.Config;
/** /**
...@@ -42,7 +42,7 @@ import org.robolectric.annotation.Config; ...@@ -42,7 +42,7 @@ import org.robolectric.annotation.Config;
* draining to the end of the stream. This could be worked around by having a test-only mode where * draining to the end of the stream. This could be worked around by having a test-only mode where
* {@link DefaultAudioSink} automatically treats audio as consumed. * {@link DefaultAudioSink} automatically treats audio as consumed.
*/ */
@RunWith(RobolectricTestRunner.class) @RunWith(AndroidJUnit4.class)
public final class DefaultAudioSinkTest { public final class DefaultAudioSinkTest {
private static final int CHANNEL_COUNT_MONO = 1; private static final int CHANNEL_COUNT_MONO = 1;
......
library/core/src/test/java/com/google/android/exoplayer2/audio/SilenceSkippingAudioProcessorTest.java
...@@ -17,6 +17,7 @@ package com.google.android.exoplayer2.audio; ...@@ -17,6 +17,7 @@ package com.google.android.exoplayer2.audio;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.audio.AudioProcessor.UnhandledFormatException; import com.google.android.exoplayer2.audio.AudioProcessor.UnhandledFormatException;
import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.Assertions;
...@@ -26,10 +27,9 @@ import java.nio.ShortBuffer; ...@@ -26,10 +27,9 @@ import java.nio.ShortBuffer;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
/** Unit tests for {@link SilenceSkippingAudioProcessor}. */ /** Unit tests for {@link SilenceSkippingAudioProcessor}. */
@RunWith(RobolectricTestRunner.class) @RunWith(AndroidJUnit4.class)
public final class SilenceSkippingAudioProcessorTest { public final class SilenceSkippingAudioProcessorTest {
private static final int TEST_SIGNAL_SAMPLE_RATE_HZ = 1000; private static final int TEST_SIGNAL_SAMPLE_RATE_HZ = 1000;
......
library/core/src/test/java/com/google/android/exoplayer2/audio/SimpleDecoderAudioRendererTest.java
...@@ -24,6 +24,7 @@ import static org.mockito.Mockito.times; ...@@ -24,6 +24,7 @@ import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.Format;
import com.google.android.exoplayer2.RendererConfiguration; import com.google.android.exoplayer2.RendererConfiguration;
...@@ -39,13 +40,10 @@ import org.junit.Test; ...@@ -39,13 +40,10 @@ import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.Mock; import org.mockito.Mock;
import org.mockito.MockitoAnnotations; import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.annotation.Config; import org.robolectric.annotation.Config;
/** /** Unit test for {@link SimpleDecoderAudioRenderer}. */
* Unit test for {@link SimpleDecoderAudioRenderer}. @RunWith(AndroidJUnit4.class)
*/
@RunWith(RobolectricTestRunner.class)
public class SimpleDecoderAudioRendererTest { public class SimpleDecoderAudioRendererTest {
private static final Format FORMAT = Format.createSampleFormat(null, MimeTypes.AUDIO_RAW, 0); private static final Format FORMAT = Format.createSampleFormat(null, MimeTypes.AUDIO_RAW, 0);
......
library/core/src/test/java/com/google/android/exoplayer2/audio/SonicAudioProcessorTest.java
...@@ -18,16 +18,14 @@ package com.google.android.exoplayer2.audio; ...@@ -18,16 +18,14 @@ package com.google.android.exoplayer2.audio;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static org.junit.Assert.fail; import static org.junit.Assert.fail;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
/** /** Unit test for {@link SonicAudioProcessor}. */
* Unit test for {@link SonicAudioProcessor}. @RunWith(AndroidJUnit4.class)
*/
@RunWith(RobolectricTestRunner.class)
public final class SonicAudioProcessorTest { public final class SonicAudioProcessorTest {
private SonicAudioProcessor sonicAudioProcessor; private SonicAudioProcessor sonicAudioProcessor;
......
library/core/src/test/java/com/google/android/exoplayer2/database/VersionTableTest.java
...@@ -18,14 +18,14 @@ package com.google.android.exoplayer2.database; ...@@ -18,14 +18,14 @@ package com.google.android.exoplayer2.database;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteDatabase;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.testutil.TestUtil; import com.google.android.exoplayer2.testutil.TestUtil;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
/** Unit tests for {@link VersionTable}. */ /** Unit tests for {@link VersionTable}. */
@RunWith(RobolectricTestRunner.class) @RunWith(AndroidJUnit4.class)
public class VersionTableTest { public class VersionTableTest {
private static final int FEATURE_1 = 1; private static final int FEATURE_1 = 1;
......
library/core/src/test/java/com/google/android/exoplayer2/drm/ClearKeyUtilTest.java
...@@ -17,16 +17,14 @@ package com.google.android.exoplayer2.drm; ...@@ -17,16 +17,14 @@ package com.google.android.exoplayer2.drm;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.util.Util;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.annotation.Config; import org.robolectric.annotation.Config;
/** /** Unit test for {@link ClearKeyUtil}. */
* Unit test for {@link ClearKeyUtil}. @RunWith(AndroidJUnit4.class)
*/
@RunWith(RobolectricTestRunner.class)
public final class ClearKeyUtilTest { public final class ClearKeyUtilTest {
private static final byte[] SINGLE_KEY_RESPONSE = private static final byte[] SINGLE_KEY_RESPONSE =
......
library/core/src/test/java/com/google/android/exoplayer2/drm/DrmInitDataTest.java
...@@ -22,6 +22,7 @@ import static com.google.android.exoplayer2.util.MimeTypes.VIDEO_MP4; ...@@ -22,6 +22,7 @@ import static com.google.android.exoplayer2.util.MimeTypes.VIDEO_MP4;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import android.os.Parcel; import android.os.Parcel;
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 com.google.android.exoplayer2.testutil.TestUtil; import com.google.android.exoplayer2.testutil.TestUtil;
...@@ -29,12 +30,9 @@ import java.util.ArrayList; ...@@ -29,12 +30,9 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
/** /** Unit test for {@link DrmInitData}. */
* Unit test for {@link DrmInitData}. @RunWith(AndroidJUnit4.class)
*/
@RunWith(RobolectricTestRunner.class)
public class DrmInitDataTest { public class DrmInitDataTest {
private static final SchemeData DATA_1 = new SchemeData(WIDEVINE_UUID, VIDEO_MP4, private static final SchemeData DATA_1 = new SchemeData(WIDEVINE_UUID, VIDEO_MP4,
......
library/core/src/test/java/com/google/android/exoplayer2/drm/OfflineLicenseHelperTest.java
...@@ -21,6 +21,7 @@ import static org.mockito.Matchers.any; ...@@ -21,6 +21,7 @@ import static org.mockito.Matchers.any;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
import android.util.Pair; import android.util.Pair;
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 com.google.android.exoplayer2.testutil.RobolectricUtil; import com.google.android.exoplayer2.testutil.RobolectricUtil;
...@@ -31,11 +32,10 @@ import org.junit.Test; ...@@ -31,11 +32,10 @@ import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.Mock; import org.mockito.Mock;
import org.mockito.MockitoAnnotations; import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.annotation.Config; import org.robolectric.annotation.Config;
/** Tests {@link OfflineLicenseHelper}. */ /** Tests {@link OfflineLicenseHelper}. */
@RunWith(RobolectricTestRunner.class) @RunWith(AndroidJUnit4.class)
@Config(shadows = {RobolectricUtil.CustomLooper.class, RobolectricUtil.CustomMessageQueue.class}) @Config(shadows = {RobolectricUtil.CustomLooper.class, RobolectricUtil.CustomMessageQueue.class})
public class OfflineLicenseHelperTest { public class OfflineLicenseHelperTest {
......
library/core/src/test/java/com/google/android/exoplayer2/extractor/ConstantBitrateSeekMapTest.java
...@@ -18,13 +18,13 @@ package com.google.android.exoplayer2.extractor; ...@@ -18,13 +18,13 @@ package com.google.android.exoplayer2.extractor;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
/** Unit test for {@link ConstantBitrateSeekMap}. */ /** Unit test for {@link ConstantBitrateSeekMap}. */
@RunWith(RobolectricTestRunner.class) @RunWith(AndroidJUnit4.class)
public final class ConstantBitrateSeekMapTest { public final class ConstantBitrateSeekMapTest {
private ConstantBitrateSeekMap constantBitrateSeekMap; private ConstantBitrateSeekMap constantBitrateSeekMap;
......
library/core/src/test/java/com/google/android/exoplayer2/extractor/DefaultExtractorInputTest.java
...@@ -22,6 +22,7 @@ import static java.util.Arrays.copyOfRange; ...@@ -22,6 +22,7 @@ import static java.util.Arrays.copyOfRange;
import static org.junit.Assert.fail; import static org.junit.Assert.fail;
import android.net.Uri; import android.net.Uri;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.testutil.FakeDataSource; import com.google.android.exoplayer2.testutil.FakeDataSource;
import com.google.android.exoplayer2.upstream.DataSpec; import com.google.android.exoplayer2.upstream.DataSpec;
...@@ -30,12 +31,9 @@ import java.io.IOException; ...@@ -30,12 +31,9 @@ import java.io.IOException;
import java.util.Arrays; import java.util.Arrays;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
/** /** Test for {@link DefaultExtractorInput}. */
* Test for {@link DefaultExtractorInput}. @RunWith(AndroidJUnit4.class)
*/
@RunWith(RobolectricTestRunner.class)
public class DefaultExtractorInputTest { public class DefaultExtractorInputTest {
private static final String TEST_URI = "http://www.google.com"; private static final String TEST_URI = "http://www.google.com";
......
library/core/src/test/java/com/google/android/exoplayer2/extractor/DefaultExtractorsFactoryTest.java
...@@ -17,6 +17,7 @@ package com.google.android.exoplayer2.extractor; ...@@ -17,6 +17,7 @@ package com.google.android.exoplayer2.extractor;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.extractor.amr.AmrExtractor; import com.google.android.exoplayer2.extractor.amr.AmrExtractor;
import com.google.android.exoplayer2.extractor.flv.FlvExtractor; import com.google.android.exoplayer2.extractor.flv.FlvExtractor;
import com.google.android.exoplayer2.extractor.mkv.MatroskaExtractor; import com.google.android.exoplayer2.extractor.mkv.MatroskaExtractor;
...@@ -33,10 +34,9 @@ import java.util.ArrayList; ...@@ -33,10 +34,9 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
/** Unit test for {@link DefaultExtractorsFactory}. */ /** Unit test for {@link DefaultExtractorsFactory}. */
@RunWith(RobolectricTestRunner.class) @RunWith(AndroidJUnit4.class)
public final class DefaultExtractorsFactoryTest { public final class DefaultExtractorsFactoryTest {
@Test @Test
......
library/core/src/test/java/com/google/android/exoplayer2/extractor/ExtractorTest.java
...@@ -17,15 +17,13 @@ package com.google.android.exoplayer2.extractor; ...@@ -17,15 +17,13 @@ package com.google.android.exoplayer2.extractor;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
/** /** Unit test for {@link Extractor}. */
* Unit test for {@link Extractor}. @RunWith(AndroidJUnit4.class)
*/
@RunWith(RobolectricTestRunner.class)
public final class ExtractorTest { public final class ExtractorTest {
@Test @Test
......
library/core/src/test/java/com/google/android/exoplayer2/extractor/Id3PeekerTest.java
...@@ -18,6 +18,7 @@ package com.google.android.exoplayer2.extractor; ...@@ -18,6 +18,7 @@ package com.google.android.exoplayer2.extractor;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.metadata.Metadata; import com.google.android.exoplayer2.metadata.Metadata;
import com.google.android.exoplayer2.metadata.id3.ApicFrame; import com.google.android.exoplayer2.metadata.id3.ApicFrame;
import com.google.android.exoplayer2.metadata.id3.CommentFrame; import com.google.android.exoplayer2.metadata.id3.CommentFrame;
...@@ -26,10 +27,9 @@ import com.google.android.exoplayer2.testutil.FakeExtractorInput; ...@@ -26,10 +27,9 @@ import com.google.android.exoplayer2.testutil.FakeExtractorInput;
import java.io.IOException; import java.io.IOException;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
/** Unit test for {@link Id3Peeker}. */ /** Unit test for {@link Id3Peeker}. */
@RunWith(RobolectricTestRunner.class) @RunWith(AndroidJUnit4.class)
public final class Id3PeekerTest { public final class Id3PeekerTest {
@Test @Test
......
library/core/src/test/java/com/google/android/exoplayer2/extractor/amr/AmrExtractorSeekTest.java
...@@ -18,6 +18,8 @@ package com.google.android.exoplayer2.extractor.amr; ...@@ -18,6 +18,8 @@ package com.google.android.exoplayer2.extractor.amr;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import android.net.Uri; import android.net.Uri;
import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.extractor.SeekMap; import com.google.android.exoplayer2.extractor.SeekMap;
import com.google.android.exoplayer2.testutil.FakeExtractorOutput; import com.google.android.exoplayer2.testutil.FakeExtractorOutput;
import com.google.android.exoplayer2.testutil.FakeTrackOutput; import com.google.android.exoplayer2.testutil.FakeTrackOutput;
...@@ -30,11 +32,9 @@ import java.util.Random; ...@@ -30,11 +32,9 @@ import java.util.Random;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
/** Unit test for {@link AmrExtractor}. */ /** Unit test for {@link AmrExtractor}. */
@RunWith(RobolectricTestRunner.class) @RunWith(AndroidJUnit4.class)
public final class AmrExtractorSeekTest { public final class AmrExtractorSeekTest {
private static final Random random = new Random(1234L); private static final Random random = new Random(1234L);
...@@ -51,7 +51,7 @@ public final class AmrExtractorSeekTest { ...@@ -51,7 +51,7 @@ public final class AmrExtractorSeekTest {
@Before @Before
public void setUp() { public void setUp() {
dataSource = dataSource =
new DefaultDataSourceFactory(RuntimeEnvironment.application, "UserAgent") new DefaultDataSourceFactory(ApplicationProvider.getApplicationContext(), "UserAgent")
.createDataSource(); .createDataSource();
} }
...@@ -62,7 +62,7 @@ public final class AmrExtractorSeekTest { ...@@ -62,7 +62,7 @@ public final class AmrExtractorSeekTest {
Uri fileUri = TestUtil.buildAssetUri(fileName); Uri fileUri = TestUtil.buildAssetUri(fileName);
expectedTrackOutput = expectedTrackOutput =
TestUtil.extractAllSamplesFromFile( TestUtil.extractAllSamplesFromFile(
createAmrExtractor(), RuntimeEnvironment.application, fileName) createAmrExtractor(), ApplicationProvider.getApplicationContext(), fileName)
.trackOutputs .trackOutputs
.get(0); .get(0);
...@@ -82,7 +82,7 @@ public final class AmrExtractorSeekTest { ...@@ -82,7 +82,7 @@ public final class AmrExtractorSeekTest {
Uri fileUri = TestUtil.buildAssetUri(fileName); Uri fileUri = TestUtil.buildAssetUri(fileName);
expectedTrackOutput = expectedTrackOutput =
TestUtil.extractAllSamplesFromFile( TestUtil.extractAllSamplesFromFile(
createAmrExtractor(), RuntimeEnvironment.application, fileName) createAmrExtractor(), ApplicationProvider.getApplicationContext(), fileName)
.trackOutputs .trackOutputs
.get(0); .get(0);
...@@ -109,7 +109,7 @@ public final class AmrExtractorSeekTest { ...@@ -109,7 +109,7 @@ public final class AmrExtractorSeekTest {
Uri fileUri = TestUtil.buildAssetUri(fileName); Uri fileUri = TestUtil.buildAssetUri(fileName);
expectedTrackOutput = expectedTrackOutput =
TestUtil.extractAllSamplesFromFile( TestUtil.extractAllSamplesFromFile(
createAmrExtractor(), RuntimeEnvironment.application, fileName) createAmrExtractor(), ApplicationProvider.getApplicationContext(), fileName)
.trackOutputs .trackOutputs
.get(0); .get(0);
AmrExtractor extractor = createAmrExtractor(); AmrExtractor extractor = createAmrExtractor();
...@@ -136,7 +136,7 @@ public final class AmrExtractorSeekTest { ...@@ -136,7 +136,7 @@ public final class AmrExtractorSeekTest {
Uri fileUri = TestUtil.buildAssetUri(fileName); Uri fileUri = TestUtil.buildAssetUri(fileName);
expectedTrackOutput = expectedTrackOutput =
TestUtil.extractAllSamplesFromFile( TestUtil.extractAllSamplesFromFile(
createAmrExtractor(), RuntimeEnvironment.application, fileName) createAmrExtractor(), ApplicationProvider.getApplicationContext(), fileName)
.trackOutputs .trackOutputs
.get(0); .get(0);
AmrExtractor extractor = createAmrExtractor(); AmrExtractor extractor = createAmrExtractor();
...@@ -165,7 +165,7 @@ public final class AmrExtractorSeekTest { ...@@ -165,7 +165,7 @@ public final class AmrExtractorSeekTest {
Uri fileUri = TestUtil.buildAssetUri(fileName); Uri fileUri = TestUtil.buildAssetUri(fileName);
expectedTrackOutput = expectedTrackOutput =
TestUtil.extractAllSamplesFromFile( TestUtil.extractAllSamplesFromFile(
createAmrExtractor(), RuntimeEnvironment.application, fileName) createAmrExtractor(), ApplicationProvider.getApplicationContext(), fileName)
.trackOutputs .trackOutputs
.get(0); .get(0);
AmrExtractor extractor = createAmrExtractor(); AmrExtractor extractor = createAmrExtractor();
...@@ -194,7 +194,7 @@ public final class AmrExtractorSeekTest { ...@@ -194,7 +194,7 @@ public final class AmrExtractorSeekTest {
Uri fileUri = TestUtil.buildAssetUri(fileName); Uri fileUri = TestUtil.buildAssetUri(fileName);
expectedTrackOutput = expectedTrackOutput =
TestUtil.extractAllSamplesFromFile( TestUtil.extractAllSamplesFromFile(
createAmrExtractor(), RuntimeEnvironment.application, fileName) createAmrExtractor(), ApplicationProvider.getApplicationContext(), fileName)
.trackOutputs .trackOutputs
.get(0); .get(0);
AmrExtractor extractor = createAmrExtractor(); AmrExtractor extractor = createAmrExtractor();
...@@ -223,7 +223,7 @@ public final class AmrExtractorSeekTest { ...@@ -223,7 +223,7 @@ public final class AmrExtractorSeekTest {
Uri fileUri = TestUtil.buildAssetUri(fileName); Uri fileUri = TestUtil.buildAssetUri(fileName);
expectedTrackOutput = expectedTrackOutput =
TestUtil.extractAllSamplesFromFile( TestUtil.extractAllSamplesFromFile(
createAmrExtractor(), RuntimeEnvironment.application, fileName) createAmrExtractor(), ApplicationProvider.getApplicationContext(), fileName)
.trackOutputs .trackOutputs
.get(0); .get(0);
...@@ -243,7 +243,7 @@ public final class AmrExtractorSeekTest { ...@@ -243,7 +243,7 @@ public final class AmrExtractorSeekTest {
Uri fileUri = TestUtil.buildAssetUri(fileName); Uri fileUri = TestUtil.buildAssetUri(fileName);
expectedTrackOutput = expectedTrackOutput =
TestUtil.extractAllSamplesFromFile( TestUtil.extractAllSamplesFromFile(
createAmrExtractor(), RuntimeEnvironment.application, fileName) createAmrExtractor(), ApplicationProvider.getApplicationContext(), fileName)
.trackOutputs .trackOutputs
.get(0); .get(0);
...@@ -270,7 +270,7 @@ public final class AmrExtractorSeekTest { ...@@ -270,7 +270,7 @@ public final class AmrExtractorSeekTest {
Uri fileUri = TestUtil.buildAssetUri(fileName); Uri fileUri = TestUtil.buildAssetUri(fileName);
expectedTrackOutput = expectedTrackOutput =
TestUtil.extractAllSamplesFromFile( TestUtil.extractAllSamplesFromFile(
createAmrExtractor(), RuntimeEnvironment.application, fileName) createAmrExtractor(), ApplicationProvider.getApplicationContext(), fileName)
.trackOutputs .trackOutputs
.get(0); .get(0);
AmrExtractor extractor = createAmrExtractor(); AmrExtractor extractor = createAmrExtractor();
...@@ -297,7 +297,7 @@ public final class AmrExtractorSeekTest { ...@@ -297,7 +297,7 @@ public final class AmrExtractorSeekTest {
Uri fileUri = TestUtil.buildAssetUri(fileName); Uri fileUri = TestUtil.buildAssetUri(fileName);
expectedTrackOutput = expectedTrackOutput =
TestUtil.extractAllSamplesFromFile( TestUtil.extractAllSamplesFromFile(
createAmrExtractor(), RuntimeEnvironment.application, fileName) createAmrExtractor(), ApplicationProvider.getApplicationContext(), fileName)
.trackOutputs .trackOutputs
.get(0); .get(0);
AmrExtractor extractor = createAmrExtractor(); AmrExtractor extractor = createAmrExtractor();
...@@ -326,7 +326,7 @@ public final class AmrExtractorSeekTest { ...@@ -326,7 +326,7 @@ public final class AmrExtractorSeekTest {
Uri fileUri = TestUtil.buildAssetUri(fileName); Uri fileUri = TestUtil.buildAssetUri(fileName);
expectedTrackOutput = expectedTrackOutput =
TestUtil.extractAllSamplesFromFile( TestUtil.extractAllSamplesFromFile(
createAmrExtractor(), RuntimeEnvironment.application, fileName) createAmrExtractor(), ApplicationProvider.getApplicationContext(), fileName)
.trackOutputs .trackOutputs
.get(0); .get(0);
AmrExtractor extractor = createAmrExtractor(); AmrExtractor extractor = createAmrExtractor();
...@@ -355,7 +355,7 @@ public final class AmrExtractorSeekTest { ...@@ -355,7 +355,7 @@ public final class AmrExtractorSeekTest {
Uri fileUri = TestUtil.buildAssetUri(fileName); Uri fileUri = TestUtil.buildAssetUri(fileName);
expectedTrackOutput = expectedTrackOutput =
TestUtil.extractAllSamplesFromFile( TestUtil.extractAllSamplesFromFile(
createAmrExtractor(), RuntimeEnvironment.application, fileName) createAmrExtractor(), ApplicationProvider.getApplicationContext(), fileName)
.trackOutputs .trackOutputs
.get(0); .get(0);
AmrExtractor extractor = createAmrExtractor(); AmrExtractor extractor = createAmrExtractor();
......
library/core/src/test/java/com/google/android/exoplayer2/extractor/amr/AmrExtractorTest.java
...@@ -23,6 +23,7 @@ import static com.google.common.truth.Truth.assertThat; ...@@ -23,6 +23,7 @@ import static com.google.common.truth.Truth.assertThat;
import static junit.framework.Assert.fail; import static junit.framework.Assert.fail;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.ParserException; import com.google.android.exoplayer2.ParserException;
import com.google.android.exoplayer2.extractor.Extractor; import com.google.android.exoplayer2.extractor.Extractor;
import com.google.android.exoplayer2.extractor.PositionHolder; import com.google.android.exoplayer2.extractor.PositionHolder;
...@@ -34,10 +35,9 @@ import java.io.IOException; ...@@ -34,10 +35,9 @@ import java.io.IOException;
import java.util.Random; import java.util.Random;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
/** Unit test for {@link AmrExtractor}. */ /** Unit test for {@link AmrExtractor}. */
@RunWith(RobolectricTestRunner.class) @RunWith(AndroidJUnit4.class)
public final class AmrExtractorTest { public final class AmrExtractorTest {
private static final Random RANDOM = new Random(1234); private static final Random RANDOM = new Random(1234);
......
library/core/src/test/java/com/google/android/exoplayer2/extractor/flv/FlvExtractorTest.java
...@@ -15,13 +15,13 @@ ...@@ -15,13 +15,13 @@
*/ */
package com.google.android.exoplayer2.extractor.flv; package com.google.android.exoplayer2.extractor.flv;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.testutil.ExtractorAsserts; import com.google.android.exoplayer2.testutil.ExtractorAsserts;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
/** Unit test for {@link FlvExtractor}. */ /** Unit test for {@link FlvExtractor}. */
@RunWith(RobolectricTestRunner.class) @RunWith(AndroidJUnit4.class)
public final class FlvExtractorTest { public final class FlvExtractorTest {
@Test @Test
......
library/core/src/test/java/com/google/android/exoplayer2/extractor/mkv/DefaultEbmlReaderTest.java
...@@ -17,6 +17,7 @@ package com.google.android.exoplayer2.extractor.mkv; ...@@ -17,6 +17,7 @@ package com.google.android.exoplayer2.extractor.mkv;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.extractor.ExtractorInput; import com.google.android.exoplayer2.extractor.ExtractorInput;
import com.google.android.exoplayer2.testutil.FakeExtractorInput; import com.google.android.exoplayer2.testutil.FakeExtractorInput;
import com.google.android.exoplayer2.testutil.TestUtil; import com.google.android.exoplayer2.testutil.TestUtil;
...@@ -26,12 +27,9 @@ import java.util.Arrays; ...@@ -26,12 +27,9 @@ import java.util.Arrays;
import java.util.List; import java.util.List;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
/** /** Tests {@link DefaultEbmlReader}. */
* Tests {@link DefaultEbmlReader}. @RunWith(AndroidJUnit4.class)
*/
@RunWith(RobolectricTestRunner.class)
public class DefaultEbmlReaderTest { public class DefaultEbmlReaderTest {
@Test @Test
......
library/core/src/test/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractorTest.java
...@@ -15,13 +15,13 @@ ...@@ -15,13 +15,13 @@
*/ */
package com.google.android.exoplayer2.extractor.mkv; package com.google.android.exoplayer2.extractor.mkv;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.testutil.ExtractorAsserts; import com.google.android.exoplayer2.testutil.ExtractorAsserts;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
/** Tests for {@link MatroskaExtractor}. */ /** Tests for {@link MatroskaExtractor}. */
@RunWith(RobolectricTestRunner.class) @RunWith(AndroidJUnit4.class)
public final class MatroskaExtractorTest { public final class MatroskaExtractorTest {
@Test @Test
......
library/core/src/test/java/com/google/android/exoplayer2/extractor/mkv/VarintReaderTest.java
...@@ -20,6 +20,7 @@ import static com.google.android.exoplayer2.C.RESULT_MAX_LENGTH_EXCEEDED; ...@@ -20,6 +20,7 @@ import static com.google.android.exoplayer2.C.RESULT_MAX_LENGTH_EXCEEDED;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static org.junit.Assert.fail; import static org.junit.Assert.fail;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.extractor.ExtractorInput; import com.google.android.exoplayer2.extractor.ExtractorInput;
import com.google.android.exoplayer2.testutil.FakeExtractorInput; import com.google.android.exoplayer2.testutil.FakeExtractorInput;
...@@ -28,12 +29,9 @@ import java.io.EOFException; ...@@ -28,12 +29,9 @@ import java.io.EOFException;
import java.io.IOException; import java.io.IOException;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
/** /** Tests for {@link VarintReader}. */
* Tests for {@link VarintReader}. @RunWith(AndroidJUnit4.class)
*/
@RunWith(RobolectricTestRunner.class)
public final class VarintReaderTest { public final class VarintReaderTest {
private static final byte MAX_BYTE = (byte) 0xFF; private static final byte MAX_BYTE = (byte) 0xFF;
......
library/core/src/test/java/com/google/android/exoplayer2/extractor/mp3/Mp3ExtractorTest.java
...@@ -15,13 +15,13 @@ ...@@ -15,13 +15,13 @@
*/ */
package com.google.android.exoplayer2.extractor.mp3; package com.google.android.exoplayer2.extractor.mp3;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.testutil.ExtractorAsserts; import com.google.android.exoplayer2.testutil.ExtractorAsserts;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
/** Unit test for {@link Mp3Extractor}. */ /** Unit test for {@link Mp3Extractor}. */
@RunWith(RobolectricTestRunner.class) @RunWith(AndroidJUnit4.class)
public final class Mp3ExtractorTest { public final class Mp3ExtractorTest {
@Test @Test
......
library/core/src/test/java/com/google/android/exoplayer2/extractor/mp3/XingSeekerTest.java
...@@ -17,6 +17,7 @@ package com.google.android.exoplayer2.extractor.mp3; ...@@ -17,6 +17,7 @@ package com.google.android.exoplayer2.extractor.mp3;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.extractor.MpegAudioHeader; import com.google.android.exoplayer2.extractor.MpegAudioHeader;
import com.google.android.exoplayer2.extractor.SeekMap.SeekPoints; import com.google.android.exoplayer2.extractor.SeekMap.SeekPoints;
...@@ -26,12 +27,9 @@ import com.google.android.exoplayer2.util.Util; ...@@ -26,12 +27,9 @@ import com.google.android.exoplayer2.util.Util;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
/** /** Tests for {@link XingSeeker}. */
* Tests for {@link XingSeeker}. @RunWith(AndroidJUnit4.class)
*/
@RunWith(RobolectricTestRunner.class)
public final class XingSeekerTest { public final class XingSeekerTest {
// Xing header/payload from http://storage.googleapis.com/exoplayer-test-media-0/play.mp3. // Xing header/payload from http://storage.googleapis.com/exoplayer-test-media-0/play.mp3.
......
library/core/src/test/java/com/google/android/exoplayer2/extractor/mp4/AtomParsersTest.java
...@@ -17,16 +17,14 @@ package com.google.android.exoplayer2.extractor.mp4; ...@@ -17,16 +17,14 @@ package com.google.android.exoplayer2.extractor.mp4;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.util.ParsableByteArray; import com.google.android.exoplayer2.util.ParsableByteArray;
import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.util.Util;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
/** /** Tests for {@link AtomParsers}. */
* Tests for {@link AtomParsers}. @RunWith(AndroidJUnit4.class)
*/
@RunWith(RobolectricTestRunner.class)
public final class AtomParsersTest { public final class AtomParsersTest {
private static final String ATOM_HEADER = "000000000000000000000000"; private static final String ATOM_HEADER = "000000000000000000000000";
......
library/core/src/test/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4ExtractorTest.java
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
*/ */
package com.google.android.exoplayer2.extractor.mp4; package com.google.android.exoplayer2.extractor.mp4;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.Format;
import com.google.android.exoplayer2.testutil.ExtractorAsserts; import com.google.android.exoplayer2.testutil.ExtractorAsserts;
import com.google.android.exoplayer2.testutil.ExtractorAsserts.ExtractorFactory; import com.google.android.exoplayer2.testutil.ExtractorAsserts.ExtractorFactory;
...@@ -23,10 +24,9 @@ import java.util.Collections; ...@@ -23,10 +24,9 @@ import java.util.Collections;
import java.util.List; import java.util.List;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
/** Unit test for {@link FragmentedMp4Extractor}. */ /** Unit test for {@link FragmentedMp4Extractor}. */
@RunWith(RobolectricTestRunner.class) @RunWith(AndroidJUnit4.class)
public final class FragmentedMp4ExtractorTest { public final class FragmentedMp4ExtractorTest {
@Test @Test
......
library/core/src/test/java/com/google/android/exoplayer2/extractor/mp4/MdtaMetadataEntryTest.java
...@@ -18,12 +18,12 @@ package com.google.android.exoplayer2.extractor.mp4; ...@@ -18,12 +18,12 @@ package com.google.android.exoplayer2.extractor.mp4;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import android.os.Parcel; import android.os.Parcel;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
/** Test for {@link MdtaMetadataEntry}. */ /** Test for {@link MdtaMetadataEntry}. */
@RunWith(RobolectricTestRunner.class) @RunWith(AndroidJUnit4.class)
public final class MdtaMetadataEntryTest { public final class MdtaMetadataEntryTest {
@Test @Test
......
library/core/src/test/java/com/google/android/exoplayer2/extractor/mp4/Mp4ExtractorTest.java
...@@ -15,13 +15,13 @@ ...@@ -15,13 +15,13 @@
*/ */
package com.google.android.exoplayer2.extractor.mp4; package com.google.android.exoplayer2.extractor.mp4;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.testutil.ExtractorAsserts; import com.google.android.exoplayer2.testutil.ExtractorAsserts;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
/** Tests for {@link Mp4Extractor}. */ /** Tests for {@link Mp4Extractor}. */
@RunWith(RobolectricTestRunner.class) @RunWith(AndroidJUnit4.class)
public final class Mp4ExtractorTest { public final class Mp4ExtractorTest {
@Test @Test
......
library/core/src/test/java/com/google/android/exoplayer2/extractor/mp4/PsshAtomUtilTest.java
...@@ -21,17 +21,15 @@ import static com.google.android.exoplayer2.extractor.mp4.Atom.parseFullAtomFlag ...@@ -21,17 +21,15 @@ import static com.google.android.exoplayer2.extractor.mp4.Atom.parseFullAtomFlag
import static com.google.android.exoplayer2.extractor.mp4.Atom.parseFullAtomVersion; import static com.google.android.exoplayer2.extractor.mp4.Atom.parseFullAtomVersion;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.util.ParsableByteArray; import com.google.android.exoplayer2.util.ParsableByteArray;
import java.util.UUID; import java.util.UUID;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
/** /** Tests for {@link PsshAtomUtil}. */
* Tests for {@link PsshAtomUtil}. @RunWith(AndroidJUnit4.class)
*/
@RunWith(RobolectricTestRunner.class)
public final class PsshAtomUtilTest { public final class PsshAtomUtilTest {
@Test @Test
......
library/core/src/test/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeekerTest.java
...@@ -19,6 +19,7 @@ import static com.google.common.truth.Truth.assertThat; ...@@ -19,6 +19,7 @@ import static com.google.common.truth.Truth.assertThat;
import static com.google.common.truth.Truth.assertWithMessage; import static com.google.common.truth.Truth.assertWithMessage;
import static org.junit.Assert.fail; import static org.junit.Assert.fail;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.testutil.FakeExtractorInput; import com.google.android.exoplayer2.testutil.FakeExtractorInput;
import com.google.android.exoplayer2.util.ParsableByteArray; import com.google.android.exoplayer2.util.ParsableByteArray;
...@@ -26,10 +27,9 @@ import java.io.IOException; ...@@ -26,10 +27,9 @@ import java.io.IOException;
import java.util.Random; import java.util.Random;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
/** Unit test for {@link DefaultOggSeeker}. */ /** Unit test for {@link DefaultOggSeeker}. */
@RunWith(RobolectricTestRunner.class) @RunWith(AndroidJUnit4.class)
public final class DefaultOggSeekerTest { public final class DefaultOggSeekerTest {
@Test @Test
......
library/core/src/test/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeekerUtilMethodsTest.java
...@@ -18,6 +18,7 @@ package com.google.android.exoplayer2.extractor.ogg; ...@@ -18,6 +18,7 @@ package com.google.android.exoplayer2.extractor.ogg;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static org.junit.Assert.fail; import static org.junit.Assert.fail;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.extractor.ExtractorInput; import com.google.android.exoplayer2.extractor.ExtractorInput;
import com.google.android.exoplayer2.testutil.FakeExtractorInput; import com.google.android.exoplayer2.testutil.FakeExtractorInput;
import com.google.android.exoplayer2.testutil.OggTestData; import com.google.android.exoplayer2.testutil.OggTestData;
...@@ -27,12 +28,9 @@ import java.io.IOException; ...@@ -27,12 +28,9 @@ import java.io.IOException;
import java.util.Random; import java.util.Random;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
/** /** Unit test for {@link DefaultOggSeeker} utility methods. */
* Unit test for {@link DefaultOggSeeker} utility methods. @RunWith(AndroidJUnit4.class)
*/
@RunWith(RobolectricTestRunner.class)
public final class DefaultOggSeekerUtilMethodsTest { public final class DefaultOggSeekerUtilMethodsTest {
private final Random random = new Random(0); private final Random random = new Random(0);
......
library/core/src/test/java/com/google/android/exoplayer2/extractor/ogg/OggExtractorTest.java
...@@ -17,6 +17,7 @@ package com.google.android.exoplayer2.extractor.ogg; ...@@ -17,6 +17,7 @@ package com.google.android.exoplayer2.extractor.ogg;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.testutil.ExtractorAsserts; import com.google.android.exoplayer2.testutil.ExtractorAsserts;
import com.google.android.exoplayer2.testutil.ExtractorAsserts.ExtractorFactory; import com.google.android.exoplayer2.testutil.ExtractorAsserts.ExtractorFactory;
import com.google.android.exoplayer2.testutil.FakeExtractorInput; import com.google.android.exoplayer2.testutil.FakeExtractorInput;
...@@ -25,10 +26,9 @@ import com.google.android.exoplayer2.testutil.TestUtil; ...@@ -25,10 +26,9 @@ import com.google.android.exoplayer2.testutil.TestUtil;
import java.io.IOException; import java.io.IOException;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
/** Unit test for {@link OggExtractor}. */ /** Unit test for {@link OggExtractor}. */
@RunWith(RobolectricTestRunner.class) @RunWith(AndroidJUnit4.class)
public final class OggExtractorTest { public final class OggExtractorTest {
private static final ExtractorFactory OGG_EXTRACTOR_FACTORY = OggExtractor::new; private static final ExtractorFactory OGG_EXTRACTOR_FACTORY = OggExtractor::new;
......
library/core/src/test/java/com/google/android/exoplayer2/extractor/ogg/OggPacketTest.java
...@@ -17,6 +17,8 @@ package com.google.android.exoplayer2.extractor.ogg; ...@@ -17,6 +17,8 @@ package com.google.android.exoplayer2.extractor.ogg;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.testutil.FakeExtractorInput; import com.google.android.exoplayer2.testutil.FakeExtractorInput;
import com.google.android.exoplayer2.testutil.OggTestData; import com.google.android.exoplayer2.testutil.OggTestData;
import com.google.android.exoplayer2.testutil.TestUtil; import com.google.android.exoplayer2.testutil.TestUtil;
...@@ -27,11 +29,9 @@ import java.util.Random; ...@@ -27,11 +29,9 @@ import java.util.Random;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
/** Unit test for {@link OggPacket}. */ /** Unit test for {@link OggPacket}. */
@RunWith(RobolectricTestRunner.class) @RunWith(AndroidJUnit4.class)
public final class OggPacketTest { public final class OggPacketTest {
private static final String TEST_FILE = "ogg/bear.opus"; private static final String TEST_FILE = "ogg/bear.opus";
...@@ -233,7 +233,7 @@ public final class OggPacketTest { ...@@ -233,7 +233,7 @@ public final class OggPacketTest {
@Test @Test
public void testParseRealFile() throws IOException, InterruptedException { public void testParseRealFile() throws IOException, InterruptedException {
byte[] data = TestUtil.getByteArray(RuntimeEnvironment.application, TEST_FILE); byte[] data = TestUtil.getByteArray(ApplicationProvider.getApplicationContext(), TEST_FILE);
FakeExtractorInput input = new FakeExtractorInput.Builder().setData(data).build(); FakeExtractorInput input = new FakeExtractorInput.Builder().setData(data).build();
int packetCounter = 0; int packetCounter = 0;
while (readPacket(input)) { while (readPacket(input)) {
......
library/core/src/test/java/com/google/android/exoplayer2/extractor/ogg/OggPageHeaderTest.java
...@@ -17,6 +17,7 @@ package com.google.android.exoplayer2.extractor.ogg; ...@@ -17,6 +17,7 @@ package com.google.android.exoplayer2.extractor.ogg;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.testutil.FakeExtractorInput; import com.google.android.exoplayer2.testutil.FakeExtractorInput;
import com.google.android.exoplayer2.testutil.FakeExtractorInput.SimulatedIOException; import com.google.android.exoplayer2.testutil.FakeExtractorInput.SimulatedIOException;
import com.google.android.exoplayer2.testutil.OggTestData; import com.google.android.exoplayer2.testutil.OggTestData;
...@@ -24,12 +25,9 @@ import com.google.android.exoplayer2.testutil.TestUtil; ...@@ -24,12 +25,9 @@ import com.google.android.exoplayer2.testutil.TestUtil;
import java.io.IOException; import java.io.IOException;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
/** /** Unit test for {@link OggPageHeader}. */
* Unit test for {@link OggPageHeader}. @RunWith(AndroidJUnit4.class)
*/
@RunWith(RobolectricTestRunner.class)
public final class OggPageHeaderTest { public final class OggPageHeaderTest {
@Test @Test
......
library/core/src/test/java/com/google/android/exoplayer2/extractor/ogg/VorbisBitArrayTest.java
...@@ -17,15 +17,13 @@ package com.google.android.exoplayer2.extractor.ogg; ...@@ -17,15 +17,13 @@ package com.google.android.exoplayer2.extractor.ogg;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.testutil.TestUtil; import com.google.android.exoplayer2.testutil.TestUtil;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
/** /** Unit test for {@link VorbisBitArray}. */
* Unit test for {@link VorbisBitArray}. @RunWith(AndroidJUnit4.class)
*/
@RunWith(RobolectricTestRunner.class)
public final class VorbisBitArrayTest { public final class VorbisBitArrayTest {
@Test @Test
......
library/core/src/test/java/com/google/android/exoplayer2/extractor/ogg/VorbisReaderTest.java
...@@ -19,6 +19,7 @@ import static com.google.android.exoplayer2.extractor.ogg.VorbisReader.readBits; ...@@ -19,6 +19,7 @@ import static com.google.android.exoplayer2.extractor.ogg.VorbisReader.readBits;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static org.junit.Assert.fail; import static org.junit.Assert.fail;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.extractor.ExtractorInput; import com.google.android.exoplayer2.extractor.ExtractorInput;
import com.google.android.exoplayer2.extractor.ogg.VorbisReader.VorbisSetup; import com.google.android.exoplayer2.extractor.ogg.VorbisReader.VorbisSetup;
import com.google.android.exoplayer2.testutil.FakeExtractorInput; import com.google.android.exoplayer2.testutil.FakeExtractorInput;
...@@ -28,12 +29,9 @@ import com.google.android.exoplayer2.util.ParsableByteArray; ...@@ -28,12 +29,9 @@ import com.google.android.exoplayer2.util.ParsableByteArray;
import java.io.IOException; import java.io.IOException;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
/** /** Unit test for {@link VorbisReader}. */
* Unit test for {@link VorbisReader}. @RunWith(AndroidJUnit4.class)
*/
@RunWith(RobolectricTestRunner.class)
public final class VorbisReaderTest { public final class VorbisReaderTest {
@Test @Test
......
library/core/src/test/java/com/google/android/exoplayer2/extractor/ogg/VorbisUtilTest.java
...@@ -20,17 +20,15 @@ import static com.google.android.exoplayer2.extractor.ogg.VorbisUtil.verifyVorbi ...@@ -20,17 +20,15 @@ import static com.google.android.exoplayer2.extractor.ogg.VorbisUtil.verifyVorbi
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static org.junit.Assert.fail; import static org.junit.Assert.fail;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.ParserException; import com.google.android.exoplayer2.ParserException;
import com.google.android.exoplayer2.testutil.OggTestData; import com.google.android.exoplayer2.testutil.OggTestData;
import com.google.android.exoplayer2.util.ParsableByteArray; import com.google.android.exoplayer2.util.ParsableByteArray;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
/** /** Unit test for {@link VorbisUtil}. */
* Unit test for {@link VorbisUtil}. @RunWith(AndroidJUnit4.class)
*/
@RunWith(RobolectricTestRunner.class)
public final class VorbisUtilTest { public final class VorbisUtilTest {
@Test @Test
......
library/core/src/test/java/com/google/android/exoplayer2/extractor/rawcc/RawCcExtractorTest.java
...@@ -15,15 +15,15 @@ ...@@ -15,15 +15,15 @@
*/ */
package com.google.android.exoplayer2.extractor.rawcc; package com.google.android.exoplayer2.extractor.rawcc;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.Format;
import com.google.android.exoplayer2.testutil.ExtractorAsserts; import com.google.android.exoplayer2.testutil.ExtractorAsserts;
import com.google.android.exoplayer2.util.MimeTypes; import com.google.android.exoplayer2.util.MimeTypes;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
/** Tests for {@link RawCcExtractor}. */ /** Tests for {@link RawCcExtractor}. */
@RunWith(RobolectricTestRunner.class) @RunWith(AndroidJUnit4.class)
public final class RawCcExtractorTest { public final class RawCcExtractorTest {
@Test @Test
......
library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/Ac3ExtractorTest.java
...@@ -15,13 +15,13 @@ ...@@ -15,13 +15,13 @@
*/ */
package com.google.android.exoplayer2.extractor.ts; package com.google.android.exoplayer2.extractor.ts;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.testutil.ExtractorAsserts; import com.google.android.exoplayer2.testutil.ExtractorAsserts;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
/** Unit test for {@link Ac3Extractor}. */ /** Unit test for {@link Ac3Extractor}. */
@RunWith(RobolectricTestRunner.class) @RunWith(AndroidJUnit4.class)
public final class Ac3ExtractorTest { public final class Ac3ExtractorTest {
@Test @Test
......
library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractorSeekTest.java
...@@ -18,6 +18,8 @@ package com.google.android.exoplayer2.extractor.ts; ...@@ -18,6 +18,8 @@ package com.google.android.exoplayer2.extractor.ts;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import android.net.Uri; import android.net.Uri;
import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.extractor.SeekMap; import com.google.android.exoplayer2.extractor.SeekMap;
import com.google.android.exoplayer2.testutil.FakeExtractorOutput; import com.google.android.exoplayer2.testutil.FakeExtractorOutput;
import com.google.android.exoplayer2.testutil.FakeTrackOutput; import com.google.android.exoplayer2.testutil.FakeTrackOutput;
...@@ -30,11 +32,9 @@ import java.util.Random; ...@@ -30,11 +32,9 @@ import java.util.Random;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
/** Unit test for {@link AdtsExtractor}. */ /** Unit test for {@link AdtsExtractor}. */
@RunWith(RobolectricTestRunner.class) @RunWith(AndroidJUnit4.class)
public final class AdtsExtractorSeekTest { public final class AdtsExtractorSeekTest {
private static final Random random = new Random(1234L); private static final Random random = new Random(1234L);
...@@ -49,7 +49,7 @@ public final class AdtsExtractorSeekTest { ...@@ -49,7 +49,7 @@ public final class AdtsExtractorSeekTest {
@Before @Before
public void setUp() { public void setUp() {
dataSource = dataSource =
new DefaultDataSourceFactory(RuntimeEnvironment.application, "UserAgent") new DefaultDataSourceFactory(ApplicationProvider.getApplicationContext(), "UserAgent")
.createDataSource(); .createDataSource();
} }
...@@ -60,7 +60,7 @@ public final class AdtsExtractorSeekTest { ...@@ -60,7 +60,7 @@ public final class AdtsExtractorSeekTest {
Uri fileUri = TestUtil.buildAssetUri(fileName); Uri fileUri = TestUtil.buildAssetUri(fileName);
expectedTrackOutput = expectedTrackOutput =
TestUtil.extractAllSamplesFromFile( TestUtil.extractAllSamplesFromFile(
createAdtsExtractor(), RuntimeEnvironment.application, fileName) createAdtsExtractor(), ApplicationProvider.getApplicationContext(), fileName)
.trackOutputs .trackOutputs
.get(0); .get(0);
...@@ -80,7 +80,7 @@ public final class AdtsExtractorSeekTest { ...@@ -80,7 +80,7 @@ public final class AdtsExtractorSeekTest {
Uri fileUri = TestUtil.buildAssetUri(fileName); Uri fileUri = TestUtil.buildAssetUri(fileName);
expectedTrackOutput = expectedTrackOutput =
TestUtil.extractAllSamplesFromFile( TestUtil.extractAllSamplesFromFile(
createAdtsExtractor(), RuntimeEnvironment.application, fileName) createAdtsExtractor(), ApplicationProvider.getApplicationContext(), fileName)
.trackOutputs .trackOutputs
.get(0); .get(0);
...@@ -107,7 +107,7 @@ public final class AdtsExtractorSeekTest { ...@@ -107,7 +107,7 @@ public final class AdtsExtractorSeekTest {
Uri fileUri = TestUtil.buildAssetUri(fileName); Uri fileUri = TestUtil.buildAssetUri(fileName);
expectedTrackOutput = expectedTrackOutput =
TestUtil.extractAllSamplesFromFile( TestUtil.extractAllSamplesFromFile(
createAdtsExtractor(), RuntimeEnvironment.application, fileName) createAdtsExtractor(), ApplicationProvider.getApplicationContext(), fileName)
.trackOutputs .trackOutputs
.get(0); .get(0);
AdtsExtractor extractor = createAdtsExtractor(); AdtsExtractor extractor = createAdtsExtractor();
...@@ -134,7 +134,7 @@ public final class AdtsExtractorSeekTest { ...@@ -134,7 +134,7 @@ public final class AdtsExtractorSeekTest {
Uri fileUri = TestUtil.buildAssetUri(fileName); Uri fileUri = TestUtil.buildAssetUri(fileName);
expectedTrackOutput = expectedTrackOutput =
TestUtil.extractAllSamplesFromFile( TestUtil.extractAllSamplesFromFile(
createAdtsExtractor(), RuntimeEnvironment.application, fileName) createAdtsExtractor(), ApplicationProvider.getApplicationContext(), fileName)
.trackOutputs .trackOutputs
.get(0); .get(0);
AdtsExtractor extractor = createAdtsExtractor(); AdtsExtractor extractor = createAdtsExtractor();
...@@ -163,7 +163,7 @@ public final class AdtsExtractorSeekTest { ...@@ -163,7 +163,7 @@ public final class AdtsExtractorSeekTest {
Uri fileUri = TestUtil.buildAssetUri(fileName); Uri fileUri = TestUtil.buildAssetUri(fileName);
expectedTrackOutput = expectedTrackOutput =
TestUtil.extractAllSamplesFromFile( TestUtil.extractAllSamplesFromFile(
createAdtsExtractor(), RuntimeEnvironment.application, fileName) createAdtsExtractor(), ApplicationProvider.getApplicationContext(), fileName)
.trackOutputs .trackOutputs
.get(0); .get(0);
AdtsExtractor extractor = createAdtsExtractor(); AdtsExtractor extractor = createAdtsExtractor();
...@@ -192,7 +192,7 @@ public final class AdtsExtractorSeekTest { ...@@ -192,7 +192,7 @@ public final class AdtsExtractorSeekTest {
Uri fileUri = TestUtil.buildAssetUri(fileName); Uri fileUri = TestUtil.buildAssetUri(fileName);
expectedTrackOutput = expectedTrackOutput =
TestUtil.extractAllSamplesFromFile( TestUtil.extractAllSamplesFromFile(
createAdtsExtractor(), RuntimeEnvironment.application, fileName) createAdtsExtractor(), ApplicationProvider.getApplicationContext(), fileName)
.trackOutputs .trackOutputs
.get(0); .get(0);
AdtsExtractor extractor = createAdtsExtractor(); AdtsExtractor extractor = createAdtsExtractor();
......
library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractorTest.java
...@@ -15,13 +15,13 @@ ...@@ -15,13 +15,13 @@
*/ */
package com.google.android.exoplayer2.extractor.ts; package com.google.android.exoplayer2.extractor.ts;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.testutil.ExtractorAsserts; import com.google.android.exoplayer2.testutil.ExtractorAsserts;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
/** Unit test for {@link AdtsExtractor}. */ /** Unit test for {@link AdtsExtractor}. */
@RunWith(RobolectricTestRunner.class) @RunWith(AndroidJUnit4.class)
public final class AdtsExtractorTest { public final class AdtsExtractorTest {
@Test @Test
......
library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/AdtsReaderTest.java
...@@ -17,6 +17,7 @@ package com.google.android.exoplayer2.extractor.ts; ...@@ -17,6 +17,7 @@ package com.google.android.exoplayer2.extractor.ts;
import static com.google.android.exoplayer2.extractor.ts.TsPayloadReader.FLAG_DATA_ALIGNMENT_INDICATOR; import static com.google.android.exoplayer2.extractor.ts.TsPayloadReader.FLAG_DATA_ALIGNMENT_INDICATOR;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.ParserException; import com.google.android.exoplayer2.ParserException;
import com.google.android.exoplayer2.extractor.ts.TsPayloadReader.TrackIdGenerator; import com.google.android.exoplayer2.extractor.ts.TsPayloadReader.TrackIdGenerator;
...@@ -28,10 +29,9 @@ import java.util.Arrays; ...@@ -28,10 +29,9 @@ import java.util.Arrays;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
/** Test for {@link AdtsReader}. */ /** Test for {@link AdtsReader}. */
@RunWith(RobolectricTestRunner.class) @RunWith(AndroidJUnit4.class)
public class AdtsReaderTest { public class AdtsReaderTest {
public static final byte[] ID3_DATA_1 = public static final byte[] ID3_DATA_1 =
......
library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/PsDurationReaderTest.java
...@@ -17,6 +17,8 @@ package com.google.android.exoplayer2.extractor.ts; ...@@ -17,6 +17,8 @@ package com.google.android.exoplayer2.extractor.ts;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.extractor.Extractor; import com.google.android.exoplayer2.extractor.Extractor;
import com.google.android.exoplayer2.extractor.PositionHolder; import com.google.android.exoplayer2.extractor.PositionHolder;
import com.google.android.exoplayer2.testutil.FakeExtractorInput; import com.google.android.exoplayer2.testutil.FakeExtractorInput;
...@@ -25,11 +27,9 @@ import java.io.IOException; ...@@ -25,11 +27,9 @@ import java.io.IOException;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
/** Unit test for {@link PsDurationReader}. */ /** Unit test for {@link PsDurationReader}. */
@RunWith(RobolectricTestRunner.class) @RunWith(AndroidJUnit4.class)
public final class PsDurationReaderTest { public final class PsDurationReaderTest {
private PsDurationReader tsDurationReader; private PsDurationReader tsDurationReader;
...@@ -50,7 +50,8 @@ public final class PsDurationReaderTest { ...@@ -50,7 +50,8 @@ public final class PsDurationReaderTest {
public void testReadDuration_returnsCorrectDuration() throws IOException, InterruptedException { public void testReadDuration_returnsCorrectDuration() throws IOException, InterruptedException {
FakeExtractorInput input = FakeExtractorInput input =
new FakeExtractorInput.Builder() new FakeExtractorInput.Builder()
.setData(TestUtil.getByteArray(RuntimeEnvironment.application, "ts/sample.ps")) .setData(
TestUtil.getByteArray(ApplicationProvider.getApplicationContext(), "ts/sample.ps"))
.build(); .build();
int result = Extractor.RESULT_CONTINUE; int result = Extractor.RESULT_CONTINUE;
...@@ -69,7 +70,8 @@ public final class PsDurationReaderTest { ...@@ -69,7 +70,8 @@ public final class PsDurationReaderTest {
throws IOException, InterruptedException { throws IOException, InterruptedException {
FakeExtractorInput input = FakeExtractorInput input =
new FakeExtractorInput.Builder() new FakeExtractorInput.Builder()
.setData(TestUtil.getByteArray(RuntimeEnvironment.application, "ts/sample.ps")) .setData(
TestUtil.getByteArray(ApplicationProvider.getApplicationContext(), "ts/sample.ps"))
.build(); .build();
input.setPosition(1234); input.setPosition(1234);
......
library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/PsExtractorSeekTest.java
...@@ -19,6 +19,8 @@ import static com.google.common.truth.Truth.assertThat; ...@@ -19,6 +19,8 @@ import static com.google.common.truth.Truth.assertThat;
import android.content.Context; import android.content.Context;
import android.net.Uri; import android.net.Uri;
import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.extractor.DefaultExtractorInput; import com.google.android.exoplayer2.extractor.DefaultExtractorInput;
import com.google.android.exoplayer2.extractor.Extractor; import com.google.android.exoplayer2.extractor.Extractor;
...@@ -39,11 +41,9 @@ import java.util.Random; ...@@ -39,11 +41,9 @@ import java.util.Random;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
/** Seeking tests for {@link PsExtractor}. */ /** Seeking tests for {@link PsExtractor}. */
@RunWith(RobolectricTestRunner.class) @RunWith(AndroidJUnit4.class)
public final class PsExtractorSeekTest { public final class PsExtractorSeekTest {
private static final String PS_FILE_PATH = "ts/elephants_dream.mpg"; private static final String PS_FILE_PATH = "ts/elephants_dream.mpg";
...@@ -63,11 +63,12 @@ public final class PsExtractorSeekTest { ...@@ -63,11 +63,12 @@ public final class PsExtractorSeekTest {
public void setUp() throws IOException, InterruptedException { public void setUp() throws IOException, InterruptedException {
expectedOutput = new FakeExtractorOutput(); expectedOutput = new FakeExtractorOutput();
positionHolder = new PositionHolder(); positionHolder = new PositionHolder();
extractAllSamplesFromFileToExpectedOutput(RuntimeEnvironment.application, PS_FILE_PATH); extractAllSamplesFromFileToExpectedOutput(
ApplicationProvider.getApplicationContext(), PS_FILE_PATH);
expectedTrackOutput = expectedOutput.trackOutputs.get(VIDEO_TRACK_ID); expectedTrackOutput = expectedOutput.trackOutputs.get(VIDEO_TRACK_ID);
dataSource = dataSource =
new DefaultDataSourceFactory(RuntimeEnvironment.application, "UserAgent") new DefaultDataSourceFactory(ApplicationProvider.getApplicationContext(), "UserAgent")
.createDataSource(); .createDataSource();
totalInputLength = readInputLength(); totalInputLength = readInputLength();
} }
......
library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/PsExtractorTest.java
...@@ -15,13 +15,13 @@ ...@@ -15,13 +15,13 @@
*/ */
package com.google.android.exoplayer2.extractor.ts; package com.google.android.exoplayer2.extractor.ts;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.testutil.ExtractorAsserts; import com.google.android.exoplayer2.testutil.ExtractorAsserts;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
/** Unit test for {@link PsExtractor}. */ /** Unit test for {@link PsExtractor}. */
@RunWith(RobolectricTestRunner.class) @RunWith(AndroidJUnit4.class)
public final class PsExtractorTest { public final class PsExtractorTest {
@Test @Test
......
library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/SectionReaderTest.java
...@@ -20,6 +20,7 @@ import static com.google.common.truth.Truth.assertThat; ...@@ -20,6 +20,7 @@ import static com.google.common.truth.Truth.assertThat;
import static java.util.Arrays.asList; import static java.util.Arrays.asList;
import static java.util.Collections.singletonList; import static java.util.Collections.singletonList;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.extractor.ExtractorOutput; import com.google.android.exoplayer2.extractor.ExtractorOutput;
import com.google.android.exoplayer2.testutil.FakeExtractorOutput; import com.google.android.exoplayer2.testutil.FakeExtractorOutput;
import com.google.android.exoplayer2.util.ParsableByteArray; import com.google.android.exoplayer2.util.ParsableByteArray;
...@@ -30,12 +31,9 @@ import java.util.List; ...@@ -30,12 +31,9 @@ import java.util.List;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
/** /** Test for {@link SectionReader}. */
* Test for {@link SectionReader}. @RunWith(AndroidJUnit4.class)
*/
@RunWith(RobolectricTestRunner.class)
public final class SectionReaderTest { public final class SectionReaderTest {
private byte[] packetPayload; private byte[] packetPayload;
......
library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/TsDurationReaderTest.java
...@@ -17,6 +17,8 @@ package com.google.android.exoplayer2.extractor.ts; ...@@ -17,6 +17,8 @@ package com.google.android.exoplayer2.extractor.ts;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.extractor.Extractor; import com.google.android.exoplayer2.extractor.Extractor;
import com.google.android.exoplayer2.extractor.PositionHolder; import com.google.android.exoplayer2.extractor.PositionHolder;
import com.google.android.exoplayer2.testutil.FakeExtractorInput; import com.google.android.exoplayer2.testutil.FakeExtractorInput;
...@@ -25,11 +27,9 @@ import java.io.IOException; ...@@ -25,11 +27,9 @@ import java.io.IOException;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
/** Unit test for {@link TsDurationReader}. */ /** Unit test for {@link TsDurationReader}. */
@RunWith(RobolectricTestRunner.class) @RunWith(AndroidJUnit4.class)
public final class TsDurationReaderTest { public final class TsDurationReaderTest {
private TsDurationReader tsDurationReader; private TsDurationReader tsDurationReader;
...@@ -50,7 +50,9 @@ public final class TsDurationReaderTest { ...@@ -50,7 +50,9 @@ public final class TsDurationReaderTest {
public void testReadDuration_returnsCorrectDuration() throws IOException, InterruptedException { public void testReadDuration_returnsCorrectDuration() throws IOException, InterruptedException {
FakeExtractorInput input = FakeExtractorInput input =
new FakeExtractorInput.Builder() new FakeExtractorInput.Builder()
.setData(TestUtil.getByteArray(RuntimeEnvironment.application, "ts/bbb_2500ms.ts")) .setData(
TestUtil.getByteArray(
ApplicationProvider.getApplicationContext(), "ts/bbb_2500ms.ts"))
.setSimulateIOErrors(false) .setSimulateIOErrors(false)
.setSimulateUnknownLength(false) .setSimulateUnknownLength(false)
.setSimulatePartialReads(false) .setSimulatePartialReads(false)
...@@ -73,7 +75,9 @@ public final class TsDurationReaderTest { ...@@ -73,7 +75,9 @@ public final class TsDurationReaderTest {
throws IOException, InterruptedException { throws IOException, InterruptedException {
FakeExtractorInput input = FakeExtractorInput input =
new FakeExtractorInput.Builder() new FakeExtractorInput.Builder()
.setData(TestUtil.getByteArray(RuntimeEnvironment.application, "ts/bbb_2500ms.ts")) .setData(
TestUtil.getByteArray(
ApplicationProvider.getApplicationContext(), "ts/bbb_2500ms.ts"))
.setSimulateIOErrors(false) .setSimulateIOErrors(false)
.setSimulateUnknownLength(false) .setSimulateUnknownLength(false)
.setSimulatePartialReads(false) .setSimulatePartialReads(false)
......
library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/TsExtractorSeekTest.java
...@@ -18,6 +18,8 @@ package com.google.android.exoplayer2.extractor.ts; ...@@ -18,6 +18,8 @@ package com.google.android.exoplayer2.extractor.ts;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import android.net.Uri; import android.net.Uri;
import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.extractor.Extractor; import com.google.android.exoplayer2.extractor.Extractor;
import com.google.android.exoplayer2.extractor.ExtractorInput; import com.google.android.exoplayer2.extractor.ExtractorInput;
import com.google.android.exoplayer2.extractor.PositionHolder; import com.google.android.exoplayer2.extractor.PositionHolder;
...@@ -34,11 +36,9 @@ import java.util.Random; ...@@ -34,11 +36,9 @@ import java.util.Random;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
/** Seeking tests for {@link TsExtractor}. */ /** Seeking tests for {@link TsExtractor}. */
@RunWith(RobolectricTestRunner.class) @RunWith(AndroidJUnit4.class)
public final class TsExtractorSeekTest { public final class TsExtractorSeekTest {
private static final String TEST_FILE = "ts/bbb_2500ms.ts"; private static final String TEST_FILE = "ts/bbb_2500ms.ts";
...@@ -57,12 +57,12 @@ public final class TsExtractorSeekTest { ...@@ -57,12 +57,12 @@ public final class TsExtractorSeekTest {
positionHolder = new PositionHolder(); positionHolder = new PositionHolder();
expectedTrackOutput = expectedTrackOutput =
TestUtil.extractAllSamplesFromFile( TestUtil.extractAllSamplesFromFile(
new TsExtractor(), RuntimeEnvironment.application, TEST_FILE) new TsExtractor(), ApplicationProvider.getApplicationContext(), TEST_FILE)
.trackOutputs .trackOutputs
.get(AUDIO_TRACK_ID); .get(AUDIO_TRACK_ID);
dataSource = dataSource =
new DefaultDataSourceFactory(RuntimeEnvironment.application, "UserAgent") new DefaultDataSourceFactory(ApplicationProvider.getApplicationContext(), "UserAgent")
.createDataSource(); .createDataSource();
} }
......
library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/TsExtractorTest.java
...@@ -18,6 +18,8 @@ package com.google.android.exoplayer2.extractor.ts; ...@@ -18,6 +18,8 @@ package com.google.android.exoplayer2.extractor.ts;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import android.util.SparseArray; import android.util.SparseArray;
import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.Format;
import com.google.android.exoplayer2.extractor.Extractor; import com.google.android.exoplayer2.extractor.Extractor;
...@@ -37,11 +39,9 @@ import java.io.ByteArrayOutputStream; ...@@ -37,11 +39,9 @@ import java.io.ByteArrayOutputStream;
import java.util.Random; import java.util.Random;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
/** Unit test for {@link TsExtractor}. */ /** Unit test for {@link TsExtractor}. */
@RunWith(RobolectricTestRunner.class) @RunWith(AndroidJUnit4.class)
public final class TsExtractorTest { public final class TsExtractorTest {
private static final int TS_PACKET_SIZE = 188; private static final int TS_PACKET_SIZE = 188;
...@@ -55,7 +55,8 @@ public final class TsExtractorTest { ...@@ -55,7 +55,8 @@ public final class TsExtractorTest {
@Test @Test
public void testStreamWithJunkData() throws Exception { public void testStreamWithJunkData() throws Exception {
Random random = new Random(0); Random random = new Random(0);
byte[] fileData = TestUtil.getByteArray(RuntimeEnvironment.application, "ts/sample.ts"); byte[] fileData =
TestUtil.getByteArray(ApplicationProvider.getApplicationContext(), "ts/sample.ts");
ByteArrayOutputStream out = new ByteArrayOutputStream(fileData.length * 2); ByteArrayOutputStream out = new ByteArrayOutputStream(fileData.length * 2);
int bytesLeft = fileData.length; int bytesLeft = fileData.length;
...@@ -74,7 +75,7 @@ public final class TsExtractorTest { ...@@ -74,7 +75,7 @@ public final class TsExtractorTest {
fileData = out.toByteArray(); fileData = out.toByteArray();
ExtractorAsserts.assertOutput( ExtractorAsserts.assertOutput(
TsExtractor::new, "ts/sample.ts", fileData, RuntimeEnvironment.application); TsExtractor::new, "ts/sample.ts", fileData, ApplicationProvider.getApplicationContext());
} }
@Test @Test
...@@ -84,7 +85,8 @@ public final class TsExtractorTest { ...@@ -84,7 +85,8 @@ public final class TsExtractorTest {
new TsExtractor(TsExtractor.MODE_MULTI_PMT, new TimestampAdjuster(0), factory); new TsExtractor(TsExtractor.MODE_MULTI_PMT, new TimestampAdjuster(0), factory);
FakeExtractorInput input = FakeExtractorInput input =
new FakeExtractorInput.Builder() new FakeExtractorInput.Builder()
.setData(TestUtil.getByteArray(RuntimeEnvironment.application, "ts/sample.ts")) .setData(
TestUtil.getByteArray(ApplicationProvider.getApplicationContext(), "ts/sample.ts"))
.setSimulateIOErrors(false) .setSimulateIOErrors(false)
.setSimulateUnknownLength(false) .setSimulateUnknownLength(false)
.setSimulatePartialReads(false) .setSimulatePartialReads(false)
...@@ -114,7 +116,9 @@ public final class TsExtractorTest { ...@@ -114,7 +116,9 @@ public final class TsExtractorTest {
new TsExtractor(TsExtractor.MODE_MULTI_PMT, new TimestampAdjuster(0), factory); new TsExtractor(TsExtractor.MODE_MULTI_PMT, new TimestampAdjuster(0), factory);
FakeExtractorInput input = FakeExtractorInput input =
new FakeExtractorInput.Builder() new FakeExtractorInput.Builder()
.setData(TestUtil.getByteArray(RuntimeEnvironment.application, "ts/sample_with_sdt.ts")) .setData(
TestUtil.getByteArray(
ApplicationProvider.getApplicationContext(), "ts/sample_with_sdt.ts"))
.setSimulateIOErrors(false) .setSimulateIOErrors(false)
.setSimulateUnknownLength(false) .setSimulateUnknownLength(false)
.setSimulatePartialReads(false) .setSimulatePartialReads(false)
......
library/core/src/test/java/com/google/android/exoplayer2/extractor/wav/WavExtractorTest.java
...@@ -15,13 +15,13 @@ ...@@ -15,13 +15,13 @@
*/ */
package com.google.android.exoplayer2.extractor.wav; package com.google.android.exoplayer2.extractor.wav;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.testutil.ExtractorAsserts; import com.google.android.exoplayer2.testutil.ExtractorAsserts;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
/** Unit test for {@link WavExtractor}. */ /** Unit test for {@link WavExtractor}. */
@RunWith(RobolectricTestRunner.class) @RunWith(AndroidJUnit4.class)
public final class WavExtractorTest { public final class WavExtractorTest {
@Test @Test
......
library/core/src/test/java/com/google/android/exoplayer2/metadata/emsg/EventMessageDecoderTest.java
...@@ -17,17 +17,15 @@ package com.google.android.exoplayer2.metadata.emsg; ...@@ -17,17 +17,15 @@ package com.google.android.exoplayer2.metadata.emsg;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.metadata.Metadata; import com.google.android.exoplayer2.metadata.Metadata;
import com.google.android.exoplayer2.metadata.MetadataInputBuffer; import com.google.android.exoplayer2.metadata.MetadataInputBuffer;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
/** /** Test for {@link EventMessageDecoder}. */
* Test for {@link EventMessageDecoder}. @RunWith(AndroidJUnit4.class)
*/
@RunWith(RobolectricTestRunner.class)
public final class EventMessageDecoderTest { public final class EventMessageDecoderTest {
@Test @Test
......
library/core/src/test/java/com/google/android/exoplayer2/metadata/emsg/EventMessageEncoderTest.java
...@@ -17,18 +17,16 @@ package com.google.android.exoplayer2.metadata.emsg; ...@@ -17,18 +17,16 @@ package com.google.android.exoplayer2.metadata.emsg;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.metadata.Metadata; import com.google.android.exoplayer2.metadata.Metadata;
import com.google.android.exoplayer2.metadata.MetadataInputBuffer; import com.google.android.exoplayer2.metadata.MetadataInputBuffer;
import java.io.IOException; import java.io.IOException;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
/** /** Unit test for {@link EventMessageEncoder}. */
* Unit test for {@link EventMessageEncoder}. @RunWith(AndroidJUnit4.class)
*/
@RunWith(RobolectricTestRunner.class)
public final class EventMessageEncoderTest { public final class EventMessageEncoderTest {
@Test @Test
......
library/core/src/test/java/com/google/android/exoplayer2/metadata/emsg/EventMessageTest.java
...@@ -18,14 +18,12 @@ package com.google.android.exoplayer2.metadata.emsg; ...@@ -18,14 +18,12 @@ package com.google.android.exoplayer2.metadata.emsg;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import android.os.Parcel; import android.os.Parcel;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
/** /** Test for {@link EventMessage}. */
* Test for {@link EventMessage}. @RunWith(AndroidJUnit4.class)
*/
@RunWith(RobolectricTestRunner.class)
public final class EventMessageTest { public final class EventMessageTest {
@Test @Test
......
library/core/src/test/java/com/google/android/exoplayer2/metadata/icy/IcyDecoderTest.java
...@@ -17,13 +17,13 @@ package com.google.android.exoplayer2.metadata.icy; ...@@ -17,13 +17,13 @@ package com.google.android.exoplayer2.metadata.icy;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.metadata.Metadata; import com.google.android.exoplayer2.metadata.Metadata;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
/** Test for {@link IcyDecoder}. */ /** Test for {@link IcyDecoder}. */
@RunWith(RobolectricTestRunner.class) @RunWith(AndroidJUnit4.class)
public final class IcyDecoderTest { public final class IcyDecoderTest {
@Test @Test
......
library/core/src/test/java/com/google/android/exoplayer2/metadata/icy/IcyHeadersTest.java
...@@ -18,12 +18,12 @@ package com.google.android.exoplayer2.metadata.icy; ...@@ -18,12 +18,12 @@ package com.google.android.exoplayer2.metadata.icy;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import android.os.Parcel; import android.os.Parcel;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
/** Test for {@link IcyHeaders}. */ /** Test for {@link IcyHeaders}. */
@RunWith(RobolectricTestRunner.class) @RunWith(AndroidJUnit4.class)
public final class IcyHeadersTest { public final class IcyHeadersTest {
@Test @Test
......
library/core/src/test/java/com/google/android/exoplayer2/metadata/icy/IcyStreamInfoTest.java
...@@ -18,12 +18,12 @@ package com.google.android.exoplayer2.metadata.icy; ...@@ -18,12 +18,12 @@ package com.google.android.exoplayer2.metadata.icy;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import android.os.Parcel; import android.os.Parcel;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
/** Test for {@link IcyInfo}. */ /** Test for {@link IcyInfo}. */
@RunWith(RobolectricTestRunner.class) @RunWith(AndroidJUnit4.class)
public final class IcyStreamInfoTest { public final class IcyStreamInfoTest {
@Test @Test
......
library/core/src/test/java/com/google/android/exoplayer2/metadata/id3/ChapterFrameTest.java
...@@ -18,14 +18,12 @@ package com.google.android.exoplayer2.metadata.id3; ...@@ -18,14 +18,12 @@ package com.google.android.exoplayer2.metadata.id3;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import android.os.Parcel; import android.os.Parcel;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
/** /** Test for {@link ChapterFrame}. */
* Test for {@link ChapterFrame}. @RunWith(AndroidJUnit4.class)
*/
@RunWith(RobolectricTestRunner.class)
public final class ChapterFrameTest { public final class ChapterFrameTest {
@Test @Test
......
library/core/src/test/java/com/google/android/exoplayer2/metadata/id3/ChapterTocFrameTest.java
...@@ -18,14 +18,12 @@ package com.google.android.exoplayer2.metadata.id3; ...@@ -18,14 +18,12 @@ package com.google.android.exoplayer2.metadata.id3;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import android.os.Parcel; import android.os.Parcel;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
/** /** Test for {@link ChapterTocFrame}. */
* Test for {@link ChapterTocFrame}. @RunWith(AndroidJUnit4.class)
*/
@RunWith(RobolectricTestRunner.class)
public final class ChapterTocFrameTest { public final class ChapterTocFrameTest {
@Test @Test
......
library/core/src/test/java/com/google/android/exoplayer2/metadata/id3/Id3DecoderTest.java
...@@ -17,6 +17,7 @@ package com.google.android.exoplayer2.metadata.id3; ...@@ -17,6 +17,7 @@ package com.google.android.exoplayer2.metadata.id3;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.metadata.Metadata; import com.google.android.exoplayer2.metadata.Metadata;
import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.Assertions;
...@@ -24,12 +25,9 @@ import java.nio.charset.Charset; ...@@ -24,12 +25,9 @@ import java.nio.charset.Charset;
import java.util.Arrays; import java.util.Arrays;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
/** /** Test for {@link Id3Decoder}. */
* Test for {@link Id3Decoder}. @RunWith(AndroidJUnit4.class)
*/
@RunWith(RobolectricTestRunner.class)
public final class Id3DecoderTest { public final class Id3DecoderTest {
private static final byte[] TAG_HEADER = new byte[] {'I', 'D', '3', 4, 0, 0, 0, 0, 0, 0}; private static final byte[] TAG_HEADER = new byte[] {'I', 'D', '3', 4, 0, 0, 0, 0, 0, 0};
......
library/core/src/test/java/com/google/android/exoplayer2/metadata/id3/MlltFrameTest.java
...@@ -18,12 +18,12 @@ package com.google.android.exoplayer2.metadata.id3; ...@@ -18,12 +18,12 @@ package com.google.android.exoplayer2.metadata.id3;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import android.os.Parcel; import android.os.Parcel;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
/** Test for {@link MlltFrame}. */ /** Test for {@link MlltFrame}. */
@RunWith(RobolectricTestRunner.class) @RunWith(AndroidJUnit4.class)
public final class MlltFrameTest { public final class MlltFrameTest {
@Test @Test
......
library/core/src/test/java/com/google/android/exoplayer2/metadata/scte35/SpliceInfoDecoderTest.java
...@@ -18,6 +18,7 @@ package com.google.android.exoplayer2.metadata.scte35; ...@@ -18,6 +18,7 @@ package com.google.android.exoplayer2.metadata.scte35;
import static com.google.android.exoplayer2.C.TIME_UNSET; import static com.google.android.exoplayer2.C.TIME_UNSET;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.metadata.Metadata; import com.google.android.exoplayer2.metadata.Metadata;
import com.google.android.exoplayer2.metadata.MetadataInputBuffer; import com.google.android.exoplayer2.metadata.MetadataInputBuffer;
import com.google.android.exoplayer2.util.TimestampAdjuster; import com.google.android.exoplayer2.util.TimestampAdjuster;
...@@ -26,12 +27,9 @@ import java.util.List; ...@@ -26,12 +27,9 @@ import java.util.List;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
/** /** Test for {@link SpliceInfoDecoder}. */
* Test for {@link SpliceInfoDecoder}. @RunWith(AndroidJUnit4.class)
*/
@RunWith(RobolectricTestRunner.class)
public final class SpliceInfoDecoderTest { public final class SpliceInfoDecoderTest {
private SpliceInfoDecoder decoder; private SpliceInfoDecoder decoder;
......
library/core/src/test/java/com/google/android/exoplayer2/offline/ActionFileTest.java
...@@ -18,6 +18,8 @@ package com.google.android.exoplayer2.offline; ...@@ -18,6 +18,8 @@ package com.google.android.exoplayer2.offline;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import android.net.Uri; import android.net.Uri;
import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.testutil.TestUtil; import com.google.android.exoplayer2.testutil.TestUtil;
import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.util.Util;
import java.io.DataOutputStream; import java.io.DataOutputStream;
...@@ -30,11 +32,9 @@ import org.junit.Assert; ...@@ -30,11 +32,9 @@ import org.junit.Assert;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
/** Unit tests for {@link ActionFile}. */ /** Unit tests for {@link ActionFile}. */
@RunWith(RobolectricTestRunner.class) @RunWith(AndroidJUnit4.class)
public class ActionFileTest { public class ActionFileTest {
private File tempFile; private File tempFile;
...@@ -43,7 +43,7 @@ public class ActionFileTest { ...@@ -43,7 +43,7 @@ public class ActionFileTest {
@Before @Before
public void setUp() throws Exception { public void setUp() throws Exception {
tempFile = Util.createTempFile(RuntimeEnvironment.application, "ExoPlayerTest"); tempFile = Util.createTempFile(ApplicationProvider.getApplicationContext(), "ExoPlayerTest");
action1 = action1 =
buildAction( buildAction(
DownloadAction.TYPE_PROGRESSIVE, DownloadAction.TYPE_PROGRESSIVE,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment