Skip to content

SDK / exoplayer

Go to a project
Commit b6b39cf7 by ibaker Committed by bachinger
Options

Use JUnit's Assume to skip Widevine GTS tests on non-GMS devices 

DashTestRunner.setWidevineInfo instantiates a Widevine MediaDrm to check
for L1 support, which fails on GMS devices that don't support Widevine.

The Widevine tests should be skipped on these devices, but the
setWidevineInfo call happens in @Before before the skipping logic
inside the test.

This change moves the skipping logic to the beginning of @Before, and
uses Assume to ensure the test isn't run.

This will also report the test as 'skipped due to unmet assumption'
which is more precise than 'passed'.

PiperOrigin-RevId: 399452734
parent d9cfebd8
Inline Side-by-side
Showing with 88 additions and 111 deletions
playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/CommonEncryptionDrmTest.java
...@@ -16,6 +16,8 @@ ...@@ -16,6 +16,8 @@
package com.google.android.exoplayer2.playbacktests.gts; package com.google.android.exoplayer2.playbacktests.gts;
import static com.google.android.exoplayer2.playbacktests.gts.GtsTestUtil.shouldSkipWidevineTest; import static com.google.android.exoplayer2.playbacktests.gts.GtsTestUtil.shouldSkipWidevineTest;
import static org.junit.Assume.assumeFalse;
import static org.junit.Assume.assumeTrue;
import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.ext.junit.runners.AndroidJUnit4;
import androidx.test.rule.ActivityTestRule; import androidx.test.rule.ActivityTestRule;
...@@ -59,6 +61,8 @@ public final class CommonEncryptionDrmTest { ...@@ -59,6 +61,8 @@ public final class CommonEncryptionDrmTest {
@Before @Before
public void setUp() { public void setUp() {
assumeFalse(shouldSkipWidevineTest(testRule.getActivity()));
testRunner = testRunner =
new DashTestRunner(TAG, testRule.getActivity()) new DashTestRunner(TAG, testRule.getActivity())
.setWidevineInfo(MimeTypes.VIDEO_H264, false) .setWidevineInfo(MimeTypes.VIDEO_H264, false)
...@@ -74,10 +78,6 @@ public final class CommonEncryptionDrmTest { ...@@ -74,10 +78,6 @@ public final class CommonEncryptionDrmTest {
@Test @Test
public void cencSchemeTypeV18() { public void cencSchemeTypeV18() {
if (Util.SDK_INT < 18 || shouldSkipWidevineTest(testRule.getActivity())) {
// Pass.
return;
}
testRunner testRunner
.setStreamName("test_widevine_h264_scheme_cenc") .setStreamName("test_widevine_h264_scheme_cenc")
.setManifestUrl(DashTestData.WIDEVINE_SCHEME_CENC) .setManifestUrl(DashTestData.WIDEVINE_SCHEME_CENC)
...@@ -86,12 +86,9 @@ public final class CommonEncryptionDrmTest { ...@@ -86,12 +86,9 @@ public final class CommonEncryptionDrmTest {
@Test @Test
public void cbcsSchemeTypeV25() { public void cbcsSchemeTypeV25() {
if (Util.SDK_INT < 25 || shouldSkipWidevineTest(testRule.getActivity())) { // cbcs support was added in API 24, but it is stable from API 25 onwards.
// cbcs support was added in API 24, but it is stable from API 25 onwards. // See [internal: b/65634809].
// See [internal: b/65634809]. assumeTrue(Util.SDK_INT >= 25);
// Pass.
return;
}
testRunner testRunner
.setStreamName("test_widevine_h264_scheme_cbcs") .setStreamName("test_widevine_h264_scheme_cbcs")
.setManifestUrl(DashTestData.WIDEVINE_SCHEME_CBCS) .setManifestUrl(DashTestData.WIDEVINE_SCHEME_CBCS)
......
playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashStreamingTest.java
...@@ -17,6 +17,8 @@ package com.google.android.exoplayer2.playbacktests.gts; ...@@ -17,6 +17,8 @@ package com.google.android.exoplayer2.playbacktests.gts;
import static com.google.android.exoplayer2.playbacktests.gts.GtsTestUtil.shouldSkipWidevineTest; import static com.google.android.exoplayer2.playbacktests.gts.GtsTestUtil.shouldSkipWidevineTest;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static org.junit.Assume.assumeFalse;
import static org.junit.Assume.assumeTrue;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.ext.junit.runners.AndroidJUnit4;
...@@ -387,10 +389,8 @@ public final class DashStreamingTest { ...@@ -387,10 +389,8 @@ public final class DashStreamingTest {
@Test @Test
public void widevineH264FixedV18() throws Exception { public void widevineH264FixedV18() throws Exception {
if (Util.SDK_INT < 18 || shouldSkipWidevineTest(testRule.getActivity())) { assumeFalse(shouldSkipWidevineTest(testRule.getActivity()));
// Pass.
return;
}
testRunner testRunner
.setStreamName("test_widevine_h264_fixed") .setStreamName("test_widevine_h264_fixed")
.setManifestUrl(DashTestData.WIDEVINE_H264_MANIFEST) .setManifestUrl(DashTestData.WIDEVINE_H264_MANIFEST)
...@@ -404,12 +404,9 @@ public final class DashStreamingTest { ...@@ -404,12 +404,9 @@ public final class DashStreamingTest {
@Test @Test
public void widevineH264AdaptiveV18() throws Exception { public void widevineH264AdaptiveV18() throws Exception {
if (Util.SDK_INT < 18 assumeFalse(shouldSkipAdaptiveTest(MimeTypes.VIDEO_H264));
|| shouldSkipAdaptiveTest(MimeTypes.VIDEO_H264) assumeFalse(shouldSkipWidevineTest(testRule.getActivity()));
|| shouldSkipWidevineTest(testRule.getActivity())) {
// Pass.
return;
}
testRunner testRunner
.setStreamName("test_widevine_h264_adaptive") .setStreamName("test_widevine_h264_adaptive")
.setManifestUrl(DashTestData.WIDEVINE_H264_MANIFEST) .setManifestUrl(DashTestData.WIDEVINE_H264_MANIFEST)
...@@ -424,12 +421,9 @@ public final class DashStreamingTest { ...@@ -424,12 +421,9 @@ public final class DashStreamingTest {
@Test @Test
public void widevineH264AdaptiveWithSeekingV18() throws Exception { public void widevineH264AdaptiveWithSeekingV18() throws Exception {
if (Util.SDK_INT < 18 assumeFalse(shouldSkipAdaptiveTest(MimeTypes.VIDEO_H264));
|| shouldSkipAdaptiveTest(MimeTypes.VIDEO_H264) assumeFalse(shouldSkipWidevineTest(testRule.getActivity()));
|| shouldSkipWidevineTest(testRule.getActivity())) {
// Pass.
return;
}
testRunner testRunner
.setStreamName("test_widevine_h264_adaptive_with_seeking") .setStreamName("test_widevine_h264_adaptive_with_seeking")
.setManifestUrl(DashTestData.WIDEVINE_H264_MANIFEST) .setManifestUrl(DashTestData.WIDEVINE_H264_MANIFEST)
...@@ -445,12 +439,9 @@ public final class DashStreamingTest { ...@@ -445,12 +439,9 @@ public final class DashStreamingTest {
@Test @Test
public void widevineH264AdaptiveWithRendererDisablingV18() throws Exception { public void widevineH264AdaptiveWithRendererDisablingV18() throws Exception {
if (Util.SDK_INT < 18 assumeFalse(shouldSkipAdaptiveTest(MimeTypes.VIDEO_H264));
|| shouldSkipAdaptiveTest(MimeTypes.VIDEO_H264) assumeFalse(shouldSkipWidevineTest(testRule.getActivity()));
|| GtsTestUtil.shouldSkipWidevineTest(testRule.getActivity())) {
// Pass.
return;
}
testRunner testRunner
.setStreamName("test_widevine_h264_adaptive_with_renderer_disabling") .setStreamName("test_widevine_h264_adaptive_with_renderer_disabling")
.setManifestUrl(DashTestData.WIDEVINE_H264_MANIFEST) .setManifestUrl(DashTestData.WIDEVINE_H264_MANIFEST)
...@@ -468,10 +459,10 @@ public final class DashStreamingTest { ...@@ -468,10 +459,10 @@ public final class DashStreamingTest {
@Test @Test
public void widevineH265FixedV23() throws Exception { public void widevineH265FixedV23() throws Exception {
if (Util.SDK_INT < 23 || GtsTestUtil.shouldSkipWidevineTest(testRule.getActivity()) || isPc()) { assumeTrue(Util.SDK_INT >= 23);
// Pass. assumeFalse(shouldSkipWidevineTest(testRule.getActivity()));
return; assumeFalse(isPc());
}
testRunner testRunner
.setStreamName("test_widevine_h265_fixed") .setStreamName("test_widevine_h265_fixed")
.setManifestUrl(DashTestData.WIDEVINE_H265_MANIFEST) .setManifestUrl(DashTestData.WIDEVINE_H265_MANIFEST)
...@@ -485,10 +476,10 @@ public final class DashStreamingTest { ...@@ -485,10 +476,10 @@ public final class DashStreamingTest {
@Test @Test
public void widevineH265AdaptiveV24() throws Exception { public void widevineH265AdaptiveV24() throws Exception {
if (Util.SDK_INT < 24 || GtsTestUtil.shouldSkipWidevineTest(testRule.getActivity()) || isPc()) { assumeTrue(Util.SDK_INT >= 24);
// Pass. assumeFalse(shouldSkipWidevineTest(testRule.getActivity()));
return; assumeFalse(isPc());
}
testRunner testRunner
.setStreamName("test_widevine_h265_adaptive") .setStreamName("test_widevine_h265_adaptive")
.setManifestUrl(DashTestData.WIDEVINE_H265_MANIFEST) .setManifestUrl(DashTestData.WIDEVINE_H265_MANIFEST)
...@@ -503,10 +494,10 @@ public final class DashStreamingTest { ...@@ -503,10 +494,10 @@ public final class DashStreamingTest {
@Test @Test
public void widevineH265AdaptiveWithSeekingV24() throws Exception { public void widevineH265AdaptiveWithSeekingV24() throws Exception {
if (Util.SDK_INT < 24 || GtsTestUtil.shouldSkipWidevineTest(testRule.getActivity()) || isPc()) { assumeTrue(Util.SDK_INT >= 24);
// Pass. assumeFalse(shouldSkipWidevineTest(testRule.getActivity()));
return; assumeFalse(isPc());
}
testRunner testRunner
.setStreamName("test_widevine_h265_adaptive_with_seeking") .setStreamName("test_widevine_h265_adaptive_with_seeking")
.setManifestUrl(DashTestData.WIDEVINE_H265_MANIFEST) .setManifestUrl(DashTestData.WIDEVINE_H265_MANIFEST)
...@@ -522,10 +513,10 @@ public final class DashStreamingTest { ...@@ -522,10 +513,10 @@ public final class DashStreamingTest {
@Test @Test
public void widevineH265AdaptiveWithRendererDisablingV24() throws Exception { public void widevineH265AdaptiveWithRendererDisablingV24() throws Exception {
if (Util.SDK_INT < 24 || GtsTestUtil.shouldSkipWidevineTest(testRule.getActivity()) || isPc()) { assumeTrue(Util.SDK_INT >= 24);
// Pass. assumeFalse(shouldSkipWidevineTest(testRule.getActivity()));
return; assumeFalse(isPc());
}
testRunner testRunner
.setStreamName("test_widevine_h265_adaptive_with_renderer_disabling") .setStreamName("test_widevine_h265_adaptive_with_renderer_disabling")
.setManifestUrl(DashTestData.WIDEVINE_H265_MANIFEST) .setManifestUrl(DashTestData.WIDEVINE_H265_MANIFEST)
...@@ -543,10 +534,9 @@ public final class DashStreamingTest { ...@@ -543,10 +534,9 @@ public final class DashStreamingTest {
@Test @Test
public void widevineVp9Fixed360pV23() throws Exception { public void widevineVp9Fixed360pV23() throws Exception {
if (Util.SDK_INT < 23 || GtsTestUtil.shouldSkipWidevineTest(testRule.getActivity())) { assumeTrue(Util.SDK_INT >= 23);
// Pass. assumeFalse(shouldSkipWidevineTest(testRule.getActivity()));
return;
}
testRunner testRunner
.setStreamName("test_widevine_vp9_fixed_360p") .setStreamName("test_widevine_vp9_fixed_360p")
.setManifestUrl(DashTestData.WIDEVINE_VP9_MANIFEST) .setManifestUrl(DashTestData.WIDEVINE_VP9_MANIFEST)
...@@ -561,10 +551,9 @@ public final class DashStreamingTest { ...@@ -561,10 +551,9 @@ public final class DashStreamingTest {
@Test @Test
public void widevineVp9AdaptiveV24() throws Exception { public void widevineVp9AdaptiveV24() throws Exception {
if (Util.SDK_INT < 24 || GtsTestUtil.shouldSkipWidevineTest(testRule.getActivity())) { assumeTrue(Util.SDK_INT >= 24);
// Pass. assumeFalse(shouldSkipWidevineTest(testRule.getActivity()));
return;
}
testRunner testRunner
.setStreamName("test_widevine_vp9_adaptive") .setStreamName("test_widevine_vp9_adaptive")
.setManifestUrl(DashTestData.WIDEVINE_VP9_MANIFEST) .setManifestUrl(DashTestData.WIDEVINE_VP9_MANIFEST)
...@@ -579,10 +568,9 @@ public final class DashStreamingTest { ...@@ -579,10 +568,9 @@ public final class DashStreamingTest {
@Test @Test
public void widevineVp9AdaptiveWithSeekingV24() throws Exception { public void widevineVp9AdaptiveWithSeekingV24() throws Exception {
if (Util.SDK_INT < 24 || GtsTestUtil.shouldSkipWidevineTest(testRule.getActivity())) { assumeTrue(Util.SDK_INT >= 24);
// Pass. assumeFalse(shouldSkipWidevineTest(testRule.getActivity()));
return;
}
testRunner testRunner
.setStreamName("test_widevine_vp9_adaptive_with_seeking") .setStreamName("test_widevine_vp9_adaptive_with_seeking")
.setManifestUrl(DashTestData.WIDEVINE_VP9_MANIFEST) .setManifestUrl(DashTestData.WIDEVINE_VP9_MANIFEST)
...@@ -598,10 +586,9 @@ public final class DashStreamingTest { ...@@ -598,10 +586,9 @@ public final class DashStreamingTest {
@Test @Test
public void widevineVp9AdaptiveWithRendererDisablingV24() throws Exception { public void widevineVp9AdaptiveWithRendererDisablingV24() throws Exception {
if (Util.SDK_INT < 24 || GtsTestUtil.shouldSkipWidevineTest(testRule.getActivity())) { assumeTrue(Util.SDK_INT >= 24);
// Pass. assumeFalse(shouldSkipWidevineTest(testRule.getActivity()));
return;
}
testRunner testRunner
.setStreamName("test_widevine_vp9_adaptive_with_renderer_disabling") .setStreamName("test_widevine_vp9_adaptive_with_renderer_disabling")
.setManifestUrl(DashTestData.WIDEVINE_VP9_MANIFEST) .setManifestUrl(DashTestData.WIDEVINE_VP9_MANIFEST)
...@@ -620,10 +607,9 @@ public final class DashStreamingTest { ...@@ -620,10 +607,9 @@ public final class DashStreamingTest {
// 23.976 fps. // 23.976 fps.
@Test @Test
public void widevine23FpsH264FixedV23() throws Exception { public void widevine23FpsH264FixedV23() throws Exception {
if (Util.SDK_INT < 23 || GtsTestUtil.shouldSkipWidevineTest(testRule.getActivity())) { assumeTrue(Util.SDK_INT >= 23);
// Pass. assumeFalse(shouldSkipWidevineTest(testRule.getActivity()));
return;
}
testRunner testRunner
.setStreamName("test_widevine_23fps_h264_fixed") .setStreamName("test_widevine_23fps_h264_fixed")
.setManifestUrl(DashTestData.WIDEVINE_H264_23_MANIFEST) .setManifestUrl(DashTestData.WIDEVINE_H264_23_MANIFEST)
...@@ -639,10 +625,9 @@ public final class DashStreamingTest { ...@@ -639,10 +625,9 @@ public final class DashStreamingTest {
// 24 fps. // 24 fps.
@Test @Test
public void widevine24FpsH264FixedV23() throws Exception { public void widevine24FpsH264FixedV23() throws Exception {
if (Util.SDK_INT < 23 || GtsTestUtil.shouldSkipWidevineTest(testRule.getActivity())) { assumeTrue(Util.SDK_INT >= 23);
// Pass. assumeFalse(shouldSkipWidevineTest(testRule.getActivity()));
return;
}
testRunner testRunner
.setStreamName("test_widevine_24fps_h264_fixed") .setStreamName("test_widevine_24fps_h264_fixed")
.setManifestUrl(DashTestData.WIDEVINE_H264_24_MANIFEST) .setManifestUrl(DashTestData.WIDEVINE_H264_24_MANIFEST)
...@@ -658,10 +643,9 @@ public final class DashStreamingTest { ...@@ -658,10 +643,9 @@ public final class DashStreamingTest {
// 29.97 fps. // 29.97 fps.
@Test @Test
public void widevine29FpsH264FixedV23() throws Exception { public void widevine29FpsH264FixedV23() throws Exception {
if (Util.SDK_INT < 23 || GtsTestUtil.shouldSkipWidevineTest(testRule.getActivity())) { assumeTrue(Util.SDK_INT >= 23);
// Pass. assumeFalse(shouldSkipWidevineTest(testRule.getActivity()));
return;
}
testRunner testRunner
.setStreamName("test_widevine_29fps_h264_fixed") .setStreamName("test_widevine_29fps_h264_fixed")
.setManifestUrl(DashTestData.WIDEVINE_H264_29_MANIFEST) .setManifestUrl(DashTestData.WIDEVINE_H264_29_MANIFEST)
...@@ -687,10 +671,9 @@ public final class DashStreamingTest { ...@@ -687,10 +671,9 @@ public final class DashStreamingTest {
@Test @Test
public void decoderInfoH265V24() throws Exception { public void decoderInfoH265V24() throws Exception {
if (Util.SDK_INT < 24 || isPc()) { assumeTrue(Util.SDK_INT >= 24);
// Pass. assumeFalse(isPc());
return;
}
assertThat( assertThat(
MediaCodecUtil.getDecoderInfo( MediaCodecUtil.getDecoderInfo(
MimeTypes.VIDEO_H265, /* secure= */ false, /* tunneling= */ false) MimeTypes.VIDEO_H265, /* secure= */ false, /* tunneling= */ false)
...@@ -700,10 +683,8 @@ public final class DashStreamingTest { ...@@ -700,10 +683,8 @@ public final class DashStreamingTest {
@Test @Test
public void decoderInfoVP9V24() throws Exception { public void decoderInfoVP9V24() throws Exception {
if (Util.SDK_INT < 24) { assumeTrue(Util.SDK_INT >= 24);
// Pass.
return;
}
assertThat( assertThat(
MediaCodecUtil.getDecoderInfo( MediaCodecUtil.getDecoderInfo(
MimeTypes.VIDEO_VP9, /* secure= */ false, /* tunneling= */ false) MimeTypes.VIDEO_VP9, /* secure= */ false, /* tunneling= */ false)
......
playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashWidevineOfflineTest.java
...@@ -15,9 +15,12 @@ ...@@ -15,9 +15,12 @@
*/ */
package com.google.android.exoplayer2.playbacktests.gts; package com.google.android.exoplayer2.playbacktests.gts;
import static com.google.android.exoplayer2.playbacktests.gts.GtsTestUtil.shouldSkipWidevineTest;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static com.google.common.truth.Truth.assertWithMessage; import static com.google.common.truth.Truth.assertWithMessage;
import static org.junit.Assert.fail; import static org.junit.Assert.fail;
import static org.junit.Assume.assumeFalse;
import static org.junit.Assume.assumeTrue;
import android.media.MediaDrm.MediaDrmStateException; import android.media.MediaDrm.MediaDrmStateException;
import android.net.Uri; import android.net.Uri;
...@@ -61,6 +64,8 @@ public final class DashWidevineOfflineTest { ...@@ -61,6 +64,8 @@ public final class DashWidevineOfflineTest {
@Before @Before
public void setUp() throws Exception { public void setUp() throws Exception {
assumeFalse(shouldSkipWidevineTest(testRule.getActivity()));
testRunner = testRunner =
new DashTestRunner(TAG, testRule.getActivity()) new DashTestRunner(TAG, testRule.getActivity())
.setStreamName("test_widevine_h264_fixed_offline") .setStreamName("test_widevine_h264_fixed_offline")
...@@ -75,13 +80,11 @@ public final class DashWidevineOfflineTest { ...@@ -75,13 +80,11 @@ public final class DashWidevineOfflineTest {
boolean useL1Widevine = DashTestRunner.isL1WidevineAvailable(MimeTypes.VIDEO_H264); boolean useL1Widevine = DashTestRunner.isL1WidevineAvailable(MimeTypes.VIDEO_H264);
String widevineLicenseUrl = DashTestData.getWidevineLicenseUrl(true, useL1Widevine); String widevineLicenseUrl = DashTestData.getWidevineLicenseUrl(true, useL1Widevine);
httpDataSourceFactory = new DefaultHttpDataSource.Factory(); httpDataSourceFactory = new DefaultHttpDataSource.Factory();
if (Util.SDK_INT >= 18) { offlineLicenseHelper =
offlineLicenseHelper = OfflineLicenseHelper.newWidevineInstance(
OfflineLicenseHelper.newWidevineInstance( widevineLicenseUrl,
widevineLicenseUrl, httpDataSourceFactory,
httpDataSourceFactory, new DrmSessionEventListener.EventDispatcher());
new DrmSessionEventListener.EventDispatcher());
}
} }
@After @After
...@@ -90,9 +93,7 @@ public final class DashWidevineOfflineTest { ...@@ -90,9 +93,7 @@ public final class DashWidevineOfflineTest {
if (offlineLicenseKeySetId != null) { if (offlineLicenseKeySetId != null) {
releaseLicense(); releaseLicense();
} }
if (offlineLicenseHelper != null) { offlineLicenseHelper.release();
offlineLicenseHelper.release();
}
offlineLicenseHelper = null; offlineLicenseHelper = null;
httpDataSourceFactory = null; httpDataSourceFactory = null;
} }
...@@ -104,9 +105,8 @@ public final class DashWidevineOfflineTest { ...@@ -104,9 +105,8 @@ public final class DashWidevineOfflineTest {
"Needs to be reconfigured/rewritten with an offline-compatible licence [internal" "Needs to be reconfigured/rewritten with an offline-compatible licence [internal"
+ " b/176960595].") + " b/176960595].")
public void widevineOfflineLicenseV22() throws Exception { public void widevineOfflineLicenseV22() throws Exception {
if (Util.SDK_INT < 22 || GtsTestUtil.shouldSkipWidevineTest(testRule.getActivity())) { assumeTrue(Util.SDK_INT >= 22);
return; // Pass.
}
downloadLicense(); downloadLicense();
testRunner.run(); testRunner.run();
...@@ -120,11 +120,8 @@ public final class DashWidevineOfflineTest { ...@@ -120,11 +120,8 @@ public final class DashWidevineOfflineTest {
"Needs to be reconfigured/rewritten with an offline-compatible licence [internal" "Needs to be reconfigured/rewritten with an offline-compatible licence [internal"
+ " b/176960595].") + " b/176960595].")
public void widevineOfflineReleasedLicenseV22() throws Throwable { public void widevineOfflineReleasedLicenseV22() throws Throwable {
if (Util.SDK_INT < 22 assumeTrue(Util.SDK_INT >= 22 && Util.SDK_INT <= 28);
|| Util.SDK_INT > 28
|| GtsTestUtil.shouldSkipWidevineTest(testRule.getActivity())) {
return; // Pass.
}
downloadLicense(); downloadLicense();
releaseLicense(); // keySetId no longer valid. releaseLicense(); // keySetId no longer valid.
...@@ -148,9 +145,8 @@ public final class DashWidevineOfflineTest { ...@@ -148,9 +145,8 @@ public final class DashWidevineOfflineTest {
"Needs to be reconfigured/rewritten with an offline-compatible licence [internal" "Needs to be reconfigured/rewritten with an offline-compatible licence [internal"
+ " b/176960595].") + " b/176960595].")
public void widevineOfflineReleasedLicenseV29() throws Throwable { public void widevineOfflineReleasedLicenseV29() throws Throwable {
if (Util.SDK_INT < 29 || GtsTestUtil.shouldSkipWidevineTest(testRule.getActivity())) { assumeTrue(Util.SDK_INT >= 29);
return; // Pass.
}
downloadLicense(); downloadLicense();
releaseLicense(); // keySetId no longer valid. releaseLicense(); // keySetId no longer valid.
...@@ -174,9 +170,8 @@ public final class DashWidevineOfflineTest { ...@@ -174,9 +170,8 @@ public final class DashWidevineOfflineTest {
"Needs to be reconfigured/rewritten with an offline-compatible licence [internal" "Needs to be reconfigured/rewritten with an offline-compatible licence [internal"
+ " b/176960595].") + " b/176960595].")
public void widevineOfflineExpiredLicenseV22() throws Exception { public void widevineOfflineExpiredLicenseV22() throws Exception {
if (Util.SDK_INT < 22 || GtsTestUtil.shouldSkipWidevineTest(testRule.getActivity())) { assumeTrue(Util.SDK_INT >= 22);
return; // Pass.
}
downloadLicense(); downloadLicense();
// Wait until the license expires // Wait until the license expires
...@@ -207,9 +202,8 @@ public final class DashWidevineOfflineTest { ...@@ -207,9 +202,8 @@ public final class DashWidevineOfflineTest {
"Needs to be reconfigured/rewritten with an offline-compatible licence [internal" "Needs to be reconfigured/rewritten with an offline-compatible licence [internal"
+ " b/176960595].") + " b/176960595].")
public void widevineOfflineLicenseExpiresOnPauseV22() throws Exception { public void widevineOfflineLicenseExpiresOnPauseV22() throws Exception {
if (Util.SDK_INT < 22 || GtsTestUtil.shouldSkipWidevineTest(testRule.getActivity())) { assumeTrue(Util.SDK_INT >= 22);
return; // Pass.
}
downloadLicense(); downloadLicense();
// During playback pause until the license expires then continue playback // During playback pause until the license expires then continue playback
......
playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/GtsTestUtil.java
...@@ -21,6 +21,7 @@ import static com.google.android.exoplayer2.C.WIDEVINE_UUID; ...@@ -21,6 +21,7 @@ import static com.google.android.exoplayer2.C.WIDEVINE_UUID;
import android.content.Context; import android.content.Context;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.media.MediaDrm; import android.media.MediaDrm;
import com.google.android.exoplayer2.util.Util;
/** Utility methods for GTS tests. */ /** Utility methods for GTS tests. */
public final class GtsTestUtil { public final class GtsTestUtil {
...@@ -29,6 +30,10 @@ public final class GtsTestUtil { ...@@ -29,6 +30,10 @@ public final class GtsTestUtil {
/** Returns true if the device doesn't support Widevine and this is permitted. */ /** Returns true if the device doesn't support Widevine and this is permitted. */
public static boolean shouldSkipWidevineTest(Context context) { public static boolean shouldSkipWidevineTest(Context context) {
if (Util.SDK_INT < 18) {
// MediaDrm isn't present until API 18
return true;
}
if (isGmsInstalled(context)) { if (isGmsInstalled(context)) {
// GMS devices are required to support Widevine. // GMS devices are required to support Widevine.
return false; return false;
......
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