test: Consolidate probeSupport in one place (shaka-project#6667)

test/cast/cast_receiver_integration.js

@@ -41,9 +41,6 @@ filterDescribe('CastReceiver', castReceiverIntegrationSupport, () => {
   let toRestore;
   let pendingWaitWrapperCalls = 0;
 
-  /** @type {!Object.<string, ?shaka.extern.DrmSupportType>} */
-  let support = {};
-
   let fakeInitState;
 
   beforeAll(async () => {
@@ -62,7 +59,6 @@ filterDescribe('CastReceiver', castReceiverIntegrationSupport, () => {
         shaka.test.TestScheme.ManifestParser.factory);
 
     await shaka.test.TestScheme.createManifests(shaka, '');
-    support = await shaka.media.DrmEngine.probeSupport();
   });
 
   beforeEach(async () => {
@@ -247,7 +243,9 @@ filterDescribe('CastReceiver', castReceiverIntegrationSupport, () => {
     });
   });
 
-  filterDescribe('with drm', () => support['com.widevine.alpha'], () => {
+  const widevineSupport =
+      () => window['shakaSupport'].drm['com.widevine.alpha'];
+  filterDescribe('with drm', widevineSupport, () => {
     drmIt('sends reasonably-sized updates', async () => {
       // Use an encrypted asset, to make sure DRM info doesn't balloon the size.
       fakeInitState.manifest = 'test:sintel-enc';

test/hls/hls_parser_integration.js

@@ -7,9 +7,6 @@
 describe('HlsParser', () => {
   const Util = shaka.test.Util;
 
-  /** @type {!Object.<string, ?shaka.extern.DrmSupportType>} */
-  let support = {};
-
   /** @type {!jasmine.Spy} */
   let onErrorSpy;
 
@@ -26,7 +23,7 @@ describe('HlsParser', () => {
   let waiter;
 
   function checkClearKeySupport() {
-    const clearKeySupport = support['org.w3.clearkey'];
+    const clearKeySupport = window['shakaSupport'].drm['org.w3.clearkey'];
     if (!clearKeySupport) {
       return false;
     }
@@ -38,7 +35,6 @@ describe('HlsParser', () => {
     document.body.appendChild(video);
     compiledShaka =
         await shaka.test.Loader.loadShaka(getClientArg('uncompiled'));
-    support = await shaka.media.DrmEngine.probeSupport();
   });
 
   beforeEach(async () => {

test/media/drm_engine_integration.js

@@ -13,9 +13,6 @@ describe('DrmEngine', () => {
   const audioInitSegmentUri = '/base/test/test/assets/multidrm-audio-init.mp4';
   const audioSegmentUri = '/base/test/test/assets/multidrm-audio-segment.mp4';
 
-  /** @type {!Object.<string, ?shaka.extern.DrmSupportType>} */
-  let support = {};
-
   /** @type {!HTMLVideoElement} */
   let video;
   /** @type {shaka.extern.Manifest} */
@@ -56,17 +53,15 @@ describe('DrmEngine', () => {
     document.body.appendChild(video);
 
     const responses = await Promise.all([
-      shaka.media.DrmEngine.probeSupport(),
       shaka.test.Util.fetch(videoInitSegmentUri),
       shaka.test.Util.fetch(videoSegmentUri),
       shaka.test.Util.fetch(audioInitSegmentUri),
       shaka.test.Util.fetch(audioSegmentUri),
     ]);
-    support = responses[0];
-    videoInitSegment = responses[1];
-    videoSegment = responses[2];
-    audioInitSegment = responses[3];
-    audioSegment = responses[4];
+    videoInitSegment = responses[0];
+    videoSegment = responses[1];
+    audioInitSegment = responses[2];
+    audioSegment = responses[3];
   });
 
   beforeEach(async () => {
@@ -151,11 +146,12 @@ describe('DrmEngine', () => {
       // https://testweb.playready.microsoft.com/Server/ServiceQueryStringSyntax
       return false;
     }
-    return support['com.widevine.alpha'] || support['com.microsoft.playready'];
+    return window['shakaSupport'].drm['com.widevine.alpha'] ||
+        window['shakaSupport'].drm['com.microsoft.playready'];
   }
 
   function checkClearKeySupport() {
-    return support['org.w3.clearkey'];
+    return window['shakaSupport'].drm['org.w3.clearkey'];
   }
 
   filterDescribe('basic flow', checkTrueDrmSupport, () => {

test/mss/mss_player_integration.js

@@ -7,9 +7,6 @@
 describe('MSS Player', () => {
   const Util = shaka.test.Util;
 
-  /** @type {!Object.<string, ?shaka.extern.DrmSupportType>} */
-  let support = {};
-
   /** @type {!jasmine.Spy} */
   let onErrorSpy;
 
@@ -35,8 +32,9 @@ describe('MSS Player', () => {
   const playreadyLicenseUrl = 'https://test.playready.microsoft.com/service/rightsmanager.asmx?cfg=(persist:false,sl:150)';
 
   function checkPlayReadySupport() {
-    const playReadySupport = support['com.microsoft.playready'] ||
-        support['com.chromecast.playready'];
+    const playReadySupport =
+        window['shakaSupport'].drm['com.microsoft.playready'] ||
+        window['shakaSupport'].drm['com.chromecast.playready'];
     if (!playReadySupport) {
       return false;
     }
@@ -48,7 +46,6 @@ describe('MSS Player', () => {
     document.body.appendChild(video);
     compiledShaka =
         await shaka.test.Loader.loadShaka(getClientArg('uncompiled'));
-    support = await shaka.media.DrmEngine.probeSupport();
   });
 
   beforeEach(async () => {

test/offline/offline_integration.js

@@ -24,14 +24,13 @@ filterDescribe('Offline', supportsStorage, () => {
   /** @type {?shaka.extern.DrmSupportType} */
   let playreadySupport;
 
-  beforeAll(async () => {
+  beforeAll(() => {
     video = shaka.test.UiUtils.createVideoElement();
     document.body.appendChild(video);
 
-    const support = await shaka.media.DrmEngine.probeSupport();
-    widevineSupport = support['com.widevine.alpha'];
-    playreadySupport = support['com.microsoft.playready'] ||
-        support['com.chromecast.playready'];
+    widevineSupport = window['shakaSupport'].drm['com.widevine.alpha'];
+    playreadySupport = window['shakaSupport'].drm['com.microsoft.playready'] ||
+        window['shakaSupport'].drm['com.chromecast.playready'];
   });
 
   afterAll(() => {

test/offline/storage_integration.js

@@ -9,14 +9,13 @@ function storageSupport() {
   return shaka.offline.Storage.support();
 }
 
-/** @return {!Promise.<boolean>} */
-async function drmStorageSupport() {
+/** @return {boolean} */
+function drmStorageSupport() {
   if (!shaka.offline.Storage.support()) {
     return false;
   }
 
-  const support = await shaka.Player.probeSupport();
-  const widevineSupport = support.drm['com.widevine.alpha'];
+  const widevineSupport = window['shakaSupport'].drm['com.widevine.alpha'];
   return !!(widevineSupport && widevineSupport.persistentState);
 }
 

test/player_external.js

@@ -11,8 +11,6 @@ describe('Player', () => {
   /** @type {!jasmine.Spy} */
   let onErrorSpy;
 
-  /** @type {shaka.extern.SupportType} */
-  let support;
   /** @type {!HTMLVideoElement} */
   let video;
   /** @type {shaka.Player} */
@@ -30,7 +28,6 @@ describe('Player', () => {
     document.body.appendChild(video);
     compiledShaka =
         await shaka.test.Loader.loadShaka(getClientArg('uncompiled'));
-    support = await compiledShaka.Player.probeSupport();
   });
 
   beforeEach(async () => {
@@ -93,7 +90,8 @@ describe('Player', () => {
             !asset.drm.some((keySystem) => {
               // Demo assets use an enum here, which we look up in idFor.
               // Command-line assets use a direct key system ID.
-              return support.drm[idFor(keySystem)] || support.drm[keySystem];
+              return window['shakaSupport'].drm[idFor(keySystem)] ||
+                 window['shakaSupport'].drm[keySystem];
             })) {
           pending('None of the required key systems are supported.');
         }
@@ -107,7 +105,7 @@ describe('Player', () => {
             mimeTypes.push('video/mp4');
           }
           if (mimeTypes.length &&
-              !mimeTypes.some((type) => support.media[type])) {
+              !mimeTypes.some((type) => window['shakaSupport'].media[type])) {
             pending('None of the required MIME types are supported.');
           }
         }

test/test/boot.js

@@ -459,6 +459,7 @@ async function logSupport() {
     const support = await shaka.Player.probeSupport();
     // Bypass Karma's log settings and dump this to the console.
     window.dump('Platform support:' + JSON.stringify(support, null, 2));
+    window['shakaSupport'] = support;
     // eslint-disable-next-line no-restricted-syntax
   } catch (error) {
     console.error('Support check failed at boot!', error);