Skip to content

SDK / exoplayer

Go to a project
Commit dd1b1c08 by ibaker Committed by Oliver Woodman
Options

Fix nullness warnings in DefaultDrmSessionManagerTest 

These only show up in Android Studio, but still seem worth fixing.

PiperOrigin-RevId: 352570399
parent 21f3fa9f
Inline Side-by-side
Showing with 41 additions and 33 deletions
library/core/src/test/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManagerTest.java
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
*/ */
package com.google.android.exoplayer2.drm; 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 com.google.common.truth.Truth.assertThat;
import static java.util.concurrent.TimeUnit.SECONDS; import static java.util.concurrent.TimeUnit.SECONDS;
...@@ -24,7 +25,6 @@ import com.google.android.exoplayer2.C; ...@@ -24,7 +25,6 @@ import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.Format;
import com.google.android.exoplayer2.testutil.FakeExoMediaDrm; import com.google.android.exoplayer2.testutil.FakeExoMediaDrm;
import com.google.android.exoplayer2.testutil.TestUtil; import com.google.android.exoplayer2.testutil.TestUtil;
import com.google.android.exoplayer2.util.Assertions;
import com.google.android.exoplayer2.util.MimeTypes; import com.google.android.exoplayer2.util.MimeTypes;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import java.util.UUID; import java.util.UUID;
...@@ -61,10 +61,11 @@ public class DefaultDrmSessionManagerTest { ...@@ -61,10 +61,11 @@ public class DefaultDrmSessionManagerTest {
.build(/* mediaDrmCallback= */ licenseServer); .build(/* mediaDrmCallback= */ licenseServer);
drmSessionManager.prepare(); drmSessionManager.prepare();
DrmSession drmSession = DrmSession drmSession =
drmSessionManager.acquireSession( checkNotNull(
/* playbackLooper= */ Assertions.checkNotNull(Looper.myLooper()), drmSessionManager.acquireSession(
/* eventDispatcher= */ null, /* playbackLooper= */ checkNotNull(Looper.myLooper()),
FORMAT_WITH_DRM_INIT_DATA); /* eventDispatcher= */ null,
FORMAT_WITH_DRM_INIT_DATA));
waitForOpenedWithKeys(drmSession); waitForOpenedWithKeys(drmSession);
assertThat(drmSession.getState()).isEqualTo(DrmSession.STATE_OPENED_WITH_KEYS); assertThat(drmSession.getState()).isEqualTo(DrmSession.STATE_OPENED_WITH_KEYS);
...@@ -84,10 +85,11 @@ public class DefaultDrmSessionManagerTest { ...@@ -84,10 +85,11 @@ public class DefaultDrmSessionManagerTest {
drmSessionManager.prepare(); drmSessionManager.prepare();
DrmSession drmSession = DrmSession drmSession =
drmSessionManager.acquireSession( checkNotNull(
/* playbackLooper= */ Assertions.checkNotNull(Looper.myLooper()), drmSessionManager.acquireSession(
/* eventDispatcher= */ null, /* playbackLooper= */ checkNotNull(Looper.myLooper()),
FORMAT_WITH_DRM_INIT_DATA); /* eventDispatcher= */ null,
FORMAT_WITH_DRM_INIT_DATA));
waitForOpenedWithKeys(drmSession); waitForOpenedWithKeys(drmSession);
assertThat(drmSession.getState()).isEqualTo(DrmSession.STATE_OPENED_WITH_KEYS); assertThat(drmSession.getState()).isEqualTo(DrmSession.STATE_OPENED_WITH_KEYS);
...@@ -109,10 +111,11 @@ public class DefaultDrmSessionManagerTest { ...@@ -109,10 +111,11 @@ public class DefaultDrmSessionManagerTest {
drmSessionManager.prepare(); drmSessionManager.prepare();
DrmSession drmSession = DrmSession drmSession =
drmSessionManager.acquireSession( checkNotNull(
/* playbackLooper= */ Assertions.checkNotNull(Looper.myLooper()), drmSessionManager.acquireSession(
/* eventDispatcher= */ null, /* playbackLooper= */ checkNotNull(Looper.myLooper()),
FORMAT_WITH_DRM_INIT_DATA); /* eventDispatcher= */ null,
FORMAT_WITH_DRM_INIT_DATA));
waitForOpenedWithKeys(drmSession); waitForOpenedWithKeys(drmSession);
drmSession.release(/* eventDispatcher= */ null); drmSession.release(/* eventDispatcher= */ null);
...@@ -131,10 +134,11 @@ public class DefaultDrmSessionManagerTest { ...@@ -131,10 +134,11 @@ public class DefaultDrmSessionManagerTest {
drmSessionManager.prepare(); drmSessionManager.prepare();
DrmSession drmSession = DrmSession drmSession =
drmSessionManager.acquireSession( checkNotNull(
/* playbackLooper= */ Assertions.checkNotNull(Looper.myLooper()), drmSessionManager.acquireSession(
/* eventDispatcher= */ null, /* playbackLooper= */ checkNotNull(Looper.myLooper()),
FORMAT_WITH_DRM_INIT_DATA); /* eventDispatcher= */ null,
FORMAT_WITH_DRM_INIT_DATA));
waitForOpenedWithKeys(drmSession); waitForOpenedWithKeys(drmSession);
drmSession.release(/* eventDispatcher= */ null); drmSession.release(/* eventDispatcher= */ null);
...@@ -161,10 +165,11 @@ public class DefaultDrmSessionManagerTest { ...@@ -161,10 +165,11 @@ public class DefaultDrmSessionManagerTest {
drmSessionManager.prepare(); drmSessionManager.prepare();
DrmSession firstDrmSession = DrmSession firstDrmSession =
drmSessionManager.acquireSession( checkNotNull(
/* playbackLooper= */ Assertions.checkNotNull(Looper.myLooper()), drmSessionManager.acquireSession(
/* eventDispatcher= */ null, /* playbackLooper= */ checkNotNull(Looper.myLooper()),
FORMAT_WITH_DRM_INIT_DATA); /* eventDispatcher= */ null,
FORMAT_WITH_DRM_INIT_DATA));
waitForOpenedWithKeys(firstDrmSession); waitForOpenedWithKeys(firstDrmSession);
firstDrmSession.release(/* eventDispatcher= */ null); firstDrmSession.release(/* eventDispatcher= */ null);
...@@ -172,10 +177,11 @@ public class DefaultDrmSessionManagerTest { ...@@ -172,10 +177,11 @@ public class DefaultDrmSessionManagerTest {
// drmSessionManager's internal reference. // drmSessionManager's internal reference.
assertThat(firstDrmSession.getState()).isEqualTo(DrmSession.STATE_OPENED_WITH_KEYS); assertThat(firstDrmSession.getState()).isEqualTo(DrmSession.STATE_OPENED_WITH_KEYS);
DrmSession secondDrmSession = DrmSession secondDrmSession =
drmSessionManager.acquireSession( checkNotNull(
/* playbackLooper= */ Assertions.checkNotNull(Looper.myLooper()), drmSessionManager.acquireSession(
/* eventDispatcher= */ null, /* playbackLooper= */ checkNotNull(Looper.myLooper()),
secondFormatWithDrmInitData); /* eventDispatcher= */ null,
secondFormatWithDrmInitData));
// The drmSessionManager had to release firstDrmSession in order to acquire secondDrmSession. // The drmSessionManager had to release firstDrmSession in order to acquire secondDrmSession.
assertThat(firstDrmSession.getState()).isEqualTo(DrmSession.STATE_RELEASED); assertThat(firstDrmSession.getState()).isEqualTo(DrmSession.STATE_RELEASED);
...@@ -195,10 +201,11 @@ public class DefaultDrmSessionManagerTest { ...@@ -195,10 +201,11 @@ public class DefaultDrmSessionManagerTest {
drmSessionManager.prepare(); drmSessionManager.prepare();
DrmSession firstDrmSession = DrmSession firstDrmSession =
drmSessionManager.acquireSession( checkNotNull(
/* playbackLooper= */ Assertions.checkNotNull(Looper.myLooper()), drmSessionManager.acquireSession(
/* eventDispatcher= */ null, /* playbackLooper= */ checkNotNull(Looper.myLooper()),
FORMAT_WITH_DRM_INIT_DATA); /* eventDispatcher= */ null,
FORMAT_WITH_DRM_INIT_DATA));
waitForOpenedWithKeys(firstDrmSession); waitForOpenedWithKeys(firstDrmSession);
firstDrmSession.release(/* eventDispatcher= */ null); firstDrmSession.release(/* eventDispatcher= */ null);
...@@ -207,10 +214,11 @@ public class DefaultDrmSessionManagerTest { ...@@ -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 // Acquire a session for the same init data 5s in to the 10s timeout (so expect the same
// instance). // instance).
DrmSession secondDrmSession = DrmSession secondDrmSession =
drmSessionManager.acquireSession( checkNotNull(
/* playbackLooper= */ Assertions.checkNotNull(Looper.myLooper()), drmSessionManager.acquireSession(
/* eventDispatcher= */ null, /* playbackLooper= */ checkNotNull(Looper.myLooper()),
FORMAT_WITH_DRM_INIT_DATA); /* eventDispatcher= */ null,
FORMAT_WITH_DRM_INIT_DATA));
assertThat(secondDrmSession).isSameInstanceAs(firstDrmSession); assertThat(secondDrmSession).isSameInstanceAs(firstDrmSession);
// Let the timeout definitely expire, and check the session didn't get released. // Let the timeout definitely expire, and check the session didn't get released.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment