From c870fb7594e88270fd63ee2da15559e3f735b145 Mon Sep 17 00:00:00 2001 From: ibaker Date: Tue, 3 Dec 2024 09:25:59 -0800 Subject: [PATCH] Enable lint errors in `extractor` tests Fix existing violations. PiperOrigin-RevId: 702366292 --- libraries/extractor/build.gradle | 5 ----- .../androidx/media3/extractor/text/CueSerializationTest.java | 2 ++ .../androidx/media3/extractor/mkv/MatroskaExtractorTest.java | 2 +- .../extractor/ogg/OggExtractorNonParameterizedTest.java | 3 ++- .../java/androidx/media3/extractor/ts/TsExtractorTest.java | 2 +- 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/libraries/extractor/build.gradle b/libraries/extractor/build.gradle index 53451ca205..e4dad3c42a 100644 --- a/libraries/extractor/build.gradle +++ b/libraries/extractor/build.gradle @@ -27,11 +27,6 @@ android { test.assets.srcDir '../test_data/src/test/assets/' } - lintOptions { - // TODO: b/353490583 - Enable this once the violations are fixed. - checkTestSources false - } - publishing { singleVariant('release') { withSourcesJar() diff --git a/libraries/extractor/src/androidTest/java/androidx/media3/extractor/text/CueSerializationTest.java b/libraries/extractor/src/androidTest/java/androidx/media3/extractor/text/CueSerializationTest.java index 817ac15e00..95881cd3db 100644 --- a/libraries/extractor/src/androidTest/java/androidx/media3/extractor/text/CueSerializationTest.java +++ b/libraries/extractor/src/androidTest/java/androidx/media3/extractor/text/CueSerializationTest.java @@ -35,6 +35,7 @@ import androidx.media3.test.utils.TestUtil; import androidx.media3.test.utils.truth.SpannedSubject; import androidx.test.core.app.ApplicationProvider; import androidx.test.ext.junit.runners.AndroidJUnit4; +import androidx.test.filters.SdkSuppress; import com.google.common.collect.ImmutableList; import org.junit.Test; import org.junit.runner.RunWith; @@ -97,6 +98,7 @@ public class CueSerializationTest { } @Test + @SdkSuppress(minSdkVersion = 26) public void serializingBitmapCue() throws Exception { CueEncoder encoder = new CueEncoder(); CueDecoder decoder = new CueDecoder(); diff --git a/libraries/extractor/src/test/java/androidx/media3/extractor/mkv/MatroskaExtractorTest.java b/libraries/extractor/src/test/java/androidx/media3/extractor/mkv/MatroskaExtractorTest.java index 3052d0aca3..f267eff6aa 100644 --- a/libraries/extractor/src/test/java/androidx/media3/extractor/mkv/MatroskaExtractorTest.java +++ b/libraries/extractor/src/test/java/androidx/media3/extractor/mkv/MatroskaExtractorTest.java @@ -15,7 +15,7 @@ */ package androidx.media3.extractor.mkv; -import static androidx.media3.extractor.mp4.FragmentedMp4Extractor.FLAG_EMIT_RAW_SUBTITLE_DATA; +import static androidx.media3.extractor.mkv.MatroskaExtractor.FLAG_EMIT_RAW_SUBTITLE_DATA; import androidx.media3.extractor.text.DefaultSubtitleParserFactory; import androidx.media3.extractor.text.SubtitleParser; diff --git a/libraries/extractor/src/test/java/androidx/media3/extractor/ogg/OggExtractorNonParameterizedTest.java b/libraries/extractor/src/test/java/androidx/media3/extractor/ogg/OggExtractorNonParameterizedTest.java index 81c8cc9531..39df956ca9 100644 --- a/libraries/extractor/src/test/java/androidx/media3/extractor/ogg/OggExtractorNonParameterizedTest.java +++ b/libraries/extractor/src/test/java/androidx/media3/extractor/ogg/OggExtractorNonParameterizedTest.java @@ -19,6 +19,7 @@ import static androidx.media3.test.utils.TestUtil.getByteArray; import static com.google.common.truth.Truth.assertThat; import androidx.media3.common.C; +import androidx.media3.extractor.Extractor; import androidx.media3.extractor.PositionHolder; import androidx.media3.test.utils.ExtractorAsserts; import androidx.media3.test.utils.FakeExtractorInput; @@ -46,7 +47,7 @@ public final class OggExtractorNonParameterizedTest { OggExtractor oggExtractor = new OggExtractor(); oggExtractor.init(new FakeExtractorOutput()); // We feed data to the extractor until the end of input is reached. - while (oggExtractor.read(input, new PositionHolder()) != C.RESULT_END_OF_INPUT) {} + while (oggExtractor.read(input, new PositionHolder()) != Extractor.RESULT_END_OF_INPUT) {} // We call read again to check that it does not throw an IllegalStateException. assertThat(oggExtractor.read(input, new PositionHolder())).isEqualTo(C.RESULT_END_OF_INPUT); } diff --git a/libraries/extractor/src/test/java/androidx/media3/extractor/ts/TsExtractorTest.java b/libraries/extractor/src/test/java/androidx/media3/extractor/ts/TsExtractorTest.java index 12b3289234..0aafcec05e 100644 --- a/libraries/extractor/src/test/java/androidx/media3/extractor/ts/TsExtractorTest.java +++ b/libraries/extractor/src/test/java/androidx/media3/extractor/ts/TsExtractorTest.java @@ -15,10 +15,10 @@ */ package androidx.media3.extractor.ts; -import static androidx.media3.extractor.mp4.FragmentedMp4Extractor.FLAG_EMIT_RAW_SUBTITLE_DATA; import static androidx.media3.extractor.ts.DefaultTsPayloadReaderFactory.FLAG_DETECT_ACCESS_UNITS; import static androidx.media3.extractor.ts.DefaultTsPayloadReaderFactory.FLAG_ENABLE_HDMV_DTS_AUDIO_STREAMS; import static androidx.media3.extractor.ts.TsExtractor.DEFAULT_TIMESTAMP_SEARCH_BYTES; +import static androidx.media3.extractor.ts.TsExtractor.FLAG_EMIT_RAW_SUBTITLE_DATA; import static androidx.media3.extractor.ts.TsExtractor.MODE_MULTI_PMT; import static androidx.media3.extractor.ts.TsExtractor.MODE_SINGLE_PMT; import static com.google.common.truth.Truth.assertThat;