From db1fe8041b78a97f3e762c03c20ececc8d8f1721 Mon Sep 17 00:00:00 2001 From: ibaker Date: Mon, 9 Aug 2021 14:15:42 +0100 Subject: [PATCH] Remove @DoNotInstrument from test classes This isn't needed now we've updated to Robolectric 4.6 Follow-up to https://github.com/google/ExoPlayer/commit/0df0df9aeece386b7421afde160e9009457512ab PiperOrigin-RevId: 389616471 --- .../com/google/android/exoplayer2/ext/ima/ImaAdsLoaderTest.java | 2 -- .../src/test/java/com/google/android/exoplayer2/RatingTest.java | 2 -- .../mediacodec/AsynchronousMediaCodecAdapterTest.java | 2 -- .../android/exoplayer2/source/dash/DashMediaPeriodTest.java | 2 -- .../android/exoplayer2/source/dash/DashMediaSourceTest.java | 2 -- .../com/google/android/exoplayer2/source/dash/DashUtilTest.java | 2 -- .../exoplayer2/source/dash/DefaultDashChunkSourceTest.java | 2 -- .../exoplayer2/source/dash/DefaultMediaSourceFactoryTest.java | 2 -- .../android/exoplayer2/source/dash/EventSampleStreamTest.java | 2 -- .../exoplayer2/source/dash/e2etest/DashPlaybackTest.java | 2 -- .../exoplayer2/source/dash/manifest/DashManifestParserTest.java | 2 -- .../exoplayer2/source/dash/manifest/DashManifestTest.java | 2 -- .../android/exoplayer2/source/dash/manifest/RangedUriTest.java | 2 -- .../exoplayer2/source/dash/manifest/SegmentBaseTest.java | 2 -- .../exoplayer2/source/dash/manifest/UrlTemplateTest.java | 2 -- .../exoplayer2/source/dash/offline/DashDownloaderTest.java | 2 -- .../exoplayer2/source/dash/offline/DownloadHelperTest.java | 2 -- .../exoplayer2/source/dash/offline/DownloadManagerDashTest.java | 2 -- .../exoplayer2/source/dash/offline/DownloadServiceDashTest.java | 2 -- .../exoplayer2/extractor/ConstantBitrateSeekMapTest.java | 2 -- .../android/exoplayer2/extractor/DefaultExtractorInputTest.java | 2 -- .../exoplayer2/extractor/DefaultExtractorsFactoryTest.java | 2 -- .../com/google/android/exoplayer2/extractor/ExtractorTest.java | 2 -- .../google/android/exoplayer2/extractor/ExtractorUtilTest.java | 2 -- .../android/exoplayer2/extractor/FlacFrameReaderTest.java | 2 -- .../android/exoplayer2/extractor/FlacMetadataReaderTest.java | 2 -- .../android/exoplayer2/extractor/FlacStreamMetadataTest.java | 2 -- .../com/google/android/exoplayer2/extractor/Id3PeekerTest.java | 2 -- .../google/android/exoplayer2/extractor/VorbisBitArrayTest.java | 2 -- .../com/google/android/exoplayer2/extractor/VorbisUtilTest.java | 2 -- .../extractor/amr/AmrExtractorNonParameterizedTest.java | 2 -- .../exoplayer2/extractor/amr/AmrExtractorParameterizedTest.java | 2 -- .../android/exoplayer2/extractor/amr/AmrExtractorSeekTest.java | 2 -- .../exoplayer2/extractor/flac/FlacExtractorSeekTest.java | 2 -- .../android/exoplayer2/extractor/flac/FlacExtractorTest.java | 2 -- .../android/exoplayer2/extractor/flv/FlvExtractorSeekTest.java | 2 -- .../android/exoplayer2/extractor/flv/FlvExtractorTest.java | 2 -- .../android/exoplayer2/extractor/jpeg/JpegExtractorTest.java | 2 -- .../exoplayer2/extractor/jpeg/MotionPhotoDescriptionTest.java | 2 -- .../android/exoplayer2/extractor/mkv/DefaultEbmlReaderTest.java | 2 -- .../android/exoplayer2/extractor/mkv/MatroskaExtractorTest.java | 2 -- .../android/exoplayer2/extractor/mkv/VarintReaderTest.java | 2 -- .../exoplayer2/extractor/mp3/ConstantBitrateSeekerTest.java | 2 -- .../android/exoplayer2/extractor/mp3/IndexSeekerTest.java | 2 -- .../android/exoplayer2/extractor/mp3/Mp3ExtractorTest.java | 2 -- .../google/android/exoplayer2/extractor/mp3/XingSeekerTest.java | 2 -- .../android/exoplayer2/extractor/mp4/AtomParsersTest.java | 2 -- .../extractor/mp4/FragmentedMp4ExtractorNoSniffingTest.java | 2 -- .../exoplayer2/extractor/mp4/FragmentedMp4ExtractorTest.java | 2 -- .../android/exoplayer2/extractor/mp4/MetadataUtilTest.java | 2 -- .../android/exoplayer2/extractor/mp4/Mp4ExtractorTest.java | 2 -- .../android/exoplayer2/extractor/mp4/PsshAtomUtilTest.java | 2 -- .../android/exoplayer2/extractor/mp4/SlowMotionDataTest.java | 2 -- .../android/exoplayer2/extractor/ogg/DefaultOggSeekerTest.java | 2 -- .../extractor/ogg/OggExtractorNonParameterizedTest.java | 2 -- .../exoplayer2/extractor/ogg/OggExtractorParameterizedTest.java | 2 -- .../google/android/exoplayer2/extractor/ogg/OggPacketTest.java | 2 -- .../android/exoplayer2/extractor/ogg/OggPageHeaderTest.java | 2 -- .../android/exoplayer2/extractor/ogg/VorbisReaderTest.java | 2 -- .../android/exoplayer2/extractor/rawcc/RawCcExtractorTest.java | 2 -- .../android/exoplayer2/extractor/ts/Ac3ExtractorTest.java | 2 -- .../android/exoplayer2/extractor/ts/Ac4ExtractorTest.java | 2 -- .../android/exoplayer2/extractor/ts/AdtsExtractorSeekTest.java | 2 -- .../android/exoplayer2/extractor/ts/AdtsExtractorTest.java | 2 -- .../google/android/exoplayer2/extractor/ts/AdtsReaderTest.java | 2 -- .../android/exoplayer2/extractor/ts/PsDurationReaderTest.java | 2 -- .../android/exoplayer2/extractor/ts/PsExtractorSeekTest.java | 2 -- .../google/android/exoplayer2/extractor/ts/PsExtractorTest.java | 2 -- .../android/exoplayer2/extractor/ts/SectionReaderTest.java | 2 -- .../android/exoplayer2/extractor/ts/TsDurationReaderTest.java | 2 -- .../android/exoplayer2/extractor/ts/TsExtractorSeekTest.java | 2 -- .../google/android/exoplayer2/extractor/ts/TsExtractorTest.java | 2 -- .../android/exoplayer2/extractor/wav/WavExtractorTest.java | 2 -- .../java/com/google/android/exoplayer2/ui/HtmlUtilsTest.java | 2 -- .../android/exoplayer2/ui/SpannedToHtmlConverterTest.java | 2 -- .../com/google/android/exoplayer2/ui/SubtitleViewUtilsTest.java | 2 -- 76 files changed, 152 deletions(-) diff --git a/extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoaderTest.java b/extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoaderTest.java index ee889ab349..b26321757f 100644 --- a/extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoaderTest.java +++ b/extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoaderTest.java @@ -94,12 +94,10 @@ import org.mockito.Mock; import org.mockito.junit.MockitoJUnit; import org.mockito.junit.MockitoRule; import org.mockito.stubbing.Answer; -import org.robolectric.annotation.internal.DoNotInstrument; import org.robolectric.shadows.ShadowSystemClock; /** Tests for {@link ImaAdsLoader}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public final class ImaAdsLoaderTest { private static final long CONTENT_DURATION_US = 10 * C.MICROS_PER_SECOND; diff --git a/library/common/src/test/java/com/google/android/exoplayer2/RatingTest.java b/library/common/src/test/java/com/google/android/exoplayer2/RatingTest.java index be77acd83b..fbe9a75eb5 100644 --- a/library/common/src/test/java/com/google/android/exoplayer2/RatingTest.java +++ b/library/common/src/test/java/com/google/android/exoplayer2/RatingTest.java @@ -20,11 +20,9 @@ import static com.google.common.truth.Truth.assertThat; 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 Rating} and its subclasses. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public class RatingTest { @Test diff --git a/library/core/src/test/java/com/google/android/exoplayer2/mediacodec/AsynchronousMediaCodecAdapterTest.java b/library/core/src/test/java/com/google/android/exoplayer2/mediacodec/AsynchronousMediaCodecAdapterTest.java index 5dfeb04ff1..a7034dab2e 100644 --- a/library/core/src/test/java/com/google/android/exoplayer2/mediacodec/AsynchronousMediaCodecAdapterTest.java +++ b/library/core/src/test/java/com/google/android/exoplayer2/mediacodec/AsynchronousMediaCodecAdapterTest.java @@ -30,11 +30,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 tests for {@link AsynchronousMediaCodecAdapter}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public class AsynchronousMediaCodecAdapterTest { private AsynchronousMediaCodecAdapter adapter; private HandlerThread callbackThread; diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DashMediaPeriodTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DashMediaPeriodTest.java index fd55087b47..5c7600ee51 100644 --- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DashMediaPeriodTest.java +++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DashMediaPeriodTest.java @@ -44,11 +44,9 @@ import java.io.InputStream; import java.util.List; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** Unit tests for {@link DashMediaPeriod}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public final class DashMediaPeriodTest { @Test diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DashMediaSourceTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DashMediaSourceTest.java index e9079e91d2..6f82c4f6fd 100644 --- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DashMediaSourceTest.java +++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DashMediaSourceTest.java @@ -43,12 +43,10 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicReference; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; import org.robolectric.shadows.ShadowLooper; /** Unit test for {@link DashMediaSource}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public final class DashMediaSourceTest { private static final String SAMPLE_MPD_LIVE_WITHOUT_LIVE_CONFIGURATION = diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DashUtilTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DashUtilTest.java index 1eb422d27c..655baea575 100644 --- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DashUtilTest.java +++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DashUtilTest.java @@ -34,11 +34,9 @@ import java.util.Arrays; import java.util.Collections; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** Unit tests for {@link DashUtil}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public final class DashUtilTest { @Test diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DefaultDashChunkSourceTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DefaultDashChunkSourceTest.java index 1308416f18..88e8b3f84c 100644 --- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DefaultDashChunkSourceTest.java +++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DefaultDashChunkSourceTest.java @@ -55,12 +55,10 @@ import java.util.List; import java.util.Random; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; import org.robolectric.shadows.ShadowSystemClock; /** Unit test for {@link DefaultDashChunkSource}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public class DefaultDashChunkSourceTest { private static final String SAMPLE_MPD_LIVE_WITH_OFFSET_INSIDE_WINDOW = diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DefaultMediaSourceFactoryTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DefaultMediaSourceFactoryTest.java index 1e64b8d7a4..ab7f456c55 100644 --- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DefaultMediaSourceFactoryTest.java +++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/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 DASH 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/dash/src/test/java/com/google/android/exoplayer2/source/dash/EventSampleStreamTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/EventSampleStreamTest.java index 7dfa4e6597..73ec3da58e 100644 --- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/EventSampleStreamTest.java +++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/EventSampleStreamTest.java @@ -30,11 +30,9 @@ import com.google.android.exoplayer2.util.MimeTypes; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** Unit test for {@link EventSampleStream}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public final class EventSampleStreamTest { private static final String SCHEME_ID = "urn:test"; diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/e2etest/DashPlaybackTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/e2etest/DashPlaybackTest.java index 9014a8c40b..e3615d8f8e 100644 --- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/e2etest/DashPlaybackTest.java +++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/e2etest/DashPlaybackTest.java @@ -35,11 +35,9 @@ import com.google.android.exoplayer2.trackselection.DefaultTrackSelector; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** End-to-end tests using DASH samples. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public final class DashPlaybackTest { @Rule diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParserTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParserTest.java index 8c3ea0c127..dc70713469 100644 --- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParserTest.java +++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParserTest.java @@ -36,13 +36,11 @@ import java.util.Collections; import java.util.List; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserFactory; /** Unit tests for {@link DashManifestParser}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public class DashManifestParserTest { private static final String SAMPLE_MPD_LIVE = "media/mpd/sample_mpd_live"; diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestTest.java index 0b3a3efbbb..5b031c179a 100644 --- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestTest.java +++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestTest.java @@ -30,11 +30,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 DashManifest}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public class DashManifestTest { private static final UtcTimingElement UTC_TIMING = new UtcTimingElement("", ""); diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/RangedUriTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/RangedUriTest.java index 486ab08cd1..44af227d96 100644 --- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/RangedUriTest.java +++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/RangedUriTest.java @@ -21,11 +21,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 RangedUri}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public class RangedUriTest { private static final String BASE_URI = "http://www.test.com/"; diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/SegmentBaseTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/SegmentBaseTest.java index 49346c4f98..91ddfbbde9 100644 --- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/SegmentBaseTest.java +++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/SegmentBaseTest.java @@ -21,11 +21,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 SegmentBase}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public final class SegmentBaseTest { @Test diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/UrlTemplateTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/UrlTemplateTest.java index 057844d848..6736840d82 100644 --- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/UrlTemplateTest.java +++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/UrlTemplateTest.java @@ -21,11 +21,9 @@ import static org.junit.Assert.fail; 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 UrlTemplate}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public class UrlTemplateTest { @Test diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DashDownloaderTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DashDownloaderTest.java index e47137baf9..d835b85725 100644 --- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DashDownloaderTest.java +++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DashDownloaderTest.java @@ -57,11 +57,9 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mockito; import org.mockito.MockitoAnnotations; -import org.robolectric.annotation.internal.DoNotInstrument; /** Unit tests for {@link DashDownloader}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public class DashDownloaderTest { private SimpleCache cache; diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadHelperTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadHelperTest.java index b7323c49a3..bfc11cb47a 100644 --- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadHelperTest.java +++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadHelperTest.java @@ -25,11 +25,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 DASH {@link DownloadHelper}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public final class DownloadHelperTest { @Test diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadManagerDashTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadManagerDashTest.java index 29102dfe3e..6bdc84438b 100644 --- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadManagerDashTest.java +++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadManagerDashTest.java @@ -55,12 +55,10 @@ import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; -import org.robolectric.annotation.internal.DoNotInstrument; import org.robolectric.shadows.ShadowLog; /** Tests {@link DownloadManager}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public class DownloadManagerDashTest { private static final int ASSERT_TRUE_TIMEOUT_MS = 5000; diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadServiceDashTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadServiceDashTest.java index e62a644af5..98a7f6e887 100644 --- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadServiceDashTest.java +++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadServiceDashTest.java @@ -57,11 +57,9 @@ import org.junit.Before; import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** Unit tests for {@link DownloadService}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public class DownloadServiceDashTest { private SimpleCache cache; diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ConstantBitrateSeekMapTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ConstantBitrateSeekMapTest.java index bbf72027f7..4d70fe3b69 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ConstantBitrateSeekMapTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ConstantBitrateSeekMapTest.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 ConstantBitrateSeekMap}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public final class ConstantBitrateSeekMapTest { private ConstantBitrateSeekMap constantBitrateSeekMap; diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/DefaultExtractorInputTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/DefaultExtractorInputTest.java index 550b7515e0..cc5fe8e5e7 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/DefaultExtractorInputTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/DefaultExtractorInputTest.java @@ -31,11 +31,9 @@ import java.io.IOException; import java.util.Arrays; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** Test for {@link DefaultExtractorInput}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public class DefaultExtractorInputTest { private static final String TEST_URI = "http://www.google.com"; diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/DefaultExtractorsFactoryTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/DefaultExtractorsFactoryTest.java index 6ad0554d07..1c6ce7b70c 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/DefaultExtractorsFactoryTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/DefaultExtractorsFactoryTest.java @@ -42,11 +42,9 @@ import java.util.List; import java.util.Map; 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 final class DefaultExtractorsFactoryTest { @Test diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ExtractorTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ExtractorTest.java index 4d3d8a7472..390d1a2c77 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ExtractorTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ExtractorTest.java @@ -21,11 +21,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 Extractor}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public final class ExtractorTest { @Test diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ExtractorUtilTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ExtractorUtilTest.java index 6734face12..8959caa323 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ExtractorUtilTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ExtractorUtilTest.java @@ -27,11 +27,9 @@ import java.io.EOFException; import java.util.Arrays; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** Unit test for {@link ExtractorUtil}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public class ExtractorUtilTest { private static final String TEST_URI = "http://www.google.com"; diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/FlacFrameReaderTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/FlacFrameReaderTest.java index 3f37e5ca7b..75ef1a201e 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/FlacFrameReaderTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/FlacFrameReaderTest.java @@ -28,7 +28,6 @@ import com.google.android.exoplayer2.util.ParsableByteArray; import java.io.IOException; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** * Unit tests for {@link FlacFrameReader}. @@ -37,7 +36,6 @@ import org.robolectric.annotation.internal.DoNotInstrument; * href="https://xiph.org/flac/documentation_tools_flac.html">flac command. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public class FlacFrameReaderTest { @Test diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/FlacMetadataReaderTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/FlacMetadataReaderTest.java index 046b810a82..1648d548d2 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/FlacMetadataReaderTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/FlacMetadataReaderTest.java @@ -33,7 +33,6 @@ import java.io.IOException; import java.util.ArrayList; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** * Unit tests for {@link FlacMetadataReader}. @@ -42,7 +41,6 @@ import org.robolectric.annotation.internal.DoNotInstrument; * href="https://xiph.org/flac/documentation_tools_metaflac.html">metaflac command. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public class FlacMetadataReaderTest { @Test diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/FlacStreamMetadataTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/FlacStreamMetadataTest.java index 3a4d515d20..9c6b63ee0a 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/FlacStreamMetadataTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/FlacStreamMetadataTest.java @@ -27,11 +27,9 @@ import java.io.IOException; import java.util.ArrayList; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** Unit test for {@link FlacStreamMetadata}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public final class FlacStreamMetadataTest { @Test diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/Id3PeekerTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/Id3PeekerTest.java index 4a252fa097..e0cf957a38 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/Id3PeekerTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/Id3PeekerTest.java @@ -29,11 +29,9 @@ import com.google.android.exoplayer2.testutil.FakeExtractorInput; import java.io.IOException; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** Unit test for {@link Id3Peeker}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public final class Id3PeekerTest { @Test diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/VorbisBitArrayTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/VorbisBitArrayTest.java index 567be685db..95e8d7321d 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/VorbisBitArrayTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/VorbisBitArrayTest.java @@ -21,11 +21,9 @@ import androidx.test.ext.junit.runners.AndroidJUnit4; import com.google.android.exoplayer2.testutil.TestUtil; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** Unit test for {@link VorbisBitArray}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public final class VorbisBitArrayTest { @Test diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/VorbisUtilTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/VorbisUtilTest.java index fb6892b364..0db0ebd79b 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/VorbisUtilTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/VorbisUtilTest.java @@ -28,11 +28,9 @@ import com.google.android.exoplayer2.util.ParsableByteArray; import java.io.IOException; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** Unit test for {@link VorbisUtil}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public final class VorbisUtilTest { @Test diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/amr/AmrExtractorNonParameterizedTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/amr/AmrExtractorNonParameterizedTest.java index ea81846cee..4c31858a41 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/amr/AmrExtractorNonParameterizedTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/amr/AmrExtractorNonParameterizedTest.java @@ -35,7 +35,6 @@ import java.io.IOException; import java.util.Random; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** * Tests for {@link AmrExtractor} that test specific behaviours and don't need to be parameterized. @@ -44,7 +43,6 @@ import org.robolectric.annotation.internal.DoNotInstrument; * AmrExtractorParameterizedTest}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public final class AmrExtractorNonParameterizedTest { private static final Random RANDOM = new Random(1234); diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/amr/AmrExtractorParameterizedTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/amr/AmrExtractorParameterizedTest.java index 3fa8d8a742..d8f9f20ae3 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/amr/AmrExtractorParameterizedTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/amr/AmrExtractorParameterizedTest.java @@ -22,7 +22,6 @@ import org.junit.runner.RunWith; import org.robolectric.ParameterizedRobolectricTestRunner; import org.robolectric.ParameterizedRobolectricTestRunner.Parameter; import org.robolectric.ParameterizedRobolectricTestRunner.Parameters; -import org.robolectric.annotation.internal.DoNotInstrument; /** * Unit tests for {@link AmrExtractor} that use parameterization to test a range of behaviours. @@ -31,7 +30,6 @@ import org.robolectric.annotation.internal.DoNotInstrument; * AmrExtractorNonParameterizedTest}. */ @RunWith(ParameterizedRobolectricTestRunner.class) -@DoNotInstrument public final class AmrExtractorParameterizedTest { @Parameters(name = "{0}") diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/amr/AmrExtractorSeekTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/amr/AmrExtractorSeekTest.java index e4ce7d2c97..534cb2572f 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/amr/AmrExtractorSeekTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/amr/AmrExtractorSeekTest.java @@ -32,11 +32,9 @@ import java.util.Random; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** Unit tests for {@link AmrExtractor} seeking behaviour. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public final class AmrExtractorSeekTest { private static final Random random = new Random(1234L); diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/flac/FlacExtractorSeekTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/flac/FlacExtractorSeekTest.java index d89bcf4920..16f92e2b4b 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/flac/FlacExtractorSeekTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/flac/FlacExtractorSeekTest.java @@ -32,11 +32,9 @@ import java.io.IOException; import java.util.List; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** Seeking tests for {@link FlacExtractor}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public class FlacExtractorSeekTest { private static final String TEST_FILE_SEEK_TABLE = "media/flac/bear.flac"; diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/flac/FlacExtractorTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/flac/FlacExtractorTest.java index 9a283928b8..1d776b9355 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/flac/FlacExtractorTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/flac/FlacExtractorTest.java @@ -23,11 +23,9 @@ import org.junit.runner.RunWith; import org.robolectric.ParameterizedRobolectricTestRunner; import org.robolectric.ParameterizedRobolectricTestRunner.Parameter; import org.robolectric.ParameterizedRobolectricTestRunner.Parameters; -import org.robolectric.annotation.internal.DoNotInstrument; /** Unit tests for {@link FlacExtractor}. */ @RunWith(ParameterizedRobolectricTestRunner.class) -@DoNotInstrument public class FlacExtractorTest { @Parameters(name = "{0}") diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/flv/FlvExtractorSeekTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/flv/FlvExtractorSeekTest.java index cb1b04b9b9..e03b7ec6d6 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/flv/FlvExtractorSeekTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/flv/FlvExtractorSeekTest.java @@ -34,11 +34,9 @@ import java.util.List; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** Seeking tests for {@link FlvExtractor}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public class FlvExtractorSeekTest { private static final String TEST_FILE_KEY_FRAME_INDEX = diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/flv/FlvExtractorTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/flv/FlvExtractorTest.java index f6e6b6f2a1..5a7e0a5a3e 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/flv/FlvExtractorTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/flv/FlvExtractorTest.java @@ -22,11 +22,9 @@ import org.junit.runner.RunWith; import org.robolectric.ParameterizedRobolectricTestRunner; import org.robolectric.ParameterizedRobolectricTestRunner.Parameter; import org.robolectric.ParameterizedRobolectricTestRunner.Parameters; -import org.robolectric.annotation.internal.DoNotInstrument; /** Unit test for {@link FlvExtractor}. */ @RunWith(ParameterizedRobolectricTestRunner.class) -@DoNotInstrument public final class FlvExtractorTest { @Parameters(name = "{0}") diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/jpeg/JpegExtractorTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/jpeg/JpegExtractorTest.java index fa493f4452..8e5556bf81 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/jpeg/JpegExtractorTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/jpeg/JpegExtractorTest.java @@ -20,11 +20,9 @@ import com.google.common.collect.ImmutableList; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.ParameterizedRobolectricTestRunner; -import org.robolectric.annotation.internal.DoNotInstrument; /** Unit tests for {@link JpegExtractor}. */ @RunWith(ParameterizedRobolectricTestRunner.class) -@DoNotInstrument public final class JpegExtractorTest { @ParameterizedRobolectricTestRunner.Parameters(name = "{0}") diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/jpeg/MotionPhotoDescriptionTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/jpeg/MotionPhotoDescriptionTest.java index 5c9635095d..6c068d2587 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/jpeg/MotionPhotoDescriptionTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/jpeg/MotionPhotoDescriptionTest.java @@ -24,11 +24,9 @@ import com.google.android.exoplayer2.util.MimeTypes; 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 MotionPhotoDescription}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public final class MotionPhotoDescriptionTest { private static final long TEST_PRESENTATION_TIMESTAMP_US = 5L; diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mkv/DefaultEbmlReaderTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mkv/DefaultEbmlReaderTest.java index 3ba902ec88..e1a700f5ed 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mkv/DefaultEbmlReaderTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mkv/DefaultEbmlReaderTest.java @@ -27,11 +27,9 @@ import java.util.Arrays; import java.util.List; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** Tests {@link DefaultEbmlReader}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public class DefaultEbmlReaderTest { @Test diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractorTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractorTest.java index 28e7057577..64faff9a0e 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractorTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractorTest.java @@ -22,11 +22,9 @@ import org.junit.runner.RunWith; import org.robolectric.ParameterizedRobolectricTestRunner; import org.robolectric.ParameterizedRobolectricTestRunner.Parameter; import org.robolectric.ParameterizedRobolectricTestRunner.Parameters; -import org.robolectric.annotation.internal.DoNotInstrument; /** Tests for {@link MatroskaExtractor}. */ @RunWith(ParameterizedRobolectricTestRunner.class) -@DoNotInstrument public final class MatroskaExtractorTest { @Parameters(name = "{0}") diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mkv/VarintReaderTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mkv/VarintReaderTest.java index 860bc009b2..e18d2cb40f 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mkv/VarintReaderTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mkv/VarintReaderTest.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 VarintReader}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public final class VarintReaderTest { private static final byte MAX_BYTE = (byte) 0xFF; diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp3/ConstantBitrateSeekerTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp3/ConstantBitrateSeekerTest.java index 713a269185..e3137a106d 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp3/ConstantBitrateSeekerTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp3/ConstantBitrateSeekerTest.java @@ -34,11 +34,9 @@ import java.util.List; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** Tests for {@link ConstantBitrateSeeker}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public class ConstantBitrateSeekerTest { private static final String CONSTANT_FRAME_SIZE_TEST_FILE = "media/mp3/bear-cbr-constant-frame-size-no-seek-table.mp3"; diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp3/IndexSeekerTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp3/IndexSeekerTest.java index 679ee526bc..24530c12f1 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp3/IndexSeekerTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp3/IndexSeekerTest.java @@ -35,11 +35,9 @@ import java.util.List; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** Tests for {@link IndexSeeker}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public class IndexSeekerTest { private static final String TEST_FILE_NO_SEEK_TABLE = "media/mp3/bear-vbr-no-seek-table.mp3"; diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp3/Mp3ExtractorTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp3/Mp3ExtractorTest.java index 5d9e0380fb..f209574de4 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp3/Mp3ExtractorTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp3/Mp3ExtractorTest.java @@ -23,11 +23,9 @@ import org.junit.runner.RunWith; import org.robolectric.ParameterizedRobolectricTestRunner; import org.robolectric.ParameterizedRobolectricTestRunner.Parameter; import org.robolectric.ParameterizedRobolectricTestRunner.Parameters; -import org.robolectric.annotation.internal.DoNotInstrument; /** Unit test for {@link Mp3Extractor}. */ @RunWith(ParameterizedRobolectricTestRunner.class) -@DoNotInstrument public final class Mp3ExtractorTest { @Parameters(name = "{0}") diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp3/XingSeekerTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp3/XingSeekerTest.java index b18f32edb3..3b40bf85d7 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp3/XingSeekerTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp3/XingSeekerTest.java @@ -27,11 +27,9 @@ import com.google.android.exoplayer2.util.Util; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** Tests for {@link XingSeeker}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public final class XingSeekerTest { // Xing header/payload from http://storage.googleapis.com/exoplayer-test-media-0/play.mp3. diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp4/AtomParsersTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp4/AtomParsersTest.java index 226b40559b..497b623140 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp4/AtomParsersTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp4/AtomParsersTest.java @@ -24,11 +24,9 @@ import com.google.android.exoplayer2.util.ParsableByteArray; import com.google.android.exoplayer2.util.Util; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** Tests for {@link AtomParsers}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public final class AtomParsersTest { private static final String ATOM_HEADER = "000000000000000000000000"; diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4ExtractorNoSniffingTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4ExtractorNoSniffingTest.java index a470457044..969c9b8d5a 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4ExtractorNoSniffingTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4ExtractorNoSniffingTest.java @@ -25,13 +25,11 @@ import org.junit.runner.RunWith; import org.robolectric.ParameterizedRobolectricTestRunner; import org.robolectric.ParameterizedRobolectricTestRunner.Parameter; import org.robolectric.ParameterizedRobolectricTestRunner.Parameters; -import org.robolectric.annotation.internal.DoNotInstrument; /** * Tests for {@link FragmentedMp4Extractor} that test behaviours where sniffing must not be tested. */ @RunWith(ParameterizedRobolectricTestRunner.class) -@DoNotInstrument public class FragmentedMp4ExtractorNoSniffingTest { @Parameters(name = "{0}") diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4ExtractorTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4ExtractorTest.java index 14783a27b0..a9d2397ca7 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4ExtractorTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4ExtractorTest.java @@ -27,11 +27,9 @@ import org.junit.runner.RunWith; import org.robolectric.ParameterizedRobolectricTestRunner; import org.robolectric.ParameterizedRobolectricTestRunner.Parameter; import org.robolectric.ParameterizedRobolectricTestRunner.Parameters; -import org.robolectric.annotation.internal.DoNotInstrument; /** Tests for {@link FragmentedMp4Extractor} that test behaviours where sniffing must be tested. */ @RunWith(ParameterizedRobolectricTestRunner.class) -@DoNotInstrument public final class FragmentedMp4ExtractorTest { @Parameters(name = "{0}") diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp4/MetadataUtilTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp4/MetadataUtilTest.java index 471e654a09..70e483457a 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp4/MetadataUtilTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp4/MetadataUtilTest.java @@ -20,11 +20,9 @@ import static com.google.common.truth.Truth.assertThat; import androidx.test.ext.junit.runners.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** Test for {@link MetadataUtil}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public final class MetadataUtilTest { @Test diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp4/Mp4ExtractorTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp4/Mp4ExtractorTest.java index 8d8bd0dfa1..4408ffab83 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp4/Mp4ExtractorTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp4/Mp4ExtractorTest.java @@ -22,11 +22,9 @@ import org.junit.runner.RunWith; import org.robolectric.ParameterizedRobolectricTestRunner; import org.robolectric.ParameterizedRobolectricTestRunner.Parameter; import org.robolectric.ParameterizedRobolectricTestRunner.Parameters; -import org.robolectric.annotation.internal.DoNotInstrument; /** Tests for {@link Mp4Extractor}. */ @RunWith(ParameterizedRobolectricTestRunner.class) -@DoNotInstrument public final class Mp4ExtractorTest { @Parameters(name = "{0}") diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp4/PsshAtomUtilTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp4/PsshAtomUtilTest.java index e526c9e3c8..cee9e22af9 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp4/PsshAtomUtilTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp4/PsshAtomUtilTest.java @@ -27,11 +27,9 @@ import com.google.android.exoplayer2.util.ParsableByteArray; import java.util.UUID; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** Tests for {@link PsshAtomUtil}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public final class PsshAtomUtilTest { @Test diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp4/SlowMotionDataTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp4/SlowMotionDataTest.java index c22220931f..5b1c33303d 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp4/SlowMotionDataTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp4/SlowMotionDataTest.java @@ -24,11 +24,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 SlowMotionData} */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public class SlowMotionDataTest { @Test diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeekerTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeekerTest.java index 1ee87d1b1d..e30f27713e 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeekerTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeekerTest.java @@ -30,11 +30,9 @@ import java.io.IOException; import java.util.Random; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** Unit test for {@link DefaultOggSeeker}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public final class DefaultOggSeekerTest { private final Random random = new Random(/* seed= */ 0); diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ogg/OggExtractorNonParameterizedTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ogg/OggExtractorNonParameterizedTest.java index 4131054775..d939d51b77 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ogg/OggExtractorNonParameterizedTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ogg/OggExtractorNonParameterizedTest.java @@ -28,7 +28,6 @@ import com.google.android.exoplayer2.testutil.FakeExtractorOutput; import java.io.IOException; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** * Tests for {@link OggExtractor} that test specific behaviours and don't need to be parameterized. @@ -37,7 +36,6 @@ import org.robolectric.annotation.internal.DoNotInstrument; * OggExtractorParameterizedTest}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public final class OggExtractorNonParameterizedTest { @Test diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ogg/OggExtractorParameterizedTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ogg/OggExtractorParameterizedTest.java index 48828b9b4a..8cbe254f07 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ogg/OggExtractorParameterizedTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ogg/OggExtractorParameterizedTest.java @@ -22,7 +22,6 @@ import org.junit.runner.RunWith; import org.robolectric.ParameterizedRobolectricTestRunner; import org.robolectric.ParameterizedRobolectricTestRunner.Parameter; import org.robolectric.ParameterizedRobolectricTestRunner.Parameters; -import org.robolectric.annotation.internal.DoNotInstrument; /** * Unit tests for {@link OggExtractor} that use parameterization to test a range of behaviours. @@ -30,7 +29,6 @@ import org.robolectric.annotation.internal.DoNotInstrument; *

