From dd1b1c0837403b047ac5d8d05d79581e3a7e3500 Mon Sep 17 00:00:00 2001 From: ibaker Date: Tue, 19 Jan 2021 16:07:54 +0000 Subject: [PATCH] Fix nullness warnings in DefaultDrmSessionManagerTest These only show up in Android Studio, but still seem worth fixing. PiperOrigin-RevId: 352570399 --- .../drm/DefaultDrmSessionManagerTest.java | 74 ++++++++++--------- 1 file changed, 41 insertions(+), 33 deletions(-) diff --git a/library/core/src/test/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManagerTest.java b/library/core/src/test/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManagerTest.java index a700350b0b..5ac26a76b3 100644 --- a/library/core/src/test/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManagerTest.java +++ b/library/core/src/test/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManagerTest.java @@ -15,6 +15,7 @@ */ package com.google.android.exoplayer2.drm; +import static com.google.android.exoplayer2.util.Assertions.checkNotNull; import static com.google.common.truth.Truth.assertThat; import static java.util.concurrent.TimeUnit.SECONDS; @@ -24,7 +25,6 @@ import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.testutil.FakeExoMediaDrm; import com.google.android.exoplayer2.testutil.TestUtil; -import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.MimeTypes; import com.google.common.collect.ImmutableList; import java.util.UUID; @@ -61,10 +61,11 @@ public class DefaultDrmSessionManagerTest { .build(/* mediaDrmCallback= */ licenseServer); drmSessionManager.prepare(); DrmSession drmSession = - drmSessionManager.acquireSession( - /* playbackLooper= */ Assertions.checkNotNull(Looper.myLooper()), - /* eventDispatcher= */ null, - FORMAT_WITH_DRM_INIT_DATA); + checkNotNull( + drmSessionManager.acquireSession( + /* playbackLooper= */ checkNotNull(Looper.myLooper()), + /* eventDispatcher= */ null, + FORMAT_WITH_DRM_INIT_DATA)); waitForOpenedWithKeys(drmSession); assertThat(drmSession.getState()).isEqualTo(DrmSession.STATE_OPENED_WITH_KEYS); @@ -84,10 +85,11 @@ public class DefaultDrmSessionManagerTest { drmSessionManager.prepare(); DrmSession drmSession = - drmSessionManager.acquireSession( - /* playbackLooper= */ Assertions.checkNotNull(Looper.myLooper()), - /* eventDispatcher= */ null, - FORMAT_WITH_DRM_INIT_DATA); + checkNotNull( + drmSessionManager.acquireSession( + /* playbackLooper= */ checkNotNull(Looper.myLooper()), + /* eventDispatcher= */ null, + FORMAT_WITH_DRM_INIT_DATA)); waitForOpenedWithKeys(drmSession); assertThat(drmSession.getState()).isEqualTo(DrmSession.STATE_OPENED_WITH_KEYS); @@ -109,10 +111,11 @@ public class DefaultDrmSessionManagerTest { drmSessionManager.prepare(); DrmSession drmSession = - drmSessionManager.acquireSession( - /* playbackLooper= */ Assertions.checkNotNull(Looper.myLooper()), - /* eventDispatcher= */ null, - FORMAT_WITH_DRM_INIT_DATA); + checkNotNull( + drmSessionManager.acquireSession( + /* playbackLooper= */ checkNotNull(Looper.myLooper()), + /* eventDispatcher= */ null, + FORMAT_WITH_DRM_INIT_DATA)); waitForOpenedWithKeys(drmSession); drmSession.release(/* eventDispatcher= */ null); @@ -131,10 +134,11 @@ public class DefaultDrmSessionManagerTest { drmSessionManager.prepare(); DrmSession drmSession = - drmSessionManager.acquireSession( - /* playbackLooper= */ Assertions.checkNotNull(Looper.myLooper()), - /* eventDispatcher= */ null, - FORMAT_WITH_DRM_INIT_DATA); + checkNotNull( + drmSessionManager.acquireSession( + /* playbackLooper= */ checkNotNull(Looper.myLooper()), + /* eventDispatcher= */ null, + FORMAT_WITH_DRM_INIT_DATA)); waitForOpenedWithKeys(drmSession); drmSession.release(/* eventDispatcher= */ null); @@ -161,10 +165,11 @@ public class DefaultDrmSessionManagerTest { drmSessionManager.prepare(); DrmSession firstDrmSession = - drmSessionManager.acquireSession( - /* playbackLooper= */ Assertions.checkNotNull(Looper.myLooper()), - /* eventDispatcher= */ null, - FORMAT_WITH_DRM_INIT_DATA); + checkNotNull( + drmSessionManager.acquireSession( + /* playbackLooper= */ checkNotNull(Looper.myLooper()), + /* eventDispatcher= */ null, + FORMAT_WITH_DRM_INIT_DATA)); waitForOpenedWithKeys(firstDrmSession); firstDrmSession.release(/* eventDispatcher= */ null); @@ -172,10 +177,11 @@ public class DefaultDrmSessionManagerTest { // drmSessionManager's internal reference. assertThat(firstDrmSession.getState()).isEqualTo(DrmSession.STATE_OPENED_WITH_KEYS); DrmSession secondDrmSession = - drmSessionManager.acquireSession( - /* playbackLooper= */ Assertions.checkNotNull(Looper.myLooper()), - /* eventDispatcher= */ null, - secondFormatWithDrmInitData); + checkNotNull( + drmSessionManager.acquireSession( + /* playbackLooper= */ checkNotNull(Looper.myLooper()), + /* eventDispatcher= */ null, + secondFormatWithDrmInitData)); // The drmSessionManager had to release firstDrmSession in order to acquire secondDrmSession. assertThat(firstDrmSession.getState()).isEqualTo(DrmSession.STATE_RELEASED); @@ -195,10 +201,11 @@ public class DefaultDrmSessionManagerTest { drmSessionManager.prepare(); DrmSession firstDrmSession = - drmSessionManager.acquireSession( - /* playbackLooper= */ Assertions.checkNotNull(Looper.myLooper()), - /* eventDispatcher= */ null, - FORMAT_WITH_DRM_INIT_DATA); + checkNotNull( + drmSessionManager.acquireSession( + /* playbackLooper= */ checkNotNull(Looper.myLooper()), + /* eventDispatcher= */ null, + FORMAT_WITH_DRM_INIT_DATA)); waitForOpenedWithKeys(firstDrmSession); firstDrmSession.release(/* eventDispatcher= */ null); @@ -207,10 +214,11 @@ public class DefaultDrmSessionManagerTest { // Acquire a session for the same init data 5s in to the 10s timeout (so expect the same // instance). DrmSession secondDrmSession = - drmSessionManager.acquireSession( - /* playbackLooper= */ Assertions.checkNotNull(Looper.myLooper()), - /* eventDispatcher= */ null, - FORMAT_WITH_DRM_INIT_DATA); + checkNotNull( + drmSessionManager.acquireSession( + /* playbackLooper= */ checkNotNull(Looper.myLooper()), + /* eventDispatcher= */ null, + FORMAT_WITH_DRM_INIT_DATA)); assertThat(secondDrmSession).isSameInstanceAs(firstDrmSession); // Let the timeout definitely expire, and check the session didn't get released.