From db454973f2b08d333733c3b7e4a461507a1c2d95 Mon Sep 17 00:00:00 2001 From: christosts Date: Thu, 1 Jul 2021 14:09:19 +0100 Subject: [PATCH] Rename packages for HLS module PiperOrigin-RevId: 382508442 --- library/hls/README.md | 6 +++--- .../exoplayer2/source/hls/Aes128DataSourceTest.java | 2 ++ .../source/hls/DefaultHlsExtractorFactoryTest.java | 2 ++ .../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 ++ .../exoplayer2/source/hls/WebvttExtractorTest.java | 2 ++ .../exoplayer2/source/hls/offline/DownloadHelperTest.java | 2 ++ .../exoplayer2/source/hls/offline/HlsDownloaderTest.java | 8 +++++--- .../hls/playlist/DefaultHlsPlaylistTrackerTest.java | 2 ++ .../source/hls/playlist/HlsMasterPlaylistParserTest.java | 2 ++ .../source/hls/playlist/HlsMediaPlaylistParserTest.java | 2 ++ 15 files changed, 34 insertions(+), 6 deletions(-) diff --git a/library/hls/README.md b/library/hls/README.md index b7eecc1ff8..d8b86e1832 100644 --- a/library/hls/README.md +++ b/library/hls/README.md @@ -18,9 +18,9 @@ instances and pass them directly to the player. For advanced download use cases, ## Links ## -* [Developer Guide][]. -* [Javadoc][]: Classes matching `com.google.android.exoplayer2.source.hls.*` - belong to this module. +* [Developer Guide][]. +* [Javadoc][]: Classes matching `com.google.android.exoplayer2.source.hls.*` belong to + this module. [Developer Guide]: https://exoplayer.dev/hls.html [Javadoc]: https://exoplayer.dev/doc/reference/index.html 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 3eef5c36d2..f25a2157be 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,9 +29,11 @@ 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 7055bc1ba4..2187d2c561 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,9 +40,11 @@ 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 54383ffe33..b8dbdb197e 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,9 +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 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 3000faf7d4..72fdddb4f4 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,9 +23,11 @@ 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 4ed8fc1ee3..b42d54c11a 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,9 +44,11 @@ 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 d4b4b1b4aa..438d77c1ee 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,9 +32,11 @@ 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 635c5615e1..2e305c023f 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,9 +43,11 @@ 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 987c2bd1af..6b1d7b0494 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,9 +22,11 @@ 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 b9c3477456..48ecf2dbb9 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,9 +29,11 @@ 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 9d1127a3d7..2182acc01b 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,9 +24,11 @@ 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 986ee4deda..b296499258 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 @@ -44,7 +44,7 @@ import com.google.android.exoplayer2.offline.Downloader; import com.google.android.exoplayer2.offline.DownloaderFactory; import com.google.android.exoplayer2.offline.StreamKey; import com.google.android.exoplayer2.source.hls.playlist.HlsMasterPlaylist; -import com.google.android.exoplayer2.testutil.CacheAsserts.RequestSet; +import com.google.android.exoplayer2.testutil.CacheAsserts; import com.google.android.exoplayer2.testutil.FakeDataSet; import com.google.android.exoplayer2.testutil.FakeDataSource; import com.google.android.exoplayer2.testutil.TestUtil; @@ -64,9 +64,11 @@ 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; @@ -136,7 +138,7 @@ public class HlsDownloaderTest { assertCachedData( cache, - new RequestSet(fakeDataSet) + new CacheAsserts.RequestSet(fakeDataSet) .subset( MASTER_PLAYLIST_URI, MEDIA_PLAYLIST_1_URI, @@ -194,7 +196,7 @@ public class HlsDownloaderTest { assertCachedData( cache, - new RequestSet(fakeDataSet) + new CacheAsserts.RequestSet(fakeDataSet) .subset( MEDIA_PLAYLIST_1_URI, MEDIA_PLAYLIST_1_DIR + "fileSequence0.ts", 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 80060b15f8..72fe4eb57e 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,9 +39,11 @@ 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 dff755a443..cc3113277f 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,9 +35,11 @@ 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 17ce2251b4..24f091d08c 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,9 +36,11 @@ 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