shaka-player 3.3.1 → 3.3.4

package/test/test/externs/karma.js

@@ -20,3 +20,7 @@ __karma__.config = {};
 
 /** @const {!Array.<*>} */
 __karma__.config.args;
+
+
+/** @param {?} error */
+__karma__.error = function(error) {};

package/test/test/namespace.js

@@ -0,0 +1,10 @@
+/*! @license
+ * Shaka Player
+ * Copyright 2016 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+// Define the shaka.test namespace before we load the test utilities.
+// Without goog.provide in the test utils, this has to be explicit and come
+// before we load the utils.
+shaka.test = {};

package/test/test/util/canned_idb.js

@@ -4,14 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.provide('shaka.test.CannedIDB');
-
-goog.require('shaka.log');
-goog.require('shaka.offline.indexeddb.DBOperation');
-goog.require('shaka.util.BufferUtils');
-goog.require('shaka.util.Uint8ArrayUtils');
-
-
 /**
  * A testing utility that can be used to dump and restore entire IndexedDB
  * databases.  This can be inserted into a running app to snapshot databases

package/test/test/util/cea_utils.js

@@ -4,12 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.provide('shaka.test.CeaUtils');
-
-goog.require('shaka.cea.CeaUtils');
-goog.require('shaka.text.Cue');
-
-
 /**
  * Testing helpers to assist tests for Closed Caption decoders for CEA captions.
  */

package/test/test/util/dash_parser_util.js

