From fe38901028e125cf5063ad2c7512531ed50fc4cb Mon Sep 17 00:00:00 2001
From: tofunmi <tofunmi@google.com>
Date: Mon, 6 Mar 2023 17:35:55 +0000
Subject: [PATCH] ImageAssetLoaderTest minor fixes

PiperOrigin-RevId: 514436359
---
 .../transformer/ImageAssetLoaderTest.java     | 27 ++++++-------------
 1 file changed, 8 insertions(+), 19 deletions(-)

diff --git a/libraries/transformer/src/test/java/androidx/media3/transformer/ImageAssetLoaderTest.java b/libraries/transformer/src/test/java/androidx/media3/transformer/ImageAssetLoaderTest.java
index 9d7beef2b3..97c7edb46c 100644
--- a/libraries/transformer/src/test/java/androidx/media3/transformer/ImageAssetLoaderTest.java
+++ b/libraries/transformer/src/test/java/androidx/media3/transformer/ImageAssetLoaderTest.java
@@ -22,10 +22,8 @@ import android.graphics.Bitmap;
 import android.os.Handler;
 import android.os.HandlerThread;
 import android.os.Looper;
-import androidx.annotation.Nullable;
 import androidx.media3.common.Format;
 import androidx.media3.common.MediaItem;
-import androidx.media3.decoder.DecoderInputBuffer;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import java.time.Duration;
@@ -35,7 +33,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.shadows.ShadowSystemClock;
 
-/** Unit tests for {@link ExoPlayerAssetLoader}. */
+/** Unit tests for {@link ImageAssetLoader}. */
 @RunWith(AndroidJUnit4.class)
 public class ImageAssetLoaderTest {
 
@@ -55,6 +53,7 @@ public class ImageAssetLoaderTest {
 
           @Override
           public void onDurationUs(long durationUs) {
+            // Sleep to increase the chances of the test failing.
             sleep();
             isDurationSet = true;
           }
@@ -72,7 +71,10 @@ public class ImageAssetLoaderTest {
               @AssetLoader.SupportedOutputTypes int supportedOutputTypes,
               long streamStartPositionUs,
               long streamOffsetUs) {
-            if (!isTrackCountSet) {
+            if (!isDurationSet) {
+              exceptionRef.set(
+                  new IllegalStateException("onTrackAdded() called before onDurationUs()"));
+            } else if (!isTrackCountSet) {
               exceptionRef.set(
                   new IllegalStateException("onTrackAdded() called before onTrackCount()"));
             }
@@ -83,11 +85,7 @@ public class ImageAssetLoaderTest {
 
           @Override
           public SampleConsumer onOutputFormat(Format format) {
-
-            if (!isDurationSet) {
-              exceptionRef.set(
-                  new IllegalStateException("onTrackAdded() called before onDurationUs()"));
-            } else if (!isTrackAdded) {
+            if (!isTrackAdded) {
               exceptionRef.set(
                   new IllegalStateException("onOutputFormat() called before onTrackAdded()"));
             }
@@ -100,7 +98,7 @@ public class ImageAssetLoaderTest {
             exceptionRef.set(e);
           }
 
-          void sleep() {
+          private void sleep() {
             try {
               Thread.sleep(10);
             } catch (InterruptedException e) {
@@ -134,15 +132,6 @@ public class ImageAssetLoaderTest {
 
   private static final class FakeSampleConsumer implements SampleConsumer {
 
-    @Nullable
-    @Override
-    public DecoderInputBuffer getInputBuffer() {
-      return null;
-    }
-
-    @Override
-    public void queueInputBuffer() {}
-
     @Override
     public void queueInputBitmap(Bitmap inputBitmap, long durationUs, int frameRate) {}