From 3db4205ac652479d52f7ceeb486954964f4b43ed Mon Sep 17 00:00:00 2001 From: huangdarwin Date: Wed, 26 Apr 2023 17:34:15 +0100 Subject: [PATCH] Test: Add @Ignore to Analysis tests In ASwB, all Transformer tests can be run by right-clicking on the project and clicking "Run all tests". We cannot, however, select only some specific test files within a project (ex. all non-analysis tests) to run tests on. Add @Ignore to analysis tests, which are not intended to be run anyways when determining whether Transformer is working on some device. These tests also don't have proper skipping logic when a device doesn't support a format, so they can't be run effectively on low-end devices anyways. This eases manual testing, for example when debugging whether tests all pass on a device. When analysis tests are desired to be run, it should be easy to comment out the @Ignore. PiperOrigin-RevId: 527289600 --- .../media3/transformer/mh/analysis/BitrateAnalysisTest.java | 4 ++++ .../mh/analysis/EncoderCapabilityAnalysisTest.java | 4 ++++ .../mh/analysis/EncoderPerformanceAnalysisTest.java | 4 ++++ .../media3/transformer/mh/analysis/RepeatedTranscodeTest.java | 4 ++++ .../media3/transformer/mh/analysis/SsimMapperTest.java | 4 ++++ 5 files changed, 20 insertions(+) diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/analysis/BitrateAnalysisTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/analysis/BitrateAnalysisTest.java index ceab7df1b3..30c4c75244 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/analysis/BitrateAnalysisTest.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/analysis/BitrateAnalysisTest.java @@ -55,6 +55,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import org.checkerframework.checker.nullness.qual.MonotonicNonNull; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; @@ -63,6 +64,9 @@ import org.junit.runners.Parameterized.Parameters; /** Instrumentation tests for analysing output bitrate and quality for a given input bitrate. */ @RunWith(Parameterized.class) +@Ignore( + "Analysis tests are not used for confirming Transformer is running properly, and not configured" + + " for this use as they're missing skip checks for unsupported devices.") public class BitrateAnalysisTest { private static final ImmutableList INPUT_FILES = ImmutableList.of( diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/analysis/EncoderCapabilityAnalysisTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/analysis/EncoderCapabilityAnalysisTest.java index 7b51ba45b7..cef8f3558d 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/analysis/EncoderCapabilityAnalysisTest.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/analysis/EncoderCapabilityAnalysisTest.java @@ -41,11 +41,15 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import org.json.JSONObject; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; /** An analysis test to log encoder capabilities on a device. */ @RunWith(AndroidJUnit4.class) +@Ignore( + "Analysis tests are not used for confirming Transformer is running properly, and not configured" + + " for this use as they're missing skip checks for unsupported devices.") public class EncoderCapabilityAnalysisTest { private static final String CAMCORDER_FORMAT_STRING = "%dx%d@%dfps:%dkbps"; diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/analysis/EncoderPerformanceAnalysisTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/analysis/EncoderPerformanceAnalysisTest.java index dcdfe35c0e..1f1df5ab6b 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/analysis/EncoderPerformanceAnalysisTest.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/analysis/EncoderPerformanceAnalysisTest.java @@ -36,6 +36,7 @@ import com.google.common.collect.ImmutableList; import java.util.HashMap; import java.util.Map; import org.checkerframework.checker.nullness.qual.MonotonicNonNull; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; @@ -44,6 +45,9 @@ import org.junit.runners.Parameterized.Parameters; /** Instrumentation tests for analyzing encoder performance settings. */ @RunWith(Parameterized.class) +@Ignore( + "Analysis tests are not used for confirming Transformer is running properly, and not configured" + + " for this use as they're missing skip checks for unsupported devices.") public class EncoderPerformanceAnalysisTest { private static final ImmutableList INPUT_FILES = diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/analysis/RepeatedTranscodeTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/analysis/RepeatedTranscodeTest.java index 64627d5a21..6179e6b643 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/analysis/RepeatedTranscodeTest.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/analysis/RepeatedTranscodeTest.java @@ -35,11 +35,15 @@ import androidx.test.ext.junit.runners.AndroidJUnit4; import com.google.common.collect.ImmutableList; import java.util.HashSet; import java.util.Set; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; /** Tests repeated transcoding operations (as a stress test and to help reproduce flakiness). */ @RunWith(AndroidJUnit4.class) +@Ignore( + "Analysis tests are not used for confirming Transformer is running properly, and not configured" + + " for this use as they're missing skip checks for unsupported devices.") public final class RepeatedTranscodeTest { private static final int TRANSCODE_COUNT = 10; diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/analysis/SsimMapperTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/analysis/SsimMapperTest.java index dab517596d..4d538bb52b 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/analysis/SsimMapperTest.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/analysis/SsimMapperTest.java @@ -67,6 +67,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; @@ -79,6 +80,9 @@ import org.junit.runners.Parameterized.Parameters; *

SSIM increases monotonically with bitrate. */ @RunWith(Parameterized.class) +@Ignore( + "Analysis tests are not used for confirming Transformer is running properly, and not configured" + + " for this use as they're missing skip checks for unsupported devices.") public class SsimMapperTest { private static final Splitter FORWARD_SLASH_SPLITTER = Splitter.on('/');