From 36d61000fdcc13fdb1e1d8627618e83ba90f5ef4 Mon Sep 17 00:00:00 2001 From: claincly Date: Tue, 27 Aug 2024 06:41:25 -0700 Subject: [PATCH] Reorder the assetions in tests So it's more clear what's actually broke in the error log. PiperOrigin-RevId: 667964963 --- .../transformer/mh/VideoTimestampConsistencyTest.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/VideoTimestampConsistencyTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/VideoTimestampConsistencyTest.java index 66fd3a111e..348620d8dc 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/VideoTimestampConsistencyTest.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/VideoTimestampConsistencyTest.java @@ -367,20 +367,20 @@ public class VideoTimestampConsistencyTest { private void compareTimestamps( List mediaItems, List expectedTimestamps, boolean containsImage) throws Exception { + ImmutableList timestampsFromTransformer = getTimestampsFromTransformer(mediaItems); + assertThat(timestampsFromTransformer).isEqualTo(expectedTimestamps); + ImmutableList timestampsFromCompositionPlayer = getTimestampsFromCompositionPlayer(mediaItems); - ImmutableList timestampsFromTransformer = getTimestampsFromTransformer(mediaItems); - - assertThat(timestampsFromCompositionPlayer).isEqualTo(timestampsFromTransformer); + assertThat(timestampsFromCompositionPlayer).isEqualTo(expectedTimestamps); if (!containsImage) { // ExoPlayer doesn't support image playback with effects. ImmutableList timestampsFromExoPlayer = getTimestampsFromExoPlayer( Lists.transform(mediaItems, editedMediaItem -> editedMediaItem.mediaItem)); - assertThat(timestampsFromCompositionPlayer).isEqualTo(timestampsFromExoPlayer); + assertThat(timestampsFromExoPlayer).isEqualTo(expectedTimestamps); } - assertThat(timestampsFromTransformer).isEqualTo(expectedTimestamps); } private ImmutableList getTimestampsFromTransformer(List editedMediaItems)