From d8ea1f60af210ac9ae65351f9bc7c57127e3034f Mon Sep 17 00:00:00 2001 From: olly Date: Wed, 4 Mar 2020 11:04:39 +0000 Subject: [PATCH] Annotate tests to use Robolectric's LEGACY LooperMode. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The default Robolectric Looper simulation mode is changing to PAUSED from LEGACY. The following tests fail in this new mode, and are thus being defaulted to LEGACY. For more details see ​go/robolectric-legacy-looper-mode-lsc Cleanup change automatically generated by error-prone refactoring //third_party/android/androidx_test/tools/errorprone/java/androidx/test/tools/errorprone:LegacyLooperModeConverter_refactoring Tested: TAP train for global presubmit queue http://test/OCL:297627974:BASE:298600828:1583273401491:7d94dbaa PiperOrigin-RevId: 298809656 --- .../com/google/android/exoplayer2/AudioFocusManagerTest.java | 3 +++ .../com/google/android/exoplayer2/MediaPeriodQueueTest.java | 3 +++ .../mediacodec/DedicatedThreadAsyncMediaCodecAdapterTest.java | 3 +++ .../mediacodec/MultiLockAsyncMediaCodecAdapterTest.java | 3 +++ .../exoplayer2/upstream/cache/CacheDataSourceTest2.java | 3 +++ 5 files changed, 15 insertions(+) diff --git a/library/core/src/test/java/com/google/android/exoplayer2/AudioFocusManagerTest.java b/library/core/src/test/java/com/google/android/exoplayer2/AudioFocusManagerTest.java index 9a44d6def6..26b990ef77 100644 --- a/library/core/src/test/java/com/google/android/exoplayer2/AudioFocusManagerTest.java +++ b/library/core/src/test/java/com/google/android/exoplayer2/AudioFocusManagerTest.java @@ -21,6 +21,7 @@ import static com.google.android.exoplayer2.AudioFocusManager.PLAYER_COMMAND_WAI import static com.google.common.truth.Truth.assertThat; import static org.junit.Assert.fail; import static org.robolectric.annotation.Config.TARGET_SDK; +import static org.robolectric.annotation.LooperMode.Mode.LEGACY; import android.content.Context; import android.media.AudioFocusRequest; @@ -36,9 +37,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.Shadows; import org.robolectric.annotation.Config; +import org.robolectric.annotation.LooperMode; import org.robolectric.shadows.ShadowAudioManager; /** Unit tests for {@link AudioFocusManager}. */ +@LooperMode(LEGACY) @RunWith(AndroidJUnit4.class) public class AudioFocusManagerTest { private static final int NO_COMMAND_RECEIVED = ~PLAYER_COMMAND_WAIT_FOR_CALLBACK; diff --git a/library/core/src/test/java/com/google/android/exoplayer2/MediaPeriodQueueTest.java b/library/core/src/test/java/com/google/android/exoplayer2/MediaPeriodQueueTest.java index eb4f046e9b..4c65e9d546 100644 --- a/library/core/src/test/java/com/google/android/exoplayer2/MediaPeriodQueueTest.java +++ b/library/core/src/test/java/com/google/android/exoplayer2/MediaPeriodQueueTest.java @@ -18,6 +18,7 @@ package com.google.android.exoplayer2; import static com.google.common.truth.Truth.assertThat; import static org.junit.Assert.assertNull; import static org.mockito.Mockito.mock; +import static org.robolectric.annotation.LooperMode.Mode.LEGACY; import android.net.Uri; import androidx.test.ext.junit.runners.AndroidJUnit4; @@ -37,8 +38,10 @@ import java.util.Collections; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.annotation.LooperMode; /** Unit tests for {@link MediaPeriodQueue}. */ +@LooperMode(LEGACY) @RunWith(AndroidJUnit4.class) public final class MediaPeriodQueueTest { diff --git a/library/core/src/test/java/com/google/android/exoplayer2/mediacodec/DedicatedThreadAsyncMediaCodecAdapterTest.java b/library/core/src/test/java/com/google/android/exoplayer2/mediacodec/DedicatedThreadAsyncMediaCodecAdapterTest.java index 66b2911349..7ea55b1d82 100644 --- a/library/core/src/test/java/com/google/android/exoplayer2/mediacodec/DedicatedThreadAsyncMediaCodecAdapterTest.java +++ b/library/core/src/test/java/com/google/android/exoplayer2/mediacodec/DedicatedThreadAsyncMediaCodecAdapterTest.java @@ -20,6 +20,7 @@ import static com.google.android.exoplayer2.testutil.TestUtil.assertBufferInfosE import static com.google.common.truth.Truth.assertThat; import static org.junit.Assert.assertThrows; import static org.robolectric.Shadows.shadowOf; +import static org.robolectric.annotation.LooperMode.Mode.LEGACY; import android.media.MediaCodec; import android.media.MediaFormat; @@ -36,9 +37,11 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.Shadows; +import org.robolectric.annotation.LooperMode; import org.robolectric.shadows.ShadowLooper; /** Unit tests for {@link DedicatedThreadAsyncMediaCodecAdapter}. */ +@LooperMode(LEGACY) @RunWith(AndroidJUnit4.class) public class DedicatedThreadAsyncMediaCodecAdapterTest { private DedicatedThreadAsyncMediaCodecAdapter adapter; diff --git a/library/core/src/test/java/com/google/android/exoplayer2/mediacodec/MultiLockAsyncMediaCodecAdapterTest.java b/library/core/src/test/java/com/google/android/exoplayer2/mediacodec/MultiLockAsyncMediaCodecAdapterTest.java index 1910d902d0..cfe9cf2900 100644 --- a/library/core/src/test/java/com/google/android/exoplayer2/mediacodec/MultiLockAsyncMediaCodecAdapterTest.java +++ b/library/core/src/test/java/com/google/android/exoplayer2/mediacodec/MultiLockAsyncMediaCodecAdapterTest.java @@ -20,6 +20,7 @@ import static com.google.android.exoplayer2.testutil.TestUtil.assertBufferInfosE import static com.google.common.truth.Truth.assertThat; import static org.junit.Assert.assertThrows; import static org.robolectric.Shadows.shadowOf; +import static org.robolectric.annotation.LooperMode.Mode.LEGACY; import android.media.MediaCodec; import android.media.MediaFormat; @@ -36,9 +37,11 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.Shadows; +import org.robolectric.annotation.LooperMode; import org.robolectric.shadows.ShadowLooper; /** Unit tests for {@link MultiLockAsyncMediaCodecAdapter}. */ +@LooperMode(LEGACY) @RunWith(AndroidJUnit4.class) public class MultiLockAsyncMediaCodecAdapterTest { private MultiLockAsyncMediaCodecAdapter adapter; diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest2.java b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest2.java index f1baab3b12..8702e887f8 100644 --- a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest2.java +++ b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest2.java @@ -18,6 +18,7 @@ package com.google.android.exoplayer2.upstream.cache; import static com.google.common.truth.Truth.assertThat; import static java.util.Arrays.copyOf; import static java.util.Arrays.copyOfRange; +import static org.robolectric.annotation.LooperMode.Mode.LEGACY; import android.content.Context; import android.net.Uri; @@ -39,8 +40,10 @@ import java.io.IOException; import java.util.Random; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.annotation.LooperMode; /** Additional tests for {@link CacheDataSource}. */ +@LooperMode(LEGACY) @RunWith(AndroidJUnit4.class) public final class CacheDataSourceTest2 {