From b18d34fc58737f2aa5182090aa7045c2ca45e943 Mon Sep 17 00:00:00 2001
From: samrobinson <samrobinson@google.com>
Date: Mon, 12 Dec 2022 08:47:45 +0000
Subject: [PATCH] Move SetFrameEditTest into TransformationTest.

PiperOrigin-RevId: 494651985
---
 .../transformer/mh/SetFrameEditTest.java      | 49 -------------------
 .../transformer/mh/TransformationTest.java    | 18 +++++++
 2 files changed, 18 insertions(+), 49 deletions(-)
 delete mode 100644 library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/mh/SetFrameEditTest.java

diff --git a/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/mh/SetFrameEditTest.java b/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/mh/SetFrameEditTest.java
deleted file mode 100644
index 34ce3feb8e..0000000000
--- a/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/mh/SetFrameEditTest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright 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.transformer.mh;
-
-import static com.google.android.exoplayer2.transformer.AndroidTestUtil.MP4_ASSET_WITH_INCREASING_TIMESTAMPS_URI_STRING;
-
-import android.content.Context;
-import android.net.Uri;
-import androidx.test.core.app.ApplicationProvider;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-import com.google.android.exoplayer2.MediaItem;
-import com.google.android.exoplayer2.transformer.TransformationRequest;
-import com.google.android.exoplayer2.transformer.Transformer;
-import com.google.android.exoplayer2.transformer.TransformerAndroidTestRunner;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-/** {@link Transformer} instrumentation test for applying a frame edit. */
-@RunWith(AndroidJUnit4.class)
-public class SetFrameEditTest {
-  @Test
-  public void setFrameEditTransform() throws Exception {
-    Context context = ApplicationProvider.getApplicationContext();
-    Transformer transformer =
-        new Transformer.Builder(context)
-            .setTransformationRequest(
-                new TransformationRequest.Builder().setRotationDegrees(45).build())
-            .build();
-
-    new TransformerAndroidTestRunner.Builder(context, transformer)
-        .build()
-        .run(
-            /* testId= */ "SetFrameEditTransform",
-            MediaItem.fromUri(Uri.parse(MP4_ASSET_WITH_INCREASING_TIMESTAMPS_URI_STRING)));
-  }
-}
diff --git a/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/mh/TransformationTest.java b/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/mh/TransformationTest.java
index 43447aa276..e8d59992d0 100644
--- a/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/mh/TransformationTest.java
+++ b/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/mh/TransformationTest.java
@@ -187,4 +187,22 @@ public class TransformationTest {
         .build()
         .run(testId, MediaItem.fromUri(Uri.parse(MP4_ASSET_SEF_URI_STRING)));
   }
+
+  @Test
+  public void transformFrameRotation() throws Exception {
+    String testId = TAG + "_transformFrameRotation";
+    Context context = ApplicationProvider.getApplicationContext();
+
+    Transformer transformer =
+        new Transformer.Builder(context)
+            .setTransformationRequest(
+                new TransformationRequest.Builder().setRotationDegrees(45).build())
+            .build();
+
+    new TransformerAndroidTestRunner.Builder(context, transformer)
+        .build()
+        .run(
+            /* testId= */ testId,
+            MediaItem.fromUri(Uri.parse(MP4_ASSET_WITH_INCREASING_TIMESTAMPS_URI_STRING)));
+  }
 }