Skip to content

Commit

Permalink
fix build error
Browse files Browse the repository at this point in the history
  • Loading branch information
@zhouzhengfw
zhouzhengfw committed Dec 7, 2021
1 parent 24bd9b4 commit f1a5df5
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 26 deletions.
9 changes: 5 additions & 4 deletions .../cast/src/test/java/com/firework/android/exoplayer2/ext/cast/CastTimelineTrackerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,11 @@
import com.firework.android.exoplayer2.testutil.TimelineAsserts;
import com.firework.android.exoplayer2.util.MimeTypes;
import com.firework.android.exoplayer2.util.Util;
import com.firework.android.gms.cast.MediaInfo;
import com.firework.android.gms.cast.MediaStatus;
import com.firework.android.gms.cast.framework.media.MediaQueue;
import com.firework.android.gms.cast.framework.media.RemoteMediaClient;
import com.google.android.gms.cast.MediaInfo;
import com.google.android.gms.cast.MediaStatus;
import com.google.android.gms.cast.framework.media.MediaQueue;
import com.google.android.gms.cast.framework.media.RemoteMediaClient;
import com.google.android.gms.cast.MediaInfo;
import java.util.Collections;
import org.junit.Test;
import org.junit.runner.RunWith;
Expand Down
2 changes: 1 addition & 1 deletion ...src/test/java/com/firework/android/exoplayer2/ext/cast/DefaultMediaItemConverterTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import com.firework.android.exoplayer2.MediaItem;
import com.firework.android.exoplayer2.MediaMetadata;
import com.firework.android.exoplayer2.util.MimeTypes;
import com.firework.android.gms.cast.MediaQueueItem;
import com.google.android.gms.cast.MediaQueueItem;
import com.google.common.collect.ImmutableMap;
import org.junit.Test;
import org.junit.runner.RunWith;
Expand Down
24 changes: 12 additions & 12 deletions library/core/src/test/java/com/firework/android/exoplayer2/ExoPlayerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ public void playEmptyTimeline() throws Exception {
player.play();
runUntilPlaybackState(player, Player.STATE_ENDED);

InOrder inOrder = inOrder(mockListener);
InOrder inOrder =Mockito.inOrder(mockListener);
inOrder
.verify(mockListener)
.onTimelineChanged(
Expand Down Expand Up @@ -326,7 +326,7 @@ public void playShortDurationPeriods() throws Exception {
player.play();
runUntilPlaybackState(player, Player.STATE_ENDED);

InOrder inOrder = inOrder(mockPlayerListener);
InOrder inOrder = Mockito.inOrder(mockPlayerListener);
inOrder
.verify(mockPlayerListener)
.onTimelineChanged(
Expand Down Expand Up @@ -550,7 +550,7 @@ public boolean isEnded() {
player.play();
runUntilPlaybackState(player, Player.STATE_ENDED);

InOrder inOrder = inOrder(mockPlayerListener);
InOrder inOrder = Mockito.inOrder(mockPlayerListener);
inOrder
.verify(mockPlayerListener)
.onTimelineChanged(
Expand Down Expand Up @@ -605,7 +605,7 @@ public synchronized void prepareSourceInternal(
// prepared, it immediately exposed a placeholder timeline, but the source info refresh from the
// second source was suppressed as we replace it with the third source before the update
// arrives.
InOrder inOrder = inOrder(mockPlayerListener);
InOrder inOrder = Mockito.inOrder(mockPlayerListener);
inOrder
.verify(mockPlayerListener)
.onTimelineChanged(
Expand Down Expand Up @@ -9788,7 +9788,7 @@ public void repeatMode_windowTransition_callsOnPositionDiscontinuityAndOnMediaIt
ArgumentCaptor.forClass(Player.PositionInfo.class);
ArgumentCaptor<Player.PositionInfo> newPosition =
ArgumentCaptor.forClass(Player.PositionInfo.class);
InOrder inOrder = inOrder(listener);
InOrder inOrder = Mockito.inOrder(listener);
// Expect media item transition for repeat mode ONE to be attributed to
// DISCONTINUITY_REASON_REPEAT.
inOrder
Expand Down Expand Up @@ -10340,7 +10340,7 @@ public void setMediaSources_removesPlayingPeriod_callsOnPositionDiscontinuity()
ArgumentCaptor.forClass(Player.PositionInfo.class);
ArgumentCaptor<Player.PositionInfo> newPosition =
ArgumentCaptor.forClass(Player.PositionInfo.class);
InOrder inOrder = inOrder(listener);
InOrder inOrder = Mockito.inOrder(listener);
inOrder
.verify(listener)
.onPositionDiscontinuity(
Expand Down Expand Up @@ -10401,7 +10401,7 @@ public void onPositionDiscontinuity(

ArgumentCaptor<PositionInfo> newPositionArgumentCaptor =
ArgumentCaptor.forClass(PositionInfo.class);
InOrder inOrder = inOrder(listener);
InOrder inOrder = Mockito.inOrder(listener);
inOrder
.verify(listener)
.onPositionDiscontinuity(
Expand Down Expand Up @@ -10466,7 +10466,7 @@ public void removeMediaItems_removesPlayingPeriod_callsOnPositionDiscontinuity()
ArgumentCaptor.forClass(Player.PositionInfo.class);
ArgumentCaptor<Player.PositionInfo> newPosition =
ArgumentCaptor.forClass(Player.PositionInfo.class);
InOrder inOrder = inOrder(listener);
InOrder inOrder = Mockito.inOrder(listener);
inOrder
.verify(listener)
.onPositionDiscontinuity(any(), any(), eq(Player.DISCONTINUITY_REASON_AUTO_TRANSITION));
Expand Down Expand Up @@ -10553,7 +10553,7 @@ public void removeMediaItems_removesPlayingPeriod_callsOnPositionDiscontinuity()
ArgumentCaptor.forClass(Player.PositionInfo.class);
ArgumentCaptor<Player.PositionInfo> newPosition =
ArgumentCaptor.forClass(Player.PositionInfo.class);
InOrder inOrder = inOrder(listener);
InOrder inOrder = Mockito.inOrder(listener);
inOrder
.verify(listener)
.onPositionDiscontinuity(any(), any(), eq(Player.DISCONTINUITY_REASON_AUTO_TRANSITION));
Expand Down Expand Up @@ -10627,7 +10627,7 @@ public void removeMediaItems_removesPlayingPeriod_callsOnPositionDiscontinuity()
ArgumentCaptor.forClass(Player.PositionInfo.class);
ArgumentCaptor<Player.PositionInfo> newPosition =
ArgumentCaptor.forClass(Player.PositionInfo.class);
InOrder inOrder = inOrder(listener);
InOrder inOrder = Mockito.inOrder(listener);
inOrder
.verify(listener)
.onPositionDiscontinuity(any(), any(), eq(Player.DISCONTINUITY_REASON_AUTO_TRANSITION));
Expand Down Expand Up @@ -10685,7 +10685,7 @@ public void setMediaItems_callsListenersWithSameInstanceOfMediaItem() throws Exc
player.play();
TestPlayerRunHelper.runUntilPlaybackState(player, Player.STATE_ENDED);

InOrder inOrder = inOrder(listener);
InOrder inOrder = Mockito.inOrder(listener);
inOrder
.verify(listener)
.onTimelineChanged(timeline.capture(), eq(Player.TIMELINE_CHANGE_REASON_PLAYLIST_CHANGED));
Expand Down Expand Up @@ -11109,7 +11109,7 @@ public void seekTo_cancelsSourceDiscontinuity_callsOnPositionDiscontinuity() thr
ArgumentCaptor.forClass(Player.PositionInfo.class);
ArgumentCaptor<Player.PositionInfo> newPosition =
ArgumentCaptor.forClass(Player.PositionInfo.class);
InOrder inOrder = inOrder(listener);
InOrder inOrder = Mockito.inOrder(listener);
inOrder
.verify(listener)
.onPositionDiscontinuity(any(), any(), eq(Player.DISCONTINUITY_REASON_AUTO_TRANSITION));
Expand Down
8 changes: 4 additions & 4 deletions ...core/src/test/java/com/firework/android/exoplayer2/offline/ActionFileUpgradeUtilTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public void tearDown() {
@Test
public void upgradeAndDelete_progressiveActionFile_createsDownloads() throws IOException {
byte[] actionFileBytes =
com.TestUtil.android.exoplayer2.testutil.TestUtil.getByteArray(
com.firework.android.exoplayer2.testutil.TestUtil.getByteArray(
ApplicationProvider.getApplicationContext(),
"media/offline/action_file_for_download_index_upgrade_progressive.exi");
try (FileOutputStream output = new FileOutputStream(tempFile)) {
Expand Down Expand Up @@ -97,7 +97,7 @@ public void upgradeAndDelete_progressiveActionFile_createsDownloads() throws IOE
@Test
public void upgradeAndDelete_dashActionFile_createsDownloads() throws IOException {
byte[] actionFileBytes =
com.TestUtil.android.exoplayer2.testutil.TestUtil.getByteArray(
com.firework.android.exoplayer2.testutil.TestUtil.getByteArray(
ApplicationProvider.getApplicationContext(),
"media/offline/action_file_for_download_index_upgrade_dash.exi");
try (FileOutputStream output = new FileOutputStream(tempFile)) {
Expand Down Expand Up @@ -136,7 +136,7 @@ public void upgradeAndDelete_dashActionFile_createsDownloads() throws IOExceptio
@Test
public void upgradeAndDelete_hlsActionFile_createsDownloads() throws IOException {
byte[] actionFileBytes =
com.TestUtil.android.exoplayer2.testutil.TestUtil.getByteArray(
com.firework.android.exoplayer2.testutil.TestUtil.getByteArray(
ApplicationProvider.getApplicationContext(),
"media/offline/action_file_for_download_index_upgrade_hls.exi");
try (FileOutputStream output = new FileOutputStream(tempFile)) {
Expand Down Expand Up @@ -175,7 +175,7 @@ public void upgradeAndDelete_hlsActionFile_createsDownloads() throws IOException
@Test
public void upgradeAndDelete_smoothStreamingActionFile_createsDownloads() throws IOException {
byte[] actionFileBytes =
com.TestUtil.android.exoplayer2.testutil.TestUtil.getByteArray(
com.firework.android.exoplayer2.testutil.TestUtil.getByteArray(
ApplicationProvider.getApplicationContext(),
"media/offline/action_file_for_download_index_upgrade_ss.exi");
try (FileOutputStream output = new FileOutputStream(tempFile)) {
Expand Down
4 changes: 0 additions & 4 deletions library/ui/src/main/res/drawable-anydpi-v21/test.xml
View file

This file was deleted.

2 changes: 1 addition & 1 deletion ...ary/ui/src/test/java/com/firework/android/exoplayer2/ui/DefaultTrackNameProviderTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,6 @@ public void getTrackName_handlesInvalidLanguage() {

String name = provider.getTrackName(format);

assertThat(name).isEqualTo(resources.getString(R.string.exo_track_unknown));
assertThat(name).isEqualTo(resources.getString(R.string.fw_exo_track_unknown));
}
}

0 comments on commit f1a5df5

Please sign in to comment.