Use a helper function and Truth Correspondence instead of NoUidTimeline

NoUidTimeline still exists as a private detail of TestUtil, but it no
longer extends ForwardingTimeline because the interactions are quite
hard to reason about.

#minor-release

PiperOrigin-RevId: 457703593

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

@@ -61,6 +61,7 @@ import static com.google.android.exoplayer2.testutil.FakeSampleStream.FakeSample
 import static com.google.android.exoplayer2.testutil.FakeTimeline.TimelineWindowDefinition.DEFAULT_WINDOW_DURATION_US;
 import static com.google.android.exoplayer2.testutil.FakeTimeline.TimelineWindowDefinition.DEFAULT_WINDOW_DURATION_US;
 import static com.google.android.exoplayer2.testutil.FakeTimeline.TimelineWindowDefinition.DEFAULT_WINDOW_OFFSET_IN_FIRST_PERIOD_US;
 import static com.google.android.exoplayer2.testutil.FakeTimeline.TimelineWindowDefinition.DEFAULT_WINDOW_OFFSET_IN_FIRST_PERIOD_US;
 import static com.google.android.exoplayer2.testutil.TestUtil.assertTimelinesSame;
 import static com.google.android.exoplayer2.testutil.TestUtil.assertTimelinesSame;
+import static com.google.android.exoplayer2.testutil.TestUtil.timelinesAreSame;
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.assertThrows;
@@ -140,7 +141,6 @@ import com.google.android.exoplayer2.testutil.FakeTimeline.TimelineWindowDefinit
 import com.google.android.exoplayer2.testutil.FakeTrackSelection;
 import com.google.android.exoplayer2.testutil.FakeTrackSelection;
 import com.google.android.exoplayer2.testutil.FakeTrackSelector;
 import com.google.android.exoplayer2.testutil.FakeTrackSelector;
 import com.google.android.exoplayer2.testutil.FakeVideoRenderer;
 import com.google.android.exoplayer2.testutil.FakeVideoRenderer;
-import com.google.android.exoplayer2.testutil.NoUidTimeline;
 import com.google.android.exoplayer2.testutil.TestExoPlayerBuilder;
 import com.google.android.exoplayer2.testutil.TestExoPlayerBuilder;
 import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
 import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
 import com.google.android.exoplayer2.upstream.Allocation;
 import com.google.android.exoplayer2.upstream.Allocation;
@@ -12247,6 +12247,6 @@ public final class ExoPlayerTest {
    * Returns an argument matcher for {@link Timeline} instances that ignores period and window uids.
    * Returns an argument matcher for {@link Timeline} instances that ignores period and window uids.
    */
    */
   private static ArgumentMatcher<Timeline> noUid(Timeline timeline) {
   private static ArgumentMatcher<Timeline> noUid(Timeline timeline) {
-    return argument -> new NoUidTimeline(timeline).equals(new NoUidTimeline(argument));
+    return argument -> timelinesAreSame(argument, timeline);
   }
   }
 }
 }

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

@@ -15,6 +15,8 @@
  */
  */
 package com.google.android.exoplayer2.testutil;
 package com.google.android.exoplayer2.testutil;
 
 
+import static com.google.android.exoplayer2.testutil.TestUtil.timelinesAreSame;
+
 import android.os.Looper;
 import android.os.Looper;
 import android.view.Surface;
 import android.view.Surface;
 import androidx.annotation.Nullable;
 import androidx.annotation.Nullable;
@@ -763,7 +765,7 @@ public abstract class Action {
         @Nullable Timeline expectedTimeline,
         @Nullable Timeline expectedTimeline,
         @Player.TimelineChangeReason int expectedReason) {
         @Player.TimelineChangeReason int expectedReason) {
       super(tag, "WaitForTimelineChanged");
       super(tag, "WaitForTimelineChanged");
-      this.expectedTimeline = expectedTimeline != null ? new NoUidTimeline(expectedTimeline) : null;
+      this.expectedTimeline = expectedTimeline;
       this.ignoreExpectedReason = false;
       this.ignoreExpectedReason = false;
       this.expectedReason = expectedReason;
       this.expectedReason = expectedReason;
     }
     }
@@ -795,7 +797,7 @@ public abstract class Action {
             @Override
             @Override
             public void onTimelineChanged(
             public void onTimelineChanged(
                 Timeline timeline, @Player.TimelineChangeReason int reason) {
                 Timeline timeline, @Player.TimelineChangeReason int reason) {
-              if ((expectedTimeline == null || new NoUidTimeline(timeline).equals(expectedTimeline))
+              if ((expectedTimeline == null || timelinesAreSame(timeline, expectedTimeline))
                   && (ignoreExpectedReason || expectedReason == reason)) {
                   && (ignoreExpectedReason || expectedReason == reason)) {
                 player.removeListener(this);
                 player.removeListener(this);
                 nextAction.schedule(player, trackSelector, surface, handler);
                 nextAction.schedule(player, trackSelector, surface, handler);
@@ -803,8 +805,8 @@ public abstract class Action {
             }
             }
           };
           };
       player.addListener(listener);
       player.addListener(listener);
-      Timeline currentTimeline = new NoUidTimeline(player.getCurrentTimeline());
-      if (currentTimeline.equals(expectedTimeline)) {
+      if (expectedTimeline != null
+          && timelinesAreSame(player.getCurrentTimeline(), expectedTimeline)) {
         player.removeListener(listener);
         player.removeListener(listener);
         nextAction.schedule(player, trackSelector, surface, handler);
         nextAction.schedule(player, trackSelector, surface, handler);
       }
       }

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

@@ -42,6 +42,7 @@ import com.google.android.exoplayer2.upstream.BandwidthMeter;
 import com.google.android.exoplayer2.util.Clock;
 import com.google.android.exoplayer2.util.Clock;
 import com.google.android.exoplayer2.util.HandlerWrapper;
 import com.google.android.exoplayer2.util.HandlerWrapper;
 import com.google.android.exoplayer2.util.MimeTypes;
 import com.google.android.exoplayer2.util.MimeTypes;
+import com.google.common.collect.ImmutableList;
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Arrays;
 import java.util.List;
 import java.util.List;
@@ -534,11 +535,8 @@ public final class ExoPlayerTestRunner implements Player.Listener, ActionSchedul
    * @param timelines A list of expected {@link Timeline}s.
    * @param timelines A list of expected {@link Timeline}s.
    */
    */
   public void assertTimelinesSame(Timeline... timelines) {
   public void assertTimelinesSame(Timeline... timelines) {
-    assertThat(this.timelines).hasSize(timelines.length);
-    for (int i = 0; i < timelines.length; i++) {
-      assertThat(new NoUidTimeline(timelines[i]))
-          .isEqualTo(new NoUidTimeline(this.timelines.get(i)));
-    }
+    TestUtil.assertTimelinesSame(
+        ImmutableList.copyOf(this.timelines), ImmutableList.copyOf(timelines));
   }
   }
 
 
   /**
   /**

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

-/*
- * Copyright (C) 2019 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 com.google.android.exoplayer2.Timeline;
-import com.google.android.exoplayer2.source.ForwardingTimeline;
-
-/**
- * A timeline which wraps another timeline and overrides all window and period uids to 0. This is
- * useful for testing timeline equality without taking uids into account.
- */
-public class NoUidTimeline extends ForwardingTimeline {
-
-  /**
-   * Creates an instance.
-   *
-   * @param timeline The underlying timeline.
-   */
-  public NoUidTimeline(Timeline timeline) {
-    super(timeline);
-  }
-
-  @Override
-  public Window getWindow(int windowIndex, Window window, long defaultPositionProjectionUs) {
-    timeline.getWindow(windowIndex, window, defaultPositionProjectionUs);
-    window.uid = 0;
-    return window;
-  }
-
-  @Override
-  public Period getPeriod(int periodIndex, Period period, boolean setIds) {
-    timeline.getPeriod(periodIndex, period, setIds);
-    period.uid = 0;
-    return period;
-  }
-}

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

@@ -43,6 +43,7 @@ import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Util;
 import com.google.android.exoplayer2.util.Util;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableList;
 import com.google.common.primitives.Bytes;
 import com.google.common.primitives.Bytes;
+import com.google.common.truth.Correspondence;
 import java.io.File;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.IOException;
@@ -205,11 +206,20 @@ public class TestUtil {
    */
    */
   public static void assertTimelinesSame(
   public static void assertTimelinesSame(
       List<Timeline> actualTimelines, List<Timeline> expectedTimelines) {
       List<Timeline> actualTimelines, List<Timeline> expectedTimelines) {
-    assertThat(actualTimelines).hasSize(expectedTimelines.size());
-    for (int i = 0; i < actualTimelines.size(); i++) {
-      assertThat(new NoUidTimeline(actualTimelines.get(i)))
-          .isEqualTo(new NoUidTimeline(expectedTimelines.get(i)));
-    }
+    assertThat(actualTimelines)
+        .comparingElementsUsing(
+            Correspondence.from(
+                TestUtil::timelinesAreSame, "is equal to (ignoring Window.uid and Period.uid)"))
+        .containsExactlyElementsIn(expectedTimelines)
+        .inOrder();
+  }
+
+  /**
+   * Returns true if {@code thisTimeline} is equal to {@code thatTimeline}, ignoring {@link
+   * Timeline.Window#uid} and {@link Timeline.Period#uid} values.
+   */
+  public static boolean timelinesAreSame(Timeline thisTimeline, Timeline thatTimeline) {
+    return new NoUidTimeline(thisTimeline).equals(new NoUidTimeline(thatTimeline));
   }
   }
 
 
   /**
   /**
@@ -492,4 +502,47 @@ public class TestUtil {
 
 
     return list;
     return list;
   }
   }
+
+  private static final class NoUidTimeline extends Timeline {
+
+    private final Timeline delegate;
+
+    public NoUidTimeline(Timeline timeline) {
+      this.delegate = timeline;
+    }
+
+    @Override
+    public int getWindowCount() {
+      return delegate.getWindowCount();
+    }
+
+    @Override
+    public Window getWindow(int windowIndex, Window window, long defaultPositionProjectionUs) {
+      delegate.getWindow(windowIndex, window, defaultPositionProjectionUs);
+      window.uid = 0;
+      return window;
+    }
+
+    @Override
+    public int getPeriodCount() {
+      return delegate.getPeriodCount();
+    }
+
+    @Override
+    public Period getPeriod(int periodIndex, Period period, boolean setIds) {
+      delegate.getPeriod(periodIndex, period, setIds);
+      period.uid = 0;
+      return period;
+    }
+
+    @Override
+    public int getIndexOfPeriod(Object uid) {
+      return delegate.getIndexOfPeriod(uid);
+    }
+
+    @Override
+    public Object getUidOfPeriod(int periodIndex) {
+      return 0;
+    }
+  }
 }
 }