From dc7a0ca22f0be01d30fab81a416b8af1087ede30 Mon Sep 17 00:00:00 2001 From: dancho Date: Tue, 19 Nov 2024 07:52:43 -0800 Subject: [PATCH] Move SDK == 33 tests to SDK 33+ Ensure tests run on any recent emulator. PiperOrigin-RevId: 698015529 --- .../media3/transformer/TransformerEndToEndTest.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/TransformerEndToEndTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/TransformerEndToEndTest.java index 2919e798ff..fd9f1422f5 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/TransformerEndToEndTest.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/TransformerEndToEndTest.java @@ -1091,10 +1091,10 @@ public class TransformerEndToEndTest { @Test public void clippedMedia_trimOptimizationEnabled_completesWithOptimizationApplied() throws Exception { - if (!isRunningOnEmulator() || Util.SDK_INT != 33) { + if (!isRunningOnEmulator() || Util.SDK_INT < 33) { // The trim optimization is only guaranteed to work on emulator for this (emulator-transcoded) // file. - recordTestSkipped(context, testId, /* reason= */ "SDK 33 Emulator only test"); + recordTestSkipped(context, testId, /* reason= */ "SDK 33+ Emulator only test"); assumeTrue(false); } Transformer transformer = @@ -1130,7 +1130,7 @@ public class TransformerEndToEndTest { if (!isRunningOnEmulator() || Util.SDK_INT < 33) { // The trim optimization is only guaranteed to work on emulator for this (emulator-transcoded) // file. - recordTestSkipped(context, testId, /* reason= */ "SDK 33 Emulator only test"); + recordTestSkipped(context, testId, /* reason= */ "SDK 33+ Emulator only test"); assumeTrue(false); } Transformer transformer = @@ -1167,7 +1167,7 @@ public class TransformerEndToEndTest { if (!isRunningOnEmulator() || Util.SDK_INT < 33) { // The trim optimization is only guaranteed to work on emulator for this (emulator-transcoded) // file. - recordTestSkipped(context, testId, /* reason= */ "SDK 33 Emulator only test"); + recordTestSkipped(context, testId, /* reason= */ "SDK 33+ Emulator only test"); assumeTrue(false); } Transformer transformer = @@ -1201,10 +1201,10 @@ public class TransformerEndToEndTest { public void clippedMediaAudioRemovedNoOpEffectAndRotated_trimOptimizationEnabled_completedWithOptimizationAppliedAndCorrectOrientation() throws Exception { - if (!isRunningOnEmulator() || Util.SDK_INT != 33) { + if (!isRunningOnEmulator() || Util.SDK_INT < 33) { // The trim optimization is only guaranteed to work on emulator for this (emulator-transcoded) // file. - recordTestSkipped(context, testId, /* reason= */ "SDK 33 Emulator only test"); + recordTestSkipped(context, testId, /* reason= */ "SDK 33+ Emulator only test"); assumeTrue(false); } Transformer transformer =