Skip to content

Commit

Permalink
Remove @DoNotInstrument from test classes
Browse files Browse the repository at this point in the history
This isn't needed now we've updated to Robolectric 4.6

Follow-up to google@0df0df9

PiperOrigin-RevId: 389616471
  • Loading branch information
icbaker authored and ojw28 committed Aug 9, 2021
1 parent 849c307 commit db1fe80
Show file tree
Hide file tree
Showing 76 changed files with 0 additions and 152 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -94,12 +94,10 @@
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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,9 @@
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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,9 @@
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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,9 @@
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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,10 @@
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 =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,9 @@
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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,10 @@
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 =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,9 @@
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";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,9 @@
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";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,9 @@
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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,11 @@
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";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,9 @@
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("", "");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,9 @@
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/";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,9 @@
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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,9 @@
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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,9 @@
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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,9 @@
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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,10 @@
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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,9 @@
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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,9 @@
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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,9 @@
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";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,9 @@
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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,9 @@
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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,9 @@
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";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
import java.io.IOException;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.annotation.internal.DoNotInstrument;

/**
* Unit tests for {@link FlacFrameReader}.
Expand All @@ -37,7 +36,6 @@
* href="https://xiph.org/flac/documentation_tools_flac.html">flac</a> command.
*/
@RunWith(AndroidJUnit4.class)
@DoNotInstrument
public class FlacFrameReaderTest {

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
import java.util.ArrayList;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.annotation.internal.DoNotInstrument;

/**
* Unit tests for {@link FlacMetadataReader}.
Expand All @@ -42,7 +41,6 @@
* href="https://xiph.org/flac/documentation_tools_metaflac.html">metaflac</a> command.
*/
@RunWith(AndroidJUnit4.class)
@DoNotInstrument
public class FlacMetadataReaderTest {

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,9 @@
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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,9 @@
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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,9 @@
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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,9 @@
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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
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.
Expand All @@ -44,7 +43,6 @@
* AmrExtractorParameterizedTest}.
*/
@RunWith(AndroidJUnit4.class)
@DoNotInstrument
public final class AmrExtractorNonParameterizedTest {

private static final Random RANDOM = new Random(1234);
Expand Down
Loading

0 comments on commit db1fe80

Please sign in to comment.