From 3a6ee77dafedab19bbd2ed4039c99d4a5d4ec724 Mon Sep 17 00:00:00 2001 From: tofunmi Date: Tue, 21 Mar 2023 14:06:11 +0000 Subject: [PATCH] skip transformer tests if no internet connection The failure reason (no network) will be logged in the test output, but the test will not be marked as failing, rather skipped. PiperOrigin-RevId: 518262203 --- .../TransformerAndroidTestRunner.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/TransformerAndroidTestRunner.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/TransformerAndroidTestRunner.java index baccb5dd18..65e71404b1 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/TransformerAndroidTestRunner.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/TransformerAndroidTestRunner.java @@ -18,6 +18,7 @@ package androidx.media3.transformer; import static androidx.media3.common.util.Assertions.checkArgument; import static androidx.media3.common.util.Assertions.checkNotNull; import static java.util.concurrent.TimeUnit.SECONDS; +import static org.junit.Assume.assumeTrue; import android.content.Context; import android.net.ConnectivityManager; @@ -270,17 +271,16 @@ public class TransformerAndroidTestRunner { .equals(MediaItem.ClippingConfiguration.UNSET), "SSIM calculation is not supported for clipped inputs."); } - if (!hasNetworkConnection(context)) { - for (EditedMediaItemSequence sequence : composition.sequences) { - for (EditedMediaItem editedMediaItem : sequence.editedMediaItems) { - Uri mediaItemUri = checkNotNull(editedMediaItem.mediaItem.localConfiguration).uri; - String scheme = checkNotNull(mediaItemUri.getScheme()); - if ((scheme.equals("http") || scheme.equals("https"))) { - throw new IllegalArgumentException( - "Input network file requested on device with no network connection. Input file" - + " name: " - + mediaItemUri); - } + for (EditedMediaItemSequence sequence : composition.sequences) { + for (EditedMediaItem editedMediaItem : sequence.editedMediaItems) { + Uri mediaItemUri = checkNotNull(editedMediaItem.mediaItem.localConfiguration).uri; + String scheme = checkNotNull(mediaItemUri.getScheme()); + if ((scheme.equals("http") || scheme.equals("https"))) { + assumeTrue( + "Input network file requested on device with no network connection. Input file" + + " name: " + + mediaItemUri, + hasNetworkConnection(context)); } } }