Skip to content

SDK / exoplayer

Go to a project
Commit a3b71d54 by olly Committed by Ian Baker
Options

Remove dependency from common tests to exoplayer 

PiperOrigin-RevId: 406354526
parent 0d144366
Expand all
Inline Side-by-side
Showing with 513 additions and 46 deletions
libraries/common/build.gradle
...@@ -50,7 +50,6 @@ dependencies { ...@@ -50,7 +50,6 @@ dependencies {
testImplementation 'junit:junit:' + junitVersion testImplementation 'junit:junit:' + junitVersion
testImplementation 'com.google.truth:truth:' + truthVersion testImplementation 'com.google.truth:truth:' + truthVersion
testImplementation 'org.robolectric:robolectric:' + robolectricVersion testImplementation 'org.robolectric:robolectric:' + robolectricVersion
testImplementation project(modulePrefix + 'lib-exoplayer')
testImplementation project(modulePrefix + 'test-utils') testImplementation project(modulePrefix + 'test-utils')
} }
......
libraries/common/src/test/java/androidx/media3/common/FormatTest.java
...@@ -20,7 +20,7 @@ import static androidx.media3.common.MimeTypes.VIDEO_MP4; ...@@ -20,7 +20,7 @@ import static androidx.media3.common.MimeTypes.VIDEO_MP4;
import static androidx.media3.common.MimeTypes.VIDEO_WEBM; import static androidx.media3.common.MimeTypes.VIDEO_WEBM;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import androidx.media3.extractor.metadata.id3.TextInformationFrame; import androidx.media3.test.utils.FakeMetadataEntry;
import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.ext.junit.runners.AndroidJUnit4;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -61,10 +61,7 @@ public final class FormatTest { ...@@ -61,10 +61,7 @@ public final class FormatTest {
byte[] projectionData = new byte[] {1, 2, 3}; byte[] projectionData = new byte[] {1, 2, 3};
Metadata metadata = Metadata metadata = new Metadata(new FakeMetadataEntry("id1"), new FakeMetadataEntry("id2"));
new Metadata(
new TextInformationFrame("id1", "description1", "value1"),
new TextInformationFrame("id2", "description2", "value2"));
ColorInfo colorInfo = ColorInfo colorInfo =
new ColorInfo( new ColorInfo(
......
libraries/common/src/test/java/androidx/media3/common/ForwardingPlayerTest.java
...@@ -24,9 +24,7 @@ import static org.mockito.ArgumentMatchers.same; ...@@ -24,9 +24,7 @@ import static org.mockito.ArgumentMatchers.same;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import android.content.Context; import androidx.media3.test.utils.StubPlayer;
import androidx.media3.test.utils.StubExoPlayer;
import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.ext.junit.runners.AndroidJUnit4;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.lang.reflect.Modifier; import java.lang.reflect.Modifier;
...@@ -47,7 +45,7 @@ public class ForwardingPlayerTest { ...@@ -47,7 +45,7 @@ public class ForwardingPlayerTest {
@Test @Test
public void addListener_addsForwardingListener() { public void addListener_addsForwardingListener() {
FakePlayer player = new FakePlayer(ApplicationProvider.getApplicationContext()); FakePlayer player = new FakePlayer();
Player.Listener listener1 = mock(Player.Listener.class); Player.Listener listener1 = mock(Player.Listener.class);
Player.Listener listener2 = mock(Player.Listener.class); Player.Listener listener2 = mock(Player.Listener.class);
...@@ -62,7 +60,7 @@ public class ForwardingPlayerTest { ...@@ -62,7 +60,7 @@ public class ForwardingPlayerTest {
@Test @Test
public void removeListener_removesForwardingListener() { public void removeListener_removesForwardingListener() {
FakePlayer player = new FakePlayer(ApplicationProvider.getApplicationContext()); FakePlayer player = new FakePlayer();
Player.Listener listener1 = mock(Player.Listener.class); Player.Listener listener1 = mock(Player.Listener.class);
Player.Listener listener2 = mock(Player.Listener.class); Player.Listener listener2 = mock(Player.Listener.class);
ForwardingPlayer forwardingPlayer = new ForwardingPlayer(player); ForwardingPlayer forwardingPlayer = new ForwardingPlayer(player);
...@@ -80,7 +78,7 @@ public class ForwardingPlayerTest { ...@@ -80,7 +78,7 @@ public class ForwardingPlayerTest {
@Test @Test
public void onEvents_passesForwardingPlayerAsArgument() { public void onEvents_passesForwardingPlayerAsArgument() {
FakePlayer player = new FakePlayer(ApplicationProvider.getApplicationContext()); FakePlayer player = new FakePlayer();
Player.Listener listener = mock(Player.Listener.class); Player.Listener listener = mock(Player.Listener.class);
ForwardingPlayer forwardingPlayer = new ForwardingPlayer(player); ForwardingPlayer forwardingPlayer = new ForwardingPlayer(player);
forwardingPlayer.addListener(listener); forwardingPlayer.addListener(listener);
...@@ -179,14 +177,10 @@ public class ForwardingPlayerTest { ...@@ -179,14 +177,10 @@ public class ForwardingPlayerTest {
throw new IllegalStateException(); throw new IllegalStateException();
} }
private static class FakePlayer extends StubExoPlayer { private static class FakePlayer extends StubPlayer {
private final Set<Listener> listeners = new HashSet<>(); private final Set<Listener> listeners = new HashSet<>();
public FakePlayer(Context context) {
super(context);
}
@Override @Override
public void addListener(Listener listener) { public void addListener(Listener listener) {
listeners.add(listener); listeners.add(listener);
......
libraries/common/src/test/java/androidx/media3/common/MetadataTest.java
...@@ -18,7 +18,7 @@ package androidx.media3.common; ...@@ -18,7 +18,7 @@ package androidx.media3.common;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import android.os.Parcel; import android.os.Parcel;
import androidx.media3.extractor.metadata.id3.BinaryFrame; import androidx.media3.test.utils.FakeMetadataEntry;
import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.ext.junit.runners.AndroidJUnit4;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
...@@ -30,8 +30,7 @@ public class MetadataTest { ...@@ -30,8 +30,7 @@ public class MetadataTest {
@Test @Test
public void parcelable() { public void parcelable() {
Metadata metadataToParcel = Metadata metadataToParcel =
new Metadata( new Metadata(new FakeMetadataEntry("id1"), new FakeMetadataEntry("id2"));
new BinaryFrame("id1", new byte[] {1}), new BinaryFrame("id2", new byte[] {2}));
Parcel parcel = Parcel.obtain(); Parcel parcel = Parcel.obtain();
metadataToParcel.writeToParcel(parcel, 0); metadataToParcel.writeToParcel(parcel, 0);
......
libraries/common/src/test/java/androidx/media3/common/TrackSelectionParametersTest.java
...@@ -19,8 +19,6 @@ import static androidx.test.core.app.ApplicationProvider.getApplicationContext; ...@@ -19,8 +19,6 @@ import static androidx.test.core.app.ApplicationProvider.getApplicationContext;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import androidx.media3.common.TrackSelectionOverrides.TrackSelectionOverride; import androidx.media3.common.TrackSelectionOverrides.TrackSelectionOverride;
import androidx.media3.exoplayer.trackselection.DefaultTrackSelector;
import androidx.media3.exoplayer.trackselection.DefaultTrackSelector.SelectionOverride;
import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
...@@ -180,17 +178,4 @@ public final class TrackSelectionParametersTest { ...@@ -180,17 +178,4 @@ public final class TrackSelectionParametersTest {
assertThat(parameters.viewportHeight).isEqualTo(Integer.MAX_VALUE); assertThat(parameters.viewportHeight).isEqualTo(Integer.MAX_VALUE);
assertThat(parameters.viewportOrientationMayChange).isTrue(); assertThat(parameters.viewportOrientationMayChange).isTrue();
} }
/** Tests {@link SelectionOverride}'s {@link Bundleable} implementation. */
@Test
public void roundTripViaBundle_ofSelectionOverride_yieldsEqualInstance() {
SelectionOverride selectionOverrideToBundle =
new SelectionOverride(/* groupIndex= */ 1, /* tracks...= */ 2, 3);
SelectionOverride selectionOverrideFromBundle =
DefaultTrackSelector.SelectionOverride.CREATOR.fromBundle(
selectionOverrideToBundle.toBundle());
assertThat(selectionOverrideFromBundle).isEqualTo(selectionOverrideToBundle);
}
} }
libraries/common/src/test/java/androidx/media3/common/util/AtomicFileTest.java
...@@ -39,7 +39,7 @@ public final class AtomicFileTest { ...@@ -39,7 +39,7 @@ public final class AtomicFileTest {
@Before @Before
public void setUp() throws Exception { public void setUp() throws Exception {
tempFolder = tempFolder =
Util.createTempDirectory(ApplicationProvider.getApplicationContext(), "ExoPlayerTest"); Util.createTempDirectory(ApplicationProvider.getApplicationContext(), "AtomicFileTest");
file = new File(tempFolder, "atomicFile"); file = new File(tempFolder, "atomicFile");
atomicFile = new AtomicFile(file); atomicFile = new AtomicFile(file);
} }
......
libraries/common/src/test/java/androidx/media3/common/util/MediaFormatUtilTest.java
...@@ -32,7 +32,7 @@ import org.junit.runner.RunWith; ...@@ -32,7 +32,7 @@ import org.junit.runner.RunWith;
public class MediaFormatUtilTest { public class MediaFormatUtilTest {
@Test @Test
public void createMediaFormatFromEmptyExoPlayerFormat_generatesExpectedEntries() { public void createMediaFormatFromFormat_withEmptyFormat_generatesExpectedEntries() {
MediaFormat mediaFormat = MediaFormat mediaFormat =
MediaFormatUtil.createMediaFormatFromFormat(new Format.Builder().build()); MediaFormatUtil.createMediaFormatFromFormat(new Format.Builder().build());
// Assert that no invalid keys are accidentally being populated. // Assert that no invalid keys are accidentally being populated.
...@@ -60,7 +60,7 @@ public class MediaFormatUtilTest { ...@@ -60,7 +60,7 @@ public class MediaFormatUtilTest {
} }
@Test @Test
public void createMediaFormatFromPopulatedExoPlayerFormat_generatesExpectedMediaFormatEntries() { public void createMediaFormatFromFormat_withPopulatedFormat_generatesExpectedEntries() {
Format format = Format format =
new Format.Builder() new Format.Builder()
.setAverageBitrate(1) .setAverageBitrate(1)
...@@ -146,7 +146,7 @@ public class MediaFormatUtilTest { ...@@ -146,7 +146,7 @@ public class MediaFormatUtilTest {
} }
@Test @Test
public void createMediaFormatWithExoPlayerPcmEncoding_containsExoPlayerSpecificEncoding() { public void createMediaFormatFromFormat_withPcmEncoding_setsCustomPcmEncodingEntry() {
Format format = new Format.Builder().setPcmEncoding(C.ENCODING_PCM_32BIT).build(); Format format = new Format.Builder().setPcmEncoding(C.ENCODING_PCM_32BIT).build();
MediaFormat mediaFormat = MediaFormatUtil.createMediaFormatFromFormat(format); MediaFormat mediaFormat = MediaFormatUtil.createMediaFormatFromFormat(format);
assertThat(mediaFormat.getInteger(MediaFormatUtil.KEY_EXO_PCM_ENCODING)) assertThat(mediaFormat.getInteger(MediaFormatUtil.KEY_EXO_PCM_ENCODING))
......
libraries/exoplayer/src/test/java/androidx/media3/exoplayer/trackselection/DefaultTrackSelectorTest.java
...@@ -1752,6 +1752,19 @@ public final class DefaultTrackSelectorTest { ...@@ -1752,6 +1752,19 @@ public final class DefaultTrackSelectorTest {
assertThat(trackGroupInfos.get(0).getTrackSupport(0)).isEqualTo(FORMAT_HANDLED); assertThat(trackGroupInfos.get(0).getTrackSupport(0)).isEqualTo(FORMAT_HANDLED);
} }
/** Tests {@link SelectionOverride}'s {@link Bundleable} implementation. */
@Test
public void roundTripViaBundle_ofSelectionOverride_yieldsEqualInstance() {
SelectionOverride selectionOverrideToBundle =
new SelectionOverride(/* groupIndex= */ 1, /* tracks...= */ 2, 3);
SelectionOverride selectionOverrideFromBundle =
DefaultTrackSelector.SelectionOverride.CREATOR.fromBundle(
selectionOverrideToBundle.toBundle());
assertThat(selectionOverrideFromBundle).isEqualTo(selectionOverrideToBundle);
}
private static void assertSelections(TrackSelectorResult result, TrackSelection[] expected) { private static void assertSelections(TrackSelectorResult result, TrackSelection[] expected) {
assertThat(result.length).isEqualTo(expected.length); assertThat(result.length).isEqualTo(expected.length);
for (int i = 0; i < expected.length; i++) { for (int i = 0; i < expected.length; i++) {
......
libraries/exoplayer_ima/src/test/java/androidx/media3/exoplayer/ima/FakePlayer.java → libraries/exoplayer_ima/src/test/java/androidx/media3/exoplayer/ima/FakeExoPlayer.java
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
*/ */
package androidx.media3.exoplayer.ima; package androidx.media3.exoplayer.ima;
import android.content.Context;
import android.os.Looper; import android.os.Looper;
import androidx.media3.common.C; import androidx.media3.common.C;
import androidx.media3.common.MediaItem; import androidx.media3.common.MediaItem;
...@@ -27,10 +26,11 @@ import androidx.media3.common.TracksInfo; ...@@ -27,10 +26,11 @@ import androidx.media3.common.TracksInfo;
import androidx.media3.common.util.Clock; import androidx.media3.common.util.Clock;
import androidx.media3.common.util.ListenerSet; import androidx.media3.common.util.ListenerSet;
import androidx.media3.common.util.Util; import androidx.media3.common.util.Util;
import androidx.media3.exoplayer.ExoPlayer;
import androidx.media3.test.utils.StubExoPlayer; import androidx.media3.test.utils.StubExoPlayer;
/** A fake player for testing content/ad playback. */ /** A fake {@link ExoPlayer} for testing content/ad playback. */
/* package */ final class FakePlayer extends StubExoPlayer { /* package */ final class FakeExoPlayer extends StubExoPlayer {
private final ListenerSet<Listener> listeners; private final ListenerSet<Listener> listeners;
private final Timeline.Period period; private final Timeline.Period period;
...@@ -48,8 +48,7 @@ import androidx.media3.test.utils.StubExoPlayer; ...@@ -48,8 +48,7 @@ import androidx.media3.test.utils.StubExoPlayer;
private int adGroupIndex; private int adGroupIndex;
private int adIndexInAdGroup; private int adIndexInAdGroup;
public FakePlayer(Context context) { public FakeExoPlayer() {
super(context);
listeners = listeners =
new ListenerSet<>( new ListenerSet<>(
Looper.getMainLooper(), Looper.getMainLooper(),
......
libraries/exoplayer_ima/src/test/java/androidx/media3/exoplayer/ima/ImaAdsLoaderTest.java
...@@ -139,13 +139,13 @@ public final class ImaAdsLoaderTest { ...@@ -139,13 +139,13 @@ public final class ImaAdsLoaderTest {
private ContentProgressProvider contentProgressProvider; private ContentProgressProvider contentProgressProvider;
private VideoAdPlayer videoAdPlayer; private VideoAdPlayer videoAdPlayer;
private TestAdsLoaderListener adsLoaderListener; private TestAdsLoaderListener adsLoaderListener;
private FakePlayer fakePlayer; private FakeExoPlayer fakePlayer;
private ImaAdsLoader imaAdsLoader; private ImaAdsLoader imaAdsLoader;
@Before @Before
public void setUp() { public void setUp() {
setupMocks(); setupMocks();
fakePlayer = new FakePlayer(getApplicationContext()); fakePlayer = new FakeExoPlayer();
adViewGroup = new FrameLayout(getApplicationContext()); adViewGroup = new FrameLayout(getApplicationContext());
View adOverlayView = new View(getApplicationContext()); View adOverlayView = new View(getApplicationContext());
adViewProvider = adViewProvider =
......
libraries/test_utils/src/main/java/androidx/media3/test/utils/FakeMetadataEntry.java 0 → 100644
/*
* Copyright (C) 2021 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package androidx.media3.test.utils;
import static androidx.media3.common.util.Util.castNonNull;
import android.os.Parcel;
import android.os.Parcelable;
import androidx.annotation.Nullable;
import androidx.media3.common.Metadata;
import androidx.media3.common.util.UnstableApi;
/** A fake {@link Metadata.Entry}. */
@UnstableApi
public final class FakeMetadataEntry implements Metadata.Entry {
public final String data;
public FakeMetadataEntry(String data) {
this.data = data;
}
/* package */ FakeMetadataEntry(Parcel in) {
data = castNonNull(in.readString());
}
@Override
public int describeContents() {
return 0;
}
@Override
public boolean equals(@Nullable Object obj) {
if (this == obj) {
return true;
}
if (obj == null || getClass() != obj.getClass()) {
return false;
}
FakeMetadataEntry other = (FakeMetadataEntry) obj;
return data.equals(other.data);
}
@Override
public int hashCode() {
return data.hashCode();
}
@Override
public void writeToParcel(Parcel dest, int flags) {
dest.writeString(data);
}
public static final Parcelable.Creator<FakeMetadataEntry> CREATOR =
new Parcelable.Creator<FakeMetadataEntry>() {
@Override
public FakeMetadataEntry createFromParcel(Parcel in) {
return new FakeMetadataEntry(in);
}
@Override
public FakeMetadataEntry[] newArray(int size) {
return new FakeMetadataEntry[size];
}
};
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment