From abc39088d07db8111f7f255ce4651feafda5e577 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Thu, 10 Sep 2020 11:31:40 +0100
Subject: [PATCH] Remove testutil dependency on Robolectric shadows

Move shadow-related utils for end-to-end tests into core test.

PiperOrigin-RevId: 330902696
---
 .../google/android/exoplayer2/e2etest/Mp4PlaybackTest.java    | 4 ++--
 .../com/google/android/exoplayer2/e2etest/TsPlaybackTest.java | 4 ++--
 .../android/exoplayer2/e2etest/util}/PlaybackOutput.java      | 3 ++-
 .../exoplayer2/e2etest/util}/ShadowMediaCodecConfig.java      | 2 +-
 .../com/google/android/exoplayer2/e2etest/util}/TeeCodec.java | 3 ++-
 testutils/build.gradle                                        | 1 -
 6 files changed, 9 insertions(+), 8 deletions(-)
 rename {testutils/src/main/java/com/google/android/exoplayer2/testutil => library/core/src/test/java/com/google/android/exoplayer2/e2etest/util}/PlaybackOutput.java (97%)
 rename {testutils/src/main/java/com/google/android/exoplayer2/testutil => library/core/src/test/java/com/google/android/exoplayer2/e2etest/util}/ShadowMediaCodecConfig.java (98%)
 rename {testutils/src/main/java/com/google/android/exoplayer2/testutil => library/core/src/test/java/com/google/android/exoplayer2/e2etest/util}/TeeCodec.java (96%)

diff --git a/library/core/src/test/java/com/google/android/exoplayer2/e2etest/Mp4PlaybackTest.java b/library/core/src/test/java/com/google/android/exoplayer2/e2etest/Mp4PlaybackTest.java
index 684399d845..021a1b3f54 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/e2etest/Mp4PlaybackTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/e2etest/Mp4PlaybackTest.java
@@ -23,10 +23,10 @@ import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.MediaItem;
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.SimpleExoPlayer;
+import com.google.android.exoplayer2.e2etest.util.PlaybackOutput;
+import com.google.android.exoplayer2.e2etest.util.ShadowMediaCodecConfig;
 import com.google.android.exoplayer2.testutil.AutoAdvancingFakeClock;
 import com.google.android.exoplayer2.testutil.DumpFileAsserts;
-import com.google.android.exoplayer2.testutil.PlaybackOutput;
-import com.google.android.exoplayer2.testutil.ShadowMediaCodecConfig;
 import com.google.android.exoplayer2.testutil.TestExoPlayer;
 import org.junit.Rule;
 import org.junit.Test;
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/e2etest/TsPlaybackTest.java b/library/core/src/test/java/com/google/android/exoplayer2/e2etest/TsPlaybackTest.java
index c78e4cfe96..8956cd5dc7 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/e2etest/TsPlaybackTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/e2etest/TsPlaybackTest.java
@@ -22,10 +22,10 @@ import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.MediaItem;
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.SimpleExoPlayer;
+import com.google.android.exoplayer2.e2etest.util.PlaybackOutput;
+import com.google.android.exoplayer2.e2etest.util.ShadowMediaCodecConfig;
 import com.google.android.exoplayer2.testutil.AutoAdvancingFakeClock;
 import com.google.android.exoplayer2.testutil.DumpFileAsserts;
-import com.google.android.exoplayer2.testutil.PlaybackOutput;
-import com.google.android.exoplayer2.testutil.ShadowMediaCodecConfig;
 import com.google.android.exoplayer2.testutil.TestExoPlayer;
 import org.junit.Rule;
 import org.junit.Test;
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/PlaybackOutput.java b/library/core/src/test/java/com/google/android/exoplayer2/e2etest/util/PlaybackOutput.java
similarity index 97%
rename from testutils/src/main/java/com/google/android/exoplayer2/testutil/PlaybackOutput.java
rename to library/core/src/test/java/com/google/android/exoplayer2/e2etest/util/PlaybackOutput.java
index 69429709a4..f9c32d34b5 100644
--- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/PlaybackOutput.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/e2etest/util/PlaybackOutput.java
@@ -13,10 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer2.testutil;
+package com.google.android.exoplayer2.e2etest.util;
 
 import com.google.android.exoplayer2.SimpleExoPlayer;
 import com.google.android.exoplayer2.metadata.Metadata;
+import com.google.android.exoplayer2.testutil.Dumper;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/ShadowMediaCodecConfig.java b/library/core/src/test/java/com/google/android/exoplayer2/e2etest/util/ShadowMediaCodecConfig.java
similarity index 98%
rename from testutils/src/main/java/com/google/android/exoplayer2/testutil/ShadowMediaCodecConfig.java
rename to library/core/src/test/java/com/google/android/exoplayer2/e2etest/util/ShadowMediaCodecConfig.java
index d1b4e784b8..6d7f23107e 100644
--- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/ShadowMediaCodecConfig.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/e2etest/util/ShadowMediaCodecConfig.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer2.testutil;
+package com.google.android.exoplayer2.e2etest.util;
 
 import android.media.MediaCodecInfo;
 import android.media.MediaFormat;
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/TeeCodec.java b/library/core/src/test/java/com/google/android/exoplayer2/e2etest/util/TeeCodec.java
similarity index 96%
rename from testutils/src/main/java/com/google/android/exoplayer2/testutil/TeeCodec.java
rename to library/core/src/test/java/com/google/android/exoplayer2/e2etest/util/TeeCodec.java
index fd9b374d46..a14787e959 100644
--- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/TeeCodec.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/e2etest/util/TeeCodec.java
@@ -13,8 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer2.testutil;
+package com.google.android.exoplayer2.e2etest.util;
 
+import com.google.android.exoplayer2.testutil.Dumper;
 import com.google.android.exoplayer2.util.MimeTypes;
 import com.google.common.collect.ImmutableList;
 import java.nio.ByteBuffer;
diff --git a/testutils/build.gradle b/testutils/build.gradle
index 8cd443e07f..93b3acf53f 100644
--- a/testutils/build.gradle
+++ b/testutils/build.gradle
@@ -24,7 +24,6 @@ dependencies {
     compileOnly 'org.jetbrains.kotlin:kotlin-annotations-jvm:' + kotlinAnnotationsVersion
     implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion
     implementation project(modulePrefix + 'library-core')
-    implementation 'org.robolectric:robolectric:' + robolectricVersion
     testImplementation 'org.robolectric:robolectric:' + robolectricVersion
 }