@@ -4,19 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.provide('shaka.test.Dash');
-
-goog.require('goog.asserts');
-goog.require('shaka.dash.DashParser');
-goog.require('shaka.test.FakeNetworkingEngine');
-goog.require('shaka.test.ManifestParser');
-goog.require('shaka.test.Util');
-goog.require('shaka.util.PlayerConfiguration');
-goog.require('shaka.util.StringUtils');
-goog.requireType('shaka.media.SegmentReference');
-goog.requireType('shaka.util.Error');
-
-
 /** @summary Utilities for working with the DASH parser. */
 shaka.test.Dash = class {
   /**

package/test/test/util/fake_ad.js

@@ -4,9 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.provide('shaka.test.FakeAd');
-
-
 /**
  * @implements {shaka.extern.IAd}
  */

package/test/test/util/fake_ad_manager.js

@@ -4,15 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.provide('shaka.test.FakeAdManager');
-
-goog.require('shaka.ads.AdManager');
-goog.require('shaka.ads.AdsStats');
-goog.require('shaka.util.FakeEvent');
-goog.require('shaka.util.FakeEventTarget');
-goog.requireType('shaka.test.FakeAd');
-
-
 /**
  * @implements {shaka.extern.IAdManager}
  * @final

package/test/test/util/fake_demo_main.js

@@ -4,11 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.provide('shaka.test.FakeDemoMain');
-
-goog.require('shaka.Player');
-
-
 /**
  * @summary
  * This simulates the interface between ShakaDemoMain and the various tabs.

package/test/test/util/fake_drm_engine.js

@@ -4,12 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.provide('shaka.test.FakeDrmEngine');
-
-goog.require('shaka.media.DrmEngine');
-goog.require('shaka.test.Util');
-
-
 /**
  * A fake DrmEngine.
  *

package/test/test/util/fake_media_source_engine.js

@@ -4,13 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.provide('shaka.test.FakeMediaSourceEngine');
-
-goog.require('shaka.media.MediaSourceEngine');
-goog.require('shaka.test.FakeTextDisplayer');
-goog.require('shaka.util.ManifestParserUtils');
-
-
 /**
  * @summary
  * This simulates multiple SourceBuffers. However, it only

package/test/test/util/fake_networking_engine.js

@@ -4,11 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.provide('shaka.test.FakeNetworkingEngine');
-
-/** @fileoverview @suppress {missingRequire} */
-
-
 /**
  * A fake networking engine that returns constant data.  The request member
  * is a jasmine spy and can be used to check the actual calls that occurred.

package/test/test/util/fake_text_displayer.js

@@ -4,11 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.provide('shaka.test.FakeTextDisplayer');
-
-goog.require('shaka.test.Util');
-
-
 /**
  * @implements {shaka.extern.TextDisplayer}
  * @final

package/test/test/util/indexeddb_utils.js

@@ -4,14 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.provide('shaka.test.IndexedDBUtils');
-
-goog.require('shaka.test.Util');
-goog.require('shaka.util.Functional');
-goog.require('shaka.util.Iterables');
-goog.require('shaka.util.PublicPromise');
-
-
 shaka.test.IndexedDBUtils = class {
   /**
    * Make a connection to indexeddb. This assumes that it will be a new
@@ -41,8 +33,7 @@ shaka.test.IndexedDBUtils = class {
     // connection after 5 attempts (with delays in between), just give
     // up.
     let lastError;
-    for (const _ of shaka.util.Iterables.range(5)) {
-      shaka.util.Functional.ignored(_);
+    for (let i = 0; i < 5; i++) {
       try {
         return await tryOpen();  // eslint-disable-line no-await-in-loop
       } catch (e) {  // eslint-disable-line no-restricted-syntax

package/test/test/util/jasmine_fetch.js

@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 // TODO: this only contains the methods that we use; if this is published
 // it should contain the entire breadth of options in jasmine-ajax.
 

package/test/test/util/loader.js

@@ -4,24 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.provide('shaka.test.Loader');
-
-goog.require('shaka.log');
-goog.require('shaka.test.TestScheme');
-goog.require('shaka.util.PublicPromise');
-goog.requireType('shaka.Player');
-goog.requireType('shaka.media.InitSegmentReference');
-goog.requireType('shaka.media.PresentationTimeline');
-goog.requireType('shaka.media.SegmentIndex');
-goog.requireType('shaka.media.SegmentReference');
-goog.requireType('shaka.net.NetworkingEngine');
-goog.requireType('shaka.offline.Storage');
-goog.requireType('shaka.ui.Controls');
-goog.requireType('shaka.ui.Element');
-goog.requireType('shaka.ui.Overlay');
-goog.requireType('shaka.util.StringUtils');
-
-
 /**
  * A stand-in type for the "shaka" namespace.  Used when loading the compiled
  * library or when referencing it in ManifestGenerator or TestScheme.

package/test/test/util/manifest_generator.js

@@ -4,18 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.provide('shaka.test.ManifestGenerator');
-
-goog.require('goog.asserts');
-goog.require('shaka.test.Util');
-goog.require('shaka.util.Iterables');
-goog.require('shaka.util.ManifestParserUtils');
-goog.require('shaka.util.Uint8ArrayUtils');
-goog.requireType('shaka.media.InitSegmentReference');
-goog.requireType('shaka.media.PresentationTimeline');
-goog.requireType('shaka.media.SegmentIndex');
-
-
 /**
  * @summary
  * A helper class used to generate manifests.  This is done through a series
@@ -606,13 +594,20 @@ shaka.test.ManifestGenerator.Stream = class {
         segmentDuration, 'Must pass a non-zero segment duration');
 
     const shaka_ = this.manifest_.shaka_;
-    const totalDuration = this.manifest_.presentationTimeline.getDuration();
+    let totalDuration = this.manifest_.presentationTimeline.getDuration();
     goog.asserts.assert(
         isFinite(totalDuration), 'Must specify a manifest duration');
+    if (!isFinite(totalDuration)) {
+      // Without this, a mistake of an infinite duration would result in an
+      // infinite loop and a crash, which would in turn prevent you from seeing
+      // the above assertion fail.
+      totalDuration = 0;
+    }
+
     const segmentCount = totalDuration / segmentDuration;
     const references = [];
 
-    for (const index of shaka.util.Iterables.range(segmentCount)) {
+    for (let index = 0; index < segmentCount; index++) {
       const getUris = () => [sprintf(template, index)];
       const start = index * segmentDuration;
       const end = Math.min(totalDuration, (index + 1) * segmentDuration);

package/test/test/util/manifest_parser_util.js

@@ -4,12 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.provide('shaka.test.ManifestParser');
-
-goog.require('shaka.media.InitSegmentReference');
-goog.require('shaka.media.SegmentReference');
-
-
 shaka.test.ManifestParser = class {
   /**
    * Verifies the segment references of a stream.

package/test/test/util/offline_utils.js

@@ -4,11 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.provide('shaka.test.OfflineUtils');
-
-goog.require('shaka.util.BufferUtils');
-
-
 shaka.test.OfflineUtils = class {
   /**
    * @param {string} originalUri

package/test/test/util/simple_fakes.js

@@ -4,28 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.provide('shaka.test.FakeAbrManager');
-goog.provide('shaka.test.FakeClosedCaptionParser');
-goog.provide('shaka.test.FakeManifestParser');
-goog.provide('shaka.test.FakePlayhead');
-goog.provide('shaka.test.FakePlayheadObserver');
-goog.provide('shaka.test.FakePresentationTimeline');
-goog.provide('shaka.test.FakeSegmentIndex');
-goog.provide('shaka.test.FakeStreamingEngine');
-goog.provide('shaka.test.FakeTextTrack');
-goog.provide('shaka.test.FakeTransmuxer');
-goog.provide('shaka.test.FakeVideo');
-
-goog.require('shaka.test.Util');
-goog.require('shaka.abr.SimpleAbrManager');
-goog.require('shaka.media.IClosedCaptionParser');
-goog.require('shaka.media.Playhead');
-goog.require('shaka.media.PresentationTimeline');
-goog.require('shaka.media.SegmentIndex');
-goog.require('shaka.media.StreamingEngine');
-goog.require('shaka.media.Transmuxer');
-
-
 /**
  * @fileoverview Defines simple mocks for library types.
  * @suppress {checkTypes} Suppress errors about missmatches between the
@@ -351,19 +329,24 @@ shaka.test.FakePlayhead = class {
 /** @extends {TextTrack} */
 shaka.test.FakeTextTrack = class {
   constructor() {
+    // The compiler knows TextTrack.cues is const, and we lied and said we
+    // "extend" TextTrack, so it won't let us assign to cues here.  But we
+    // must, because this fake is a from-scratch implementation of the API.
+    // This cast-hack works around the issue.
     /** @type {!Array.<TextTrackCue>} */
-    this.cues = [];
+    const cues = [];
+    (/** @type {?} */(this))['cues'] = cues;
 
     /** @type {!jasmine.Spy} */
     this.addCue = jasmine.createSpy('addCue').and.callFake((cue) => {
-      this.cues.push(cue);
+      cues.push(cue);
     });
 
     /** @type {!jasmine.Spy} */
     this.removeCue = jasmine.createSpy('removeCue').and.callFake((cue) => {
-      const idx = this.cues.indexOf(cue);
+      const idx = cues.indexOf(cue);
       expect(idx).not.toBeLessThan(0);
-      this.cues.splice(idx, 1);
+      cues.splice(idx, 1);
     });
   }
 };

package/test/test/util/stream_generator.js

@@ -4,20 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.provide('shaka.test.IStreamGenerator');
-goog.provide('shaka.test.Mp4LiveStreamGenerator');
-goog.provide('shaka.test.Mp4VodStreamGenerator');
-goog.provide('shaka.test.StreamGenerator');
-goog.provide('shaka.test.TSVodStreamGenerator');
-
-goog.require('goog.asserts');
-goog.require('shaka.log');
-goog.require('shaka.test.Util');
-goog.require('shaka.util.BufferUtils');
-goog.require('shaka.util.DataViewReader');
-goog.require('shaka.util.Uint8ArrayUtils');
-
-
 /**
  * @summary
  * Defines an interface to generate streams.

package/test/test/util/streaming_engine_util.js

@@ -4,21 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.provide('shaka.test.StreamingEngineUtil');
-
-goog.require('goog.asserts');
-goog.require('shaka.media.InitSegmentReference');
-goog.require('shaka.media.SegmentReference');
-goog.require('shaka.test.FakeNetworkingEngine');
-goog.require('shaka.test.FakePresentationTimeline');
-goog.require('shaka.test.FakeSegmentIndex');
-goog.require('shaka.test.Util');
-goog.require('shaka.util.AbortableOperation');
-goog.require('shaka.util.Error');
-goog.require('shaka.util.ManifestParserUtils');
-goog.requireType('shaka.media.PresentationTimeline');
-
-
 shaka.test.StreamingEngineUtil = class {
   /**
    * Creates a FakeNetworkingEngine.

package/test/test/util/test_scheme.js

@@ -4,24 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.provide('shaka.test.TestScheme');
-
-goog.require('goog.asserts');
-goog.require('goog.Uri');
-goog.require('shaka.Player');
-goog.require('shaka.media.ManifestParser');
-goog.require('shaka.net.NetworkingEngine');
-goog.require('shaka.test.ManifestGenerator');
-goog.require('shaka.test.Mp4VodStreamGenerator');
-goog.require('shaka.test.TSVodStreamGenerator');
-goog.require('shaka.test.Util');
-goog.require('shaka.util.AbortableOperation');
-goog.require('shaka.util.Error');
-goog.require('shaka.util.ManifestParserUtils');
-goog.requireType('shaka.net.NetworkingEngine.RequestType');
-goog.requireType('shaka.test.IStreamGenerator');
-
-
 /**
  * @typedef {{
  *   initSegmentUri: string,
@@ -578,7 +560,7 @@ shaka.test.TestScheme.DATA = {
     duration: 30,
   },
 
-  // https://github.com/google/shaka-player/issues/2553
+  // https://github.com/shaka-project/shaka-player/issues/2553
   'forced_subs_simulation': {
     audio: sintelAudioSegment,
     text: vttSegment,

package/test/test/util/ttml_utils.js

@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.provide('shaka.test.TtmlUtils');
-
 shaka.test.TtmlUtils = class {
   /**
    * @param {!Array} expectedCues

package/test/test/util/ui_utils.js

@@ -4,15 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
-goog.provide('shaka.test.UiUtils');
-
-goog.require('shaka.Player');
-goog.require('shaka.test.Waiter');
-goog.require('shaka.ui.Overlay');
-goog.require('shaka.util.EventManager');
-
-
 shaka.test.UiUtils = class {
   /**
    * @param {!HTMLElement} videoContainer

package/test/test/util/util.js

@@ -4,19 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.provide('shaka.test.StatusPromise');
-goog.provide('shaka.test.Util');
-
-goog.require('goog.asserts');
-goog.require('shaka.media.InitSegmentReference');
-goog.require('shaka.media.SegmentReference');
-goog.require('shaka.util.Functional');
-goog.require('shaka.util.Iterables');
-goog.require('shaka.util.StringUtils');
-goog.require('shaka.util.XmlUtils');
-goog.requireType('shaka.util.Error');
-
-
 /**
  * @extends {Promise}
  */
@@ -52,10 +39,9 @@ shaka.test.Util = class {
    */
   static async fakeEventLoop(duration, onTick) {
     // Run this synchronously:
-    for (const time of shaka.util.Iterables.range(duration)) {
+    for (let time = 0; time < duration; time++) {
       // We shouldn't need more than 6 rounds.
-      for (const _ of shaka.util.Iterables.range(6)) {
-        shaka.util.Functional.ignored(_);
+      for (let i = 0; i < 6; i++) {
         jasmine.clock().tick(0);
         await Promise.resolve();  // eslint-disable-line no-await-in-loop
       }
@@ -203,7 +189,7 @@ shaka.test.Util = class {
       if (actual.childNodes.length != expected.childNodes.length) {
         return prospectiveDiff + 'Different child node list length.';
       }
-      for (const i of shaka.util.Iterables.range(actual.childNodes.length)) {
+      for (let i = 0; i < actual.childNodes.length; i++) {
         const aNode = actual.childNodes[i];
         const eNode = expected.childNodes[i];
         const diff =
@@ -334,9 +320,9 @@ shaka.test.Util = class {
     // TODO: There should be a way to alter the externs for jasmine.Spy so that
     // this utility is not needed.
     // Why isn't there something like ICallable in Closure?
-    // https://github.com/google/closure-compiler/issues/946
+    // https://github.com/shaka-project/closure-compiler/issues/946
     // Why isn't it enough that jasmine.Spy extends Function?
-    // https://github.com/google/closure-compiler/issues/1422
+    // https://github.com/shaka-project/closure-compiler/issues/1422
     return /** @type {Function} */(spy)(...varArgs);
   }
 
@@ -401,10 +387,10 @@ shaka.test.Util = class {
    *   within the bounds of the viewport.
    * @param {string} name An identifier for the screenshot.  Use alphanumeric
    *   plus dash and underscore only.
-   * @param {number} threshold A change threshold in pixels.
+   * @param {number} minSimilarity A minimum similarity score between 0 and 1.
    * @return {!Promise}
    */
-  static async checkScreenshot(element, name, threshold=0) {
+  static async checkScreenshot(element, name, minSimilarity=1) {
     // Make sure the DOM is up-to-date and layout has settled before continuing.
     // Without this delay, or with a shorter delay, we sometimes get missing
     // elements in our UITextDisplayer tests on some platforms.
@@ -448,13 +434,16 @@ shaka.test.Util = class {
     const buffer = await shaka.test.Util.fetch(
         '/screenshot/diff' + parentUrlParams + paramsString);
     const json = shaka.util.StringUtils.fromUTF8(buffer);
-    const pixelsChanged = /** @type {number} */(JSON.parse(json));
+    const similarity = /** @type {number} */(JSON.parse(json));
 
-    // If the change threshold is exceeded, you can review the new screenshot
+    // If the minimum similarity is not met, you can review the new screenshot
     // and the diff image in the screenshots folder.  Look for images that end
-    // with "-new" and "-diff".  If cropping doesn't work right, you can view
-    // the full-page screenshot in the image that ends with "-full".
-    expect(pixelsChanged).withContext(name).not.toBeGreaterThan(threshold);
+    // with "-new" and "-diff".  (NOTE: The diff is a pixel-wise diff for human
+    // review, and is not produced with the same structural similarity
+    // algorithm used to detect changes in the test.)  If cropping doesn't work
+    // right, you can view the full-page screenshot in the image that ends with
+    // "-full".
+    expect(similarity).withContext(name).not.toBeLessThan(minSimilarity);
   }
 };