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

Migrate from is(Not)SameAs to is(Not)SameInstanceAs.

Browse Source 
They behave identically, and the old names are being removed.

Open-source note: The new methods are available in Truth as of version 0.44.

END_PUBLIC

More information:
  go/issameas-lsc

Tested:
    TAP --sample ran all affected tests and none failed
    http://test/OCL:246024032:BASE:246042619:1556672975894:513e7746
PiperOrigin-RevId: 246101315
This commit is contained in:
olly 2019-05-01 10:08:27 +01:00 committed by Oliver Woodman
parent c480818249
commit f8cd770d84
7 changed files with 19 additions and 19 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/source/ads/AdPlaybackStateTest.java
View File

@ -53,7 +53,7 @@ public final class AdPlaybackStateTest {
assertThat(state.adGroups[0].uris[0]).isNull(); assertThat(state.adGroups[0].uris[0]).isNull();
assertThat(state.adGroups[0].states[0]).isEqualTo(AdPlaybackState.AD_STATE_UNAVAILABLE); assertThat(state.adGroups[0].states[0]).isEqualTo(AdPlaybackState.AD_STATE_UNAVAILABLE);
assertThat(state.adGroups[0].uris[1]).isSameAs(TEST_URI); assertThat(state.adGroups[0].uris[1]).isSameInstanceAs(TEST_URI);
assertThat(state.adGroups[0].states[1]).isEqualTo(AdPlaybackState.AD_STATE_AVAILABLE); assertThat(state.adGroups[0].states[1]).isEqualTo(AdPlaybackState.AD_STATE_AVAILABLE);
} }

8
library/core/src/test/java/com/google/android/exoplayer2/text/ttml/TtmlRenderUtilTest.java
View File

@ -45,7 +45,7 @@ public final class TtmlRenderUtilTest {
String[] styleIds = {"s0"}; String[] styleIds = {"s0"};
assertThat(TtmlRenderUtil.resolveStyle(null, styleIds, globalStyles)) assertThat(TtmlRenderUtil.resolveStyle(null, styleIds, globalStyles))
.isSameAs(globalStyles.get("s0")); .isSameInstanceAs(globalStyles.get("s0"));
} }
@Test @Test
@ -74,7 +74,7 @@ public final class TtmlRenderUtilTest {
style.setBackgroundColor(Color.YELLOW); style.setBackgroundColor(Color.YELLOW);
TtmlStyle resolved = TtmlRenderUtil.resolveStyle(style, styleIds, globalStyles); TtmlStyle resolved = TtmlRenderUtil.resolveStyle(style, styleIds, globalStyles);
assertThat(resolved).isSameAs(style); assertThat(resolved).isSameInstanceAs(style);
// inline attribute not overridden // inline attribute not overridden
assertThat(resolved.getBackgroundColor()).isEqualTo(YELLOW); assertThat(resolved.getBackgroundColor()).isEqualTo(YELLOW);
@ -90,7 +90,7 @@ public final class TtmlRenderUtilTest {
style.setBackgroundColor(Color.YELLOW); style.setBackgroundColor(Color.YELLOW);
TtmlStyle resolved = TtmlRenderUtil.resolveStyle(style, styleIds, globalStyles); TtmlStyle resolved = TtmlRenderUtil.resolveStyle(style, styleIds, globalStyles);
assertThat(resolved).isSameAs(style); assertThat(resolved).isSameInstanceAs(style);
// inline attribute not overridden // inline attribute not overridden
assertThat(resolved.getBackgroundColor()).isEqualTo(YELLOW); assertThat(resolved.getBackgroundColor()).isEqualTo(YELLOW);
@ -101,7 +101,7 @@ public final class TtmlRenderUtilTest {
@Test @Test
public void testResolveStyleOnlyInlineStyle() { public void testResolveStyleOnlyInlineStyle() {
TtmlStyle inlineStyle = new TtmlStyle(); TtmlStyle inlineStyle = new TtmlStyle();
assertThat(TtmlRenderUtil.resolveStyle(inlineStyle, null, null)).isSameAs(inlineStyle); assertThat(TtmlRenderUtil.resolveStyle(inlineStyle, null, null)).isSameInstanceAs(inlineStyle);
} }
private static Map<String, TtmlStyle> getGlobalStyles() { private static Map<String, TtmlStyle> getGlobalStyles() {

4
library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java
View File

@ -1491,7 +1491,7 @@ public final class DefaultTrackSelectorTest {
assertThat(selection.length()).isEqualTo(1); assertThat(selection.length()).isEqualTo(1);
assertThat(selection.getIndexInTrackGroup(0)).isEqualTo(expectedTrack); assertThat(selection.getIndexInTrackGroup(0)).isEqualTo(expectedTrack);
assertThat(selection.getFormat(0)) assertThat(selection.getFormat(0))
.isSameAs(expectedTrackGroup.getFormat(selection.getIndexInTrackGroup(0))); .isSameInstanceAs(expectedTrackGroup.getFormat(selection.getIndexInTrackGroup(0)));
} }
private static void assertNoSelection(TrackSelection selection) { private static void assertNoSelection(TrackSelection selection) {
@ -1506,7 +1506,7 @@ public final class DefaultTrackSelectorTest {
for (int i = 0; i < expectedTracks.length; i++) { for (int i = 0; i < expectedTracks.length; i++) {
assertThat(selection.getIndexInTrackGroup(i)).isEqualTo(expectedTracks[i]); assertThat(selection.getIndexInTrackGroup(i)).isEqualTo(expectedTracks[i]);
assertThat(selection.getFormat(i)) assertThat(selection.getFormat(i))
.isSameAs(expectedTrackGroup.getFormat(selection.getIndexInTrackGroup(i))); .isSameInstanceAs(expectedTrackGroup.getFormat(selection.getIndexInTrackGroup(i)));
} }
} }

4
library/core/src/test/java/com/google/android/exoplayer2/trackselection/TrackSelectionUtilTest.java
View File

@ -202,7 +202,7 @@ public class TrackSelectionUtilTest {
MAX_DURATION_US, MAX_DURATION_US,
bitratesArrayToUse); bitratesArrayToUse);
assertThat(bitrates).isSameAs(bitratesArrayToUse); assertThat(bitrates).isSameInstanceAs(bitratesArrayToUse);
} }
@Test @Test
@ -436,7 +436,7 @@ public class TrackSelectionUtilTest {
MAX_DURATION_US, MAX_DURATION_US,
bitratesArrayToUse); bitratesArrayToUse);
assertThat(bitrates).isSameAs(bitratesArrayToUse); assertThat(bitrates).isSameInstanceAs(bitratesArrayToUse);
} }
@Test @Test

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

