Skip to content

SDK / exoplayer

Go to a project
Commit 576ef821 by olly Committed by Oliver Woodman
Options

Remove explicit use of Robolectric PAUSED looper mode 

It's now the default everywhere, so there's no need to specify it
explicitly.

PiperOrigin-RevId: 322153319
parent 302b5f2b
Inline Side-by-side
Showing with 0 additions and 48 deletions
extensions/cronet/src/test/java/com/google/android/exoplayer2/ext/cronet/CronetDataSourceTest.java
...@@ -64,13 +64,10 @@ import org.junit.runner.RunWith; ...@@ -64,13 +64,10 @@ import org.junit.runner.RunWith;
import org.mockito.ArgumentMatchers; import org.mockito.ArgumentMatchers;
import org.mockito.Mock; import org.mockito.Mock;
import org.mockito.MockitoAnnotations; import org.mockito.MockitoAnnotations;
import org.robolectric.annotation.LooperMode;
import org.robolectric.annotation.LooperMode.Mode;
import org.robolectric.shadows.ShadowLooper; import org.robolectric.shadows.ShadowLooper;
/** Tests for {@link CronetDataSource}. */ /** Tests for {@link CronetDataSource}. */
@RunWith(AndroidJUnit4.class) @RunWith(AndroidJUnit4.class)
@LooperMode(Mode.PAUSED)
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;
......
library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java
...@@ -108,12 +108,10 @@ import org.junit.Before; ...@@ -108,12 +108,10 @@ import org.junit.Before;
import org.junit.Ignore; import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.annotation.LooperMode;
import org.robolectric.shadows.ShadowAudioManager; import org.robolectric.shadows.ShadowAudioManager;
/** Unit test for {@link ExoPlayer}. */ /** Unit test for {@link ExoPlayer}. */
@RunWith(AndroidJUnit4.class) @RunWith(AndroidJUnit4.class)
@LooperMode(LooperMode.Mode.PAUSED)
public final class ExoPlayerTest { public final class ExoPlayerTest {
private static final String TAG = "ExoPlayerTest"; private static final String TAG = "ExoPlayerTest";
......
library/core/src/test/java/com/google/android/exoplayer2/analytics/AnalyticsCollectorTest.java
...@@ -70,12 +70,9 @@ import java.util.concurrent.atomic.AtomicInteger; ...@@ -70,12 +70,9 @@ import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.atomic.AtomicReference;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.annotation.LooperMode;
import org.robolectric.annotation.LooperMode.Mode;
/** Integration test for {@link AnalyticsCollector}. */ /** Integration test for {@link AnalyticsCollector}. */
@RunWith(AndroidJUnit4.class) @RunWith(AndroidJUnit4.class)
@LooperMode(Mode.PAUSED)
public final class AnalyticsCollectorTest { public final class AnalyticsCollectorTest {
private static final String TAG = "AnalyticsCollectorTest"; private static final String TAG = "AnalyticsCollectorTest";
......
library/core/src/test/java/com/google/android/exoplayer2/drm/OfflineLicenseHelperTest.java
...@@ -32,11 +32,9 @@ import org.junit.Test; ...@@ -32,11 +32,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.annotation.LooperMode;
/** Tests {@link OfflineLicenseHelper}. */ /** Tests {@link OfflineLicenseHelper}. */
@RunWith(AndroidJUnit4.class) @RunWith(AndroidJUnit4.class)
@LooperMode(LooperMode.Mode.PAUSED)
public class OfflineLicenseHelperTest { public class OfflineLicenseHelperTest {
private OfflineLicenseHelper offlineLicenseHelper; private OfflineLicenseHelper offlineLicenseHelper;
......
library/core/src/test/java/com/google/android/exoplayer2/mediacodec/AsynchronousMediaCodecAdapterTest.java
...@@ -19,7 +19,6 @@ package com.google.android.exoplayer2.mediacodec; ...@@ -19,7 +19,6 @@ package com.google.android.exoplayer2.mediacodec;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static org.junit.Assert.assertThrows; import static org.junit.Assert.assertThrows;
import static org.robolectric.Shadows.shadowOf; import static org.robolectric.Shadows.shadowOf;
import static org.robolectric.annotation.LooperMode.Mode.PAUSED;
import android.media.MediaCodec; import android.media.MediaCodec;
import android.media.MediaFormat; import android.media.MediaFormat;
...@@ -32,11 +31,9 @@ import org.junit.After; ...@@ -32,11 +31,9 @@ import org.junit.After;
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.annotation.LooperMode;
import org.robolectric.shadows.ShadowLooper; import org.robolectric.shadows.ShadowLooper;
/** Unit tests for {@link AsynchronousMediaCodecAdapter}. */ /** Unit tests for {@link AsynchronousMediaCodecAdapter}. */
@LooperMode(PAUSED)
@RunWith(AndroidJUnit4.class) @RunWith(AndroidJUnit4.class)
public class AsynchronousMediaCodecAdapterTest { public class AsynchronousMediaCodecAdapterTest {
private AsynchronousMediaCodecAdapter adapter; private AsynchronousMediaCodecAdapter adapter;
......
library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadHelperTest.java
...@@ -52,11 +52,9 @@ import org.junit.Before; ...@@ -52,11 +52,9 @@ import org.junit.Before;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.annotation.LooperMode;
/** Unit tests for {@link DownloadHelper}. */ /** Unit tests for {@link DownloadHelper}. */
@RunWith(AndroidJUnit4.class) @RunWith(AndroidJUnit4.class)
@LooperMode(LooperMode.Mode.PAUSED)
public class DownloadHelperTest { public class DownloadHelperTest {
private static final Object TEST_MANIFEST = new Object(); private static final Object TEST_MANIFEST = new Object();
......
library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
...@@ -41,13 +41,10 @@ import org.junit.After; ...@@ -41,13 +41,10 @@ import org.junit.After;
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.annotation.LooperMode;
import org.robolectric.annotation.LooperMode.Mode;
import org.robolectric.shadows.ShadowLog; import org.robolectric.shadows.ShadowLog;
/** Tests {@link DownloadManager}. */ /** Tests {@link DownloadManager}. */
@RunWith(AndroidJUnit4.class) @RunWith(AndroidJUnit4.class)
@LooperMode(Mode.PAUSED)
public class DownloadManagerTest { public class DownloadManagerTest {
/** Timeout to use when blocking on conditions that we expect to become unblocked. */ /** Timeout to use when blocking on conditions that we expect to become unblocked. */
......
library/core/src/test/java/com/google/android/exoplayer2/source/ClippingMediaSourceTest.java
...@@ -45,12 +45,9 @@ import java.io.IOException; ...@@ -45,12 +45,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.annotation.LooperMode;
import org.robolectric.annotation.LooperMode.Mode;
/** Unit tests for {@link ClippingMediaSource}. */ /** Unit tests for {@link ClippingMediaSource}. */
@RunWith(AndroidJUnit4.class) @RunWith(AndroidJUnit4.class)
@LooperMode(Mode.PAUSED)
public final class ClippingMediaSourceTest { public final class ClippingMediaSourceTest {
private static final long TEST_PERIOD_DURATION_US = 1_000_000; private static final long TEST_PERIOD_DURATION_US = 1_000_000;
......
library/core/src/test/java/com/google/android/exoplayer2/source/ConcatenatingMediaSourceTest.java
...@@ -43,11 +43,9 @@ import org.junit.After; ...@@ -43,11 +43,9 @@ import org.junit.After;
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.annotation.LooperMode;
/** Unit tests for {@link ConcatenatingMediaSource}. */ /** Unit tests for {@link ConcatenatingMediaSource}. */
@RunWith(AndroidJUnit4.class) @RunWith(AndroidJUnit4.class)
@LooperMode(LooperMode.Mode.PAUSED)
public final class ConcatenatingMediaSourceTest { public final class ConcatenatingMediaSourceTest {
private ConcatenatingMediaSource mediaSource; private ConcatenatingMediaSource mediaSource;
......
library/core/src/test/java/com/google/android/exoplayer2/source/LoopingMediaSourceTest.java
...@@ -28,11 +28,9 @@ import java.io.IOException; ...@@ -28,11 +28,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.annotation.LooperMode;
/** Unit tests for {@link LoopingMediaSource}. */ /** Unit tests for {@link LoopingMediaSource}. */
@RunWith(AndroidJUnit4.class) @RunWith(AndroidJUnit4.class)
@LooperMode(LooperMode.Mode.PAUSED)
public class LoopingMediaSourceTest { public class LoopingMediaSourceTest {
private FakeTimeline multiWindowTimeline; private FakeTimeline multiWindowTimeline;
......
library/core/src/test/java/com/google/android/exoplayer2/source/MergingMediaPeriodTest.java
...@@ -36,11 +36,9 @@ import java.util.concurrent.CountDownLatch; ...@@ -36,11 +36,9 @@ import java.util.concurrent.CountDownLatch;
import org.checkerframework.checker.nullness.compatqual.NullableType; import org.checkerframework.checker.nullness.compatqual.NullableType;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.annotation.LooperMode;
/** Unit test for {@link MergingMediaPeriod}. */ /** Unit test for {@link MergingMediaPeriod}. */
@RunWith(AndroidJUnit4.class) @RunWith(AndroidJUnit4.class)
@LooperMode(LooperMode.Mode.PAUSED)
public final class MergingMediaPeriodTest { public final class MergingMediaPeriodTest {
private static final Format childFormat11 = new Format.Builder().setId("1_1").build(); private static final Format childFormat11 = new Format.Builder().setId("1_1").build();
......
library/core/src/test/java/com/google/android/exoplayer2/source/MergingMediaSourceTest.java
...@@ -29,11 +29,9 @@ import com.google.android.exoplayer2.testutil.MediaSourceTestRunner; ...@@ -29,11 +29,9 @@ import com.google.android.exoplayer2.testutil.MediaSourceTestRunner;
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.annotation.LooperMode;
/** Unit tests for {@link MergingMediaSource}. */ /** Unit tests for {@link MergingMediaSource}. */
@RunWith(AndroidJUnit4.class) @RunWith(AndroidJUnit4.class)
@LooperMode(LooperMode.Mode.PAUSED)
public class MergingMediaSourceTest { public class MergingMediaSourceTest {
@Test @Test
......
library/core/src/test/java/com/google/android/exoplayer2/source/ProgressiveMediaPeriodTest.java
...@@ -33,11 +33,9 @@ import com.google.android.exoplayer2.upstream.DefaultLoadErrorHandlingPolicy; ...@@ -33,11 +33,9 @@ import com.google.android.exoplayer2.upstream.DefaultLoadErrorHandlingPolicy;
import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicBoolean;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.annotation.LooperMode;
/** Unit test for {@link ProgressiveMediaPeriod}. */ /** Unit test for {@link ProgressiveMediaPeriod}. */
@RunWith(AndroidJUnit4.class) @RunWith(AndroidJUnit4.class)
@LooperMode(LooperMode.Mode.PAUSED)
public final class ProgressiveMediaPeriodTest { public final class ProgressiveMediaPeriodTest {
@Test @Test
......
library/core/src/test/java/com/google/android/exoplayer2/source/ads/AdsMediaSourceTest.java
...@@ -22,7 +22,6 @@ import static org.mockito.Mockito.mock; ...@@ -22,7 +22,6 @@ import static org.mockito.Mockito.mock;
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 static org.robolectric.Shadows.shadowOf; import static org.robolectric.Shadows.shadowOf;
import static org.robolectric.annotation.LooperMode.Mode.PAUSED;
import android.net.Uri; import android.net.Uri;
import android.os.Looper; import android.os.Looper;
...@@ -47,11 +46,9 @@ import org.mockito.ArgumentCaptor; ...@@ -47,11 +46,9 @@ import org.mockito.ArgumentCaptor;
import org.mockito.Mock; import org.mockito.Mock;
import org.mockito.junit.MockitoJUnit; import org.mockito.junit.MockitoJUnit;
import org.mockito.junit.MockitoRule; import org.mockito.junit.MockitoRule;
import org.robolectric.annotation.LooperMode;
/** Unit tests for {@link AdsMediaSource}. */ /** Unit tests for {@link AdsMediaSource}. */
@RunWith(AndroidJUnit4.class) @RunWith(AndroidJUnit4.class)
@LooperMode(PAUSED)
public final class AdsMediaSourceTest { public final class AdsMediaSourceTest {
private static final long PREROLL_AD_DURATION_US = 10 * C.MICROS_PER_SECOND; private static final long PREROLL_AD_DURATION_US = 10 * C.MICROS_PER_SECOND;
......
library/core/src/test/java/com/google/android/exoplayer2/video/DecoderVideoRendererTest.java
...@@ -52,11 +52,9 @@ import org.junit.runner.RunWith; ...@@ -52,11 +52,9 @@ import org.junit.runner.RunWith;
import org.mockito.Mock; import org.mockito.Mock;
import org.mockito.junit.MockitoJUnit; import org.mockito.junit.MockitoJUnit;
import org.mockito.junit.MockitoRule; import org.mockito.junit.MockitoRule;
import org.robolectric.annotation.LooperMode;
import org.robolectric.shadows.ShadowLooper; import org.robolectric.shadows.ShadowLooper;
/** Unit test for {@link DecoderVideoRenderer}. */ /** Unit test for {@link DecoderVideoRenderer}. */
@LooperMode(LooperMode.Mode.PAUSED)
@RunWith(AndroidJUnit4.class) @RunWith(AndroidJUnit4.class)
public final class DecoderVideoRendererTest { public final class DecoderVideoRendererTest {
@Rule public final MockitoRule mockito = MockitoJUnit.rule(); @Rule public final MockitoRule mockito = MockitoJUnit.rule();
......
library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DashMediaPeriodTest.java
...@@ -48,11 +48,9 @@ import java.util.Collections; ...@@ -48,11 +48,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.annotation.LooperMode;
/** Unit tests for {@link DashMediaPeriod}. */ /** Unit tests for {@link DashMediaPeriod}. */
@RunWith(AndroidJUnit4.class) @RunWith(AndroidJUnit4.class)
@LooperMode(LooperMode.Mode.PAUSED)
public final class DashMediaPeriodTest { public final class DashMediaPeriodTest {
@Test @Test
......
library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadManagerDashTest.java
...@@ -55,12 +55,10 @@ import org.junit.Ignore; ...@@ -55,12 +55,10 @@ import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.MockitoAnnotations; import org.mockito.MockitoAnnotations;
import org.robolectric.annotation.LooperMode;
import org.robolectric.shadows.ShadowLog; import org.robolectric.shadows.ShadowLog;
/** Tests {@link DownloadManager}. */ /** Tests {@link DownloadManager}. */
@RunWith(AndroidJUnit4.class) @RunWith(AndroidJUnit4.class)
@LooperMode(LooperMode.Mode.PAUSED)
public class DownloadManagerDashTest { public class DownloadManagerDashTest {
private static final int ASSERT_TRUE_TIMEOUT_MS = 5000; private static final int ASSERT_TRUE_TIMEOUT_MS = 5000;
......
library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadServiceDashTest.java
...@@ -57,11 +57,9 @@ import org.junit.Before; ...@@ -57,11 +57,9 @@ import org.junit.Before;
import org.junit.Ignore; import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.annotation.LooperMode;
/** Unit tests for {@link DownloadService}. */ /** Unit tests for {@link DownloadService}. */
@RunWith(AndroidJUnit4.class) @RunWith(AndroidJUnit4.class)
@LooperMode(LooperMode.Mode.PAUSED)
public class DownloadServiceDashTest { public class DownloadServiceDashTest {
private SimpleCache cache; private SimpleCache cache;
......
library/hls/src/test/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriodTest.java
...@@ -44,11 +44,9 @@ import java.util.Collections; ...@@ -44,11 +44,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.annotation.LooperMode;
/** Unit test for {@link HlsMediaPeriod}. */ /** Unit test for {@link HlsMediaPeriod}. */
@RunWith(AndroidJUnit4.class) @RunWith(AndroidJUnit4.class)
@LooperMode(LooperMode.Mode.PAUSED)
public final class HlsMediaPeriodTest { public final class HlsMediaPeriodTest {
@Test @Test
......
library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaPeriodTest.java
...@@ -37,11 +37,9 @@ import com.google.android.exoplayer2.upstream.TransferListener; ...@@ -37,11 +37,9 @@ import com.google.android.exoplayer2.upstream.TransferListener;
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.annotation.LooperMode;
/** Unit tests for {@link SsMediaPeriod}. */ /** Unit tests for {@link SsMediaPeriod}. */
@RunWith(AndroidJUnit4.class) @RunWith(AndroidJUnit4.class)
@LooperMode(LooperMode.Mode.PAUSED)
public class SsMediaPeriodTest { public class SsMediaPeriodTest {
@Test @Test
......
testutils/src/test/java/com/google/android/exoplayer2/testutil/FakeClockTest.java
...@@ -26,11 +26,9 @@ import java.util.concurrent.CountDownLatch; ...@@ -26,11 +26,9 @@ import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.annotation.LooperMode;
/** Unit test for {@link FakeClock}. */ /** Unit test for {@link FakeClock}. */
@RunWith(AndroidJUnit4.class) @RunWith(AndroidJUnit4.class)
@LooperMode(LooperMode.Mode.PAUSED)
public final class FakeClockTest { public final class FakeClockTest {
private static final long TIMEOUT_MS = 10_000; private static final long TIMEOUT_MS = 10_000;
......
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