Remove dependency from common tests to exoplayer

PiperOrigin-RevId: 406354526

extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/FakePlayer.java → extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/FakeExoPlayer.java

@@ -15,9 +15,9 @@
  */
 package com.google.android.exoplayer2.ext.ima;
 
-import android.content.Context;
 import android.os.Looper;
 import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.ExoPlayer;
 import com.google.android.exoplayer2.MediaItem;
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.Timeline;
@@ -29,8 +29,8 @@ import com.google.android.exoplayer2.util.Clock;
 import com.google.android.exoplayer2.util.ListenerSet;
 import com.google.android.exoplayer2.util.Util;
 
-/** A fake player for testing content/ad playback. */
-/* package */ final class FakePlayer extends StubExoPlayer {
+/** A fake {@link ExoPlayer} for testing content/ad playback. */
+/* package */ final class FakeExoPlayer extends StubExoPlayer {
 
   private final ListenerSet<Listener> listeners;
   private final Timeline.Period period;
@@ -48,8 +48,7 @@ import com.google.android.exoplayer2.util.Util;
   private int adGroupIndex;
   private int adIndexInAdGroup;
 
-  public FakePlayer(Context context) {
-    super(context);
+  public FakeExoPlayer() {
     listeners =
         new ListenerSet<>(
             Looper.getMainLooper(),

extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoaderTest.java

@@ -139,13 +139,13 @@ public final class ImaAdsLoaderTest {
   private ContentProgressProvider contentProgressProvider;
   private VideoAdPlayer videoAdPlayer;
   private TestAdsLoaderListener adsLoaderListener;
-  private FakePlayer fakePlayer;
+  private FakeExoPlayer fakePlayer;
   private ImaAdsLoader imaAdsLoader;
 
   @Before
   public void setUp() {
     setupMocks();
-    fakePlayer = new FakePlayer(getApplicationContext());
+    fakePlayer = new FakeExoPlayer();
     adViewGroup = new FrameLayout(getApplicationContext());
     View adOverlayView = new View(getApplicationContext());
     adViewProvider =

library/common/build.gradle

@@ -49,7 +49,6 @@ dependencies {
     testImplementation 'junit:junit:' + junitVersion
     testImplementation 'com.google.truth:truth:' + truthVersion
     testImplementation 'org.robolectric:robolectric:' + robolectricVersion
-    testImplementation project(modulePrefix + 'library-core')
     testImplementation project(modulePrefix + 'testutils')
 }
 

library/common/src/test/java/com/google/android/exoplayer2/FormatTest.java

@@ -23,7 +23,7 @@ import static com.google.common.truth.Truth.assertThat;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.drm.DrmInitData;
 import com.google.android.exoplayer2.metadata.Metadata;
-import com.google.android.exoplayer2.metadata.id3.TextInformationFrame;
+import com.google.android.exoplayer2.testutil.FakeMetadataEntry;
 import com.google.android.exoplayer2.util.MimeTypes;
 import com.google.android.exoplayer2.video.ColorInfo;
 import java.util.ArrayList;
@@ -65,10 +65,7 @@ public final class FormatTest {
 
     byte[] projectionData = new byte[] {1, 2, 3};
 
-    Metadata metadata =
-        new Metadata(
-            new TextInformationFrame("id1", "description1", "value1"),
-            new TextInformationFrame("id2", "description2", "value2"));
+    Metadata metadata = new Metadata(new FakeMetadataEntry("id1"), new FakeMetadataEntry("id2"));
 
     ColorInfo colorInfo =
         new ColorInfo(

library/common/src/test/java/com/google/android/exoplayer2/ForwardingPlayerTest.java

@@ -24,10 +24,8 @@ import static org.mockito.ArgumentMatchers.same;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 
-import android.content.Context;
-import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
-import com.google.android.exoplayer2.testutil.StubExoPlayer;
+import com.google.android.exoplayer2.testutil.StubPlayer;
 import com.google.android.exoplayer2.util.FlagSet;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
@@ -48,7 +46,7 @@ public class ForwardingPlayerTest {
 
   @Test
   public void addListener_addsForwardingListener() {
-    FakePlayer player = new FakePlayer(ApplicationProvider.getApplicationContext());
+    FakePlayer player = new FakePlayer();
     Player.Listener listener1 = mock(Player.Listener.class);
     Player.Listener listener2 = mock(Player.Listener.class);
 
@@ -63,7 +61,7 @@ public class ForwardingPlayerTest {
 
   @Test
   public void removeListener_removesForwardingListener() {
-    FakePlayer player = new FakePlayer(ApplicationProvider.getApplicationContext());
+    FakePlayer player = new FakePlayer();
     Player.Listener listener1 = mock(Player.Listener.class);
     Player.Listener listener2 = mock(Player.Listener.class);
     ForwardingPlayer forwardingPlayer = new ForwardingPlayer(player);
@@ -81,7 +79,7 @@ public class ForwardingPlayerTest {
 
   @Test
   public void onEvents_passesForwardingPlayerAsArgument() {
-    FakePlayer player = new FakePlayer(ApplicationProvider.getApplicationContext());
+    FakePlayer player = new FakePlayer();
     Player.Listener listener = mock(Player.Listener.class);
     ForwardingPlayer forwardingPlayer = new ForwardingPlayer(player);
     forwardingPlayer.addListener(listener);
@@ -180,14 +178,10 @@ public class ForwardingPlayerTest {
     throw new IllegalStateException();
   }
 
-  private static class FakePlayer extends StubExoPlayer {
+  private static class FakePlayer extends StubPlayer {
 
     private final Set<Listener> listeners = new HashSet<>();
 
-    public FakePlayer(Context context) {
-      super(context);
-    }
-
     @Override
     public void addListener(Listener listener) {
       listeners.add(listener);

library/common/src/test/java/com/google/android/exoplayer2/metadata/MetadataTest.java

@@ -19,7 +19,7 @@ import static com.google.common.truth.Truth.assertThat;
 
 import android.os.Parcel;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
-import com.google.android.exoplayer2.metadata.id3.BinaryFrame;
+import com.google.android.exoplayer2.testutil.FakeMetadataEntry;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -30,8 +30,7 @@ public class MetadataTest {
   @Test
   public void parcelable() {
     Metadata metadataToParcel =
-        new Metadata(
-            new BinaryFrame("id1", new byte[] {1}), new BinaryFrame("id2", new byte[] {2}));
+        new Metadata(new FakeMetadataEntry("id1"), new FakeMetadataEntry("id2"));
 
     Parcel parcel = Parcel.obtain();
     metadataToParcel.writeToParcel(parcel, 0);

library/common/src/test/java/com/google/android/exoplayer2/trackselection/TrackSelectionParametersTest.java

@@ -19,10 +19,8 @@ import static androidx.test.core.app.ApplicationProvider.getApplicationContext;
 import static com.google.common.truth.Truth.assertThat;
 
 import androidx.test.ext.junit.runners.AndroidJUnit4;
-import com.google.android.exoplayer2.Bundleable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
-import com.google.android.exoplayer2.trackselection.DefaultTrackSelector.SelectionOverride;
 import com.google.android.exoplayer2.trackselection.TrackSelectionOverrides.TrackSelectionOverride;
 import com.google.android.exoplayer2.util.MimeTypes;
 import com.google.common.collect.ImmutableList;
@@ -183,17 +181,4 @@ public final class TrackSelectionParametersTest {
     assertThat(parameters.viewportHeight).isEqualTo(Integer.MAX_VALUE);
     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);
-  }
 }

library/common/src/test/java/com/google/android/exoplayer2/util/AtomicFileTest.java

@@ -39,7 +39,7 @@ public final class AtomicFileTest {
   @Before
   public void setUp() throws Exception {
     tempFolder =
-        Util.createTempDirectory(ApplicationProvider.getApplicationContext(), "ExoPlayerTest");
+        Util.createTempDirectory(ApplicationProvider.getApplicationContext(), "AtomicFileTest");
     file = new File(tempFolder, "atomicFile");
     atomicFile = new AtomicFile(file);
   }

library/common/src/test/java/com/google/android/exoplayer2/util/MediaFormatUtilTest.java

@@ -31,7 +31,7 @@ import org.junit.runner.RunWith;
 public class MediaFormatUtilTest {
 
   @Test
-  public void createMediaFormatFromEmptyExoPlayerFormat_generatesExpectedEntries() {
+  public void createMediaFormatFromFormat_withEmptyFormat_generatesExpectedEntries() {
     MediaFormat mediaFormat =
         MediaFormatUtil.createMediaFormatFromFormat(new Format.Builder().build());
     // Assert that no invalid keys are accidentally being populated.
@@ -59,7 +59,7 @@ public class MediaFormatUtilTest {
   }
 
   @Test
-  public void createMediaFormatFromPopulatedExoPlayerFormat_generatesExpectedMediaFormatEntries() {
+  public void createMediaFormatFromFormat_withPopulatedFormat_generatesExpectedEntries() {
     Format format =
         new Format.Builder()
             .setAverageBitrate(1)
@@ -145,7 +145,7 @@ public class MediaFormatUtilTest {
   }
 
   @Test
-  public void createMediaFormatWithExoPlayerPcmEncoding_containsExoPlayerSpecificEncoding() {
+  public void createMediaFormatFromFormat_withPcmEncoding_setsCustomPcmEncodingEntry() {
     Format format = new Format.Builder().setPcmEncoding(C.ENCODING_PCM_32BIT).build();
     MediaFormat mediaFormat = MediaFormatUtil.createMediaFormatFromFormat(format);
     assertThat(mediaFormat.getInteger(MediaFormatUtil.KEY_EXO_PCM_ENCODING))

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

@@ -1750,6 +1750,19 @@ public final class DefaultTrackSelectorTest {
     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) {
     assertThat(result.length).isEqualTo(expected.length);
     for (int i = 0; i < expected.length; i++) {

testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeMetadataEntry.java

+/*
+ * 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 com.google.android.exoplayer2.testutil;
+
+import static com.google.android.exoplayer2.util.Util.castNonNull;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+import androidx.annotation.Nullable;
+import com.google.android.exoplayer2.metadata.Metadata;
+
+/** A fake {@link Metadata.Entry}. */
+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];
+        }
+      };
+}