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

Migrate from containsAllOf to containsAtLeast.

Browse Source 
The two behave identically, and containsAllOf is being removed.

More information:
  go/containsall-lsc

Tested:
    TAP --sample for global presubmit queue
    http://test/OCL:244737393:BASE:244782138:1555991083653:3080d7c7
PiperOrigin-RevId: 244886736
This commit is contained in:
olly 2019-04-23 19:03:22 +01:00 committed by Oliver Woodman
parent ba94f9dc01
commit d60b6d64ab
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2092,7 +2092,7 @@ public final class ExoPlayerTest {
testRunner.assertPlayedPeriodIndices(0, 1, 0, 1); testRunner.assertPlayedPeriodIndices(0, 1, 0, 1);
assertThat(mediaSource.getCreatedMediaPeriods()) assertThat(mediaSource.getCreatedMediaPeriods())
.containsAllOf( .containsAtLeast(
new MediaPeriodId( new MediaPeriodId(
timeline.getUidOfPeriod(/* periodIndex= */ 0), /* windowSequenceNumber= */ 0), timeline.getUidOfPeriod(/* periodIndex= */ 0), /* windowSequenceNumber= */ 0),
new MediaPeriodId( new MediaPeriodId(

2
library/core/src/test/java/com/google/android/exoplayer2/analytics/AnalyticsCollectorTest.java
View File

@ -325,7 +325,7 @@ public final class AnalyticsCollectorTest {
assertThat(listener.getEvents(EVENT_SEEK_PROCESSED)).containsExactly(period1); assertThat(listener.getEvents(EVENT_SEEK_PROCESSED)).containsExactly(period1);
List<EventWindowAndPeriodId> loadingEvents = listener.getEvents(EVENT_LOADING_CHANGED); List<EventWindowAndPeriodId> loadingEvents = listener.getEvents(EVENT_LOADING_CHANGED);
assertThat(loadingEvents).hasSize(4); assertThat(loadingEvents).hasSize(4);
assertThat(loadingEvents).containsAllOf(period0, period0); assertThat(loadingEvents).containsAtLeast(period0, period0);
assertThat(listener.getEvents(EVENT_TRACKS_CHANGED)).containsExactly(period0, period1); assertThat(listener.getEvents(EVENT_TRACKS_CHANGED)).containsExactly(period0, period1);
assertThat(listener.getEvents(EVENT_LOAD_STARTED)) assertThat(listener.getEvents(EVENT_LOAD_STARTED))
.containsExactly( .containsExactly(

2
library/core/src/test/java/com/google/android/exoplayer2/drm/DrmInitDataTest.java
View File

@ -124,7 +124,7 @@ public class DrmInitDataTest {
@Test @Test
public void testGetByIndex() { public void testGetByIndex() {
DrmInitData testInitData = new DrmInitData(DATA_1, DATA_2); DrmInitData testInitData = new DrmInitData(DATA_1, DATA_2);
assertThat(getAllSchemeData(testInitData)).containsAllOf(DATA_1, DATA_2); assertThat(getAllSchemeData(testInitData)).containsAtLeast(DATA_1, DATA_2);
} }
@Test @Test

4
library/core/src/test/java/com/google/android/exoplayer2/source/ConcatenatingMediaSourceTest.java
View File

@ -827,7 +827,7 @@ public final class ConcatenatingMediaSourceTest {
Object childPeriodUid0 = childTimeline.getUidOfPeriod(/* periodIndex= */ 0); Object childPeriodUid0 = childTimeline.getUidOfPeriod(/* periodIndex= */ 0);
Object childPeriodUid1 = childTimeline.getUidOfPeriod(/* periodIndex= */ 1); Object childPeriodUid1 = childTimeline.getUidOfPeriod(/* periodIndex= */ 1);
assertThat(childSource.getCreatedMediaPeriods()) assertThat(childSource.getCreatedMediaPeriods())
.containsAllOf( .containsAtLeast(
new MediaPeriodId(childPeriodUid0, /* windowSequenceNumber= */ 0), new MediaPeriodId(childPeriodUid0, /* windowSequenceNumber= */ 0),
new MediaPeriodId(childPeriodUid0, /* windowSequenceNumber= */ 2), new MediaPeriodId(childPeriodUid0, /* windowSequenceNumber= */ 2),
new MediaPeriodId(childPeriodUid0, /* windowSequenceNumber= */ 4), new MediaPeriodId(childPeriodUid0, /* windowSequenceNumber= */ 4),
@ -863,7 +863,7 @@ public final class ConcatenatingMediaSourceTest {
testRunner.assertPrepareAndReleaseAllPeriods(); testRunner.assertPrepareAndReleaseAllPeriods();
Object childPeriodUid = childTimeline.getUidOfPeriod(/* periodIndex= */ 0); Object childPeriodUid = childTimeline.getUidOfPeriod(/* periodIndex= */ 0);
assertThat(childSource.getCreatedMediaPeriods()) assertThat(childSource.getCreatedMediaPeriods())
.containsAllOf( .containsAtLeast(
new MediaPeriodId(childPeriodUid, /* windowSequenceNumber= */ 0), new MediaPeriodId(childPeriodUid, /* windowSequenceNumber= */ 0),
new MediaPeriodId(childPeriodUid, /* windowSequenceNumber= */ 1), new MediaPeriodId(childPeriodUid, /* windowSequenceNumber= */ 1),
new MediaPeriodId(childPeriodUid, /* windowSequenceNumber= */ 2), new MediaPeriodId(childPeriodUid, /* windowSequenceNumber= */ 2),