shaka-player 3.3.2 → 4.0.0

package/test/hls/manifest_text_parser_unit.js

@@ -4,16 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
-goog.require('shaka.hls.Attribute');
-goog.require('shaka.hls.ManifestTextParser');
-goog.require('shaka.hls.PlaylistType');
-goog.require('shaka.hls.Segment');
-goog.require('shaka.hls.Tag');
-goog.require('shaka.test.Util');
-goog.require('shaka.util.Error');
-goog.require('shaka.util.StringUtils');
-
 describe('ManifestTextParser', () => {
   /** @type {!shaka.hls.ManifestTextParser} */
   let parser;

package/test/media/adaptation_set_criteria_unit.js

@@ -4,10 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.media.PreferenceBasedCriteria');
-goog.require('shaka.test.ManifestGenerator');
-goog.requireType('shaka.media.AdaptationSet');
-
 describe('AdaptationSetCriteria', () => {
   describe('preference based selection', () => {
     it('chooses variants in user\'s preferred language', () => {
@@ -84,7 +80,7 @@ describe('AdaptationSetCriteria', () => {
     });
 
     it('chooses only one role, even if none is preferred', () => {
-      // Regression test for https://github.com/google/shaka-player/issues/949
+      // Regression test for https://github.com/shaka-project/shaka-player/issues/949
       const manifest = shaka.test.ManifestGenerator.generate((manifest) => {
         manifest.addVariant(1, (variant) => {
           variant.language = 'en';
@@ -136,7 +132,7 @@ describe('AdaptationSetCriteria', () => {
     });
 
     it('chooses only one role, even if all are primary', () => {
-      // Regression test for https://github.com/google/shaka-player/issues/949
+      // Regression test for https://github.com/shaka-project/shaka-player/issues/949
       const manifest = shaka.test.ManifestGenerator.generate((manifest) => {
         manifest.addVariant(1, (variant) => {
           variant.language = 'en';
@@ -194,7 +190,7 @@ describe('AdaptationSetCriteria', () => {
     });
 
     it('chooses only one language, even if all are primary', () => {
-      // Regression test for https://github.com/google/shaka-player/issues/918
+      // Regression test for https://github.com/shaka-project/shaka-player/issues/918
       const manifest = shaka.test.ManifestGenerator.generate((manifest) => {
         manifest.addVariant(1, (variant) => {
           variant.language = 'en';

package/test/media/adaptation_set_unit.js

@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.media.AdaptationSet');
-
 describe('AdaptationSet', () => {
   describe('roles', () => {
     const mimeType = 'mime-type';

package/test/media/buffering_observer_unit.js

@@ -4,9 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.media.BufferingObserver');
-goog.require('shaka.util.Iterables');
-
 describe('BufferingObserver', () => {
   const BufferingObserver = shaka.media.BufferingObserver;
   const State = shaka.media.BufferingObserver.State;
@@ -115,7 +112,7 @@ describe('BufferingObserver', () => {
       /** @type {boolean} */
       let changed;
 
-      for (const lead of shaka.util.Iterables.range(5)) {
+      for (let lead = 0; lead < 5; lead++) {
         changed = controller.update(lead, /* toEnd= */ false);
         expect(changed).toBeFalsy();
       }

package/test/media/closed_caption_parser_unit.js

@@ -4,9 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.media.ClosedCaptionParser');
-goog.require('shaka.test.Util');
-
 describe('ClosedCaptionParser', () => {
   it('can handle empty caption packets', async () => {
     const initSegment = await shaka.test.Util.fetch(

package/test/media/drm_engine_integration.js

@@ -4,21 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.media.DrmEngine');
-goog.require('shaka.media.MediaSourceEngine');
-goog.require('shaka.net.NetworkingEngine');
-goog.require('shaka.test.FakeClosedCaptionParser');
-goog.require('shaka.test.FakeTextDisplayer');
-goog.require('shaka.test.ManifestGenerator');
-goog.require('shaka.test.UiUtils');
-goog.require('shaka.test.Util');
-goog.require('shaka.test.Waiter');
-goog.require('shaka.util.EventManager');
-goog.require('shaka.util.ManifestParserUtils');
-goog.require('shaka.util.Platform');
-goog.require('shaka.util.PlayerConfiguration');
-goog.require('shaka.util.PublicPromise');
-
 describe('DrmEngine', () => {
   const ContentType = shaka.util.ManifestParserUtils.ContentType;
 
@@ -271,6 +256,7 @@ describe('DrmEngine', () => {
       video.play();
 
       const waiter = new shaka.test.Waiter(eventManager).timeoutAfter(15);
+      waiter.setMediaSourceEngine(mediaSourceEngine);
       await waiter.waitForMovement(video);
 
       // Something should have played by now.
@@ -351,6 +337,7 @@ describe('DrmEngine', () => {
       video.play();
 
       const waiter = new shaka.test.Waiter(eventManager).timeoutAfter(15);
+      waiter.setMediaSourceEngine(mediaSourceEngine);
       await waiter.waitForMovement(video);
 
       // Something should have played by now.

package/test/media/drm_engine_unit.js

@@ -4,26 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.log');
-goog.require('shaka.media.DrmEngine');
-goog.require('shaka.media.Transmuxer');
-goog.require('shaka.net.DataUriPlugin');
-goog.require('shaka.net.NetworkingEngine');
-goog.require('shaka.test.FakeNetworkingEngine');
-goog.require('shaka.test.FakeVideo');
-goog.require('shaka.test.ManifestGenerator');
-goog.require('shaka.test.Util');
-goog.require('shaka.util.AbortableOperation');
-goog.require('shaka.util.BufferUtils');
-goog.require('shaka.util.Error');
-goog.require('shaka.util.Platform');
-goog.require('shaka.util.PlayerConfiguration');
-goog.require('shaka.util.Platform');
-goog.require('shaka.util.PublicPromise');
-goog.require('shaka.util.StringUtils');
-goog.require('shaka.util.Uint8ArrayUtils');
-
-
 describe('DrmEngine', () => {
   const Util = shaka.test.Util;
 
@@ -776,11 +756,6 @@ describe('DrmEngine', () => {
       expect(mockVideo.setMediaKeys).not.toHaveBeenCalled();
     });
 
-    it('sets MediaKeys for encrypted content', async () => {
-      await initAndAttach();
-      expect(mockVideo.setMediaKeys).toHaveBeenCalledWith(mockMediaKeys);
-    });
-
     it('sets server certificate if present in config', async () => {
       const cert = new Uint8Array(1);
       config.advanced['drm.abc'] = createAdvancedConfig(cert);
@@ -877,7 +852,7 @@ describe('DrmEngine', () => {
       /** @type {!Uint8Array} */
       const initData1 = new Uint8Array(5);
       /** @type {!Uint8Array} */
-      const initData2 = new Uint8Array(0);
+      const initData2 = new Uint8Array(1);
       /** @type {!Uint8Array} */
       const initData3 = new Uint8Array(10);
 
@@ -925,7 +900,7 @@ describe('DrmEngine', () => {
           .toHaveBeenCalledWith('cenc', initData1);
     });
 
-    // https://github.com/google/shaka-player/issues/2754
+    // https://github.com/shaka-project/shaka-player/issues/2754
     it('ignores duplicate init data from newInitData', async () => {
       /** @type {!Uint8Array} */
       const initData = new Uint8Array(1);
@@ -1019,12 +994,23 @@ describe('DrmEngine', () => {
       mockVideo.setMediaKeys.and.returnValue(Promise.reject(
           new Error('whoops!')));
 
-      const expected = Util.jasmineError(new shaka.util.Error(
+      tweakDrmInfos((drmInfos) => {
+        drmInfos[0].initData = [
+          {initData: new Uint8Array(1), initDataType: 'cenc', keyId: null},
+        ];
+      });
+
+      onErrorSpy.and.stub();
+
+      await initAndAttach();
+
+      expect(onErrorSpy).toHaveBeenCalled();
+      const error = onErrorSpy.calls.argsFor(0)[0];
+      shaka.test.Util.expectToEqualError(error, new shaka.util.Error(
           shaka.util.Error.Severity.CRITICAL,
           shaka.util.Error.Category.DRM,
           shaka.util.Error.Code.FAILED_TO_ATTACH_TO_VIDEO,
           'whoops!'));
-      await expectAsync(initAndAttach()).toBeRejectedWith(expected);
     });
 
     it('fails with an error if setServerCertificate fails', async () => {
@@ -1087,10 +1073,8 @@ describe('DrmEngine', () => {
         const initData1 = new Uint8Array(1);
         const initData2 = new Uint8Array(2);
 
-        mockVideo.on['encrypted'](
-            {initDataType: 'webm', initData: initData1, keyId: null});
-        mockVideo.on['encrypted'](
-            {initDataType: 'cenc', initData: initData2, keyId: null});
+        await sendEncryptedEvent('webm', initData1);
+        await sendEncryptedEvent('cenc', initData2);
 
         expect(mockMediaKeys.createSession).toHaveBeenCalledTimes(2);
         expect(session1.generateRequest)
@@ -1101,32 +1085,23 @@ describe('DrmEngine', () => {
 
       it('suppresses duplicate initDatas', async () => {
         await initAndAttach();
+
         const initData1 = new Uint8Array(1);
-        const initData2 = new Uint8Array(1);  // identical to initData1
 
-        mockVideo.on['encrypted'](
-            {initDataType: 'webm', initData: initData1, keyId: null});
-        mockVideo.on['encrypted'](
-            {initDataType: 'cenc', initData: initData2, keyId: null});
+        await sendEncryptedEvent('webm', initData1);
+        await sendEncryptedEvent('cenc'); // identical to webm initData
 
         expect(mockMediaKeys.createSession).toHaveBeenCalledTimes(1);
         expect(session1.generateRequest)
             .toHaveBeenCalledWith('webm', initData1);
       });
 
-      it('is ignored when init data is in DrmInfo', async () => {
-        // Set up an init data override in the manifest:
-        tweakDrmInfos((drmInfos) => {
-          drmInfos[0].initData = [
-            {initData: new Uint8Array(0), initDataType: 'cenc', keyId: null},
-          ];
-        });
-
+      it('set media keys when not already done at startup', async () => {
         await initAndAttach();
-        // We already created a session for the init data override.
+        await sendEncryptedEvent();
+
+        expect(mockVideo.setMediaKeys).toHaveBeenCalledTimes(1);
         expect(mockMediaKeys.createSession).toHaveBeenCalledTimes(1);
-        // We aren't even listening for 'encrypted' events.
-        expect(mockVideo.on['encrypted']).toBe(undefined);
       });
 
       it('dispatches an error if createSession fails', async () => {
@@ -1134,9 +1109,7 @@ describe('DrmEngine', () => {
         onErrorSpy.and.stub();
 
         await initAndAttach();
-        const initData1 = new Uint8Array(1);
-        mockVideo.on['encrypted'](
-            {initDataType: 'webm', initData: initData1, keyId: null});
+        await sendEncryptedEvent();
 
         expect(onErrorSpy).toHaveBeenCalled();
         const error = onErrorSpy.calls.argsFor(0)[0];
@@ -1156,9 +1129,7 @@ describe('DrmEngine', () => {
         onErrorSpy.and.stub();
 
         await initAndAttach();
-        const initData1 = new Uint8Array(1);
-        mockVideo.on['encrypted'](
-            {initDataType: 'webm', initData: initData1, keyId: null});
+        await sendEncryptedEvent();
 
         expect(onErrorSpy).toHaveBeenCalled();
         const error = onErrorSpy.calls.argsFor(0)[0];
@@ -1172,9 +1143,7 @@ describe('DrmEngine', () => {
     describe('message', () => {
       it('is listened for', async () => {
         await initAndAttach();
-        const initData = new Uint8Array(0);
-        mockVideo.on['encrypted'](
-            {initDataType: 'webm', initData: initData, keyId: null});
+        await sendEncryptedEvent();
 
         expect(session1.addEventListener).toHaveBeenCalledWith(
             'message', jasmine.any(Function), jasmine.anything());
@@ -1214,9 +1183,7 @@ describe('DrmEngine', () => {
         onErrorSpy.and.stub();
 
         await initAndAttach();
-        const initData = new Uint8Array(0);
-        mockVideo.on['encrypted'](
-            {initDataType: 'webm', initData: initData, keyId: null});
+        await sendEncryptedEvent();
 
         // Simulate a permission error from the web server.
         const netError = new shaka.util.Error(
@@ -1252,9 +1219,7 @@ describe('DrmEngine', () => {
       async function sendMessageTest(
           expectedUrl, messageType = 'license-request') {
         await initAndAttach();
-        const initData = new Uint8Array(0);
-        mockVideo.on['encrypted'](
-            {initDataType: 'webm', initData: initData, keyId: null});
+        await sendEncryptedEvent();
 
         const operation = shaka.util.AbortableOperation.completed({});
         fakeNetEngine.request.and.returnValue(operation);
@@ -1276,9 +1241,7 @@ describe('DrmEngine', () => {
     describe('keystatuseschange', () => {
       it('is listened for', async () => {
         await initAndAttach();
-        const initData = new Uint8Array(0);
-        mockVideo.on['encrypted'](
-            {initDataType: 'webm', initData: initData, keyId: null});
+        await sendEncryptedEvent();
 
         expect(session1.addEventListener).toHaveBeenCalledWith(
             'keystatuseschange', jasmine.any(Function), jasmine.anything());
@@ -1286,9 +1249,7 @@ describe('DrmEngine', () => {
 
       it('triggers callback', async () => {
         await initAndAttach();
-        const initData = new Uint8Array(0);
-        mockVideo.on['encrypted'](
-            {initDataType: 'webm', initData: initData, keyId: null});
+        await sendEncryptedEvent();
 
         const keyId1 = makeKeyId(1);
         const keyId2 = makeKeyId(2);
@@ -1311,13 +1272,10 @@ describe('DrmEngine', () => {
         expect(onKeyStatusSpy).toHaveBeenCalled();
       });
 
-      // See https://github.com/google/shaka-player/issues/1541
+      // See https://github.com/shaka-project/shaka-player/issues/1541
       it('does not update public key statuses before callback', async () => {
         await initAndAttach();
-
-        const initData = new Uint8Array(0);
-        mockVideo.on['encrypted'](
-            {initDataType: 'webm', initData: initData, keyId: null});
+        await sendEncryptedEvent();
 
         const keyId1 = makeKeyId(1);
         const keyId2 = makeKeyId(2);
@@ -1349,7 +1307,7 @@ describe('DrmEngine', () => {
         expect(keyIds.length).toBe(2);
       });
 
-      // See https://github.com/google/shaka-player/issues/1541
+      // See https://github.com/shaka-project/shaka-player/issues/1541
       it('does not invoke callback until all sessions are loaded', async () => {
         // Set up init data overrides in the manifest so that we get multiple
         // sessions.
@@ -1394,9 +1352,7 @@ describe('DrmEngine', () => {
         await initAndAttach();
         expect(onErrorSpy).not.toHaveBeenCalled();
 
-        const initData = new Uint8Array(0);
-        mockVideo.on['encrypted'](
-            {initDataType: 'webm', initData: initData, keyId: null});
+        await sendEncryptedEvent();
 
         const keyId1 = makeKeyId(1);
         const keyId2 = makeKeyId(2);
@@ -1443,9 +1399,7 @@ describe('DrmEngine', () => {
         await initAndAttach();
         expect(onErrorSpy).not.toHaveBeenCalled();
 
-        const initData = new Uint8Array(0);
-        mockVideo.on['encrypted'](
-            {initDataType: 'webm', initData: initData, keyId: null});
+        await sendEncryptedEvent();
 
         const keyId1 = makeKeyId(1);
         const keyId2 = makeKeyId(2);
@@ -1489,9 +1443,7 @@ describe('DrmEngine', () => {
       const license = new Uint8Array(0);
 
       await initAndAttach();
-      const initData = new Uint8Array(0);
-      mockVideo.on['encrypted'](
-          {initDataType: 'webm', initData: initData, keyId: null});
+      await sendEncryptedEvent();
 
       fakeNetEngine.setResponseValue('http://abc.drm/license', license);
       const message = new Uint8Array(0);
@@ -1550,9 +1502,8 @@ describe('DrmEngine', () => {
 
     it('publishes an event if update succeeds', async () => {
       await initAndAttach();
-      const initData = new Uint8Array(1);
-      mockVideo.on['encrypted'](
-          {initDataType: 'webm', initData: initData, keyId: null});
+      await sendEncryptedEvent();
+
       const message = new Uint8Array(0);
       session1.on['message']({target: session1, message: message});
       session1.update.and.returnValue(Promise.resolve());
@@ -1568,9 +1519,7 @@ describe('DrmEngine', () => {
       const license = new Uint8Array(0);
 
       await initAndAttach();
-      const initData = new Uint8Array(0);
-      mockVideo.on['encrypted'](
-          {initDataType: 'webm', initData: initData, keyId: null});
+      await sendEncryptedEvent();
 
       fakeNetEngine.setResponseValue('http://abc.drm/license', license);
       const message = new Uint8Array(0);
@@ -1591,12 +1540,9 @@ describe('DrmEngine', () => {
   describe('destroy', () => {
     it('tears down MediaKeys and active sessions', async () => {
       await initAndAttach();
-      const initData1 = new Uint8Array(1);
-      const initData2 = new Uint8Array(2);
-      mockVideo.on['encrypted'](
-          {initDataType: 'webm', initData: initData1, keyId: null});
-      mockVideo.on['encrypted'](
-          {initDataType: 'webm', initData: initData2, keyId: null});
+
+      await sendEncryptedEvent('webm');
+      await sendEncryptedEvent('cenc', new Uint8Array(2));
 
       const message = new Uint8Array(0);
       session1.on['message']({target: session1, message: message});
@@ -1621,12 +1567,8 @@ describe('DrmEngine', () => {
       drmEngine.configure(config);
 
       await initAndAttach();
-      const initData1 = new Uint8Array(1);
-      const initData2 = new Uint8Array(2);
-      mockVideo.on['encrypted'](
-          {initDataType: 'webm', initData: initData1, keyId: null});
-      mockVideo.on['encrypted'](
-          {initDataType: 'webm', initData: initData2, keyId: null});
+      await sendEncryptedEvent('webm');
+      await sendEncryptedEvent('cenc', new Uint8Array(2));
 
       const message = new Uint8Array(0);
       session1.on['message']({target: session1, message: message});
@@ -1647,12 +1589,8 @@ describe('DrmEngine', () => {
 
     it('swallows errors when closing sessions', async () => {
       await initAndAttach();
-      const initData1 = new Uint8Array(1);
-      const initData2 = new Uint8Array(2);
-      mockVideo.on['encrypted'](
-          {initDataType: 'webm', initData: initData1, keyId: null});
-      mockVideo.on['encrypted'](
-          {initDataType: 'webm', initData: initData2, keyId: null});
+      await sendEncryptedEvent('webm');
+      await sendEncryptedEvent('cenc', new Uint8Array(2));
 
       const message = new Uint8Array(0);
       session1.on['message']({target: session1, message: message});
@@ -1668,12 +1606,8 @@ describe('DrmEngine', () => {
 
     it('swallows errors when clearing MediaKeys', async () => {
       await initAndAttach();
-      const initData1 = new Uint8Array(1);
-      const initData2 = new Uint8Array(2);
-      mockVideo.on['encrypted'](
-          {initDataType: 'webm', initData: initData1, keyId: null});
-      mockVideo.on['encrypted'](
-          {initDataType: 'webm', initData: initData2, keyId: null});
+      await sendEncryptedEvent('webm');
+      await sendEncryptedEvent('cenc', new Uint8Array(2));
 
       const message = new Uint8Array(0);
       session1.on['message']({target: session1, message: message});
@@ -1752,6 +1686,14 @@ describe('DrmEngine', () => {
       const p1 = new shaka.util.PublicPromise();
       mockVideo.setMediaKeys.and.returnValue(p1);
 
+      onErrorSpy.and.stub();
+
+      tweakDrmInfos((drmInfos) => {
+        drmInfos[0].initData = [
+          {initData: new Uint8Array(1), initDataType: 'cenc', keyId: null},
+        ];
+      });
+
       const init = expectAsync(initAndAttach()).toBeRejected();
 
       await shaka.test.Util.shortDelay();
@@ -1765,10 +1707,12 @@ describe('DrmEngine', () => {
       const destroy = drmEngine.destroy();
       const fail = async () => {
         await shaka.test.Util.shortDelay();
-        p1.reject(new Error(''));
+        shaka.log.warning('fail');
+        p1.reject(new Error('titi'));
       };
       const success = async () => {
         await shaka.test.Util.shortDelay();
+        shaka.log.warning('success');
         p2.resolve();
       };
       await Promise.all([init, destroy, fail(), success()]);
@@ -1780,6 +1724,12 @@ describe('DrmEngine', () => {
       const p1 = new shaka.util.PublicPromise();
       mockVideo.setMediaKeys.and.returnValue(p1);
 
+      tweakDrmInfos((drmInfos) => {
+        drmInfos[0].initData = [
+          {initData: new Uint8Array(1), initDataType: 'cenc', keyId: null},
+        ];
+      });
+
       const init = expectAsync(initAndAttach()).toBeRejected();
 
       await shaka.test.Util.shortDelay();
@@ -1857,9 +1807,7 @@ describe('DrmEngine', () => {
       session1.generateRequest.and.returnValue(p);
 
       await initAndAttach();
-      const initData1 = new Uint8Array(1);
-      mockVideo.on['encrypted'](
-          {initDataType: 'webm', initData: initData1, keyId: null});
+      await sendEncryptedEvent();
 
       // We are now blocked on generateRequest:
       expect(session1.generateRequest).toHaveBeenCalledTimes(1);
@@ -1878,9 +1826,7 @@ describe('DrmEngine', () => {
       fakeNetEngine.request.and.returnValue(operation);
 
       await initAndAttach();
-      const initData1 = new Uint8Array(1);
-      mockVideo.on['encrypted'](
-          {initDataType: 'webm', initData: initData1, keyId: null});
+      await sendEncryptedEvent();
 
       const message = new Uint8Array(0);
       session1.on['message']({target: session1, message: message});
@@ -1909,9 +1855,7 @@ describe('DrmEngine', () => {
       fakeNetEngine.request.and.returnValue(operation);
 
       await initAndAttach();
-      const initData1 = new Uint8Array(1);
-      mockVideo.on['encrypted'](
-          {initDataType: 'webm', initData: initData1, keyId: null});
+      await sendEncryptedEvent();
 
       const message = new Uint8Array(0);
       session1.on['message']({target: session1, message: message});
@@ -1939,9 +1883,7 @@ describe('DrmEngine', () => {
       session1.update.and.returnValue(p);
 
       await initAndAttach();
-      const initData1 = new Uint8Array(1);
-      mockVideo.on['encrypted'](
-          {initDataType: 'webm', initData: initData1, keyId: null});
+      await sendEncryptedEvent();
 
       const message = new Uint8Array(0);
       session1.on['message']({target: session1, message: message});
@@ -1962,7 +1904,7 @@ describe('DrmEngine', () => {
       // this doesn't work if the session is not callable (no license request
       // sent).  So |session.closed| should never resolve and |session.close()|
       // should be rejected and destroy() should still succeed.
-      // https://github.com/google/shaka-player/issues/664
+      // https://github.com/shaka-project/shaka-player/issues/664
       await initAndAttach();
       session1.closed = new shaka.util.PublicPromise();
       session2.closed = new shaka.util.PublicPromise();
@@ -1975,12 +1917,8 @@ describe('DrmEngine', () => {
       session1.close.and.returnValue(rejected);
       session2.close.and.returnValue(rejected);
 
-      const initData1 = new Uint8Array(1);
-      const initData2 = new Uint8Array(2);
-      mockVideo.on['encrypted'](
-          {initDataType: 'webm', initData: initData1, keyId: null});
-      mockVideo.on['encrypted'](
-          {initDataType: 'webm', initData: initData2, keyId: null});
+      await sendEncryptedEvent('webm');
+      await sendEncryptedEvent('cenc', new Uint8Array(2));
 
       // Still resolve these since we are mocking close and closed.  This
       // ensures DrmEngine is in the correct state.
@@ -2205,9 +2143,7 @@ describe('DrmEngine', () => {
       mockVideo.paused = true;
 
       await initAndAttach();
-      const initData = new Uint8Array(0);
-      mockVideo.on['encrypted'](
-          {initDataType: 'webm', initData: initData, keyId: null});
+      await sendEncryptedEvent();
 
       const operation = shaka.util.AbortableOperation.completed({});
       fakeNetEngine.request.and.returnValue(operation);
@@ -2233,9 +2169,7 @@ describe('DrmEngine', () => {
       mockVideo.paused = true;
 
       await initAndAttach();
-      const initData = new Uint8Array(0);
-      mockVideo.on['encrypted'](
-          {initDataType: 'webm', initData: initData, keyId: null});
+      await sendEncryptedEvent();
 
       const operation = shaka.util.AbortableOperation.completed({});
       fakeNetEngine.request.and.returnValue(operation);
@@ -2350,10 +2284,9 @@ describe('DrmEngine', () => {
       session1.expiration = NaN;
 
       await initAndAttach();
-      const initData = new Uint8Array(0);
+      await sendEncryptedEvent();
+
       const message = new Uint8Array(0);
-      mockVideo.on['encrypted'](
-          {initDataType: 'webm', initData: initData, keyId: null});
       session1.on['message']({target: session1, message: message});
       session1.update.and.returnValue(Promise.resolve());
     });
@@ -2516,4 +2449,17 @@ describe('DrmEngine', () => {
       callback(manifest.variants[0].audio.drmInfos);
     }
   }
+
+  /**
+   *
+   * @param {string} initDataType
+   * @param {Uint8Array} initData
+   * @param {string|null} keyId
+   */
+  async function sendEncryptedEvent(
+      initDataType = 'cenc', initData = new Uint8Array(1), keyId = null) {
+    mockVideo.on['encrypted']({initDataType, initData, keyId});
+
+    await Util.shortDelay();
+  }
 });

package/test/media/manifest_parser_unit.js

@@ -4,10 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.media.ManifestParser');
-goog.require('shaka.net.NetworkingEngine');
-goog.require('shaka.test.FakeNetworkingEngine');
-
 const testGetMimeType = async (expertedMimeType, contentType) => {
   const netEngine = new shaka.test.FakeNetworkingEngine()
       .setHeaders('dummy://foo', {'content-type': contentType});