For non-parameterized tests see {@link OggExtractorNonParameterizedTest}. */ @RunWith(ParameterizedRobolectricTestRunner.class) -@DoNotInstrument public final class OggExtractorParameterizedTest { @Parameters(name = "{0}") diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ogg/OggPacketTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ogg/OggPacketTest.java index d9bbe348f9..e74ecf7be0 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ogg/OggPacketTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ogg/OggPacketTest.java @@ -28,11 +28,9 @@ import java.util.Arrays; import java.util.Random; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** Unit test for {@link OggPacket}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public final class OggPacketTest { private static final String TEST_FILE = "media/ogg/bear.opus"; diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ogg/OggPageHeaderTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ogg/OggPageHeaderTest.java index 89c8306342..ad821401ae 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ogg/OggPageHeaderTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ogg/OggPageHeaderTest.java @@ -28,11 +28,9 @@ import java.io.IOException; import java.util.Random; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** Unit test for {@link OggPageHeader}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public final class OggPageHeaderTest { private final Random random; diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ogg/VorbisReaderTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ogg/VorbisReaderTest.java index e938743379..cab37c4183 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ogg/VorbisReaderTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ogg/VorbisReaderTest.java @@ -30,11 +30,9 @@ import com.google.android.exoplayer2.util.ParsableByteArray; import java.io.IOException; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** Unit test for {@link VorbisReader}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public final class VorbisReaderTest { @Test diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/rawcc/RawCcExtractorTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/rawcc/RawCcExtractorTest.java index 5873bfc9b7..3856f2b573 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/rawcc/RawCcExtractorTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/rawcc/RawCcExtractorTest.java @@ -22,11 +22,9 @@ import com.google.common.collect.ImmutableList; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.ParameterizedRobolectricTestRunner; -import org.robolectric.annotation.internal.DoNotInstrument; /** Tests for {@link RawCcExtractor}. */ @RunWith(ParameterizedRobolectricTestRunner.class) -@DoNotInstrument public final class RawCcExtractorTest { @ParameterizedRobolectricTestRunner.Parameters(name = "{0}") diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/Ac3ExtractorTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/Ac3ExtractorTest.java index 6f28ecde4a..8b0ffef80d 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/Ac3ExtractorTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/Ac3ExtractorTest.java @@ -22,11 +22,9 @@ import org.junit.runner.RunWith; import org.robolectric.ParameterizedRobolectricTestRunner; import org.robolectric.ParameterizedRobolectricTestRunner.Parameter; import org.robolectric.ParameterizedRobolectricTestRunner.Parameters; -import org.robolectric.annotation.internal.DoNotInstrument; /** Unit test for {@link Ac3Extractor}. */ @RunWith(ParameterizedRobolectricTestRunner.class) -@DoNotInstrument public final class Ac3ExtractorTest { @Parameters(name = "{0}") diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/Ac4ExtractorTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/Ac4ExtractorTest.java index 50f04c43fc..39ab1bb534 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/Ac4ExtractorTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/Ac4ExtractorTest.java @@ -22,11 +22,9 @@ import org.junit.runner.RunWith; import org.robolectric.ParameterizedRobolectricTestRunner; import org.robolectric.ParameterizedRobolectricTestRunner.Parameter; import org.robolectric.ParameterizedRobolectricTestRunner.Parameters; -import org.robolectric.annotation.internal.DoNotInstrument; /** Unit test for {@link Ac4Extractor}. */ @RunWith(ParameterizedRobolectricTestRunner.class) -@DoNotInstrument public final class Ac4ExtractorTest { @Parameters(name = "{0}") diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractorSeekTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractorSeekTest.java index 59c5130050..2770d4ef66 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractorSeekTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractorSeekTest.java @@ -32,11 +32,9 @@ import java.util.Random; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** Unit test for {@link AdtsExtractor}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public final class AdtsExtractorSeekTest { private static final Random random = new Random(1234L); diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractorTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractorTest.java index fb70fe603c..420d8d589b 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractorTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractorTest.java @@ -23,11 +23,9 @@ import org.junit.runner.RunWith; import org.robolectric.ParameterizedRobolectricTestRunner; import org.robolectric.ParameterizedRobolectricTestRunner.Parameter; import org.robolectric.ParameterizedRobolectricTestRunner.Parameters; -import org.robolectric.annotation.internal.DoNotInstrument; /** Unit test for {@link AdtsExtractor}. */ @RunWith(ParameterizedRobolectricTestRunner.class) -@DoNotInstrument public final class AdtsExtractorTest { @Parameters(name = "{0}") diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/AdtsReaderTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/AdtsReaderTest.java index ed1726e50b..6869c0314c 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/AdtsReaderTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/AdtsReaderTest.java @@ -31,11 +31,9 @@ import java.util.Arrays; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** Test for {@link AdtsReader}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public class AdtsReaderTest { public static final byte[] ID3_DATA_1 = diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/PsDurationReaderTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/PsDurationReaderTest.java index df79f0bba9..8c1805c568 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/PsDurationReaderTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/PsDurationReaderTest.java @@ -27,11 +27,9 @@ import java.io.IOException; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** Unit test for {@link PsDurationReader}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public final class PsDurationReaderTest { private PsDurationReader tsDurationReader; diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/PsExtractorSeekTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/PsExtractorSeekTest.java index 9c8ee8687b..d2d76d6695 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/PsExtractorSeekTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/PsExtractorSeekTest.java @@ -41,11 +41,9 @@ import java.util.Random; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** Seeking tests for {@link PsExtractor}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public final class PsExtractorSeekTest { private static final String PS_FILE_PATH = "media/ts/elephants_dream.mpg"; diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/PsExtractorTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/PsExtractorTest.java index 7143ca0783..688cc318f1 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/PsExtractorTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/PsExtractorTest.java @@ -22,11 +22,9 @@ import org.junit.runner.RunWith; import org.robolectric.ParameterizedRobolectricTestRunner; import org.robolectric.ParameterizedRobolectricTestRunner.Parameter; import org.robolectric.ParameterizedRobolectricTestRunner.Parameters; -import org.robolectric.annotation.internal.DoNotInstrument; /** Unit test for {@link PsExtractor}. */ @RunWith(ParameterizedRobolectricTestRunner.class) -@DoNotInstrument public final class PsExtractorTest { @Parameters(name = "{0}") diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/SectionReaderTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/SectionReaderTest.java index 7866e67d47..59054ebbab 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/SectionReaderTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/SectionReaderTest.java @@ -31,11 +31,9 @@ import java.util.List; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** Test for {@link SectionReader}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public final class SectionReaderTest { private byte[] packetPayload; diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/TsDurationReaderTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/TsDurationReaderTest.java index 97c74e4292..0e55d292b8 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/TsDurationReaderTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/TsDurationReaderTest.java @@ -27,11 +27,9 @@ import java.io.IOException; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** Unit test for {@link TsDurationReader}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public final class TsDurationReaderTest { private TsDurationReader tsDurationReader; diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/TsExtractorSeekTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/TsExtractorSeekTest.java index 1123e14a96..a796f3c994 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/TsExtractorSeekTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/TsExtractorSeekTest.java @@ -36,11 +36,9 @@ import java.util.Random; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** Seeking tests for {@link TsExtractor}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public final class TsExtractorSeekTest { private static final String TEST_FILE = "media/ts/bbb_2500ms.ts"; diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/TsExtractorTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/TsExtractorTest.java index f113efbfa5..87215d45ee 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/TsExtractorTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/TsExtractorTest.java @@ -42,11 +42,9 @@ import org.junit.runner.RunWith; import org.robolectric.ParameterizedRobolectricTestRunner; import org.robolectric.ParameterizedRobolectricTestRunner.Parameter; import org.robolectric.ParameterizedRobolectricTestRunner.Parameters; -import org.robolectric.annotation.internal.DoNotInstrument; /** Unit test for {@link TsExtractor}. */ @RunWith(ParameterizedRobolectricTestRunner.class) -@DoNotInstrument public final class TsExtractorTest { @Parameters(name = "{0}") diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/wav/WavExtractorTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/wav/WavExtractorTest.java index cc35344b2a..4217a1528a 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/wav/WavExtractorTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/wav/WavExtractorTest.java @@ -21,11 +21,9 @@ import com.google.common.collect.ImmutableList; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.ParameterizedRobolectricTestRunner; -import org.robolectric.annotation.internal.DoNotInstrument; /** Unit test for {@link WavExtractor}. */ @RunWith(ParameterizedRobolectricTestRunner.class) -@DoNotInstrument public final class WavExtractorTest { @ParameterizedRobolectricTestRunner.Parameters(name = "{0}") diff --git a/library/ui/src/test/java/com/google/android/exoplayer2/ui/HtmlUtilsTest.java b/library/ui/src/test/java/com/google/android/exoplayer2/ui/HtmlUtilsTest.java index 68469e8886..82ddfb4202 100644 --- a/library/ui/src/test/java/com/google/android/exoplayer2/ui/HtmlUtilsTest.java +++ b/library/ui/src/test/java/com/google/android/exoplayer2/ui/HtmlUtilsTest.java @@ -21,11 +21,9 @@ import android.graphics.Color; 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 HtmlUtils}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public class HtmlUtilsTest { @Test diff --git a/library/ui/src/test/java/com/google/android/exoplayer2/ui/SpannedToHtmlConverterTest.java b/library/ui/src/test/java/com/google/android/exoplayer2/ui/SpannedToHtmlConverterTest.java index 187dcf6204..09efaad709 100644 --- a/library/ui/src/test/java/com/google/android/exoplayer2/ui/SpannedToHtmlConverterTest.java +++ b/library/ui/src/test/java/com/google/android/exoplayer2/ui/SpannedToHtmlConverterTest.java @@ -39,11 +39,9 @@ import com.google.android.exoplayer2.text.span.TextEmphasisSpan; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.annotation.Config; -import org.robolectric.annotation.internal.DoNotInstrument; /** Tests for {@link SpannedToHtmlConverter}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public class SpannedToHtmlConverterTest { private final float displayDensity; diff --git a/library/ui/src/test/java/com/google/android/exoplayer2/ui/SubtitleViewUtilsTest.java b/library/ui/src/test/java/com/google/android/exoplayer2/ui/SubtitleViewUtilsTest.java index 1b211626c3..1ad530cc11 100644 --- a/library/ui/src/test/java/com/google/android/exoplayer2/ui/SubtitleViewUtilsTest.java +++ b/library/ui/src/test/java/com/google/android/exoplayer2/ui/SubtitleViewUtilsTest.java @@ -34,11 +34,9 @@ import com.google.android.exoplayer2.text.span.TextAnnotation; import com.google.android.exoplayer2.text.span.TextEmphasisSpan; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.internal.DoNotInstrument; /** Tests for {@link SubtitleView}. */ @RunWith(AndroidJUnit4.class) -@DoNotInstrument public class SubtitleViewUtilsTest { private static final Cue CUE = buildCue();