@ -145,7 +145,7 @@ public class WindowedTrackBitrateEstimatorTest {
new MediaChunkIterator[] {iterator1, iterator2}, new MediaChunkIterator[] {iterator1, iterator2},
bitratesArrayToUse); bitratesArrayToUse);
assertThat(bitrates).isSameAs(bitratesArrayToUse); assertThat(bitrates).isSameInstanceAs(bitratesArrayToUse);
} }
private static MediaChunk createMediaChunk(int formatBitrate, int actualBitrate) { private static MediaChunk createMediaChunk(int formatBitrate, int actualBitrate) {

16
library/core/src/test/java/com/google/android/exoplayer2/upstream/BaseDataSourceTest.java
View File

@ -40,10 +40,10 @@ public class BaseDataSourceTest {
testSource.read(/* buffer= */ null, /* offset= */ 0, /* readLength= */ 100); testSource.read(/* buffer= */ null, /* offset= */ 0, /* readLength= */ 100);
testSource.close(); testSource.close();
assertThat(transferListener.lastTransferInitializingSource).isSameAs(testSource); assertThat(transferListener.lastTransferInitializingSource).isSameInstanceAs(testSource);
assertThat(transferListener.lastTransferStartSource).isSameAs(testSource); assertThat(transferListener.lastTransferStartSource).isSameInstanceAs(testSource);
assertThat(transferListener.lastBytesTransferredSource).isSameAs(testSource); assertThat(transferListener.lastBytesTransferredSource).isSameInstanceAs(testSource);
assertThat(transferListener.lastTransferEndSource).isSameAs(testSource); assertThat(transferListener.lastTransferEndSource).isSameInstanceAs(testSource);
assertThat(transferListener.lastTransferInitializingDataSpec).isEqualTo(dataSpec); assertThat(transferListener.lastTransferInitializingDataSpec).isEqualTo(dataSpec);
assertThat(transferListener.lastTransferStartDataSpec).isEqualTo(dataSpec); assertThat(transferListener.lastTransferStartDataSpec).isEqualTo(dataSpec);
@ -69,10 +69,10 @@ public class BaseDataSourceTest {
testSource.read(/* buffer= */ null, /* offset= */ 0, /* readLength= */ 100); testSource.read(/* buffer= */ null, /* offset= */ 0, /* readLength= */ 100);
testSource.close(); testSource.close();
assertThat(transferListener.lastTransferInitializingSource).isSameAs(testSource); assertThat(transferListener.lastTransferInitializingSource).isSameInstanceAs(testSource);
assertThat(transferListener.lastTransferStartSource).isSameAs(testSource); assertThat(transferListener.lastTransferStartSource).isSameInstanceAs(testSource);
assertThat(transferListener.lastBytesTransferredSource).isSameAs(testSource); assertThat(transferListener.lastBytesTransferredSource).isSameInstanceAs(testSource);
assertThat(transferListener.lastTransferEndSource).isSameAs(testSource); assertThat(transferListener.lastTransferEndSource).isSameInstanceAs(testSource);
assertThat(transferListener.lastTransferInitializingDataSpec).isEqualTo(dataSpec); assertThat(transferListener.lastTransferInitializingDataSpec).isEqualTo(dataSpec);
assertThat(transferListener.lastTransferStartDataSpec).isEqualTo(dataSpec); assertThat(transferListener.lastTransferStartDataSpec).isEqualTo(dataSpec);

2
library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/HlsMediaPlaylistParserTest.java
View File

@ -362,7 +362,7 @@ public class HlsMediaPlaylistParserTest {
List<Segment> segments = playlist.segments; List<Segment> segments = playlist.segments;
assertThat(segments.get(0).initializationSegment).isNull(); assertThat(segments.get(0).initializationSegment).isNull();
assertThat(segments.get(1).initializationSegment) assertThat(segments.get(1).initializationSegment)
.isSameAs(segments.get(2).initializationSegment); .isSameInstanceAs(segments.get(2).initializationSegment);
assertThat(segments.get(1).initializationSegment.url).isEqualTo("init1.ts"); assertThat(segments.get(1).initializationSegment.url).isEqualTo("init1.ts");
assertThat(segments.get(3).initializationSegment.url).isEqualTo("init2.ts"); assertThat(segments.get(3).initializationSegment.url).isEqualTo("init2.ts");
} }