From 0df0df9aeece386b7421afde160e9009457512ab Mon Sep 17 00:00:00 2001 From: ibaker Date: Mon, 5 Jul 2021 12:12:41 +0100 Subject: [PATCH] Remove @DoNotInstrument from test classes This isn't needed now we've updated to Robolectric 4.6 PiperOrigin-RevId: 383109343 --- .../com/google/android/exoplayer2/ext/cast/CastPlayerTest.java | 2 -- .../android/exoplayer2/ext/cast/CastTimelineTrackerTest.java | 2 -- .../android/exoplayer2/ext/cast/CastTrackSelectionTest.java | 2 -- .../exoplayer2/ext/cast/DefaultMediaItemConverterTest.java | 2 -- .../exoplayer2/ext/cronet/ByteArrayUploadDataProviderTest.java | 2 -- .../android/exoplayer2/ext/cronet/CronetDataSourceTest.java | 2 -- .../exoplayer2/ext/ffmpeg/DefaultRenderersFactoryTest.java | 2 -- .../exoplayer2/ext/flac/DefaultRenderersFactoryTest.java | 2 -- .../exoplayer2/ext/okhttp/OkHttpDataSourceContractTest.java | 2 -- .../android/exoplayer2/ext/okhttp/OkHttpDataSourceTest.java | 2 -- .../exoplayer2/ext/opus/DefaultRenderersFactoryTest.java | 2 -- .../android/exoplayer2/ext/rtmp/DefaultDataSourceTest.java | 2 -- .../android/exoplayer2/ext/vp9/DefaultRenderersFactoryTest.java | 2 -- .../android/exoplayer2/source/hls/Aes128DataSourceTest.java | 2 -- .../exoplayer2/source/hls/DefaultHlsExtractorFactoryTest.java | 2 -- .../exoplayer2/source/hls/DefaultMediaSourceFactoryTest.java | 2 -- .../source/hls/FullSegmentEncryptionKeyCacheTest.java | 2 -- .../android/exoplayer2/source/hls/HlsMediaPeriodTest.java | 2 -- .../source/hls/HlsMediaPlaylistSegmentIteratorTest.java | 2 -- .../android/exoplayer2/source/hls/HlsMediaSourceTest.java | 2 -- .../exoplayer2/source/hls/HlsTrackMetadataEntryTest.java | 2 -- .../android/exoplayer2/source/hls/WebvttExtractorTest.java | 2 -- .../exoplayer2/source/hls/offline/DownloadHelperTest.java | 2 -- .../exoplayer2/source/hls/offline/HlsDownloaderTest.java | 2 -- .../source/hls/playlist/DefaultHlsPlaylistTrackerTest.java | 2 -- .../source/hls/playlist/HlsMasterPlaylistParserTest.java | 2 -- .../source/hls/playlist/HlsMediaPlaylistParserTest.java | 2 -- .../exoplayer2/source/rtsp/RtpPacketReorderingQueueTest.java | 2 -- .../android/exoplayer2/source/rtsp/RtpPacketStreamDump.java | 2 -- .../google/android/exoplayer2/source/rtsp/RtpPacketTest.java | 2 -- .../exoplayer2/source/rtsp/RtspAuthenticationInfoTest.java | 2 -- .../google/android/exoplayer2/source/rtsp/RtspClientTest.java | 2 -- .../google/android/exoplayer2/source/rtsp/RtspHeadersTest.java | 2 -- .../android/exoplayer2/source/rtsp/RtspMediaPeriodTest.java | 2 -- .../android/exoplayer2/source/rtsp/RtspMediaTrackTest.java | 2 -- .../android/exoplayer2/source/rtsp/RtspMessageChannelTest.java | 2 -- .../android/exoplayer2/source/rtsp/RtspMessageUtilTest.java | 2 -- .../google/android/exoplayer2/source/rtsp/RtspPlaybackTest.java | 2 -- .../android/exoplayer2/source/rtsp/RtspSessionTimingTest.java | 2 -- .../android/exoplayer2/source/rtsp/RtspTrackTimingTest.java | 2 -- .../android/exoplayer2/source/rtsp/SessionDescriptionTest.java | 2 -- .../exoplayer2/source/rtsp/TransferRtpDataChannelTest.java | 2 -- .../exoplayer2/source/rtsp/UdpDataSourceRtpDataChannelTest.java | 2 -- .../android/exoplayer2/source/rtsp/reader/RtpAc3ReaderTest.java | 2 -- .../source/smoothstreaming/DefaultMediaSourceFactoryTest.java | 2 -- .../exoplayer2/source/smoothstreaming/SsMediaPeriodTest.java | 2 -- .../exoplayer2/source/smoothstreaming/SsMediaSourceTest.java | 2 -- .../source/smoothstreaming/manifest/SsManifestParserTest.java | 2 -- .../source/smoothstreaming/manifest/SsManifestTest.java | 2 -- .../source/smoothstreaming/offline/DownloadHelperTest.java | 2 -- .../source/smoothstreaming/offline/SsDownloaderTest.java | 2 -- .../transformer/SefSlowMotionVideoSampleTransformerTest.java | 2 -- .../exoplayer2/transformer/SegmentSpeedProviderTest.java | 2 -- .../android/exoplayer2/transformer/TransformerBuilderTest.java | 2 -- .../google/android/exoplayer2/transformer/TransformerTest.java | 2 -- .../android/exoplayer2/robolectric/RobolectricUtilTest.java | 2 -- .../android/exoplayer2/testutil/AdditionalFailureInfoTest.java | 2 -- .../android/exoplayer2/testutil/FakeAdaptiveDataSetTest.java | 2 -- .../com/google/android/exoplayer2/testutil/FakeClockTest.java | 2 -- .../com/google/android/exoplayer2/testutil/FakeDataSetTest.java | 2 -- .../android/exoplayer2/testutil/FakeDataSourceContractTest.java | 2 -- .../google/android/exoplayer2/testutil/FakeDataSourceTest.java | 2 -- .../android/exoplayer2/testutil/WebServerDispatcherTest.java | 2 -- .../android/exoplayer2/testutil/truth/SpannedSubjectTest.java | 2 -- 64 files changed, 128 deletions(-) diff --git a/extensions/cast/src/test/java/com/google/android/exoplayer2/ext/cast/CastPlayerTest.java b/extensions/cast/src/test/java/com/google/android/exoplayer2/ext/cast/CastPlayerTest.java index 104fa78769..a9aa3b4062 100644 --- a/extensions/cast/src/test/java/com/google/android/exoplayer2/ext/cast/CastPlayerTest.java +++ b/extensions/cast/src/test/java/com/google/android/exoplayer2/ext/cast/CastPlayerTest.java @@ -90,11 +90,9 @@ import org.mockito.Captor; import org.mockito.InOrder; import org.mockito.Mock; import org.mockito.Mockito; -import org.robolectric.annotation.internal.DoNotInstrument; /** Tests for {@link CastPlayer}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public class CastPlayerTest { private CastPlayer castPlayer; diff --git a/extensions/cast/src/test/java/com/google/android/exoplayer2/ext/cast/CastTimelineTrackerTest.java b/extensions/cast/src/test/java/com/google/android/exoplayer2/ext/cast/CastTimelineTrackerTest.java index 014009ed53..cae117ea00 100644 --- a/extensions/cast/src/test/java/com/google/android/exoplayer2/ext/cast/CastTimelineTrackerTest.java +++ b/extensions/cast/src/test/java/com/google/android/exoplayer2/ext/cast/CastTimelineTrackerTest.java @@ -29,11 +29,9 @@ import java.util.Collections; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mockito; -import org.robolectric.annotation.internal.DoNotInstrument; /** Tests for {@link CastTimelineTracker}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public class CastTimelineTrackerTest { private static final long DURATION_2_MS = 2000; diff --git a/extensions/cast/src/test/java/com/google/android/exoplayer2/ext/cast/CastTrackSelectionTest.java b/extensions/cast/src/test/java/com/google/android/exoplayer2/ext/cast/CastTrackSelectionTest.java index 1aadc1bd6c..0a30c0c4b8 100644 --- a/extensions/cast/src/test/java/com/google/android/exoplayer2/ext/cast/CastTrackSelectionTest.java +++ b/extensions/cast/src/test/java/com/google/android/exoplayer2/ext/cast/CastTrackSelectionTest.java @@ -23,11 +23,9 @@ import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.source.TrackGroup; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** Test for {@link CastTrackSelection}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public class CastTrackSelectionTest { private static final TrackGroup TRACK_GROUP = diff --git a/extensions/cast/src/test/java/com/google/android/exoplayer2/ext/cast/DefaultMediaItemConverterTest.java b/extensions/cast/src/test/java/com/google/android/exoplayer2/ext/cast/DefaultMediaItemConverterTest.java index 6e17ac8fd1..9d80725c56 100644 --- a/extensions/cast/src/test/java/com/google/android/exoplayer2/ext/cast/DefaultMediaItemConverterTest.java +++ b/extensions/cast/src/test/java/com/google/android/exoplayer2/ext/cast/DefaultMediaItemConverterTest.java @@ -27,11 +27,9 @@ import com.google.android.gms.cast.MediaQueueItem; import java.util.Collections; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** Test for {@link DefaultMediaItemConverter}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public class DefaultMediaItemConverterTest { @Test diff --git a/extensions/cronet/src/test/java/com/google/android/exoplayer2/ext/cronet/ByteArrayUploadDataProviderTest.java b/extensions/cronet/src/test/java/com/google/android/exoplayer2/ext/cronet/ByteArrayUploadDataProviderTest.java index f8e3430027..355b4ed2a9 100644 --- a/extensions/cronet/src/test/java/com/google/android/exoplayer2/ext/cronet/ByteArrayUploadDataProviderTest.java +++ b/extensions/cronet/src/test/java/com/google/android/exoplayer2/ext/cronet/ByteArrayUploadDataProviderTest.java @@ -29,11 +29,9 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.robolectric.annotation.internal.DoNotInstrument; /** Tests for {@link ByteArrayUploadDataProvider}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public final class ByteArrayUploadDataProviderTest { private static final byte[] TEST_DATA = new byte[] {1, 2, 3, 4, 5, 6, 7, 8, 9, 10}; diff --git a/extensions/cronet/src/test/java/com/google/android/exoplayer2/ext/cronet/CronetDataSourceTest.java b/extensions/cronet/src/test/java/com/google/android/exoplayer2/ext/cronet/CronetDataSourceTest.java index e510776860..e2e278ad00 100644 --- a/extensions/cronet/src/test/java/com/google/android/exoplayer2/ext/cronet/CronetDataSourceTest.java +++ b/extensions/cronet/src/test/java/com/google/android/exoplayer2/ext/cronet/CronetDataSourceTest.java @@ -76,12 +76,10 @@ import org.mockito.ArgumentCaptor; import org.mockito.ArgumentMatchers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.robolectric.annotation.internal.DoNotInstrument; import org.robolectric.shadows.ShadowLooper; /** Tests for {@link CronetDataSource}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public final class CronetDataSourceTest { private static final int TEST_CONNECT_TIMEOUT_MS = 100; diff --git a/extensions/ffmpeg/src/test/java/com/google/android/exoplayer2/ext/ffmpeg/DefaultRenderersFactoryTest.java b/extensions/ffmpeg/src/test/java/com/google/android/exoplayer2/ext/ffmpeg/DefaultRenderersFactoryTest.java index dec1f75563..cc8ca5487e 100644 --- a/extensions/ffmpeg/src/test/java/com/google/android/exoplayer2/ext/ffmpeg/DefaultRenderersFactoryTest.java +++ b/extensions/ffmpeg/src/test/java/com/google/android/exoplayer2/ext/ffmpeg/DefaultRenderersFactoryTest.java @@ -20,14 +20,12 @@ import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.testutil.DefaultRenderersFactoryAsserts; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** * Unit test for {@link DefaultRenderersFactoryTest} with {@link FfmpegAudioRenderer} and {@link * FfmpegVideoRenderer}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public final class DefaultRenderersFactoryTest { @Test diff --git a/extensions/flac/src/test/java/com/google/android/exoplayer2/ext/flac/DefaultRenderersFactoryTest.java b/extensions/flac/src/test/java/com/google/android/exoplayer2/ext/flac/DefaultRenderersFactoryTest.java index 98dd5e55ae..3fb8f2cece 100644 --- a/extensions/flac/src/test/java/com/google/android/exoplayer2/ext/flac/DefaultRenderersFactoryTest.java +++ b/extensions/flac/src/test/java/com/google/android/exoplayer2/ext/flac/DefaultRenderersFactoryTest.java @@ -20,11 +20,9 @@ import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.testutil.DefaultRenderersFactoryAsserts; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** Unit test for {@link DefaultRenderersFactoryTest} with {@link LibflacAudioRenderer}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public final class DefaultRenderersFactoryTest { @Test diff --git a/extensions/okhttp/src/test/java/com/google/android/exoplayer2/ext/okhttp/OkHttpDataSourceContractTest.java b/extensions/okhttp/src/test/java/com/google/android/exoplayer2/ext/okhttp/OkHttpDataSourceContractTest.java index 0aa68ecdff..8bf572d70d 100644 --- a/extensions/okhttp/src/test/java/com/google/android/exoplayer2/ext/okhttp/OkHttpDataSourceContractTest.java +++ b/extensions/okhttp/src/test/java/com/google/android/exoplayer2/ext/okhttp/OkHttpDataSourceContractTest.java @@ -24,11 +24,9 @@ import com.google.common.collect.ImmutableList; import okhttp3.OkHttpClient; import org.junit.Rule; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** {@link DataSource} contract tests for {@link OkHttpDataSource}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public class OkHttpDataSourceContractTest extends DataSourceContractTest { @Rule public HttpDataSourceTestEnv httpDataSourceTestEnv = new HttpDataSourceTestEnv(); diff --git a/extensions/okhttp/src/test/java/com/google/android/exoplayer2/ext/okhttp/OkHttpDataSourceTest.java b/extensions/okhttp/src/test/java/com/google/android/exoplayer2/ext/okhttp/OkHttpDataSourceTest.java index cf85aff42c..889d99cc2e 100644 --- a/extensions/okhttp/src/test/java/com/google/android/exoplayer2/ext/okhttp/OkHttpDataSourceTest.java +++ b/extensions/okhttp/src/test/java/com/google/android/exoplayer2/ext/okhttp/OkHttpDataSourceTest.java @@ -32,11 +32,9 @@ import okhttp3.mockwebserver.MockResponse; import okhttp3.mockwebserver.MockWebServer; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** Unit tests for {@link OkHttpDataSource}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public class OkHttpDataSourceTest { /** diff --git a/extensions/opus/src/test/java/com/google/android/exoplayer2/ext/opus/DefaultRenderersFactoryTest.java b/extensions/opus/src/test/java/com/google/android/exoplayer2/ext/opus/DefaultRenderersFactoryTest.java index 02c925357d..9931f2d05f 100644 --- a/extensions/opus/src/test/java/com/google/android/exoplayer2/ext/opus/DefaultRenderersFactoryTest.java +++ b/extensions/opus/src/test/java/com/google/android/exoplayer2/ext/opus/DefaultRenderersFactoryTest.java @@ -20,11 +20,9 @@ import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.testutil.DefaultRenderersFactoryAsserts; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** Unit test for {@link DefaultRenderersFactoryTest} with {@link LibopusAudioRenderer}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public final class DefaultRenderersFactoryTest { @Test diff --git a/extensions/rtmp/src/test/java/com/google/android/exoplayer2/ext/rtmp/DefaultDataSourceTest.java b/extensions/rtmp/src/test/java/com/google/android/exoplayer2/ext/rtmp/DefaultDataSourceTest.java index 56ee5df1de..469e66a884 100644 --- a/extensions/rtmp/src/test/java/com/google/android/exoplayer2/ext/rtmp/DefaultDataSourceTest.java +++ b/extensions/rtmp/src/test/java/com/google/android/exoplayer2/ext/rtmp/DefaultDataSourceTest.java @@ -23,11 +23,9 @@ import com.google.android.exoplayer2.upstream.DefaultDataSource; import java.io.IOException; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** Unit test for {@link DefaultDataSource} with RTMP URIs. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public final class DefaultDataSourceTest { @Test diff --git a/extensions/vp9/src/test/java/com/google/android/exoplayer2/ext/vp9/DefaultRenderersFactoryTest.java b/extensions/vp9/src/test/java/com/google/android/exoplayer2/ext/vp9/DefaultRenderersFactoryTest.java index a107a79faa..33de600aa7 100644 --- a/extensions/vp9/src/test/java/com/google/android/exoplayer2/ext/vp9/DefaultRenderersFactoryTest.java +++ b/extensions/vp9/src/test/java/com/google/android/exoplayer2/ext/vp9/DefaultRenderersFactoryTest.java @@ -20,11 +20,9 @@ import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.testutil.DefaultRenderersFactoryAsserts; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** Unit test for {@link DefaultRenderersFactoryTest} with {@link LibvpxVideoRenderer}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public final class DefaultRenderersFactoryTest { @Test diff --git a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/Aes128DataSourceTest.java b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/Aes128DataSourceTest.java index f25a2157be..3eef5c36d2 100644 --- a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/Aes128DataSourceTest.java +++ b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/Aes128DataSourceTest.java @@ -29,11 +29,9 @@ import javax.crypto.Cipher; import javax.crypto.NoSuchPaddingException; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** Test for {@link Aes128DataSource}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public class Aes128DataSourceTest { @Test diff --git a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/DefaultHlsExtractorFactoryTest.java b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/DefaultHlsExtractorFactoryTest.java index 2187d2c561..7055bc1ba4 100644 --- a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/DefaultHlsExtractorFactoryTest.java +++ b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/DefaultHlsExtractorFactoryTest.java @@ -40,11 +40,9 @@ import java.util.Map; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** Unit test for {@link DefaultExtractorsFactory}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public class DefaultHlsExtractorFactoryTest { private static final Uri URI_WITH_JPEG_EXTENSION = Uri.parse("http://path/filename.jpg"); diff --git a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/DefaultMediaSourceFactoryTest.java b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/DefaultMediaSourceFactoryTest.java index b8dbdb197e..54383ffe33 100644 --- a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/DefaultMediaSourceFactoryTest.java +++ b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/DefaultMediaSourceFactoryTest.java @@ -27,11 +27,9 @@ import com.google.android.exoplayer2.source.MediaSource; import com.google.android.exoplayer2.util.MimeTypes; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** Unit test for creating HLS media sources with the {@link DefaultMediaSourceFactory}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public class DefaultMediaSourceFactoryTest { private static final String URI_MEDIA = "http://exoplayer.dev/video"; diff --git a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/FullSegmentEncryptionKeyCacheTest.java b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/FullSegmentEncryptionKeyCacheTest.java index 72fdddb4f4..3000faf7d4 100644 --- a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/FullSegmentEncryptionKeyCacheTest.java +++ b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/FullSegmentEncryptionKeyCacheTest.java @@ -23,11 +23,9 @@ import android.net.Uri; import androidx.test.ext.junit.runners.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** Tests for {@link FullSegmentEncryptionKeyCache}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public class FullSegmentEncryptionKeyCacheTest { private final Uri firstUri = Uri.parse("https://www.google.com"); diff --git a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriodTest.java b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriodTest.java index b42d54c11a..4ed8fc1ee3 100644 --- a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriodTest.java +++ b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriodTest.java @@ -44,11 +44,9 @@ import java.util.Collections; import java.util.List; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** Unit test for {@link HlsMediaPeriod}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public final class HlsMediaPeriodTest { @Test diff --git a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/HlsMediaPlaylistSegmentIteratorTest.java b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/HlsMediaPlaylistSegmentIteratorTest.java index 438d77c1ee..d4b4b1b4aa 100644 --- a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/HlsMediaPlaylistSegmentIteratorTest.java +++ b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/HlsMediaPlaylistSegmentIteratorTest.java @@ -32,11 +32,9 @@ import java.util.ArrayList; import java.util.List; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** Unit test for {@link HlsChunkSource.HlsMediaPlaylistSegmentIterator}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public class HlsMediaPlaylistSegmentIteratorTest { public static final String LOW_LATENCY_SEGMENTS_AND_PARTS = diff --git a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/HlsMediaSourceTest.java b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/HlsMediaSourceTest.java index 2e305c023f..635c5615e1 100644 --- a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/HlsMediaSourceTest.java +++ b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/HlsMediaSourceTest.java @@ -43,11 +43,9 @@ import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicReference; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** Unit test for {@link HlsMediaSource}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public class HlsMediaSourceTest { // Tests backwards compatibility diff --git a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/HlsTrackMetadataEntryTest.java b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/HlsTrackMetadataEntryTest.java index 6b1d7b0494..987c2bd1af 100644 --- a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/HlsTrackMetadataEntryTest.java +++ b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/HlsTrackMetadataEntryTest.java @@ -22,11 +22,9 @@ import androidx.test.ext.junit.runners.AndroidJUnit4; import com.google.android.exoplayer2.source.hls.HlsTrackMetadataEntry.VariantInfo; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** Test for {@link HlsTrackMetadataEntry}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public class HlsTrackMetadataEntryTest { @Test diff --git a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/WebvttExtractorTest.java b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/WebvttExtractorTest.java index 48ecf2dbb9..b9c3477456 100644 --- a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/WebvttExtractorTest.java +++ b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/WebvttExtractorTest.java @@ -29,11 +29,9 @@ import java.io.EOFException; import java.io.IOException; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** Tests for {@link WebvttExtractor}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public class WebvttExtractorTest { @Test diff --git a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/offline/DownloadHelperTest.java b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/offline/DownloadHelperTest.java index 2182acc01b..9d1127a3d7 100644 --- a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/offline/DownloadHelperTest.java +++ b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/offline/DownloadHelperTest.java @@ -24,11 +24,9 @@ import com.google.android.exoplayer2.testutil.FakeDataSource; import com.google.android.exoplayer2.util.MimeTypes; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** Unit test to verify creation of a HLS {@link DownloadHelper}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public final class DownloadHelperTest { @Test diff --git a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloaderTest.java b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloaderTest.java index b296499258..b8ff3680bf 100644 --- a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloaderTest.java +++ b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloaderTest.java @@ -64,11 +64,9 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mockito; -import org.robolectric.annotation.internal.DoNotInstrument; /** Unit tests for {@link HlsDownloader}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public class HlsDownloaderTest { private SimpleCache cache; diff --git a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/DefaultHlsPlaylistTrackerTest.java b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/DefaultHlsPlaylistTrackerTest.java index 72fe4eb57e..80060b15f8 100644 --- a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/DefaultHlsPlaylistTrackerTest.java +++ b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/DefaultHlsPlaylistTrackerTest.java @@ -39,11 +39,9 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** Unit test for {@link DefaultHlsPlaylistTracker}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public class DefaultHlsPlaylistTrackerTest { private static final String SAMPLE_M3U8_LIVE_MASTER = "media/m3u8/live_low_latency_master"; diff --git a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylistParserTest.java b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylistParserTest.java index cc3113277f..dff755a443 100644 --- a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylistParserTest.java +++ b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylistParserTest.java @@ -35,11 +35,9 @@ import java.util.Collections; import java.util.List; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** Test for {@link HlsMasterPlaylist}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public class HlsMasterPlaylistParserTest { private static final String PLAYLIST_URI = "https://example.com/test.m3u8"; diff --git a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/HlsMediaPlaylistParserTest.java b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/HlsMediaPlaylistParserTest.java index 24f091d08c..17ce2251b4 100644 --- a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/HlsMediaPlaylistParserTest.java +++ b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/HlsMediaPlaylistParserTest.java @@ -36,11 +36,9 @@ import java.util.HashMap; import java.util.List; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** Test for {@link HlsMediaPlaylistParserTest}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public class HlsMediaPlaylistParserTest { @Test diff --git a/library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/RtpPacketReorderingQueueTest.java b/library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/RtpPacketReorderingQueueTest.java index 181e1cef4d..fcfb19f5b6 100644 --- a/library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/RtpPacketReorderingQueueTest.java +++ b/library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/RtpPacketReorderingQueueTest.java @@ -23,11 +23,9 @@ import java.util.ArrayList; import java.util.List; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** Unit tests for {@link RtpPacketReorderingQueue}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public class RtpPacketReorderingQueueTest { private final RtpPacketReorderingQueue reorderingQueue = new RtpPacketReorderingQueue(); diff --git a/library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/RtpPacketStreamDump.java b/library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/RtpPacketStreamDump.java index 082b9e7054..4758494273 100644 --- a/library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/RtpPacketStreamDump.java +++ b/library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/RtpPacketStreamDump.java @@ -20,10 +20,8 @@ import com.google.common.collect.ImmutableList; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; -import org.robolectric.annotation.internal.DoNotInstrument; /** A value wrapper for a dumped RTP packet stream. */ -@DoNotInstrument /* package */ class RtpPacketStreamDump { /** The name of the RTP track. */ public final String trackName; diff --git a/library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/RtpPacketTest.java b/library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/RtpPacketTest.java index 76aa61e7ac..929a0edc21 100644 --- a/library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/RtpPacketTest.java +++ b/library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/RtpPacketTest.java @@ -25,11 +25,9 @@ import com.google.android.exoplayer2.C; import java.util.Arrays; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** Unit tests for {@link RtpPacket}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public final class RtpPacketTest { /* 10.. .... = Version: RFC 1889 Version (2) diff --git a/library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/RtspAuthenticationInfoTest.java b/library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/RtspAuthenticationInfoTest.java index 640f604e2e..c191ad23c9 100644 --- a/library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/RtspAuthenticationInfoTest.java +++ b/library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/RtspAuthenticationInfoTest.java @@ -22,11 +22,9 @@ import androidx.test.ext.junit.runners.AndroidJUnit4; import com.google.android.exoplayer2.source.rtsp.RtspMessageUtil.RtspAuthUserInfo; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** Unit test for {@link RtspAuthenticationInfo}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public class RtspAuthenticationInfoTest { @Test diff --git a/library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/RtspClientTest.java b/library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/RtspClientTest.java index 8cee5af601..129871c584 100644 --- a/library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/RtspClientTest.java +++ b/library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/RtspClientTest.java @@ -33,11 +33,9 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** Tests the {@link RtspClient} using the {@link RtspServer}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public final class RtspClientTest { private static final String SESSION_DESCRIPTION = diff --git a/library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/RtspHeadersTest.java b/library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/RtspHeadersTest.java index 72427f9518..72dc0611e7 100644 --- a/library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/RtspHeadersTest.java +++ b/library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/RtspHeadersTest.java @@ -23,11 +23,9 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ListMultimap; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** Unit test for {@link RtspHeaders}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public final class RtspHeadersTest { @Test diff --git a/library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/RtspMediaPeriodTest.java b/library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/RtspMediaPeriodTest.java index 39789d4fb2..9072103958 100644 --- a/library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/RtspMediaPeriodTest.java +++ b/library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/RtspMediaPeriodTest.java @@ -30,11 +30,9 @@ import java.util.concurrent.atomic.AtomicLong; import org.junit.After; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** Tests the {@link RtspMediaPeriod} using the {@link RtspServer}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public final class RtspMediaPeriodTest { private static final long DEFAULT_TIMEOUT_MS = 8000; diff --git a/library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/RtspMediaTrackTest.java b/library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/RtspMediaTrackTest.java index 1b176fd292..7cbf1cff23 100644 --- a/library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/RtspMediaTrackTest.java +++ b/library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/RtspMediaTrackTest.java @@ -32,11 +32,9 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** Unit test for {@link RtspMediaTrack}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public class RtspMediaTrackTest { @Test diff --git a/library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/RtspMessageChannelTest.java b/library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/RtspMessageChannelTest.java index 1cd54053e6..eb1a4d5894 100644 --- a/library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/RtspMessageChannelTest.java +++ b/library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/RtspMessageChannelTest.java @@ -39,11 +39,9 @@ import java.util.concurrent.atomic.AtomicReference; import javax.net.SocketFactory; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** Unit test for {@link RtspMessageChannel}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public final class RtspMessageChannelTest { @Test diff --git a/library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/RtspMessageUtilTest.java b/library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/RtspMessageUtilTest.java index f0663ac342..d326586844 100644 --- a/library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/RtspMessageUtilTest.java +++ b/library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/RtspMessageUtilTest.java @@ -28,11 +28,9 @@ import java.util.Arrays; import java.util.List; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** Unit test for {@link RtspMessageUtil}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public final class RtspMessageUtilTest { @Test diff --git a/library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/RtspPlaybackTest.java b/library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/RtspPlaybackTest.java index c1829440e0..c88ae87be6 100644 --- a/library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/RtspPlaybackTest.java +++ b/library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/RtspPlaybackTest.java @@ -51,11 +51,9 @@ import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.annotation.Config; -import org.robolectric.annotation.internal.DoNotInstrument; /** Playback testing for RTSP. */ @Config(sdk = 29) -@DoNotInstrument @RunWith(AndroidJUnit4.class) public final class RtspPlaybackTest { diff --git a/library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/RtspSessionTimingTest.java b/library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/RtspSessionTimingTest.java index ecdfccb86e..133b4155b7 100644 --- a/library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/RtspSessionTimingTest.java +++ b/library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/RtspSessionTimingTest.java @@ -22,11 +22,9 @@ import androidx.test.ext.junit.runners.AndroidJUnit4; import com.google.android.exoplayer2.C; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** Unit test for {@link RtspSessionTiming}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public class RtspSessionTimingTest { @Test public void parseTiming_withNowLiveTiming() throws Exception { diff --git a/library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/RtspTrackTimingTest.java b/library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/RtspTrackTimingTest.java index 99ba83a09a..1269811301 100644 --- a/library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/RtspTrackTimingTest.java +++ b/library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/RtspTrackTimingTest.java @@ -25,11 +25,9 @@ import com.google.android.exoplayer2.ParserException; import com.google.common.collect.ImmutableList; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** Unit test for {@link RtspTrackTiming}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public class RtspTrackTimingTest { @Test public void parseTiming_withSeqNumberAndRtpTime() throws Exception { diff --git a/library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/SessionDescriptionTest.java b/library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/SessionDescriptionTest.java index 3c0f06fbe1..d71976148d 100644 --- a/library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/SessionDescriptionTest.java +++ b/library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/SessionDescriptionTest.java @@ -32,11 +32,9 @@ import android.net.Uri; import androidx.test.ext.junit.runners.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** Unit test for {@link SessionDescription}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public class SessionDescriptionTest { @Test diff --git a/library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/TransferRtpDataChannelTest.java b/library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/TransferRtpDataChannelTest.java index 739e307642..1f330fdbec 100644 --- a/library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/TransferRtpDataChannelTest.java +++ b/library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/TransferRtpDataChannelTest.java @@ -24,11 +24,9 @@ import com.google.common.primitives.Bytes; import java.util.Arrays; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** Unit test for {@link TransferRtpDataChannel}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public class TransferRtpDataChannelTest { private static final long POLL_TIMEOUT_MS = 8000; diff --git a/library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/UdpDataSourceRtpDataChannelTest.java b/library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/UdpDataSourceRtpDataChannelTest.java index 618d2b0e22..45980ca8d4 100644 --- a/library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/UdpDataSourceRtpDataChannelTest.java +++ b/library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/UdpDataSourceRtpDataChannelTest.java @@ -21,11 +21,9 @@ import androidx.test.ext.junit.runners.AndroidJUnit4; import com.google.android.exoplayer2.upstream.UdpDataSource; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** Unit test for {@link UdpDataSourceRtpDataChannel}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public class UdpDataSourceRtpDataChannelTest { @Test diff --git a/library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/reader/RtpAc3ReaderTest.java b/library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/reader/RtpAc3ReaderTest.java index 27a2c191ad..14ce7913c6 100644 --- a/library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/reader/RtpAc3ReaderTest.java +++ b/library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/reader/RtpAc3ReaderTest.java @@ -36,11 +36,9 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnit; import org.mockito.junit.MockitoRule; -import org.robolectric.annotation.internal.DoNotInstrument; /** Unit test for {@link RtpAc3Reader}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public final class RtpAc3ReaderTest { private final RtpPacket frame1fragment1 = diff --git a/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/DefaultMediaSourceFactoryTest.java b/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/DefaultMediaSourceFactoryTest.java index 598c106d64..43c62071d3 100644 --- a/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/DefaultMediaSourceFactoryTest.java +++ b/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/DefaultMediaSourceFactoryTest.java @@ -27,13 +27,11 @@ import com.google.android.exoplayer2.source.MediaSource; import com.google.android.exoplayer2.util.MimeTypes; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** * Unit test for creating SmoothStreaming media sources with the {@link DefaultMediaSourceFactory}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public class DefaultMediaSourceFactoryTest { private static final String URI_MEDIA = "http://exoplayer.dev/video"; diff --git a/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaPeriodTest.java b/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaPeriodTest.java index ee8f56ad46..81648706c4 100644 --- a/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaPeriodTest.java +++ b/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaPeriodTest.java @@ -37,11 +37,9 @@ import com.google.android.exoplayer2.upstream.TransferListener; import com.google.android.exoplayer2.util.MimeTypes; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** Unit tests for {@link SsMediaPeriod}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public class SsMediaPeriodTest { @Test diff --git a/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaSourceTest.java b/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaSourceTest.java index 2a3aa2ab49..7e6f659ce7 100644 --- a/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaSourceTest.java +++ b/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaSourceTest.java @@ -25,11 +25,9 @@ import com.google.android.exoplayer2.upstream.FileDataSource; import java.util.Collections; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** Unit tests for {@link SsMediaSource}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public class SsMediaSourceTest { // Tests backwards compatibility diff --git a/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestParserTest.java b/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestParserTest.java index 70c522535e..e5a7ee5add 100644 --- a/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestParserTest.java +++ b/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestParserTest.java @@ -22,11 +22,9 @@ import com.google.android.exoplayer2.testutil.TestUtil; import java.io.IOException; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** Unit tests for {@link SsManifestParser}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public final class SsManifestParserTest { private static final String SAMPLE_ISMC_1 = "media/smooth-streaming/sample_ismc_1"; diff --git a/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestTest.java b/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestTest.java index 4cc28fbee0..5715a787bd 100644 --- a/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestTest.java +++ b/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestTest.java @@ -31,11 +31,9 @@ import java.util.List; import java.util.Random; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** Unit tests for {@link SsManifest}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public class SsManifestTest { @Test diff --git a/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/offline/DownloadHelperTest.java b/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/offline/DownloadHelperTest.java index 6525a147aa..df1a0bd6da 100644 --- a/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/offline/DownloadHelperTest.java +++ b/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/offline/DownloadHelperTest.java @@ -24,11 +24,9 @@ import com.google.android.exoplayer2.testutil.FakeDataSource; import com.google.android.exoplayer2.util.MimeTypes; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** Unit test to verify creation of a SmoothStreaming {@link DownloadHelper}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public final class DownloadHelperTest { @Test diff --git a/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloaderTest.java b/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloaderTest.java index db4364de2c..38132b55ed 100644 --- a/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloaderTest.java +++ b/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloaderTest.java @@ -32,11 +32,9 @@ import java.util.Collections; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mockito; -import org.robolectric.annotation.internal.DoNotInstrument; /** Unit tests for {@link SsDownloader}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public final class SsDownloaderTest { @Test diff --git a/library/transformer/src/test/java/com/google/android/exoplayer2/transformer/SefSlowMotionVideoSampleTransformerTest.java b/library/transformer/src/test/java/com/google/android/exoplayer2/transformer/SefSlowMotionVideoSampleTransformerTest.java index 6bfeb61cd3..c29289e4c8 100644 --- a/library/transformer/src/test/java/com/google/android/exoplayer2/transformer/SefSlowMotionVideoSampleTransformerTest.java +++ b/library/transformer/src/test/java/com/google/android/exoplayer2/transformer/SefSlowMotionVideoSampleTransformerTest.java @@ -31,11 +31,9 @@ import java.util.Arrays; import java.util.List; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** Unit tests for {@link SefSlowMotionVideoSampleTransformer}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public class SefSlowMotionVideoSampleTransformerTest { /** diff --git a/library/transformer/src/test/java/com/google/android/exoplayer2/transformer/SegmentSpeedProviderTest.java b/library/transformer/src/test/java/com/google/android/exoplayer2/transformer/SegmentSpeedProviderTest.java index 40de5d3a52..616443e963 100644 --- a/library/transformer/src/test/java/com/google/android/exoplayer2/transformer/SegmentSpeedProviderTest.java +++ b/library/transformer/src/test/java/com/google/android/exoplayer2/transformer/SegmentSpeedProviderTest.java @@ -29,11 +29,9 @@ import com.google.common.collect.ImmutableList; import java.util.List; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** Unit tests for {@link SegmentSpeedProvider}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public class SegmentSpeedProviderTest { private static final SmtaMetadataEntry SMTA_SPEED_8 = diff --git a/library/transformer/src/test/java/com/google/android/exoplayer2/transformer/TransformerBuilderTest.java b/library/transformer/src/test/java/com/google/android/exoplayer2/transformer/TransformerBuilderTest.java index bd91385dca..8cfba3156d 100644 --- a/library/transformer/src/test/java/com/google/android/exoplayer2/transformer/TransformerBuilderTest.java +++ b/library/transformer/src/test/java/com/google/android/exoplayer2/transformer/TransformerBuilderTest.java @@ -24,11 +24,9 @@ import androidx.test.ext.junit.runners.AndroidJUnit4; import com.google.android.exoplayer2.util.MimeTypes; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** Unit test for {@link Transformer.Builder}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public class TransformerBuilderTest { @Test diff --git a/library/transformer/src/test/java/com/google/android/exoplayer2/transformer/TransformerTest.java b/library/transformer/src/test/java/com/google/android/exoplayer2/transformer/TransformerTest.java index 655f45481a..a99b4a369b 100644 --- a/library/transformer/src/test/java/com/google/android/exoplayer2/transformer/TransformerTest.java +++ b/library/transformer/src/test/java/com/google/android/exoplayer2/transformer/TransformerTest.java @@ -51,12 +51,10 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; import org.robolectric.shadows.ShadowMediaCodec; /** Unit test for {@link Transformer}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public final class TransformerTest { private static final String URI_PREFIX = "asset:///media/"; diff --git a/robolectricutils/src/test/java/com/google/android/exoplayer2/robolectric/RobolectricUtilTest.java b/robolectricutils/src/test/java/com/google/android/exoplayer2/robolectric/RobolectricUtilTest.java index f4bd23e6e9..08d1a2ae2b 100644 --- a/robolectricutils/src/test/java/com/google/android/exoplayer2/robolectric/RobolectricUtilTest.java +++ b/robolectricutils/src/test/java/com/google/android/exoplayer2/robolectric/RobolectricUtilTest.java @@ -30,11 +30,9 @@ import com.google.common.base.Supplier; import java.util.concurrent.TimeoutException; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** Unit test for {@link RobolectricUtil}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public class RobolectricUtilTest { @Test public void createRobolectricConditionVariable_blockWithTimeout_timesOut() diff --git a/testutils/src/test/java/com/google/android/exoplayer2/testutil/AdditionalFailureInfoTest.java b/testutils/src/test/java/com/google/android/exoplayer2/testutil/AdditionalFailureInfoTest.java index 9148c1784d..2087b1ad0e 100644 --- a/testutils/src/test/java/com/google/android/exoplayer2/testutil/AdditionalFailureInfoTest.java +++ b/testutils/src/test/java/com/google/android/exoplayer2/testutil/AdditionalFailureInfoTest.java @@ -29,11 +29,9 @@ import org.junit.rules.TestRule; import org.junit.runner.Description; import org.junit.runner.RunWith; import org.junit.runners.model.Statement; -import org.robolectric.annotation.internal.DoNotInstrument; /** Tests for {@link AdditionalFailureInfo}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public final class AdditionalFailureInfoTest { private final ExpectedException expectedException = new ExpectedException(); diff --git a/testutils/src/test/java/com/google/android/exoplayer2/testutil/FakeAdaptiveDataSetTest.java b/testutils/src/test/java/com/google/android/exoplayer2/testutil/FakeAdaptiveDataSetTest.java index de07b1f1ef..e475e93ae2 100644 --- a/testutils/src/test/java/com/google/android/exoplayer2/testutil/FakeAdaptiveDataSetTest.java +++ b/testutils/src/test/java/com/google/android/exoplayer2/testutil/FakeAdaptiveDataSetTest.java @@ -28,11 +28,9 @@ import java.util.List; import java.util.Random; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** Unit test for {@link FakeAdaptiveDataSet}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public final class FakeAdaptiveDataSetTest { private static final Format[] TEST_FORMATS = { diff --git a/testutils/src/test/java/com/google/android/exoplayer2/testutil/FakeClockTest.java b/testutils/src/test/java/com/google/android/exoplayer2/testutil/FakeClockTest.java index 2877f0e4cb..bcd6fa902e 100644 --- a/testutils/src/test/java/com/google/android/exoplayer2/testutil/FakeClockTest.java +++ b/testutils/src/test/java/com/google/android/exoplayer2/testutil/FakeClockTest.java @@ -32,12 +32,10 @@ import java.util.ArrayList; import java.util.List; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; import org.robolectric.shadows.ShadowLooper; /** Unit test for {@link FakeClock}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public final class FakeClockTest { @Test diff --git a/testutils/src/test/java/com/google/android/exoplayer2/testutil/FakeDataSetTest.java b/testutils/src/test/java/com/google/android/exoplayer2/testutil/FakeDataSetTest.java index 057cbeb731..0f7aabffc1 100644 --- a/testutils/src/test/java/com/google/android/exoplayer2/testutil/FakeDataSetTest.java +++ b/testutils/src/test/java/com/google/android/exoplayer2/testutil/FakeDataSetTest.java @@ -24,11 +24,9 @@ import java.io.IOException; import java.util.List; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** Unit test for {@link FakeDataSet} */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public final class FakeDataSetTest { @Test diff --git a/testutils/src/test/java/com/google/android/exoplayer2/testutil/FakeDataSourceContractTest.java b/testutils/src/test/java/com/google/android/exoplayer2/testutil/FakeDataSourceContractTest.java index 3bd56d7e60..975d8f6f36 100644 --- a/testutils/src/test/java/com/google/android/exoplayer2/testutil/FakeDataSourceContractTest.java +++ b/testutils/src/test/java/com/google/android/exoplayer2/testutil/FakeDataSourceContractTest.java @@ -21,11 +21,9 @@ import com.google.android.exoplayer2.upstream.DataSource; import com.google.common.collect.ImmutableList; import org.junit.Before; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** {@link DataSource} contract tests for {@link FakeDataSource}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public class FakeDataSourceContractTest extends DataSourceContractTest { private Uri simpleUri; diff --git a/testutils/src/test/java/com/google/android/exoplayer2/testutil/FakeDataSourceTest.java b/testutils/src/test/java/com/google/android/exoplayer2/testutil/FakeDataSourceTest.java index c262dfe253..1a03134d98 100644 --- a/testutils/src/test/java/com/google/android/exoplayer2/testutil/FakeDataSourceTest.java +++ b/testutils/src/test/java/com/google/android/exoplayer2/testutil/FakeDataSourceTest.java @@ -27,11 +27,9 @@ import java.util.Arrays; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** Unit test for {@link FakeDataSource}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public final class FakeDataSourceTest { private static final String URI_STRING = "test://test.test"; diff --git a/testutils/src/test/java/com/google/android/exoplayer2/testutil/WebServerDispatcherTest.java b/testutils/src/test/java/com/google/android/exoplayer2/testutil/WebServerDispatcherTest.java index f8fb346c4d..2def3514f8 100644 --- a/testutils/src/test/java/com/google/android/exoplayer2/testutil/WebServerDispatcherTest.java +++ b/testutils/src/test/java/com/google/android/exoplayer2/testutil/WebServerDispatcherTest.java @@ -28,7 +28,6 @@ import okhttp3.mockwebserver.MockWebServer; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** Tests for {@link WebServerDispatcher}. */ // We use the OkHttp client library for these tests because it's generally nicer to use than Java's @@ -52,7 +51,6 @@ import org.robolectric.annotation.internal.DoNotInstrument; // So instead we just don't test these cases that require passing header combinations that are // impossible with OkHttp. @RunWith(AndroidJUnit4.class) -@DoNotInstrument public class WebServerDispatcherTest { private static int seed; diff --git a/testutils/src/test/java/com/google/android/exoplayer2/testutil/truth/SpannedSubjectTest.java b/testutils/src/test/java/com/google/android/exoplayer2/testutil/truth/SpannedSubjectTest.java index 910a043f23..aaa399a47d 100644 --- a/testutils/src/test/java/com/google/android/exoplayer2/testutil/truth/SpannedSubjectTest.java +++ b/testutils/src/test/java/com/google/android/exoplayer2/testutil/truth/SpannedSubjectTest.java @@ -47,11 +47,9 @@ import com.google.android.exoplayer2.util.Util; import com.google.common.truth.ExpectFailure; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** Tests for {@link SpannedSubject}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public class SpannedSubjectTest { private static final String TEXT_PREFIX = "string with ";