From 4ae36cc17545331df498a1590d5439975980b9e9 Mon Sep 17 00:00:00 2001 From: ibaker Date: Mon, 3 Jul 2023 15:18:10 +0000 Subject: [PATCH] Fix Error Prone warning in `SubtitleExtractorTest` Also make some casting that is needed a bit safer. Error Prone was complaining about casting `long` to `int` before passing it to `Extractor.seek(long, long)`: > Converting a `long` or `Long` to an `int` to pass as a `long` > parameter is usually not necessary. If this conversion is intentional, > consider `Longs.constrainToRange()` instead. PiperOrigin-RevId: 545226063 --- .../media3/extractor/text/SubtitleExtractorTest.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libraries/extractor/src/test/java/androidx/media3/extractor/text/SubtitleExtractorTest.java b/libraries/extractor/src/test/java/androidx/media3/extractor/text/SubtitleExtractorTest.java index 664925218b..5e2c13a30b 100644 --- a/libraries/extractor/src/test/java/androidx/media3/extractor/text/SubtitleExtractorTest.java +++ b/libraries/extractor/src/test/java/androidx/media3/extractor/text/SubtitleExtractorTest.java @@ -28,6 +28,7 @@ import androidx.media3.test.utils.FakeExtractorInput; import androidx.media3.test.utils.FakeExtractorOutput; import androidx.media3.test.utils.FakeTrackOutput; import androidx.test.ext.junit.runners.AndroidJUnit4; +import com.google.common.primitives.Ints; import java.util.List; import org.junit.Test; import org.junit.runner.RunWith; @@ -112,8 +113,8 @@ public class SubtitleExtractorTest { FakeTrackOutput trackOutput = output.trackOutputs.get(0); while (extractor.read(input, null) != Extractor.RESULT_END_OF_INPUT) {} - extractor.seek((int) output.seekMap.getSeekPoints(2_445_000L).first.position, 2_445_000L); - input.setPosition((int) output.seekMap.getSeekPoints(2_445_000L).first.position); + extractor.seek(output.seekMap.getSeekPoints(2_445_000L).first.position, 2_445_000L); + input.setPosition(Ints.checkedCast(output.seekMap.getSeekPoints(2_445_000L).first.position)); trackOutput.clear(); while (extractor.read(input, null) != Extractor.RESULT_END_OF_INPUT) {} @@ -157,8 +158,8 @@ public class SubtitleExtractorTest { FakeTrackOutput trackOutput = output.trackOutputs.get(0); assertThat(extractor.read(input, null)).isNotEqualTo(Extractor.RESULT_END_OF_INPUT); - extractor.seek((int) output.seekMap.getSeekPoints(2_345_000L).first.position, 2_345_000L); - input.setPosition((int) output.seekMap.getSeekPoints(2_345_000L).first.position); + extractor.seek(output.seekMap.getSeekPoints(2_345_000L).first.position, 2_345_000L); + input.setPosition(Ints.checkedCast(output.seekMap.getSeekPoints(2_345_000L).first.position)); trackOutput.clear(); while (extractor.read(input, null) != Extractor.RESULT_END_OF_INPUT) {}