Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
SDK
/
exoplayer
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
7b69b47a
authored
Jul 14, 2020
by
ibaker
Committed by
Oliver Woodman
Jul 24, 2020
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Migrate usages of deprecated MediaSource#getTag() method
PiperOrigin-RevId: 321156463
parent
1d1762d3
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
5 deletions
library/core/src/test/java/com/google/android/exoplayer2/source/DefaultMediaSourceFactoryTest.java
library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DefaultMediaSourceFactoryTest.java
library/hls/src/test/java/com/google/android/exoplayer2/source/hls/DefaultMediaSourceFactoryTest.java
library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/DefaultMediaSourceFactoryTest.java
library/core/src/test/java/com/google/android/exoplayer2/source/DefaultMediaSourceFactoryTest.java
View file @
7b69b47a
...
...
@@ -43,6 +43,17 @@ public final class DefaultMediaSourceFactoryTest {
private
static
final
String
URI_TEXT
=
"http://exoplayer.dev/text"
;
@Test
public
void
createMediaSource_fromMediaItem_returnsSameMediaItemInstance
()
{
DefaultMediaSourceFactory
defaultMediaSourceFactory
=
DefaultMediaSourceFactory
.
newInstance
(
ApplicationProvider
.
getApplicationContext
());
MediaItem
mediaItem
=
new
MediaItem
.
Builder
().
setUri
(
URI_MEDIA
).
build
();
MediaSource
mediaSource
=
defaultMediaSourceFactory
.
createMediaSource
(
mediaItem
);
assertThat
(
mediaSource
.
getMediaItem
()).
isSameInstanceAs
(
mediaItem
);
}
@Test
public
void
createMediaSource_withoutMimeType_progressiveSource
()
{
DefaultMediaSourceFactory
defaultMediaSourceFactory
=
DefaultMediaSourceFactory
.
newInstance
(
ApplicationProvider
.
getApplicationContext
());
...
...
@@ -54,7 +65,8 @@ public final class DefaultMediaSourceFactoryTest {
}
@Test
public
void
createMediaSource_withTag_tagInSource
()
{
@SuppressWarnings
(
"deprecation"
)
// Testing deprecated MediaSource.getTag() still works.
public
void
createMediaSource_withTag_tagInSource_deprecated
()
{
Object
tag
=
new
Object
();
DefaultMediaSourceFactory
defaultMediaSourceFactory
=
DefaultMediaSourceFactory
.
newInstance
(
ApplicationProvider
.
getApplicationContext
());
...
...
@@ -109,7 +121,8 @@ public final class DefaultMediaSourceFactoryTest {
}
@Test
public
void
createMediaSource_withSubtitle_hasTag
()
{
@SuppressWarnings
(
"deprecation"
)
// Testing deprecated MediaSource.getTag() still works.
public
void
createMediaSource_withSubtitle_hasTag_deprecated
()
{
DefaultMediaSourceFactory
defaultMediaSourceFactory
=
DefaultMediaSourceFactory
.
newInstance
(
ApplicationProvider
.
getApplicationContext
());
Object
tag
=
new
Object
();
...
...
library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DefaultMediaSourceFactoryTest.java
View file @
7b69b47a
...
...
@@ -59,7 +59,7 @@ public class DefaultMediaSourceFactoryTest {
MediaSource
mediaSource
=
defaultMediaSourceFactory
.
createMediaSource
(
mediaItem
);
assertThat
(
mediaSource
.
get
Tag
()
).
isEqualTo
(
tag
);
assertThat
(
mediaSource
.
get
MediaItem
().
playbackProperties
.
tag
).
isEqualTo
(
tag
);
}
@Test
...
...
library/hls/src/test/java/com/google/android/exoplayer2/source/hls/DefaultMediaSourceFactoryTest.java
View file @
7b69b47a
...
...
@@ -59,7 +59,7 @@ public class DefaultMediaSourceFactoryTest {
MediaSource
mediaSource
=
defaultMediaSourceFactory
.
createMediaSource
(
mediaItem
);
assertThat
(
mediaSource
.
get
Tag
()
).
isEqualTo
(
tag
);
assertThat
(
mediaSource
.
get
MediaItem
().
playbackProperties
.
tag
).
isEqualTo
(
tag
);
}
@Test
...
...
library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/DefaultMediaSourceFactoryTest.java
View file @
7b69b47a
...
...
@@ -59,7 +59,7 @@ public class DefaultMediaSourceFactoryTest {
MediaSource
mediaSource
=
defaultMediaSourceFactory
.
createMediaSource
(
mediaItem
);
assertThat
(
mediaSource
.
get
Tag
()
).
isEqualTo
(
tag
);
assertThat
(
mediaSource
.
get
MediaItem
().
playbackProperties
.
tag
).
isEqualTo
(
tag
);
}
@Test
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment