diff --git a/google3/third_party/java_src/android_libs/media/libraries/effect/src/androidTest/java/androidx/media3/effect/GlEffectsFrameProcessorPixelTest.java b/google3/third_party/java_src/android_libs/media/libraries/effect/src/androidTest/java/androidx/media3/effect/GlEffectsFrameProcessorPixelTest.java index d8a296096c..a57c9ee63f 100644 --- a/google3/third_party/java_src/android_libs/media/libraries/effect/src/androidTest/java/androidx/media3/effect/GlEffectsFrameProcessorPixelTest.java +++ b/google3/third_party/java_src/android_libs/media/libraries/effect/src/androidTest/java/androidx/media3/effect/GlEffectsFrameProcessorPixelTest.java @@ -37,7 +37,7 @@ import androidx.media3.common.FrameProcessingException; import androidx.media3.common.FrameProcessor; import androidx.media3.common.SurfaceInfo; import androidx.test.ext.junit.runners.AndroidJUnit4; -import com.google.android.exoplayer2.testutil.DecodeOneFrameTestUtil; +import com.google.android.exoplayer2.testutil.DecodeOneFrameUtil; import com.google.android.exoplayer2.video.ColorInfo; import com.google.common.collect.ImmutableList; import java.util.List; @@ -464,9 +464,9 @@ public final class GlEffectsFrameProcessorPixelTest { DebugViewProvider.NONE, ColorInfo.SDR_BT709_LIMITED, /* releaseFramesAutomatically= */ true)); - DecodeOneFrameTestUtil.decodeOneAssetFileFrame( + DecodeOneFrameUtil.decodeOneAssetFileFrame( INPUT_MP4_ASSET_STRING, - new DecodeOneFrameTestUtil.Listener() { + new DecodeOneFrameUtil.Listener() { @Override public void onContainerExtracted(MediaFormat mediaFormat) { glEffectsFrameProcessor.setInputFrameInfo( diff --git a/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/mh/RepeatedTranscodeTransformationTest.java b/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/mh/RepeatedTranscodeTest.java similarity index 99% rename from library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/mh/RepeatedTranscodeTransformationTest.java rename to library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/mh/RepeatedTranscodeTest.java index d68ba78b01..b6b1670a22 100644 --- a/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/mh/RepeatedTranscodeTransformationTest.java +++ b/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/mh/RepeatedTranscodeTest.java @@ -35,7 +35,7 @@ import org.junit.runner.RunWith; /** Tests repeated transcoding operations (as a stress test and to help reproduce flakiness). */ @RunWith(AndroidJUnit4.class) -public final class RepeatedTranscodeTransformationTest { +public final class RepeatedTranscodeTest { private static final int TRANSCODE_COUNT = 10; @Test diff --git a/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/mh/SetFrameEditTransformationTest.java b/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/mh/SetFrameEditTest.java similarity index 97% rename from library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/mh/SetFrameEditTransformationTest.java rename to library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/mh/SetFrameEditTest.java index 7fc01415a1..34ce3feb8e 100644 --- a/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/mh/SetFrameEditTransformationTest.java +++ b/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/mh/SetFrameEditTest.java @@ -30,7 +30,7 @@ import org.junit.runner.RunWith; /** {@link Transformer} instrumentation test for applying a frame edit. */ @RunWith(AndroidJUnit4.class) -public class SetFrameEditTransformationTest { +public class SetFrameEditTest { @Test public void setFrameEditTransform() throws Exception { Context context = ApplicationProvider.getApplicationContext(); diff --git a/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/mh/SetHdrEditingTransformationTest.java b/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/mh/SetHdrEditingTest.java similarity index 98% rename from library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/mh/SetHdrEditingTransformationTest.java rename to library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/mh/SetHdrEditingTest.java index 0a76c4c9e5..258e290cde 100644 --- a/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/mh/SetHdrEditingTransformationTest.java +++ b/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/mh/SetHdrEditingTest.java @@ -18,7 +18,7 @@ package com.google.android.exoplayer2.transformer.mh; import static com.google.android.exoplayer2.transformer.AndroidTestUtil.MP4_ASSET_1080P_1_SECOND_HDR10_VIDEO_SDR_CONTAINER; import static com.google.android.exoplayer2.transformer.AndroidTestUtil.MP4_ASSET_1080P_4_SECOND_HDR10; import static com.google.android.exoplayer2.transformer.AndroidTestUtil.recordTestSkipped; -import static com.google.android.exoplayer2.transformer.mh.analysis.FileTestUtil.assertFileHasColorTransfer; +import static com.google.android.exoplayer2.transformer.mh.analysis.FileUtil.assertFileHasColorTransfer; import static com.google.android.exoplayer2.util.Assertions.checkNotNull; import static com.google.android.exoplayer2.util.MimeTypes.VIDEO_H265; import static com.google.common.truth.Truth.assertThat; @@ -45,8 +45,8 @@ import org.junit.runner.RunWith; // TODO(b/239172735): Add HLG tests after finding a shareable HLG file. /** {@link Transformer} instrumentation test for applying an HDR frame edit. */ @RunWith(AndroidJUnit4.class) -public class SetHdrEditingTransformationTest { - public static final String TAG = "SetHdrEditingTransformationTest"; +public class SetHdrEditingTest { + public static final String TAG = "SetHdrEditingTest"; private static final ColorInfo HDR10_DEFAULT_COLOR_INFO = new ColorInfo( C.COLOR_SPACE_BT2020, diff --git a/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/mh/SetHdrToSdrToneMapTransformationTest.java b/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/mh/SetHdrToSdrToneMapTest.java similarity index 97% rename from library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/mh/SetHdrToSdrToneMapTransformationTest.java rename to library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/mh/SetHdrToSdrToneMapTest.java index 09817cf1e1..2f8c264b67 100644 --- a/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/mh/SetHdrToSdrToneMapTransformationTest.java +++ b/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/mh/SetHdrToSdrToneMapTest.java @@ -16,7 +16,7 @@ package com.google.android.exoplayer2.transformer.mh; import static com.google.android.exoplayer2.transformer.AndroidTestUtil.MP4_ASSET_1080P_4_SECOND_HDR10; -import static com.google.android.exoplayer2.transformer.mh.analysis.FileTestUtil.assertFileHasColorTransfer; +import static com.google.android.exoplayer2.transformer.mh.analysis.FileUtil.assertFileHasColorTransfer; import static com.google.android.exoplayer2.util.Assertions.checkNotNull; import static com.google.common.truth.Truth.assertThat; @@ -39,8 +39,8 @@ import org.junit.runner.RunWith; // TODO(b/239172735): Add HLG tests after finding a shareable HLG file. /** {@link Transformer} instrumentation test for applying an HDR to SDR tone mapping edit. */ @RunWith(AndroidJUnit4.class) -public class SetHdrToSdrToneMapTransformationTest { - public static final String TAG = "SetHdrToSdrToneMapTransformationTest"; +public class SetHdrToSdrToneMapTest { + public static final String TAG = "SetHdrToSdrToneMapTest"; @Test public void transform_toneMapNoRequestedTranscode_hdr10File_toneMapsOrThrows() throws Exception { diff --git a/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/mh/analysis/FileTestUtil.java b/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/mh/analysis/FileUtil.java similarity index 90% rename from library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/mh/analysis/FileTestUtil.java rename to library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/mh/analysis/FileUtil.java index 9f9beaa744..e428fa1b5c 100644 --- a/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/mh/analysis/FileTestUtil.java +++ b/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/mh/analysis/FileUtil.java @@ -22,13 +22,13 @@ import static com.google.common.truth.Truth.assertThat; import android.media.MediaFormat; import androidx.annotation.Nullable; import com.google.android.exoplayer2.C; -import com.google.android.exoplayer2.testutil.DecodeOneFrameTestUtil; +import com.google.android.exoplayer2.testutil.DecodeOneFrameUtil; import com.google.android.exoplayer2.util.MediaFormatUtil; import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.video.ColorInfo; /** Utilities for reading color info from a file. */ -public class FileTestUtil { +public class FileUtil { public static void assertFileHasColorTransfer( @Nullable String filePath, @C.ColorTransfer int expectedColorTransfer) throws Exception { if (Util.SDK_INT < 29) { @@ -36,9 +36,9 @@ public class FileTestUtil { // required for MediaFormatUtil#getColorInfo. return; } - DecodeOneFrameTestUtil.decodeOneCacheFileFrame( + DecodeOneFrameUtil.decodeOneCacheFileFrame( checkNotNull(filePath), - new DecodeOneFrameTestUtil.Listener() { + new DecodeOneFrameUtil.Listener() { @Override public void onContainerExtracted(MediaFormat mediaFormat) { @Nullable ColorInfo extractedColor = MediaFormatUtil.getColorInfo(mediaFormat); @@ -54,5 +54,5 @@ public class FileTestUtil { /* surface= */ null); } - private FileTestUtil() {} + private FileUtil() {} } diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/DecodeOneFrameTestUtil.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/DecodeOneFrameUtil.java similarity index 98% rename from testutils/src/main/java/com/google/android/exoplayer2/testutil/DecodeOneFrameTestUtil.java rename to testutils/src/main/java/com/google/android/exoplayer2/testutil/DecodeOneFrameUtil.java index da5243b8bd..a49c489993 100644 --- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/DecodeOneFrameTestUtil.java +++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/DecodeOneFrameUtil.java @@ -33,7 +33,7 @@ import java.nio.ByteBuffer; import org.checkerframework.checker.nullness.qual.Nullable; /** Utilities for decoding a frame for tests. */ -public class DecodeOneFrameTestUtil { +public class DecodeOneFrameUtil { /** Listener for decoding events. */ public interface Listener { @@ -171,5 +171,5 @@ public class DecodeOneFrameTestUtil { } } - private DecodeOneFrameTestUtil() {} + private DecodeOneFrameUtil() {} }