loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make one of the ExoPlayerTest tests more sensible.

Browse Source 
Some variables were defined although they are the default and other things
were set-up in a non-sensible way, e.g. asserting that audio is selected
although no audio renderer is available, or using unset duration for
everything.

PiperOrigin-RevId: 259532782
This commit is contained in:
tonihei 2019-07-23 15:33:29 +01:00 committed by Oliver Woodman
parent e5b3c32c98
commit 39574b5a61
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java
View File

@ -51,7 +51,6 @@ import com.google.android.exoplayer2.testutil.FakeTimeline;
import com.google.android.exoplayer2.testutil.FakeTimeline.TimelineWindowDefinition; import com.google.android.exoplayer2.testutil.FakeTimeline.TimelineWindowDefinition;
import com.google.android.exoplayer2.testutil.FakeTrackSelection; import com.google.android.exoplayer2.testutil.FakeTrackSelection;
import com.google.android.exoplayer2.testutil.FakeTrackSelector; import com.google.android.exoplayer2.testutil.FakeTrackSelector;
import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
import com.google.android.exoplayer2.trackselection.TrackSelectionArray; import com.google.android.exoplayer2.trackselection.TrackSelectionArray;
import com.google.android.exoplayer2.upstream.Allocator; import com.google.android.exoplayer2.upstream.Allocator;
import com.google.android.exoplayer2.upstream.TransferListener; import com.google.android.exoplayer2.upstream.TransferListener;
@ -2253,17 +2252,15 @@ public final class ExoPlayerTest {
public void testUpdateTrackSelectorThenSeekToUnpreparedPeriod_returnsEmptyTrackGroups() public void testUpdateTrackSelectorThenSeekToUnpreparedPeriod_returnsEmptyTrackGroups()
throws Exception { throws Exception {
// Use unset duration to prevent pre-loading of the second window. // Use unset duration to prevent pre-loading of the second window.
Timeline fakeTimeline = Timeline timelineUnsetDuration =
new FakeTimeline( new FakeTimeline(
new TimelineWindowDefinition( new TimelineWindowDefinition(
/* isSeekable= */ true, /* isDynamic= */ false, /* durationUs= */ C.TIME_UNSET)); /* isSeekable= */ true, /* isDynamic= */ false, /* durationUs= */ C.TIME_UNSET));
MediaSource[] fakeMediaSources = { Timeline timelineSetDuration = new FakeTimeline(/* windowCount= */ 1);
new FakeMediaSource(fakeTimeline, Builder.VIDEO_FORMAT), MediaSource mediaSource =
new FakeMediaSource(fakeTimeline, Builder.AUDIO_FORMAT) new ConcatenatingMediaSource(
}; new FakeMediaSource(timelineUnsetDuration, Builder.VIDEO_FORMAT),
MediaSource mediaSource = new ConcatenatingMediaSource(fakeMediaSources); new FakeMediaSource(timelineSetDuration, Builder.AUDIO_FORMAT));
FakeRenderer renderer = new FakeRenderer(Builder.VIDEO_FORMAT);
DefaultTrackSelector trackSelector = new DefaultTrackSelector();
ActionSchedule actionSchedule = ActionSchedule actionSchedule =
new ActionSchedule.Builder("testUpdateTrackSelectorThenSeekToUnpreparedPeriod") new ActionSchedule.Builder("testUpdateTrackSelectorThenSeekToUnpreparedPeriod")
.pause() .pause()
@ -2275,8 +2272,7 @@ public final class ExoPlayerTest {
List<TrackSelectionArray> trackSelectionsList = new ArrayList<>(); List<TrackSelectionArray> trackSelectionsList = new ArrayList<>();
new Builder() new Builder()
.setMediaSource(mediaSource) .setMediaSource(mediaSource)
.setTrackSelector(trackSelector) .setSupportedFormats(Builder.VIDEO_FORMAT, Builder.AUDIO_FORMAT)
.setRenderers(renderer)
.setActionSchedule(actionSchedule) .setActionSchedule(actionSchedule)
.setEventListener( .setEventListener(
new EventListener() { new EventListener() {