From e14156aa3bc75b070e8e5a0bfcbf96c021810149 Mon Sep 17 00:00:00 2001 From: sheenachhabra Date: Mon, 18 Mar 2024 11:10:03 -0700 Subject: [PATCH] Rename test classes having duplicate names PiperOrigin-RevId: 616887534 --- ...4MuxerEndToEndTest.java => Mp4MuxerEndToEndAndroidTest.java} | 2 +- ...t.java => TransformerWithInAppMuxerEndToEndAndroidTest.java} | 2 +- ...ndTest.java => TransformerWithInAppMuxerEndToEndMhTest.java} | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename libraries/muxer/src/androidTest/java/androidx/media3/muxer/{Mp4MuxerEndToEndTest.java => Mp4MuxerEndToEndAndroidTest.java} (99%) rename libraries/transformer/src/androidTest/java/androidx/media3/transformer/{TransformerWithInAppMuxerEndToEndTest.java => TransformerWithInAppMuxerEndToEndAndroidTest.java} (98%) rename libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/{TransformerWithInAppMuxerEndToEndTest.java => TransformerWithInAppMuxerEndToEndMhTest.java} (98%) diff --git a/libraries/muxer/src/androidTest/java/androidx/media3/muxer/Mp4MuxerEndToEndTest.java b/libraries/muxer/src/androidTest/java/androidx/media3/muxer/Mp4MuxerEndToEndAndroidTest.java similarity index 99% rename from libraries/muxer/src/androidTest/java/androidx/media3/muxer/Mp4MuxerEndToEndTest.java rename to libraries/muxer/src/androidTest/java/androidx/media3/muxer/Mp4MuxerEndToEndAndroidTest.java index c664da2ed1..5eaed5ff9b 100644 --- a/libraries/muxer/src/androidTest/java/androidx/media3/muxer/Mp4MuxerEndToEndTest.java +++ b/libraries/muxer/src/androidTest/java/androidx/media3/muxer/Mp4MuxerEndToEndAndroidTest.java @@ -50,7 +50,7 @@ import org.junit.runners.Parameterized.Parameters; /** End to end instrumentation tests for {@link Mp4Muxer}. */ @RunWith(Parameterized.class) -public class Mp4MuxerEndToEndTest { +public class Mp4MuxerEndToEndAndroidTest { private static final String H264_MP4 = "sample_no_bframes.mp4"; private static final String H265_HDR10_MP4 = "hdr10-720p.mp4"; private static final String H265_WITH_METADATA_TRACK_MP4 = "h265_with_metadata_track.mp4"; diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/TransformerWithInAppMuxerEndToEndTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/TransformerWithInAppMuxerEndToEndAndroidTest.java similarity index 98% rename from libraries/transformer/src/androidTest/java/androidx/media3/transformer/TransformerWithInAppMuxerEndToEndTest.java rename to libraries/transformer/src/androidTest/java/androidx/media3/transformer/TransformerWithInAppMuxerEndToEndAndroidTest.java index edae7f3326..094b8ef8bc 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/TransformerWithInAppMuxerEndToEndTest.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/TransformerWithInAppMuxerEndToEndAndroidTest.java @@ -37,7 +37,7 @@ import org.junit.runners.Parameterized.Parameters; /** End-to-end instrumentation test for {@link Transformer} with {@link InAppMuxer}. */ @RunWith(Parameterized.class) -public class TransformerWithInAppMuxerEndToEndTest { +public class TransformerWithInAppMuxerEndToEndAndroidTest { private static final String MP4_FILE_ASSET_DIRECTORY = "asset:///media/mp4/"; private static final String H264_MP4 = "sample_no_bframes.mp4"; private static final String H265_MP4 = "h265_with_metadata_track.mp4"; diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/TransformerWithInAppMuxerEndToEndTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/TransformerWithInAppMuxerEndToEndMhTest.java similarity index 98% rename from libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/TransformerWithInAppMuxerEndToEndTest.java rename to libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/TransformerWithInAppMuxerEndToEndMhTest.java index 6ad9d978fa..3fa19b652b 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/TransformerWithInAppMuxerEndToEndTest.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/TransformerWithInAppMuxerEndToEndMhTest.java @@ -42,7 +42,7 @@ import org.junit.runner.RunWith; /** End-to-end instrumentation test for {@link Transformer} with {@link InAppMuxer}. */ @RunWith(AndroidJUnit4.class) -public class TransformerWithInAppMuxerEndToEndTest { +public class TransformerWithInAppMuxerEndToEndMhTest { @Rule public final TestName testName = new TestName(); private String testId;