From f73c24a10d82bc4aecfefa71b409d81371120a26 Mon Sep 17 00:00:00 2001 From: ibaker Date: Tue, 14 May 2024 03:35:50 -0700 Subject: [PATCH] Bump Truth dep to 1.4.0 so we can assert directly on Java 8 types https://truth.dev/faq#java8 Also use this change to remove most test usages of `Lists.transform(...)` and replace them with `.stream().map(...)`. PiperOrigin-RevId: 633523904 --- constants.gradle | 2 +- .../dash/DefaultDashChunkSourceTest.java | 5 +- .../DefaultExtractorsFactoryTest.java | 6 +- .../extractor/text/ttml/TtmlParserTest.java | 29 ++++---- .../webvtt/LegacySubtitleUtilWebvttTest.java | 67 +++++++++---------- 5 files changed, 53 insertions(+), 56 deletions(-) diff --git a/constants.gradle b/constants.gradle index c310a73a99..b270a3b067 100644 --- a/constants.gradle +++ b/constants.gradle @@ -56,7 +56,7 @@ project.ext { androidxTestRunnerVersion = '1.5.2' androidxTestRulesVersion = '1.5.0' androidxTestTruthVersion = '1.5.0' - truthVersion = '1.1.3' + truthVersion = '1.4.0' okhttpVersion = '4.12.0' modulePrefix = ':' if (gradle.ext.has('androidxMediaModulePrefix')) { diff --git a/libraries/exoplayer_dash/src/test/java/androidx/media3/exoplayer/dash/DefaultDashChunkSourceTest.java b/libraries/exoplayer_dash/src/test/java/androidx/media3/exoplayer/dash/DefaultDashChunkSourceTest.java index fa5eaf8738..c5d4ac102c 100644 --- a/libraries/exoplayer_dash/src/test/java/androidx/media3/exoplayer/dash/DefaultDashChunkSourceTest.java +++ b/libraries/exoplayer_dash/src/test/java/androidx/media3/exoplayer/dash/DefaultDashChunkSourceTest.java @@ -54,7 +54,6 @@ import androidx.test.ext.junit.runners.AndroidJUnit4; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableListMultimap; import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Lists; import java.io.IOException; import java.time.Duration; import java.util.ArrayList; @@ -201,7 +200,7 @@ public class DefaultDashChunkSourceTest { loadErrorHandlingPolicy); } - assertThat(Lists.transform(chunks, (chunk) -> chunk.dataSpec.uri.toString())) + assertThat(chunks.stream().map(chunk -> chunk.dataSpec.uri.toString())) .containsExactly( "http://video.com/baseUrl/a/video/video_0_1300000.m4s", "http://video.com/baseUrl/b/video/video_0_1300000.m4s", @@ -258,7 +257,7 @@ public class DefaultDashChunkSourceTest { output.chunk.dataSpec, /* httpResponseCode= */ 404, /* errorCount= */ 1), loadErrorHandlingPolicy); } - assertThat(Lists.transform(chunks, (chunk) -> chunk.dataSpec.uri.toString())) + assertThat(chunks.stream().map(chunk -> chunk.dataSpec.uri.toString())) .containsExactly( "http://video.com/baseUrl/a/video/video_0_700000.m4s", "http://video.com/baseUrl/a/video/video_0_452000.m4s", diff --git a/libraries/extractor/src/test/java/androidx/media3/extractor/DefaultExtractorsFactoryTest.java b/libraries/extractor/src/test/java/androidx/media3/extractor/DefaultExtractorsFactoryTest.java index 2d0313b1a8..f77e4281ad 100644 --- a/libraries/extractor/src/test/java/androidx/media3/extractor/DefaultExtractorsFactoryTest.java +++ b/libraries/extractor/src/test/java/androidx/media3/extractor/DefaultExtractorsFactoryTest.java @@ -16,6 +16,7 @@ package androidx.media3.extractor; import static com.google.common.truth.Truth.assertThat; +import static java.util.Arrays.stream; import android.net.Uri; import androidx.media3.common.MimeTypes; @@ -138,9 +139,8 @@ public final class DefaultExtractorsFactoryTest { Extractor[] extractors = defaultExtractorsFactory.createExtractors(); - for (Extractor extractor : extractors) { - assertThat(extractor.getClass()).isNotEqualTo(SubtitleTranscodingExtractor.class); - } + assertThat(stream(extractors).map(Object::getClass)) + .doesNotContain(SubtitleTranscodingExtractor.class); } private static List> getUnderlyingExtractorClasses( diff --git a/libraries/extractor/src/test/java/androidx/media3/extractor/text/ttml/TtmlParserTest.java b/libraries/extractor/src/test/java/androidx/media3/extractor/text/ttml/TtmlParserTest.java index beaf46bca6..d3b24b531c 100644 --- a/libraries/extractor/src/test/java/androidx/media3/extractor/text/ttml/TtmlParserTest.java +++ b/libraries/extractor/src/test/java/androidx/media3/extractor/text/ttml/TtmlParserTest.java @@ -32,7 +32,6 @@ import androidx.test.core.app.ApplicationProvider; import androidx.test.ext.junit.runners.AndroidJUnit4; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; import java.io.IOException; import java.util.ArrayList; import java.util.List; @@ -86,19 +85,19 @@ public final class TtmlParserTest { assertThat(firstCue.startTimeUs).isEqualTo(10_000_000); assertThat(firstCue.durationUs).isEqualTo(8_000_000); assertThat(firstCue.endTimeUs).isEqualTo(18_000_000); - assertThat(Lists.transform(firstCue.cues, c -> c.text.toString())).containsExactly("cue 1"); + assertThat(firstCue.cues.stream().map(c -> c.text.toString())).containsExactly("cue 1"); CuesWithTiming secondCue = allCues.get(1); assertThat(secondCue.startTimeUs).isEqualTo(20_000_000); assertThat(secondCue.durationUs).isEqualTo(8_000_000); assertThat(secondCue.endTimeUs).isEqualTo(28_000_000); - assertThat(Lists.transform(secondCue.cues, c -> c.text.toString())).containsExactly("cue 2"); + assertThat(secondCue.cues.stream().map(c -> c.text.toString())).containsExactly("cue 2"); CuesWithTiming thirdCue = allCues.get(2); assertThat(thirdCue.startTimeUs).isEqualTo(30_000_000); assertThat(thirdCue.durationUs).isEqualTo(8_000_000); assertThat(thirdCue.endTimeUs).isEqualTo(38_000_000); - assertThat(Lists.transform(thirdCue.cues, c -> c.text.toString())).containsExactly("cue 3"); + assertThat(thirdCue.cues.stream().map(c -> c.text.toString())).containsExactly("cue 3"); } @Test @@ -115,7 +114,7 @@ public final class TtmlParserTest { CuesWithTiming firstCue = cues.get(0); // First cue is truncated to OutputOptions.startTimeUs assertThat(firstCue.startTimeUs).isEqualTo(11_000_000); - assertThat(Lists.transform(firstCue.cues, c -> c.text.toString())).containsExactly("cue 1"); + assertThat(firstCue.cues.stream().map(c -> c.text.toString())).containsExactly("cue 1"); assertThat(getOnlyCueTextAtIndex(cues, 1).toString()).isEqualTo("cue 2"); assertThat(getOnlyCueTextAtIndex(cues, 2).toString()).isEqualTo("cue 3"); } @@ -134,7 +133,7 @@ public final class TtmlParserTest { CuesWithTiming firstCue = cues.get(0); // First cue is truncated to OutputOptions.startTimeUs assertThat(firstCue.startTimeUs).isEqualTo(11_000_000); - assertThat(Lists.transform(firstCue.cues, c -> c.text.toString())).containsExactly("cue 1"); + assertThat(firstCue.cues.stream().map(c -> c.text.toString())).containsExactly("cue 1"); assertThat(getOnlyCueTextAtIndex(cues, 1).toString()).isEqualTo("cue 2"); assertThat(getOnlyCueTextAtIndex(cues, 2).toString()).isEqualTo("cue 3"); @@ -143,7 +142,7 @@ public final class TtmlParserTest { // Last cue is the part of firstCue before OutputOptions.startTimeUs assertThat(fourthCue.startTimeUs).isEqualTo(10_000_000); assertThat(fourthCue.endTimeUs).isEqualTo(11_000_000); - assertThat(Lists.transform(fourthCue.cues, c -> c.text.toString())).containsExactly("cue 1"); + assertThat(fourthCue.cues.stream().map(c -> c.text.toString())).containsExactly("cue 1"); } @Test @@ -156,34 +155,34 @@ public final class TtmlParserTest { assertThat(firstCue.startTimeUs).isEqualTo(10_000_000); assertThat(firstCue.durationUs).isEqualTo(5_000_000); assertThat(firstCue.endTimeUs).isEqualTo(15_000_000); - assertThat(Lists.transform(firstCue.cues, c -> c.text.toString())).containsExactly("cue 1"); + assertThat(firstCue.cues.stream().map(c -> c.text.toString())).containsExactly("cue 1"); CuesWithTiming secondCue = allCues.get(1); assertThat(secondCue.startTimeUs).isEqualTo(15_000_000); assertThat(secondCue.durationUs).isEqualTo(1_000_000); assertThat(secondCue.endTimeUs).isEqualTo(16_000_000); - assertThat(Lists.transform(secondCue.cues, c -> c.text.toString())) + assertThat(secondCue.cues.stream().map(c -> c.text.toString())) .containsExactly("cue 1\ncue 2: nested inside cue 1"); CuesWithTiming thirdCue = allCues.get(2); assertThat(thirdCue.startTimeUs).isEqualTo(16_000_000); assertThat(thirdCue.durationUs).isEqualTo(4_000_000); assertThat(thirdCue.endTimeUs).isEqualTo(20_000_000); - assertThat(Lists.transform(thirdCue.cues, c -> c.text.toString())) + assertThat(thirdCue.cues.stream().map(c -> c.text.toString())) .containsExactly("cue 1\ncue 2: nested inside cue 1\ncue 3: overlaps with cue 2"); CuesWithTiming fourthCue = allCues.get(3); assertThat(fourthCue.startTimeUs).isEqualTo(20_000_000); assertThat(fourthCue.durationUs).isEqualTo(5_000_000); assertThat(fourthCue.endTimeUs).isEqualTo(25_000_000); - assertThat(Lists.transform(fourthCue.cues, c -> c.text.toString())) + assertThat(fourthCue.cues.stream().map(c -> c.text.toString())) .containsExactly("cue 1\ncue 3: overlaps with cue 2"); CuesWithTiming fifthCue = allCues.get(4); assertThat(fifthCue.startTimeUs).isEqualTo(25_000_000); assertThat(fifthCue.durationUs).isEqualTo(3_000_000); assertThat(fifthCue.endTimeUs).isEqualTo(28_000_000); - assertThat(Lists.transform(fifthCue.cues, c -> c.text.toString())) + assertThat(fifthCue.cues.stream().map(c -> c.text.toString())) .containsExactly("cue 3: overlaps with cue 2"); } @@ -202,7 +201,7 @@ public final class TtmlParserTest { CuesWithTiming firstCue = cues.get(0); // First cue is truncated to OutputOptions.startTimeUs assertThat(firstCue.startTimeUs).isEqualTo(11_000_000); - assertThat(Lists.transform(firstCue.cues, c -> c.text.toString())).containsExactly("cue 1"); + assertThat(firstCue.cues.stream().map(c -> c.text.toString())).containsExactly("cue 1"); assertThat(getOnlyCueTextAtIndex(cues, 1).toString()) .isEqualTo("cue 1\ncue 2: nested inside cue 1"); assertThat(getOnlyCueTextAtIndex(cues, 2).toString()) @@ -230,7 +229,7 @@ public final class TtmlParserTest { CuesWithTiming firstCue = cues.get(0); // First cue is truncated to OutputOptions.startTimeUs assertThat(firstCue.startTimeUs).isEqualTo(11_000_000); - assertThat(Lists.transform(firstCue.cues, c -> c.text.toString())).containsExactly("cue 1"); + assertThat(firstCue.cues.stream().map(c -> c.text.toString())).containsExactly("cue 1"); assertThat(getOnlyCueTextAtIndex(cues, 1).toString()) .isEqualTo("cue 1\ncue 2: nested inside cue 1"); @@ -244,7 +243,7 @@ public final class TtmlParserTest { // Last cue is truncated to end at OutputOptions.startTimeUs assertThat(sixthCue.startTimeUs).isEqualTo(10_000_000); assertThat(sixthCue.endTimeUs).isEqualTo(11_000_000); - assertThat(Lists.transform(sixthCue.cues, c -> c.text.toString())).containsExactly("cue 1"); + assertThat(sixthCue.cues.stream().map(c -> c.text.toString())).containsExactly("cue 1"); } @Test diff --git a/libraries/extractor/src/test/java/androidx/media3/extractor/text/webvtt/LegacySubtitleUtilWebvttTest.java b/libraries/extractor/src/test/java/androidx/media3/extractor/text/webvtt/LegacySubtitleUtilWebvttTest.java index 2645c78874..0afa37bcae 100644 --- a/libraries/extractor/src/test/java/androidx/media3/extractor/text/webvtt/LegacySubtitleUtilWebvttTest.java +++ b/libraries/extractor/src/test/java/androidx/media3/extractor/text/webvtt/LegacySubtitleUtilWebvttTest.java @@ -23,7 +23,6 @@ import androidx.media3.extractor.text.Subtitle; import androidx.media3.extractor.text.SubtitleParser; import androidx.test.ext.junit.runners.AndroidJUnit4; import com.google.common.collect.ImmutableList; -import com.google.common.collect.Lists; import java.util.Arrays; import org.junit.Test; import org.junit.runner.RunWith; @@ -85,12 +84,12 @@ public class LegacySubtitleUtilWebvttTest { assertThat(cuesWithTimingsList.get(0).startTimeUs).isEqualTo(1_000_000); assertThat(cuesWithTimingsList.get(0).durationUs).isEqualTo(1_000_000); assertThat(cuesWithTimingsList.get(0).endTimeUs).isEqualTo(2_000_000); - assertThat(Lists.transform(cuesWithTimingsList.get(0).cues, c -> c.text)) + assertThat(cuesWithTimingsList.get(0).cues.stream().map(c -> c.text)) .containsExactly(FIRST_SUBTITLE_STRING); assertThat(cuesWithTimingsList.get(1).startTimeUs).isEqualTo(3_000_000); assertThat(cuesWithTimingsList.get(1).durationUs).isEqualTo(1_000_000); assertThat(cuesWithTimingsList.get(1).endTimeUs).isEqualTo(4_000_000); - assertThat(Lists.transform(cuesWithTimingsList.get(1).cues, c -> c.text)) + assertThat(cuesWithTimingsList.get(1).cues.stream().map(c -> c.text)) .containsExactly(SECOND_SUBTITLE_STRING); } @@ -103,12 +102,12 @@ public class LegacySubtitleUtilWebvttTest { assertThat(cuesWithTimingsList.get(0).startTimeUs).isEqualTo(1_000_000); assertThat(cuesWithTimingsList.get(0).durationUs).isEqualTo(1_000_000); assertThat(cuesWithTimingsList.get(0).endTimeUs).isEqualTo(2_000_000); - assertThat(Lists.transform(cuesWithTimingsList.get(0).cues, c -> c.text)) + assertThat(cuesWithTimingsList.get(0).cues.stream().map(c -> c.text)) .containsExactly(FIRST_SUBTITLE_STRING); assertThat(cuesWithTimingsList.get(1).startTimeUs).isEqualTo(2_000_000); assertThat(cuesWithTimingsList.get(1).durationUs).isEqualTo(2_000_000); assertThat(cuesWithTimingsList.get(1).endTimeUs).isEqualTo(4_000_000); - assertThat(Lists.transform(cuesWithTimingsList.get(1).cues, c -> c.text)) + assertThat(cuesWithTimingsList.get(1).cues.stream().map(c -> c.text)) .containsExactly(SECOND_SUBTITLE_STRING); } @@ -121,18 +120,18 @@ public class LegacySubtitleUtilWebvttTest { assertThat(cuesWithTimingsList.get(0).startTimeUs).isEqualTo(1_000_000); assertThat(cuesWithTimingsList.get(0).durationUs).isEqualTo(1_000_000); assertThat(cuesWithTimingsList.get(0).endTimeUs).isEqualTo(2_000_000); - assertThat(Lists.transform(cuesWithTimingsList.get(0).cues, c -> c.text)) + assertThat(cuesWithTimingsList.get(0).cues.stream().map(c -> c.text)) .containsExactly(FIRST_SUBTITLE_STRING); assertThat(cuesWithTimingsList.get(1).startTimeUs).isEqualTo(2_000_000); assertThat(cuesWithTimingsList.get(1).durationUs).isEqualTo(1_000_000); assertThat(cuesWithTimingsList.get(1).endTimeUs).isEqualTo(3_000_000); - assertThat(Lists.transform(cuesWithTimingsList.get(1).cues, c -> c.text)) + assertThat(cuesWithTimingsList.get(1).cues.stream().map(c -> c.text)) .containsExactly(FIRST_SUBTITLE_STRING, SECOND_SUBTITLE_STRING) .inOrder(); assertThat(cuesWithTimingsList.get(2).startTimeUs).isEqualTo(3_000_000); assertThat(cuesWithTimingsList.get(2).durationUs).isEqualTo(1_000_000); assertThat(cuesWithTimingsList.get(2).endTimeUs).isEqualTo(4_000_000); - assertThat(Lists.transform(cuesWithTimingsList.get(2).cues, c -> c.text)) + assertThat(cuesWithTimingsList.get(2).cues.stream().map(c -> c.text)) .containsExactly(SECOND_SUBTITLE_STRING); } @@ -146,7 +145,7 @@ public class LegacySubtitleUtilWebvttTest { assertThat(cuesWithTimingsList.get(0).startTimeUs).isEqualTo(3_000_000); assertThat(cuesWithTimingsList.get(0).durationUs).isEqualTo(1_000_000); assertThat(cuesWithTimingsList.get(0).endTimeUs).isEqualTo(4_000_000); - assertThat(Lists.transform(cuesWithTimingsList.get(0).cues, c -> c.text)) + assertThat(cuesWithTimingsList.get(0).cues.stream().map(c -> c.text)) .containsExactly(SECOND_SUBTITLE_STRING); } @@ -160,7 +159,7 @@ public class LegacySubtitleUtilWebvttTest { assertThat(cuesWithTimingsList.get(0).startTimeUs).isEqualTo(3_000_000); assertThat(cuesWithTimingsList.get(0).durationUs).isEqualTo(1_000_000); assertThat(cuesWithTimingsList.get(0).endTimeUs).isEqualTo(4_000_000); - assertThat(Lists.transform(cuesWithTimingsList.get(0).cues, c -> c.text)) + assertThat(cuesWithTimingsList.get(0).cues.stream().map(c -> c.text)) .containsExactly(SECOND_SUBTITLE_STRING); } @@ -174,7 +173,7 @@ public class LegacySubtitleUtilWebvttTest { assertThat(cuesWithTimingsList.get(0).startTimeUs).isEqualTo(3_000_000); assertThat(cuesWithTimingsList.get(0).durationUs).isEqualTo(1_000_000); assertThat(cuesWithTimingsList.get(0).endTimeUs).isEqualTo(4_000_000); - assertThat(Lists.transform(cuesWithTimingsList.get(0).cues, c -> c.text)) + assertThat(cuesWithTimingsList.get(0).cues.stream().map(c -> c.text)) .containsExactly(SECOND_SUBTITLE_STRING); } @@ -189,12 +188,12 @@ public class LegacySubtitleUtilWebvttTest { assertThat(cuesWithTimingsList.get(0).startTimeUs).isEqualTo(1_500_000); assertThat(cuesWithTimingsList.get(0).durationUs).isEqualTo(500_000); assertThat(cuesWithTimingsList.get(0).endTimeUs).isEqualTo(2_000_000); - assertThat(Lists.transform(cuesWithTimingsList.get(0).cues, c -> c.text)) + assertThat(cuesWithTimingsList.get(0).cues.stream().map(c -> c.text)) .containsExactly(FIRST_SUBTITLE_STRING); assertThat(cuesWithTimingsList.get(1).startTimeUs).isEqualTo(3_000_000); assertThat(cuesWithTimingsList.get(1).durationUs).isEqualTo(1_000_000); assertThat(cuesWithTimingsList.get(1).endTimeUs).isEqualTo(4_000_000); - assertThat(Lists.transform(cuesWithTimingsList.get(1).cues, c -> c.text)) + assertThat(cuesWithTimingsList.get(1).cues.stream().map(c -> c.text)) .containsExactly(SECOND_SUBTITLE_STRING); } @@ -208,7 +207,7 @@ public class LegacySubtitleUtilWebvttTest { assertThat(cuesWithTimingsList.get(0).startTimeUs).isEqualTo(2_000_000); assertThat(cuesWithTimingsList.get(0).durationUs).isEqualTo(2_000_000); assertThat(cuesWithTimingsList.get(0).endTimeUs).isEqualTo(4_000_000); - assertThat(Lists.transform(cuesWithTimingsList.get(0).cues, c -> c.text)) + assertThat(cuesWithTimingsList.get(0).cues.stream().map(c -> c.text)) .containsExactly(SECOND_SUBTITLE_STRING); } @@ -223,12 +222,12 @@ public class LegacySubtitleUtilWebvttTest { assertThat(cuesWithTimingsList.get(0).startTimeUs).isEqualTo(1_500_000); assertThat(cuesWithTimingsList.get(0).durationUs).isEqualTo(500_000); assertThat(cuesWithTimingsList.get(0).endTimeUs).isEqualTo(2_000_000); - assertThat(Lists.transform(cuesWithTimingsList.get(0).cues, c -> c.text)) + assertThat(cuesWithTimingsList.get(0).cues.stream().map(c -> c.text)) .containsExactly(FIRST_SUBTITLE_STRING); assertThat(cuesWithTimingsList.get(1).startTimeUs).isEqualTo(2_000_000); assertThat(cuesWithTimingsList.get(1).durationUs).isEqualTo(2_000_000); assertThat(cuesWithTimingsList.get(1).endTimeUs).isEqualTo(4_000_000); - assertThat(Lists.transform(cuesWithTimingsList.get(1).cues, c -> c.text)) + assertThat(cuesWithTimingsList.get(1).cues.stream().map(c -> c.text)) .containsExactly(SECOND_SUBTITLE_STRING); } @@ -243,13 +242,13 @@ public class LegacySubtitleUtilWebvttTest { assertThat(cuesWithTimingsList.get(0).startTimeUs).isEqualTo(2_500_000); assertThat(cuesWithTimingsList.get(0).durationUs).isEqualTo(500_000); assertThat(cuesWithTimingsList.get(0).endTimeUs).isEqualTo(3_000_000); - assertThat(Lists.transform(cuesWithTimingsList.get(0).cues, c -> c.text)) + assertThat(cuesWithTimingsList.get(0).cues.stream().map(c -> c.text)) .containsExactly(FIRST_SUBTITLE_STRING, SECOND_SUBTITLE_STRING) .inOrder(); assertThat(cuesWithTimingsList.get(1).startTimeUs).isEqualTo(3_000_000); assertThat(cuesWithTimingsList.get(1).durationUs).isEqualTo(1_000_000); assertThat(cuesWithTimingsList.get(1).endTimeUs).isEqualTo(4_000_000); - assertThat(Lists.transform(cuesWithTimingsList.get(1).cues, c -> c.text)) + assertThat(cuesWithTimingsList.get(1).cues.stream().map(c -> c.text)) .containsExactly(SECOND_SUBTITLE_STRING); } @@ -265,12 +264,12 @@ public class LegacySubtitleUtilWebvttTest { assertThat(cuesWithTimingsList.get(0).startTimeUs).isEqualTo(3_000_000); assertThat(cuesWithTimingsList.get(0).durationUs).isEqualTo(1_000_000); assertThat(cuesWithTimingsList.get(0).endTimeUs).isEqualTo(4_000_000); - assertThat(Lists.transform(cuesWithTimingsList.get(0).cues, c -> c.text)) + assertThat(cuesWithTimingsList.get(0).cues.stream().map(c -> c.text)) .containsExactly(SECOND_SUBTITLE_STRING); assertThat(cuesWithTimingsList.get(1).startTimeUs).isEqualTo(1_000_000); assertThat(cuesWithTimingsList.get(1).durationUs).isEqualTo(1_000_000); assertThat(cuesWithTimingsList.get(1).endTimeUs).isEqualTo(2_000_000); - assertThat(Lists.transform(cuesWithTimingsList.get(1).cues, c -> c.text)) + assertThat(cuesWithTimingsList.get(1).cues.stream().map(c -> c.text)) .containsExactly(FIRST_SUBTITLE_STRING); } @@ -287,18 +286,18 @@ public class LegacySubtitleUtilWebvttTest { assertThat(cuesWithTimingsList.get(0).startTimeUs).isEqualTo(1_500_000); assertThat(cuesWithTimingsList.get(0).durationUs).isEqualTo(500_000); assertThat(cuesWithTimingsList.get(0).endTimeUs).isEqualTo(2_000_000); - assertThat(Lists.transform(cuesWithTimingsList.get(0).cues, c -> c.text)) + assertThat(cuesWithTimingsList.get(0).cues.stream().map(c -> c.text)) .containsExactly(FIRST_SUBTITLE_STRING); assertThat(cuesWithTimingsList.get(1).startTimeUs).isEqualTo(3_000_000); assertThat(cuesWithTimingsList.get(1).durationUs).isEqualTo(1_000_000); assertThat(cuesWithTimingsList.get(1).endTimeUs).isEqualTo(4_000_000); - assertThat(Lists.transform(cuesWithTimingsList.get(1).cues, c -> c.text)) + assertThat(cuesWithTimingsList.get(1).cues.stream().map(c -> c.text)) .containsExactly(SECOND_SUBTITLE_STRING); // Final event is the part of the 'first event' that is before OutputOptions.startTimeUs assertThat(cuesWithTimingsList.get(2).startTimeUs).isEqualTo(1_000_000); assertThat(cuesWithTimingsList.get(2).durationUs).isEqualTo(500_000); assertThat(cuesWithTimingsList.get(2).endTimeUs).isEqualTo(1_500_000); - assertThat(Lists.transform(cuesWithTimingsList.get(2).cues, c -> c.text)) + assertThat(cuesWithTimingsList.get(2).cues.stream().map(c -> c.text)) .containsExactly(FIRST_SUBTITLE_STRING); } @@ -314,12 +313,12 @@ public class LegacySubtitleUtilWebvttTest { assertThat(cuesWithTimingsList.get(0).startTimeUs).isEqualTo(3_000_000); assertThat(cuesWithTimingsList.get(0).durationUs).isEqualTo(1_000_000); assertThat(cuesWithTimingsList.get(0).endTimeUs).isEqualTo(4_000_000); - assertThat(Lists.transform(cuesWithTimingsList.get(0).cues, c -> c.text)) + assertThat(cuesWithTimingsList.get(0).cues.stream().map(c -> c.text)) .containsExactly(SECOND_SUBTITLE_STRING); assertThat(cuesWithTimingsList.get(1).startTimeUs).isEqualTo(1_000_000); assertThat(cuesWithTimingsList.get(1).durationUs).isEqualTo(1_000_000); assertThat(cuesWithTimingsList.get(1).endTimeUs).isEqualTo(2_000_000); - assertThat(Lists.transform(cuesWithTimingsList.get(1).cues, c -> c.text)) + assertThat(cuesWithTimingsList.get(1).cues.stream().map(c -> c.text)) .containsExactly(FIRST_SUBTITLE_STRING); } @@ -335,12 +334,12 @@ public class LegacySubtitleUtilWebvttTest { assertThat(cuesWithTimingsList.get(0).startTimeUs).isEqualTo(2_000_000); assertThat(cuesWithTimingsList.get(0).durationUs).isEqualTo(2_000_000); assertThat(cuesWithTimingsList.get(0).endTimeUs).isEqualTo(4_000_000); - assertThat(Lists.transform(cuesWithTimingsList.get(0).cues, c -> c.text)) + assertThat(cuesWithTimingsList.get(0).cues.stream().map(c -> c.text)) .containsExactly(SECOND_SUBTITLE_STRING); assertThat(cuesWithTimingsList.get(1).startTimeUs).isEqualTo(1_000_000); assertThat(cuesWithTimingsList.get(1).durationUs).isEqualTo(1_000_000); assertThat(cuesWithTimingsList.get(1).endTimeUs).isEqualTo(2_000_000); - assertThat(Lists.transform(cuesWithTimingsList.get(1).cues, c -> c.text)) + assertThat(cuesWithTimingsList.get(1).cues.stream().map(c -> c.text)) .containsExactly(FIRST_SUBTITLE_STRING); } @@ -357,18 +356,18 @@ public class LegacySubtitleUtilWebvttTest { assertThat(cuesWithTimingsList.get(0).startTimeUs).isEqualTo(1_500_000); assertThat(cuesWithTimingsList.get(0).durationUs).isEqualTo(500_000); assertThat(cuesWithTimingsList.get(0).endTimeUs).isEqualTo(2_000_000); - assertThat(Lists.transform(cuesWithTimingsList.get(0).cues, c -> c.text)) + assertThat(cuesWithTimingsList.get(0).cues.stream().map(c -> c.text)) .containsExactly(FIRST_SUBTITLE_STRING); assertThat(cuesWithTimingsList.get(1).startTimeUs).isEqualTo(2_000_000); assertThat(cuesWithTimingsList.get(1).durationUs).isEqualTo(2_000_000); assertThat(cuesWithTimingsList.get(1).endTimeUs).isEqualTo(4_000_000); - assertThat(Lists.transform(cuesWithTimingsList.get(1).cues, c -> c.text)) + assertThat(cuesWithTimingsList.get(1).cues.stream().map(c -> c.text)) .containsExactly(SECOND_SUBTITLE_STRING); // Final event is the part of the 'first event' that is before OutputOptions.startTimeUs assertThat(cuesWithTimingsList.get(2).startTimeUs).isEqualTo(1_000_000); assertThat(cuesWithTimingsList.get(2).durationUs).isEqualTo(500_000); assertThat(cuesWithTimingsList.get(2).endTimeUs).isEqualTo(1_500_000); - assertThat(Lists.transform(cuesWithTimingsList.get(2).cues, c -> c.text)) + assertThat(cuesWithTimingsList.get(2).cues.stream().map(c -> c.text)) .containsExactly(FIRST_SUBTITLE_STRING); } @@ -384,24 +383,24 @@ public class LegacySubtitleUtilWebvttTest { assertThat(cuesWithTimingsList.get(0).startTimeUs).isEqualTo(2_500_000); assertThat(cuesWithTimingsList.get(0).durationUs).isEqualTo(500_000); assertThat(cuesWithTimingsList.get(0).endTimeUs).isEqualTo(3_000_000); - assertThat(Lists.transform(cuesWithTimingsList.get(0).cues, c -> c.text)) + assertThat(cuesWithTimingsList.get(0).cues.stream().map(c -> c.text)) .containsExactly(FIRST_SUBTITLE_STRING, SECOND_SUBTITLE_STRING) .inOrder(); assertThat(cuesWithTimingsList.get(1).startTimeUs).isEqualTo(3_000_000); assertThat(cuesWithTimingsList.get(1).durationUs).isEqualTo(1_000_000); assertThat(cuesWithTimingsList.get(1).endTimeUs).isEqualTo(4_000_000); - assertThat(Lists.transform(cuesWithTimingsList.get(1).cues, c -> c.text)) + assertThat(cuesWithTimingsList.get(1).cues.stream().map(c -> c.text)) .containsExactly(SECOND_SUBTITLE_STRING); assertThat(cuesWithTimingsList.get(2).startTimeUs).isEqualTo(1_000_000); assertThat(cuesWithTimingsList.get(2).durationUs).isEqualTo(1_000_000); assertThat(cuesWithTimingsList.get(2).endTimeUs).isEqualTo(2_000_000); - assertThat(Lists.transform(cuesWithTimingsList.get(2).cues, c -> c.text)) + assertThat(cuesWithTimingsList.get(2).cues.stream().map(c -> c.text)) .containsExactly(FIRST_SUBTITLE_STRING); // Final event is the part of the 'first event' that is before OutputOptions.startTimeUs assertThat(cuesWithTimingsList.get(3).startTimeUs).isEqualTo(2_000_000); assertThat(cuesWithTimingsList.get(3).durationUs).isEqualTo(500_000); assertThat(cuesWithTimingsList.get(3).endTimeUs).isEqualTo(2_500_000); - assertThat(Lists.transform(cuesWithTimingsList.get(3).cues, c -> c.text)) + assertThat(cuesWithTimingsList.get(3).cues.stream().map(c -> c.text)) .containsExactly(FIRST_SUBTITLE_STRING, SECOND_SUBTITLE_STRING) .inOrder(); }