[Pkg-javascript-commits] [pdf.js] 306/414: Updates Jasmine version.
David Prévot
taffit at moszumanska.debian.org
Tue Jun 28 17:12:33 UTC 2016
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository pdf.js.
commit 0a700fa29d54a5dd02527615aac8f69a94e2c87a
Author: Yury Delendik <ydelendik at mozilla.com>
Date: Tue Mar 29 09:34:13 2016 -0500
Updates Jasmine version.
---
external/jasmine/MIT.LICENSE | 20 -
external/jasmine/jasmine-html.js | 676 ----------
external/jasmine/jasmine.css | 81 --
external/jasmine/jasmine.js | 2469 ----------------------------------
external/jasmine/jasmine_favicon.png | Bin 776 -> 0 bytes
package.json | 1 +
test/font/font_core_spec.js | 10 +-
test/font/font_fpgm_spec.js | 8 +-
test/font/font_os2_spec.js | 16 +-
test/font/font_post_spec.js | 24 +-
test/font/font_test.html | 71 +-
test/font/jasmine-boot.js | 157 +++
test/unit/annotation_layer_spec.js | 39 +-
test/unit/api_spec.js | 369 +++--
test/unit/cmap_spec.js | 102 +-
test/unit/crypto_spec.js | 12 +
test/unit/evaluator_spec.js | 110 +-
test/unit/font_spec.js | 13 +-
test/unit/function_spec.js | 55 +-
test/unit/jasmine-boot.js | 208 +++
test/unit/network_spec.js | 41 +-
test/unit/primitives_spec.js | 11 +-
test/unit/stream_spec.js | 36 +-
test/unit/testreporter.js | 27 +-
test/unit/unit_test.html | 123 +-
25 files changed, 876 insertions(+), 3803 deletions(-)
diff --git a/external/jasmine/MIT.LICENSE b/external/jasmine/MIT.LICENSE
deleted file mode 100644
index 7c435ba..0000000
--- a/external/jasmine/MIT.LICENSE
+++ /dev/null
@@ -1,20 +0,0 @@
-Copyright (c) 2008-2011 Pivotal Labs
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/external/jasmine/jasmine-html.js b/external/jasmine/jasmine-html.js
deleted file mode 100644
index 3de4e8a..0000000
--- a/external/jasmine/jasmine-html.js
+++ /dev/null
@@ -1,676 +0,0 @@
-jasmine.HtmlReporterHelpers = {};
-
-jasmine.HtmlReporterHelpers.createDom = function(type, attrs, childrenVarArgs) {
- var el = document.createElement(type);
-
- for (var i = 2; i < arguments.length; i++) {
- var child = arguments[i];
-
- if (typeof child === 'string') {
- el.appendChild(document.createTextNode(child));
- } else {
- if (child) {
- el.appendChild(child);
- }
- }
- }
-
- for (var attr in attrs) {
- if (attr == "className") {
- el[attr] = attrs[attr];
- } else {
- el.setAttribute(attr, attrs[attr]);
- }
- }
-
- return el;
-};
-
-jasmine.HtmlReporterHelpers.getSpecStatus = function(child) {
- var results = child.results();
- var status = results.passed() ? 'passed' : 'failed';
- if (results.skipped) {
- status = 'skipped';
- }
-
- return status;
-};
-
-jasmine.HtmlReporterHelpers.appendToSummary = function(child, childElement) {
- var parentDiv = this.dom.summary;
- var parentSuite = (typeof child.parentSuite == 'undefined') ? 'suite' : 'parentSuite';
- var parent = child[parentSuite];
-
- if (parent) {
- if (typeof this.views.suites[parent.id] == 'undefined') {
- this.views.suites[parent.id] = new jasmine.HtmlReporter.SuiteView(parent, this.dom, this.views);
- }
- parentDiv = this.views.suites[parent.id].element;
- }
-
- parentDiv.appendChild(childElement);
-};
-
-
-jasmine.HtmlReporterHelpers.addHelpers = function(ctor) {
- for(var fn in jasmine.HtmlReporterHelpers) {
- ctor.prototype[fn] = jasmine.HtmlReporterHelpers[fn];
- }
-};
-
-jasmine.HtmlReporter = function(_doc) {
- var self = this;
- var doc = _doc || window.document;
-
- var reporterView;
-
- var dom = {};
-
- // Jasmine Reporter Public Interface
- self.logRunningSpecs = false;
-
- self.reportRunnerStarting = function(runner) {
- var specs = runner.specs() || [];
-
- if (specs.length == 0) {
- return;
- }
-
- createReporterDom(runner.env.versionString());
- doc.body.appendChild(dom.reporter);
-
- reporterView = new jasmine.HtmlReporter.ReporterView(dom);
- reporterView.addSpecs(specs, self.specFilter);
- };
-
- self.reportRunnerResults = function(runner) {
- reporterView.complete();
- };
-
- self.reportSuiteResults = function(suite) {
- reporterView.suiteComplete(suite);
- };
-
- self.reportSpecStarting = function(spec) {
- if (self.logRunningSpecs) {
- self.log('>> Jasmine Running ' + spec.suite.description + ' ' + spec.description + '...');
- }
- };
-
- self.reportSpecResults = function(spec) {
- reporterView.specComplete(spec);
- };
-
- self.log = function() {
- var console = jasmine.getGlobal().console;
- if (console && console.log) {
- if (console.log.apply) {
- console.log.apply(console, arguments);
- } else {
- console.log(arguments); // ie fix: console.log.apply doesn't exist on ie
- }
- }
- };
-
- self.specFilter = function(spec) {
- if (!focusedSpecName()) {
- return true;
- }
-
- return spec.getFullName().indexOf(focusedSpecName()) === 0;
- };
-
- return self;
-
- function focusedSpecName() {
- var specName;
-
- (function memoizeFocusedSpec() {
- if (specName) {
- return;
- }
-
- var paramMap = [];
- var params = doc.location.search.substring(1).split('&');
-
- for (var i = 0; i < params.length; i++) {
- var p = params[i].split('=');
- paramMap[decodeURIComponent(p[0])] = decodeURIComponent(p[1]);
- }
-
- specName = paramMap.spec;
- })();
-
- return specName;
- }
-
- function createReporterDom(version) {
- dom.reporter = self.createDom('div', { id: 'HTMLReporter', className: 'jasmine_reporter' },
- dom.banner = self.createDom('div', { className: 'banner' },
- self.createDom('span', { className: 'title' }, "Jasmine "),
- self.createDom('span', { className: 'version' }, version)),
-
- dom.symbolSummary = self.createDom('ul', {className: 'symbolSummary'}),
- dom.alert = self.createDom('div', {className: 'alert'}),
- dom.results = self.createDom('div', {className: 'results'},
- dom.summary = self.createDom('div', { className: 'summary' }),
- dom.details = self.createDom('div', { id: 'details' }))
- );
- }
-};
-jasmine.HtmlReporterHelpers.addHelpers(jasmine.HtmlReporter);jasmine.HtmlReporterHelpers = {};
-
-jasmine.HtmlReporterHelpers.createDom = function(type, attrs, childrenVarArgs) {
- var el = document.createElement(type);
-
- for (var i = 2; i < arguments.length; i++) {
- var child = arguments[i];
-
- if (typeof child === 'string') {
- el.appendChild(document.createTextNode(child));
- } else {
- if (child) {
- el.appendChild(child);
- }
- }
- }
-
- for (var attr in attrs) {
- if (attr == "className") {
- el[attr] = attrs[attr];
- } else {
- el.setAttribute(attr, attrs[attr]);
- }
- }
-
- return el;
-};
-
-jasmine.HtmlReporterHelpers.getSpecStatus = function(child) {
- var results = child.results();
- var status = results.passed() ? 'passed' : 'failed';
- if (results.skipped) {
- status = 'skipped';
- }
-
- return status;
-};
-
-jasmine.HtmlReporterHelpers.appendToSummary = function(child, childElement) {
- var parentDiv = this.dom.summary;
- var parentSuite = (typeof child.parentSuite == 'undefined') ? 'suite' : 'parentSuite';
- var parent = child[parentSuite];
-
- if (parent) {
- if (typeof this.views.suites[parent.id] == 'undefined') {
- this.views.suites[parent.id] = new jasmine.HtmlReporter.SuiteView(parent, this.dom, this.views);
- }
- parentDiv = this.views.suites[parent.id].element;
- }
-
- parentDiv.appendChild(childElement);
-};
-
-
-jasmine.HtmlReporterHelpers.addHelpers = function(ctor) {
- for(var fn in jasmine.HtmlReporterHelpers) {
- ctor.prototype[fn] = jasmine.HtmlReporterHelpers[fn];
- }
-};
-
-jasmine.HtmlReporter.ReporterView = function(dom) {
- this.startedAt = new Date();
- this.runningSpecCount = 0;
- this.completeSpecCount = 0;
- this.passedCount = 0;
- this.failedCount = 0;
- this.skippedCount = 0;
-
- this.createResultsMenu = function() {
- this.resultsMenu = this.createDom('span', {className: 'resultsMenu bar'},
- this.summaryMenuItem = this.createDom('a', {className: 'summaryMenuItem', href: "#"}, '0 specs'),
- ' | ',
- this.detailsMenuItem = this.createDom('a', {className: 'detailsMenuItem', href: "#"}, '0 failing'));
-
- this.summaryMenuItem.onclick = function() {
- dom.reporter.className = dom.reporter.className.replace(/ showDetails/g, '');
- };
-
- this.detailsMenuItem.onclick = function() {
- showDetails();
- };
- };
-
- this.addSpecs = function(specs, specFilter) {
- this.totalSpecCount = specs.length;
-
- this.views = {
- specs: {},
- suites: {}
- };
-
- for (var i = 0; i < specs.length; i++) {
- var spec = specs[i];
- this.views.specs[spec.id] = new jasmine.HtmlReporter.SpecView(spec, dom, this.views);
- if (specFilter(spec)) {
- this.runningSpecCount++;
- }
- }
- };
-
- this.specComplete = function(spec) {
- this.completeSpecCount++;
-
- if (isUndefined(this.views.specs[spec.id])) {
- this.views.specs[spec.id] = new jasmine.HtmlReporter.SpecView(spec, dom);
- }
-
- var specView = this.views.specs[spec.id];
-
- switch (specView.status()) {
- case 'passed':
- this.passedCount++;
- break;
-
- case 'failed':
- this.failedCount++;
- break;
-
- case 'skipped':
- this.skippedCount++;
- break;
- }
-
- specView.refresh();
- this.refresh();
- };
-
- this.suiteComplete = function(suite) {
- var suiteView = this.views.suites[suite.id];
- if (isUndefined(suiteView)) {
- return;
- }
- suiteView.refresh();
- };
-
- this.refresh = function() {
-
- if (isUndefined(this.resultsMenu)) {
- this.createResultsMenu();
- }
-
- // currently running UI
- if (isUndefined(this.runningAlert)) {
- this.runningAlert = this.createDom('a', {href: "?", className: "runningAlert bar"});
- dom.alert.appendChild(this.runningAlert);
- }
- this.runningAlert.innerHTML = "Running " + this.completeSpecCount + " of " + specPluralizedFor(this.totalSpecCount);
-
- // skipped specs UI
- if (isUndefined(this.skippedAlert)) {
- this.skippedAlert = this.createDom('a', {href: "?", className: "skippedAlert bar"});
- }
-
- this.skippedAlert.innerHTML = "Skipping " + this.skippedCount + " of " + specPluralizedFor(this.totalSpecCount) + " - run all";
-
- if (this.skippedCount === 1 && isDefined(dom.alert)) {
- dom.alert.appendChild(this.skippedAlert);
- }
-
- // passing specs UI
- if (isUndefined(this.passedAlert)) {
- this.passedAlert = this.createDom('span', {href: "?", className: "passingAlert bar"});
- }
- this.passedAlert.innerHTML = "Passing " + specPluralizedFor(this.passedCount);
-
- // failing specs UI
- if (isUndefined(this.failedAlert)) {
- this.failedAlert = this.createDom('span', {href: "?", className: "failingAlert bar"});
- }
- this.failedAlert.innerHTML = "Failing " + specPluralizedFor(this.failedCount);
-
- if (this.failedCount === 1 && isDefined(dom.alert)) {
- dom.alert.appendChild(this.failedAlert);
- dom.alert.appendChild(this.resultsMenu);
- }
-
- // summary info
- this.summaryMenuItem.innerHTML = "" + specPluralizedFor(this.runningSpecCount);
- this.detailsMenuItem.innerHTML = "" + this.failedCount + " failing";
- };
-
- this.complete = function() {
- dom.alert.removeChild(this.runningAlert);
-
- this.skippedAlert.innerHTML = "Ran " + this.runningSpecCount + " of " + specPluralizedFor(this.totalSpecCount) + " - run all";
-
- if (this.failedCount === 0) {
- dom.alert.appendChild(this.createDom('span', {className: 'passingAlert bar'}, "Passing " + specPluralizedFor(this.passedCount)));
- } else {
- showDetails();
- }
-
- dom.banner.appendChild(this.createDom('span', {className: 'duration'}, "finished in " + ((new Date().getTime() - this.startedAt.getTime()) / 1000) + "s"));
- };
-
- return this;
-
- function showDetails() {
- if (dom.reporter.className.search(/showDetails/) === -1) {
- dom.reporter.className += " showDetails";
- }
- }
-
- function isUndefined(obj) {
- return typeof obj === 'undefined';
- }
-
- function isDefined(obj) {
- return !isUndefined(obj);
- }
-
- function specPluralizedFor(count) {
- var str = count + " spec";
- if (count > 1) {
- str += "s"
- }
- return str;
- }
-
-};
-
-jasmine.HtmlReporterHelpers.addHelpers(jasmine.HtmlReporter.ReporterView);
-
-
-jasmine.HtmlReporter.SpecView = function(spec, dom, views) {
- this.spec = spec;
- this.dom = dom;
- this.views = views;
-
- this.symbol = this.createDom('li', { className: 'pending' });
- this.dom.symbolSummary.appendChild(this.symbol);
-
- this.summary = this.createDom('div', { className: 'specSummary' },
- this.createDom('a', {
- className: 'description',
- href: '?spec=' + encodeURIComponent(this.spec.getFullName()),
- title: this.spec.getFullName()
- }, this.spec.description)
- );
-
- this.detail = this.createDom('div', { className: 'specDetail' },
- this.createDom('a', {
- className: 'description',
- href: '?spec=' + encodeURIComponent(this.spec.getFullName()),
- title: this.spec.getFullName()
- }, this.spec.getFullName())
- );
-};
-
-jasmine.HtmlReporter.SpecView.prototype.status = function() {
- return this.getSpecStatus(this.spec);
-};
-
-jasmine.HtmlReporter.SpecView.prototype.refresh = function() {
- this.symbol.className = this.status();
-
- switch (this.status()) {
- case 'skipped':
- break;
-
- case 'passed':
- this.appendSummaryToSuiteDiv();
- break;
-
- case 'failed':
- this.appendSummaryToSuiteDiv();
- this.appendFailureDetail();
- break;
- }
-};
-
-jasmine.HtmlReporter.SpecView.prototype.appendSummaryToSuiteDiv = function() {
- this.summary.className += ' ' + this.status();
- this.appendToSummary(this.spec, this.summary);
-};
-
-jasmine.HtmlReporter.SpecView.prototype.appendFailureDetail = function() {
- this.detail.className += ' ' + this.status();
-
- var resultItems = this.spec.results().getItems();
- var messagesDiv = this.createDom('div', { className: 'messages' });
-
- for (var i = 0; i < resultItems.length; i++) {
- var result = resultItems[i];
-
- if (result.type == 'log') {
- messagesDiv.appendChild(this.createDom('div', {className: 'resultMessage log'}, result.toString()));
- } else if (result.type == 'expect' && result.passed && !result.passed()) {
- messagesDiv.appendChild(this.createDom('div', {className: 'resultMessage fail'}, result.message));
-
- if (result.trace.stack) {
- messagesDiv.appendChild(this.createDom('div', {className: 'stackTrace'}, result.trace.stack));
- }
- }
- }
-
- if (messagesDiv.childNodes.length > 0) {
- this.detail.appendChild(messagesDiv);
- this.dom.details.appendChild(this.detail);
- }
-};
-
-jasmine.HtmlReporterHelpers.addHelpers(jasmine.HtmlReporter.SpecView);jasmine.HtmlReporter.SuiteView = function(suite, dom, views) {
- this.suite = suite;
- this.dom = dom;
- this.views = views;
-
- this.element = this.createDom('div', { className: 'suite' },
- this.createDom('a', { className: 'description', href: '?spec=' + encodeURIComponent(this.suite.getFullName()) }, this.suite.description)
- );
-
- this.appendToSummary(this.suite, this.element);
-};
-
-jasmine.HtmlReporter.SuiteView.prototype.status = function() {
- return this.getSpecStatus(this.suite);
-};
-
-jasmine.HtmlReporter.SuiteView.prototype.refresh = function() {
- this.element.className += " " + this.status();
-};
-
-jasmine.HtmlReporterHelpers.addHelpers(jasmine.HtmlReporter.SuiteView);
-
-/* @deprecated Use jasmine.HtmlReporter instead
- */
-jasmine.TrivialReporter = function(doc) {
- this.document = doc || document;
- this.suiteDivs = {};
- this.logRunningSpecs = false;
-};
-
-jasmine.TrivialReporter.prototype.createDom = function(type, attrs, childrenVarArgs) {
- var el = document.createElement(type);
-
- for (var i = 2; i < arguments.length; i++) {
- var child = arguments[i];
-
- if (typeof child === 'string') {
- el.appendChild(document.createTextNode(child));
- } else {
- if (child) { el.appendChild(child); }
- }
- }
-
- for (var attr in attrs) {
- if (attr == "className") {
- el[attr] = attrs[attr];
- } else {
- el.setAttribute(attr, attrs[attr]);
- }
- }
-
- return el;
-};
-
-jasmine.TrivialReporter.prototype.reportRunnerStarting = function(runner) {
- var showPassed, showSkipped;
-
- this.outerDiv = this.createDom('div', { id: 'TrivialReporter', className: 'jasmine_reporter' },
- this.createDom('div', { className: 'banner' },
- this.createDom('div', { className: 'logo' },
- this.createDom('span', { className: 'title' }, "Jasmine"),
- this.createDom('span', { className: 'version' }, runner.env.versionString())),
- this.createDom('div', { className: 'options' },
- "Show ",
- showPassed = this.createDom('input', { id: "__jasmine_TrivialReporter_showPassed__", type: 'checkbox' }),
- this.createDom('label', { "for": "__jasmine_TrivialReporter_showPassed__" }, " passed "),
- showSkipped = this.createDom('input', { id: "__jasmine_TrivialReporter_showSkipped__", type: 'checkbox' }),
- this.createDom('label', { "for": "__jasmine_TrivialReporter_showSkipped__" }, " skipped")
- )
- ),
-
- this.runnerDiv = this.createDom('div', { className: 'runner running' },
- this.createDom('a', { className: 'run_spec', href: '?' }, "run all"),
- this.runnerMessageSpan = this.createDom('span', {}, "Running..."),
- this.finishedAtSpan = this.createDom('span', { className: 'finished-at' }, ""))
- );
-
- this.document.body.appendChild(this.outerDiv);
-
- var suites = runner.suites();
- for (var i = 0; i < suites.length; i++) {
- var suite = suites[i];
- var suiteDiv = this.createDom('div', { className: 'suite' },
- this.createDom('a', { className: 'run_spec', href: '?spec=' + encodeURIComponent(suite.getFullName()) }, "run"),
- this.createDom('a', { className: 'description', href: '?spec=' + encodeURIComponent(suite.getFullName()) }, suite.description));
- this.suiteDivs[suite.id] = suiteDiv;
- var parentDiv = this.outerDiv;
- if (suite.parentSuite) {
- parentDiv = this.suiteDivs[suite.parentSuite.id];
- }
- parentDiv.appendChild(suiteDiv);
- }
-
- this.startedAt = new Date();
-
- var self = this;
- showPassed.onclick = function(evt) {
- if (showPassed.checked) {
- self.outerDiv.className += ' show-passed';
- } else {
- self.outerDiv.className = self.outerDiv.className.replace(/ show-passed/, '');
- }
- };
-
- showSkipped.onclick = function(evt) {
- if (showSkipped.checked) {
- self.outerDiv.className += ' show-skipped';
- } else {
- self.outerDiv.className = self.outerDiv.className.replace(/ show-skipped/, '');
- }
- };
-};
-
-jasmine.TrivialReporter.prototype.reportRunnerResults = function(runner) {
- var results = runner.results();
- var className = (results.failedCount > 0) ? "runner failed" : "runner passed";
- this.runnerDiv.setAttribute("class", className);
- //do it twice for IE
- this.runnerDiv.setAttribute("className", className);
- var specs = runner.specs();
- var specCount = 0;
- for (var i = 0; i < specs.length; i++) {
- if (this.specFilter(specs[i])) {
- specCount++;
- }
- }
- var message = "" + specCount + " spec" + (specCount == 1 ? "" : "s" ) + ", " + results.failedCount + " failure" + ((results.failedCount == 1) ? "" : "s");
- message += " in " + ((new Date().getTime() - this.startedAt.getTime()) / 1000) + "s";
- this.runnerMessageSpan.replaceChild(this.createDom('a', { className: 'description', href: '?'}, message), this.runnerMessageSpan.firstChild);
-
- this.finishedAtSpan.appendChild(document.createTextNode("Finished at " + new Date().toString()));
-};
-
-jasmine.TrivialReporter.prototype.reportSuiteResults = function(suite) {
- var results = suite.results();
- var status = results.passed() ? 'passed' : 'failed';
- if (results.totalCount === 0) { // todo: change this to check results.skipped
- status = 'skipped';
- }
- this.suiteDivs[suite.id].className += " " + status;
-};
-
-jasmine.TrivialReporter.prototype.reportSpecStarting = function(spec) {
- if (this.logRunningSpecs) {
- this.log('>> Jasmine Running ' + spec.suite.description + ' ' + spec.description + '...');
- }
-};
-
-jasmine.TrivialReporter.prototype.reportSpecResults = function(spec) {
- var results = spec.results();
- var status = results.passed() ? 'passed' : 'failed';
- if (results.skipped) {
- status = 'skipped';
- }
- var specDiv = this.createDom('div', { className: 'spec ' + status },
- this.createDom('a', { className: 'run_spec', href: '?spec=' + encodeURIComponent(spec.getFullName()) }, "run"),
- this.createDom('a', {
- className: 'description',
- href: '?spec=' + encodeURIComponent(spec.getFullName()),
- title: spec.getFullName()
- }, spec.description));
-
-
- var resultItems = results.getItems();
- var messagesDiv = this.createDom('div', { className: 'messages' });
- for (var i = 0; i < resultItems.length; i++) {
- var result = resultItems[i];
-
- if (result.type == 'log') {
- messagesDiv.appendChild(this.createDom('div', {className: 'resultMessage log'}, result.toString()));
- } else if (result.type == 'expect' && result.passed && !result.passed()) {
- messagesDiv.appendChild(this.createDom('div', {className: 'resultMessage fail'}, result.message));
-
- if (result.trace.stack) {
- messagesDiv.appendChild(this.createDom('div', {className: 'stackTrace'}, result.trace.stack));
- }
- }
- }
-
- if (messagesDiv.childNodes.length > 0) {
- specDiv.appendChild(messagesDiv);
- }
-
- this.suiteDivs[spec.suite.id].appendChild(specDiv);
-};
-
-jasmine.TrivialReporter.prototype.log = function() {
- var console = jasmine.getGlobal().console;
- if (console && console.log) {
- if (console.log.apply) {
- console.log.apply(console, arguments);
- } else {
- console.log(arguments); // ie fix: console.log.apply doesn't exist on ie
- }
- }
-};
-
-jasmine.TrivialReporter.prototype.getLocation = function() {
- return this.document.location;
-};
-
-jasmine.TrivialReporter.prototype.specFilter = function(spec) {
- var paramMap = {};
- var params = this.getLocation().search.substring(1).split('&');
- for (var i = 0; i < params.length; i++) {
- var p = params[i].split('=');
- paramMap[decodeURIComponent(p[0])] = decodeURIComponent(p[1]);
- }
-
- if (!paramMap.spec) {
- return true;
- }
- return spec.getFullName().indexOf(paramMap.spec) === 0;
-};
diff --git a/external/jasmine/jasmine.css b/external/jasmine/jasmine.css
deleted file mode 100644
index 826e575..0000000
--- a/external/jasmine/jasmine.css
+++ /dev/null
@@ -1,81 +0,0 @@
-body { background-color: #eeeeee; padding: 0; margin: 5px; overflow-y: scroll; }
-
-#HTMLReporter { font-size: 11px; font-family: Monaco, "Lucida Console", monospace; line-height: 14px; color: #333333; }
-#HTMLReporter a { text-decoration: none; }
-#HTMLReporter a:hover { text-decoration: underline; }
-#HTMLReporter p, #HTMLReporter h1, #HTMLReporter h2, #HTMLReporter h3, #HTMLReporter h4, #HTMLReporter h5, #HTMLReporter h6 { margin: 0; line-height: 14px; }
-#HTMLReporter .banner, #HTMLReporter .symbolSummary, #HTMLReporter .summary, #HTMLReporter .resultMessage, #HTMLReporter .specDetail .description, #HTMLReporter .alert .bar, #HTMLReporter .stackTrace { padding-left: 9px; padding-right: 9px; }
-#HTMLReporter #jasmine_content { position: fixed; right: 100%; }
-#HTMLReporter .version { color: #aaaaaa; }
-#HTMLReporter .banner { margin-top: 14px; }
-#HTMLReporter .duration { color: #aaaaaa; float: right; }
-#HTMLReporter .symbolSummary { overflow: hidden; *zoom: 1; margin: 14px 0; }
-#HTMLReporter .symbolSummary li { display: block; float: left; height: 7px; width: 14px; margin-bottom: 7px; font-size: 16px; }
-#HTMLReporter .symbolSummary li.passed { font-size: 14px; }
-#HTMLReporter .symbolSummary li.passed:before { color: #5e7d00; content: "\02022"; }
-#HTMLReporter .symbolSummary li.failed { line-height: 9px; }
-#HTMLReporter .symbolSummary li.failed:before { color: #b03911; content: "x"; font-weight: bold; margin-left: -1px; }
-#HTMLReporter .symbolSummary li.skipped { font-size: 14px; }
-#HTMLReporter .symbolSummary li.skipped:before { color: #bababa; content: "\02022"; }
-#HTMLReporter .symbolSummary li.pending { line-height: 11px; }
-#HTMLReporter .symbolSummary li.pending:before { color: #aaaaaa; content: "-"; }
-#HTMLReporter .bar { line-height: 28px; font-size: 14px; display: block; color: #eee; }
-#HTMLReporter .runningAlert { background-color: #666666; }
-#HTMLReporter .skippedAlert { background-color: #aaaaaa; }
-#HTMLReporter .skippedAlert:first-child { background-color: #333333; }
-#HTMLReporter .skippedAlert:hover { text-decoration: none; color: white; text-decoration: underline; }
-#HTMLReporter .passingAlert { background-color: #a6b779; }
-#HTMLReporter .passingAlert:first-child { background-color: #5e7d00; }
-#HTMLReporter .failingAlert { background-color: #cf867e; }
-#HTMLReporter .failingAlert:first-child { background-color: #b03911; }
-#HTMLReporter .results { margin-top: 14px; }
-#HTMLReporter #details { display: none; }
-#HTMLReporter .resultsMenu, #HTMLReporter .resultsMenu a { background-color: #fff; color: #333333; }
-#HTMLReporter.showDetails .summaryMenuItem { font-weight: normal; text-decoration: inherit; }
-#HTMLReporter.showDetails .summaryMenuItem:hover { text-decoration: underline; }
-#HTMLReporter.showDetails .detailsMenuItem { font-weight: bold; text-decoration: underline; }
-#HTMLReporter.showDetails .summary { display: none; }
-#HTMLReporter.showDetails #details { display: block; }
-#HTMLReporter .summaryMenuItem { font-weight: bold; text-decoration: underline; }
-#HTMLReporter .summary { margin-top: 14px; }
-#HTMLReporter .summary .suite .suite, #HTMLReporter .summary .specSummary { margin-left: 14px; }
-#HTMLReporter .summary .specSummary.passed a { color: #5e7d00; }
-#HTMLReporter .summary .specSummary.failed a { color: #b03911; }
-#HTMLReporter .description + .suite { margin-top: 0; }
-#HTMLReporter .suite { margin-top: 14px; }
-#HTMLReporter .suite a { color: #333333; }
-#HTMLReporter #details .specDetail { margin-bottom: 28px; }
-#HTMLReporter #details .specDetail .description { display: block; color: white; background-color: #b03911; }
-#HTMLReporter .resultMessage { padding-top: 14px; color: #333333; }
-#HTMLReporter .resultMessage span.result { display: block; }
-#HTMLReporter .stackTrace { margin: 5px 0 0 0; max-height: 224px; overflow: auto; line-height: 18px; color: #666666; border: 1px solid #ddd; background: white; white-space: pre; }
-
-#TrivialReporter { padding: 8px 13px; position: absolute; top: 0; bottom: 0; left: 0; right: 0; overflow-y: scroll; background-color: white; font-family: "Helvetica Neue Light", "Lucida Grande", "Calibri", "Arial", sans-serif; /*.resultMessage {*/ /*white-space: pre;*/ /*}*/ }
-#TrivialReporter a:visited, #TrivialReporter a { color: #303; }
-#TrivialReporter a:hover, #TrivialReporter a:active { color: blue; }
-#TrivialReporter .run_spec { float: right; padding-right: 5px; font-size: .8em; text-decoration: none; }
-#TrivialReporter .banner { color: #303; background-color: #fef; padding: 5px; }
-#TrivialReporter .logo { float: left; font-size: 1.1em; padding-left: 5px; }
-#TrivialReporter .logo .version { font-size: .6em; padding-left: 1em; }
-#TrivialReporter .runner.running { background-color: yellow; }
-#TrivialReporter .options { text-align: right; font-size: .8em; }
-#TrivialReporter .suite { border: 1px outset gray; margin: 5px 0; padding-left: 1em; }
-#TrivialReporter .suite .suite { margin: 5px; }
-#TrivialReporter .suite.passed { background-color: #dfd; }
-#TrivialReporter .suite.failed { background-color: #fdd; }
-#TrivialReporter .spec { margin: 5px; padding-left: 1em; clear: both; }
-#TrivialReporter .spec.failed, #TrivialReporter .spec.passed, #TrivialReporter .spec.skipped { padding-bottom: 5px; border: 1px solid gray; }
-#TrivialReporter .spec.failed { background-color: #fbb; border-color: red; }
-#TrivialReporter .spec.passed { background-color: #bfb; border-color: green; }
-#TrivialReporter .spec.skipped { background-color: #bbb; }
-#TrivialReporter .messages { border-left: 1px dashed gray; padding-left: 1em; padding-right: 1em; }
-#TrivialReporter .passed { background-color: #cfc; display: none; }
-#TrivialReporter .failed { background-color: #fbb; }
-#TrivialReporter .skipped { color: #777; background-color: #eee; display: none; }
-#TrivialReporter .resultMessage span.result { display: block; line-height: 2em; color: black; }
-#TrivialReporter .resultMessage .mismatch { color: black; }
-#TrivialReporter .stackTrace { white-space: pre; font-size: .8em; margin-left: 10px; max-height: 5em; overflow: auto; border: 1px inset red; padding: 1em; background: #eef; }
-#TrivialReporter .finished-at { padding-left: 1em; font-size: .6em; }
-#TrivialReporter.show-passed .passed, #TrivialReporter.show-skipped .skipped { display: block; }
-#TrivialReporter #jasmine_content { position: fixed; right: 100%; }
-#TrivialReporter .runner { border: 1px solid gray; display: block; margin: 5px 0; padding: 2px 0 2px 10px; }
diff --git a/external/jasmine/jasmine.js b/external/jasmine/jasmine.js
deleted file mode 100644
index adf9859..0000000
--- a/external/jasmine/jasmine.js
+++ /dev/null
@@ -1,2469 +0,0 @@
-var isCommonJS = typeof window == "undefined";
-
-/**
- * Top level namespace for Jasmine, a lightweight JavaScript BDD/spec/testing framework.
- *
- * @namespace
- */
-var jasmine = {};
-if (isCommonJS) exports.jasmine = jasmine;
-/**
- * @private
- */
-jasmine.unimplementedMethod_ = function() {
- throw new Error("unimplemented method");
-};
-
-/**
- * Use <code>jasmine.undefined</code> instead of <code>undefined</code>, since <code>undefined</code> is just
- * a plain old variable and may be redefined by somebody else.
- *
- * @private
- */
-jasmine.undefined = jasmine.___undefined___;
-
-/**
- * Show diagnostic messages in the console if set to true
- *
- */
-jasmine.VERBOSE = false;
-
-/**
- * Default interval in milliseconds for event loop yields (e.g. to allow network activity or to refresh the screen with the HTML-based runner). Small values here may result in slow test running. Zero means no updates until all tests have completed.
- *
- */
-jasmine.DEFAULT_UPDATE_INTERVAL = 250;
-
-/**
- * Default timeout interval in milliseconds for waitsFor() blocks.
- */
-jasmine.DEFAULT_TIMEOUT_INTERVAL = 5000;
-
-jasmine.getGlobal = function() {
- function getGlobal() {
- return this;
- }
-
- return getGlobal();
-};
-
-/**
- * Allows for bound functions to be compared. Internal use only.
- *
- * @ignore
- * @private
- * @param base {Object} bound 'this' for the function
- * @param name {Function} function to find
- */
-jasmine.bindOriginal_ = function(base, name) {
- var original = base[name];
- if (original.apply) {
- return function() {
- return original.apply(base, arguments);
- };
- } else {
- // IE support
- return jasmine.getGlobal()[name];
- }
-};
-
-jasmine.setTimeout = jasmine.bindOriginal_(jasmine.getGlobal(), 'setTimeout');
-jasmine.clearTimeout = jasmine.bindOriginal_(jasmine.getGlobal(), 'clearTimeout');
-jasmine.setInterval = jasmine.bindOriginal_(jasmine.getGlobal(), 'setInterval');
-jasmine.clearInterval = jasmine.bindOriginal_(jasmine.getGlobal(), 'clearInterval');
-
-jasmine.MessageResult = function(values) {
- this.type = 'log';
- this.values = values;
- this.trace = new Error(); // todo: test better
-};
-
-jasmine.MessageResult.prototype.toString = function() {
- var text = "";
- for (var i = 0; i < this.values.length; i++) {
- if (i > 0) text += " ";
- if (jasmine.isString_(this.values[i])) {
- text += this.values[i];
- } else {
- text += jasmine.pp(this.values[i]);
- }
- }
- return text;
-};
-
-jasmine.ExpectationResult = function(params) {
- this.type = 'expect';
- this.matcherName = params.matcherName;
- this.passed_ = params.passed;
- this.expected = params.expected;
- this.actual = params.actual;
- this.message = this.passed_ ? 'Passed.' : params.message;
-
- var trace = (params.trace || new Error(this.message));
- this.trace = this.passed_ ? '' : trace;
-};
-
-jasmine.ExpectationResult.prototype.toString = function () {
- return this.message;
-};
-
-jasmine.ExpectationResult.prototype.passed = function () {
- return this.passed_;
-};
-
-/**
- * Getter for the Jasmine environment. Ensures one gets created
- */
-jasmine.getEnv = function() {
- var env = jasmine.currentEnv_ = jasmine.currentEnv_ || new jasmine.Env();
- return env;
-};
-
-/**
- * @ignore
- * @private
- * @param value
- * @returns {Boolean}
- */
-jasmine.isArray_ = function(value) {
- return jasmine.isA_("Array", value);
-};
-
-/**
- * @ignore
- * @private
- * @param value
- * @returns {Boolean}
- */
-jasmine.isString_ = function(value) {
- return jasmine.isA_("String", value);
-};
-
-/**
- * @ignore
- * @private
- * @param value
- * @returns {Boolean}
- */
-jasmine.isNumber_ = function(value) {
- return jasmine.isA_("Number", value);
-};
-
-/**
- * @ignore
- * @private
- * @param {String} typeName
- * @param value
- * @returns {Boolean}
- */
-jasmine.isA_ = function(typeName, value) {
- return Object.prototype.toString.apply(value) === '[object ' + typeName + ']';
-};
-
-/**
- * Pretty printer for expecations. Takes any object and turns it into a human-readable string.
- *
- * @param value {Object} an object to be outputted
- * @returns {String}
- */
-jasmine.pp = function(value) {
- var stringPrettyPrinter = new jasmine.StringPrettyPrinter();
- stringPrettyPrinter.format(value);
- return stringPrettyPrinter.string;
-};
-
-/**
- * Returns true if the object is a DOM Node.
- *
- * @param {Object} obj object to check
- * @returns {Boolean}
- */
-jasmine.isDomNode = function(obj) {
- return obj.nodeType > 0;
-};
-
-/**
- * Returns a matchable 'generic' object of the class type. For use in expecations of type when values don't matter.
- *
- * @example
- * // don't care about which function is passed in, as long as it's a function
- * expect(mySpy).toHaveBeenCalledWith(jasmine.any(Function));
- *
- * @param {Class} clazz
- * @returns matchable object of the type clazz
- */
-jasmine.any = function(clazz) {
- return new jasmine.Matchers.Any(clazz);
-};
-
-/**
- * Jasmine Spies are test doubles that can act as stubs, spies, fakes or when used in an expecation, mocks.
- *
- * Spies should be created in test setup, before expectations. They can then be checked, using the standard Jasmine
- * expectation syntax. Spies can be checked if they were called or not and what the calling params were.
- *
- * A Spy has the following fields: wasCalled, callCount, mostRecentCall, and argsForCall (see docs).
- *
- * Spies are torn down at the end of every spec.
- *
- * Note: Do <b>not</b> call new jasmine.Spy() directly - a spy must be created using spyOn, jasmine.createSpy or jasmine.createSpyObj.
- *
- * @example
- * // a stub
- * var myStub = jasmine.createSpy('myStub'); // can be used anywhere
- *
- * // spy example
- * var foo = {
- * not: function(bool) { return !bool; }
- * }
- *
- * // actual foo.not will not be called, execution stops
- * spyOn(foo, 'not');
-
- // foo.not spied upon, execution will continue to implementation
- * spyOn(foo, 'not').andCallThrough();
- *
- * // fake example
- * var foo = {
- * not: function(bool) { return !bool; }
- * }
- *
- * // foo.not(val) will return val
- * spyOn(foo, 'not').andCallFake(function(value) {return value;});
- *
- * // mock example
- * foo.not(7 == 7);
- * expect(foo.not).toHaveBeenCalled();
- * expect(foo.not).toHaveBeenCalledWith(true);
- *
- * @constructor
- * @see spyOn, jasmine.createSpy, jasmine.createSpyObj
- * @param {String} name
- */
-jasmine.Spy = function(name) {
- /**
- * The name of the spy, if provided.
- */
- this.identity = name || 'unknown';
- /**
- * Is this Object a spy?
- */
- this.isSpy = true;
- /**
- * The actual function this spy stubs.
- */
- this.plan = function() {
- };
- /**
- * Tracking of the most recent call to the spy.
- * @example
- * var mySpy = jasmine.createSpy('foo');
- * mySpy(1, 2);
- * mySpy.mostRecentCall.args = [1, 2];
- */
- this.mostRecentCall = {};
-
- /**
- * Holds arguments for each call to the spy, indexed by call count
- * @example
- * var mySpy = jasmine.createSpy('foo');
- * mySpy(1, 2);
- * mySpy(7, 8);
- * mySpy.mostRecentCall.args = [7, 8];
- * mySpy.argsForCall[0] = [1, 2];
- * mySpy.argsForCall[1] = [7, 8];
- */
- this.argsForCall = [];
- this.calls = [];
-};
-
-/**
- * Tells a spy to call through to the actual implemenatation.
- *
- * @example
- * var foo = {
- * bar: function() { // do some stuff }
- * }
- *
- * // defining a spy on an existing property: foo.bar
- * spyOn(foo, 'bar').andCallThrough();
- */
-jasmine.Spy.prototype.andCallThrough = function() {
- this.plan = this.originalValue;
- return this;
-};
-
-/**
- * For setting the return value of a spy.
- *
- * @example
- * // defining a spy from scratch: foo() returns 'baz'
- * var foo = jasmine.createSpy('spy on foo').andReturn('baz');
- *
- * // defining a spy on an existing property: foo.bar() returns 'baz'
- * spyOn(foo, 'bar').andReturn('baz');
- *
- * @param {Object} value
- */
-jasmine.Spy.prototype.andReturn = function(value) {
- this.plan = function() {
- return value;
- };
- return this;
-};
-
-/**
- * For throwing an exception when a spy is called.
- *
- * @example
- * // defining a spy from scratch: foo() throws an exception w/ message 'ouch'
- * var foo = jasmine.createSpy('spy on foo').andThrow('baz');
- *
- * // defining a spy on an existing property: foo.bar() throws an exception w/ message 'ouch'
- * spyOn(foo, 'bar').andThrow('baz');
- *
- * @param {String} exceptionMsg
- */
-jasmine.Spy.prototype.andThrow = function(exceptionMsg) {
- this.plan = function() {
- throw exceptionMsg;
- };
- return this;
-};
-
-/**
- * Calls an alternate implementation when a spy is called.
- *
- * @example
- * var baz = function() {
- * // do some stuff, return something
- * }
- * // defining a spy from scratch: foo() calls the function baz
- * var foo = jasmine.createSpy('spy on foo').andCall(baz);
- *
- * // defining a spy on an existing property: foo.bar() calls an anonymnous function
- * spyOn(foo, 'bar').andCall(function() { return 'baz';} );
- *
- * @param {Function} fakeFunc
- */
-jasmine.Spy.prototype.andCallFake = function(fakeFunc) {
- this.plan = fakeFunc;
- return this;
-};
-
-/**
- * Resets all of a spy's the tracking variables so that it can be used again.
- *
- * @example
- * spyOn(foo, 'bar');
- *
- * foo.bar();
- *
- * expect(foo.bar.callCount).toEqual(1);
- *
- * foo.bar.reset();
- *
- * expect(foo.bar.callCount).toEqual(0);
- */
-jasmine.Spy.prototype.reset = function() {
- this.wasCalled = false;
- this.callCount = 0;
- this.argsForCall = [];
- this.calls = [];
- this.mostRecentCall = {};
-};
-
-jasmine.createSpy = function(name) {
-
- var spyObj = function() {
- spyObj.wasCalled = true;
- spyObj.callCount++;
- var args = jasmine.util.argsToArray(arguments);
- spyObj.mostRecentCall.object = this;
- spyObj.mostRecentCall.args = args;
- spyObj.argsForCall.push(args);
- spyObj.calls.push({object: this, args: args});
- return spyObj.plan.apply(this, arguments);
- };
-
- var spy = new jasmine.Spy(name);
-
- for (var prop in spy) {
- spyObj[prop] = spy[prop];
- }
-
- spyObj.reset();
-
- return spyObj;
-};
-
-/**
- * Determines whether an object is a spy.
- *
- * @param {jasmine.Spy|Object} putativeSpy
- * @returns {Boolean}
- */
-jasmine.isSpy = function(putativeSpy) {
- return putativeSpy && putativeSpy.isSpy;
-};
-
-/**
- * Creates a more complicated spy: an Object that has every property a function that is a spy. Used for stubbing something
- * large in one call.
- *
- * @param {String} baseName name of spy class
- * @param {Array} methodNames array of names of methods to make spies
- */
-jasmine.createSpyObj = function(baseName, methodNames) {
- if (!jasmine.isArray_(methodNames) || methodNames.length === 0) {
- throw new Error('createSpyObj requires a non-empty array of method names to create spies for');
- }
- var obj = {};
- for (var i = 0; i < methodNames.length; i++) {
- obj[methodNames[i]] = jasmine.createSpy(baseName + '.' + methodNames[i]);
- }
- return obj;
-};
-
-/**
- * All parameters are pretty-printed and concatenated together, then written to the current spec's output.
- *
- * Be careful not to leave calls to <code>jasmine.log</code> in production code.
- */
-jasmine.log = function() {
- var spec = jasmine.getEnv().currentSpec;
- spec.log.apply(spec, arguments);
-};
-
-/**
- * Function that installs a spy on an existing object's method name. Used within a Spec to create a spy.
- *
- * @example
- * // spy example
- * var foo = {
- * not: function(bool) { return !bool; }
- * }
- * spyOn(foo, 'not'); // actual foo.not will not be called, execution stops
- *
- * @see jasmine.createSpy
- * @param obj
- * @param methodName
- * @returns a Jasmine spy that can be chained with all spy methods
- */
-var spyOn = function(obj, methodName) {
- return jasmine.getEnv().currentSpec.spyOn(obj, methodName);
-};
-if (isCommonJS) exports.spyOn = spyOn;
-
-/**
- * Creates a Jasmine spec that will be added to the current suite.
- *
- * @example
- * it('should be true', function() {
- * expect(true).toEqual(true);
- * });
- *
- * @param {String} desc description of this specification
- * @param {Function} func defines the preconditions and expectations of the spec
- */
-var it = function(desc, func) {
- return jasmine.getEnv().it(desc, func);
-};
-if (isCommonJS) exports.it = it;
-
-/**
- * Creates a <em>disabled</em> Jasmine spec.
- *
- * A convenience method that allows existing specs to be disabled temporarily during development.
- *
- * @param {String} desc description of this specification
- * @param {Function} func defines the preconditions and expectations of the spec
- */
-var xit = function(desc, func) {
- return jasmine.getEnv().xit(desc, func);
-};
-if (isCommonJS) exports.xit = xit;
-
-/**
- * Starts a chain for a Jasmine expectation.
- *
- * It is passed an Object that is the actual value and should chain to one of the many
- * jasmine.Matchers functions.
- *
- * @param {Object} actual Actual value to test against and expected value
- */
-var expect = function(actual) {
- return jasmine.getEnv().currentSpec.expect(actual);
-};
-if (isCommonJS) exports.expect = expect;
-
-/**
- * Defines part of a jasmine spec. Used in cominbination with waits or waitsFor in asynchrnous specs.
- *
- * @param {Function} func Function that defines part of a jasmine spec.
- */
-var runs = function(func) {
- jasmine.getEnv().currentSpec.runs(func);
-};
-if (isCommonJS) exports.runs = runs;
-
-/**
- * Waits a fixed time period before moving to the next block.
- *
- * @deprecated Use waitsFor() instead
- * @param {Number} timeout milliseconds to wait
- */
-var waits = function(timeout) {
- jasmine.getEnv().currentSpec.waits(timeout);
-};
-if (isCommonJS) exports.waits = waits;
-
-/**
- * Waits for the latchFunction to return true before proceeding to the next block.
- *
- * @param {Function} latchFunction
- * @param {String} optional_timeoutMessage
- * @param {Number} optional_timeout
- */
-var waitsFor = function(latchFunction, optional_timeoutMessage, optional_timeout) {
- jasmine.getEnv().currentSpec.waitsFor.apply(jasmine.getEnv().currentSpec, arguments);
-};
-if (isCommonJS) exports.waitsFor = waitsFor;
-
-/**
- * A function that is called before each spec in a suite.
- *
- * Used for spec setup, including validating assumptions.
- *
- * @param {Function} beforeEachFunction
- */
-var beforeEach = function(beforeEachFunction) {
- jasmine.getEnv().beforeEach(beforeEachFunction);
-};
-if (isCommonJS) exports.beforeEach = beforeEach;
-
-/**
- * A function that is called after each spec in a suite.
- *
- * Used for restoring any state that is hijacked during spec execution.
- *
- * @param {Function} afterEachFunction
- */
-var afterEach = function(afterEachFunction) {
- jasmine.getEnv().afterEach(afterEachFunction);
-};
-if (isCommonJS) exports.afterEach = afterEach;
-
-/**
- * Defines a suite of specifications.
- *
- * Stores the description and all defined specs in the Jasmine environment as one suite of specs. Variables declared
- * are accessible by calls to beforeEach, it, and afterEach. Describe blocks can be nested, allowing for specialization
- * of setup in some tests.
- *
- * @param {String} description A string, usually the class under test.
- * @param {Function} specDefinitions function that defines several specs.
- */
-var describe = function(description, specDefinitions) {
- return jasmine.getEnv().describe(description, specDefinitions);
-};
-if (isCommonJS) exports.describe = describe;
-
-/**
- * Disables a suite of specifications. Used to disable some suites in a file, or files, temporarily during development.
- *
- * @param {String} description A string, usually the class under test.
- * @param {Function} specDefinitions function that defines several specs.
- */
-var xdescribe = function(description, specDefinitions) {
- return jasmine.getEnv().xdescribe(description, specDefinitions);
-};
-if (isCommonJS) exports.xdescribe = xdescribe;
-
-
-// Provide the XMLHttpRequest class for IE 5.x-6.x:
-jasmine.XmlHttpRequest = (typeof XMLHttpRequest == "undefined") ? function() {
- function tryIt(f) {
- try {
- return f();
- } catch(e) {
- }
- return null;
- }
-
- var xhr = tryIt(function() {
- return new ActiveXObject("Msxml2.XMLHTTP.6.0");
- }) ||
- tryIt(function() {
- return new ActiveXObject("Msxml2.XMLHTTP.3.0");
- }) ||
- tryIt(function() {
- return new ActiveXObject("Msxml2.XMLHTTP");
- }) ||
- tryIt(function() {
- return new ActiveXObject("Microsoft.XMLHTTP");
- });
-
- if (!xhr) throw new Error("This browser does not support XMLHttpRequest.");
-
- return xhr;
-} : XMLHttpRequest;
-/**
- * @namespace
- */
-jasmine.util = {};
-
-/**
- * Declare that a child class inherit it's prototype from the parent class.
- *
- * @private
- * @param {Function} childClass
- * @param {Function} parentClass
- */
-jasmine.util.inherit = function(childClass, parentClass) {
- /**
- * @private
- */
- var subclass = function() {
- };
- subclass.prototype = parentClass.prototype;
- childClass.prototype = new subclass();
-};
-
-jasmine.util.formatException = function(e) {
- var lineNumber;
- if (e.line) {
- lineNumber = e.line;
- }
- else if (e.lineNumber) {
- lineNumber = e.lineNumber;
- }
-
- var file;
-
- if (e.sourceURL) {
- file = e.sourceURL;
- }
- else if (e.fileName) {
- file = e.fileName;
- }
-
- var message = (e.name && e.message) ? (e.name + ': ' + e.message) : e.toString();
-
- if (file && lineNumber) {
- message += ' in ' + file + ' (line ' + lineNumber + ')';
- }
-
- return message;
-};
-
-jasmine.util.htmlEscape = function(str) {
- if (!str) return str;
- return str.replace(/&/g, '&')
- .replace(/</g, '<')
- .replace(/>/g, '>');
-};
-
-jasmine.util.argsToArray = function(args) {
- var arrayOfArgs = [];
- for (var i = 0; i < args.length; i++) arrayOfArgs.push(args[i]);
- return arrayOfArgs;
-};
-
-jasmine.util.extend = function(destination, source) {
- for (var property in source) destination[property] = source[property];
- return destination;
-};
-
-/**
- * Environment for Jasmine
- *
- * @constructor
- */
-jasmine.Env = function() {
- this.currentSpec = null;
- this.currentSuite = null;
- this.currentRunner_ = new jasmine.Runner(this);
-
- this.reporter = new jasmine.MultiReporter();
-
- this.updateInterval = jasmine.DEFAULT_UPDATE_INTERVAL;
- this.defaultTimeoutInterval = jasmine.DEFAULT_TIMEOUT_INTERVAL;
- this.lastUpdate = 0;
- this.specFilter = function() {
- return true;
- };
-
- this.nextSpecId_ = 0;
- this.nextSuiteId_ = 0;
- this.equalityTesters_ = [];
-
- // wrap matchers
- this.matchersClass = function() {
- jasmine.Matchers.apply(this, arguments);
- };
- jasmine.util.inherit(this.matchersClass, jasmine.Matchers);
-
- jasmine.Matchers.wrapInto_(jasmine.Matchers.prototype, this.matchersClass);
-};
-
-
-jasmine.Env.prototype.setTimeout = jasmine.setTimeout;
-jasmine.Env.prototype.clearTimeout = jasmine.clearTimeout;
-jasmine.Env.prototype.setInterval = jasmine.setInterval;
-jasmine.Env.prototype.clearInterval = jasmine.clearInterval;
-
-/**
- * @returns an object containing jasmine version build info, if set.
- */
-jasmine.Env.prototype.version = function () {
- if (jasmine.version_) {
- return jasmine.version_;
- } else {
- throw new Error('Version not set');
- }
-};
-
-/**
- * @returns string containing jasmine version build info, if set.
- */
-jasmine.Env.prototype.versionString = function() {
- if (!jasmine.version_) {
- return "version unknown";
- }
-
- var version = this.version();
- var versionString = version.major + "." + version.minor + "." + version.build;
- if (version.release_candidate) {
- versionString += ".rc" + version.release_candidate;
- }
- versionString += " revision " + version.revision;
- return versionString;
-};
-
-/**
- * @returns a sequential integer starting at 0
- */
-jasmine.Env.prototype.nextSpecId = function () {
- return this.nextSpecId_++;
-};
-
-/**
- * @returns a sequential integer starting at 0
- */
-jasmine.Env.prototype.nextSuiteId = function () {
- return this.nextSuiteId_++;
-};
-
-/**
- * Register a reporter to receive status updates from Jasmine.
- * @param {jasmine.Reporter} reporter An object which will receive status updates.
- */
-jasmine.Env.prototype.addReporter = function(reporter) {
- this.reporter.addReporter(reporter);
-};
-
-jasmine.Env.prototype.execute = function() {
- this.currentRunner_.execute();
-};
-
-jasmine.Env.prototype.describe = function(description, specDefinitions) {
- var suite = new jasmine.Suite(this, description, specDefinitions, this.currentSuite);
-
- var parentSuite = this.currentSuite;
- if (parentSuite) {
- parentSuite.add(suite);
- } else {
- this.currentRunner_.add(suite);
- }
-
- this.currentSuite = suite;
-
- var declarationError = null;
- try {
- specDefinitions.call(suite);
- } catch(e) {
- declarationError = e;
- }
-
- if (declarationError) {
- this.it("encountered a declaration exception", function() {
- throw declarationError;
- });
- }
-
- this.currentSuite = parentSuite;
-
- return suite;
-};
-
-jasmine.Env.prototype.beforeEach = function(beforeEachFunction) {
- if (this.currentSuite) {
- this.currentSuite.beforeEach(beforeEachFunction);
- } else {
- this.currentRunner_.beforeEach(beforeEachFunction);
- }
-};
-
-jasmine.Env.prototype.currentRunner = function () {
- return this.currentRunner_;
-};
-
-jasmine.Env.prototype.afterEach = function(afterEachFunction) {
- if (this.currentSuite) {
- this.currentSuite.afterEach(afterEachFunction);
- } else {
- this.currentRunner_.afterEach(afterEachFunction);
- }
-
-};
-
-jasmine.Env.prototype.xdescribe = function(desc, specDefinitions) {
- return {
- execute: function() {
- }
- };
-};
-
-jasmine.Env.prototype.it = function(description, func) {
- var spec = new jasmine.Spec(this, this.currentSuite, description);
- this.currentSuite.add(spec);
- this.currentSpec = spec;
-
- if (func) {
- spec.runs(func);
- }
-
- return spec;
-};
-
-jasmine.Env.prototype.xit = function(desc, func) {
- return {
- id: this.nextSpecId(),
- runs: function() {
- }
- };
-};
-
-jasmine.Env.prototype.compareObjects_ = function(a, b, mismatchKeys, mismatchValues) {
- if (a.__Jasmine_been_here_before__ === b && b.__Jasmine_been_here_before__ === a) {
- return true;
- }
-
- a.__Jasmine_been_here_before__ = b;
- b.__Jasmine_been_here_before__ = a;
-
- var hasKey = function(obj, keyName) {
- return obj !== null && obj[keyName] !== jasmine.undefined;
- };
-
- for (var property in b) {
- if (!hasKey(a, property) && hasKey(b, property)) {
- mismatchKeys.push("expected has key '" + property + "', but missing from actual.");
- }
- }
- for (property in a) {
- if (!hasKey(b, property) && hasKey(a, property)) {
- mismatchKeys.push("expected missing key '" + property + "', but present in actual.");
- }
- }
- for (property in b) {
- if (property == '__Jasmine_been_here_before__') continue;
- if (!this.equals_(a[property], b[property], mismatchKeys, mismatchValues)) {
- mismatchValues.push("'" + property + "' was '" + (b[property] ? jasmine.util.htmlEscape(b[property].toString()) : b[property]) + "' in expected, but was '" + (a[property] ? jasmine.util.htmlEscape(a[property].toString()) : a[property]) + "' in actual.");
- }
- }
-
- if (jasmine.isArray_(a) && jasmine.isArray_(b) && a.length != b.length) {
- mismatchValues.push("arrays were not the same length");
- }
-
- delete a.__Jasmine_been_here_before__;
- delete b.__Jasmine_been_here_before__;
- return (mismatchKeys.length === 0 && mismatchValues.length === 0);
-};
-
-jasmine.Env.prototype.equals_ = function(a, b, mismatchKeys, mismatchValues) {
- mismatchKeys = mismatchKeys || [];
- mismatchValues = mismatchValues || [];
-
- for (var i = 0; i < this.equalityTesters_.length; i++) {
- var equalityTester = this.equalityTesters_[i];
- var result = equalityTester(a, b, this, mismatchKeys, mismatchValues);
- if (result !== jasmine.undefined) return result;
- }
-
- if (a === b) return true;
-
- if (a === jasmine.undefined || a === null || b === jasmine.undefined || b === null) {
- return (a == jasmine.undefined && b == jasmine.undefined);
- }
-
- if (jasmine.isDomNode(a) && jasmine.isDomNode(b)) {
- return a === b;
- }
-
- if (a instanceof Date && b instanceof Date) {
- return a.getTime() == b.getTime();
- }
-
- if (a instanceof jasmine.Matchers.Any) {
- return a.matches(b);
- }
-
- if (b instanceof jasmine.Matchers.Any) {
- return b.matches(a);
- }
-
- if (jasmine.isString_(a) && jasmine.isString_(b)) {
- return (a == b);
- }
-
- if (jasmine.isNumber_(a) && jasmine.isNumber_(b)) {
- return (a == b);
- }
-
- if (typeof a === "object" && typeof b === "object") {
- return this.compareObjects_(a, b, mismatchKeys, mismatchValues);
- }
-
- //Straight check
- return (a === b);
-};
-
-jasmine.Env.prototype.contains_ = function(haystack, needle) {
- if (jasmine.isArray_(haystack)) {
- for (var i = 0; i < haystack.length; i++) {
- if (this.equals_(haystack[i], needle)) return true;
- }
- return false;
- }
- return haystack.indexOf(needle) >= 0;
-};
-
-jasmine.Env.prototype.addEqualityTester = function(equalityTester) {
- this.equalityTesters_.push(equalityTester);
-};
-/** No-op base class for Jasmine reporters.
- *
- * @constructor
- */
-jasmine.Reporter = function() {
-};
-
-//noinspection JSUnusedLocalSymbols
-jasmine.Reporter.prototype.reportRunnerStarting = function(runner) {
-};
-
-//noinspection JSUnusedLocalSymbols
-jasmine.Reporter.prototype.reportRunnerResults = function(runner) {
-};
-
-//noinspection JSUnusedLocalSymbols
-jasmine.Reporter.prototype.reportSuiteResults = function(suite) {
-};
-
-//noinspection JSUnusedLocalSymbols
-jasmine.Reporter.prototype.reportSpecStarting = function(spec) {
-};
-
-//noinspection JSUnusedLocalSymbols
-jasmine.Reporter.prototype.reportSpecResults = function(spec) {
-};
-
-//noinspection JSUnusedLocalSymbols
-jasmine.Reporter.prototype.log = function(str) {
-};
-
-/**
- * Blocks are functions with executable code that make up a spec.
- *
- * @constructor
- * @param {jasmine.Env} env
- * @param {Function} func
- * @param {jasmine.Spec} spec
- */
-jasmine.Block = function(env, func, spec) {
- this.env = env;
- this.func = func;
- this.spec = spec;
-};
-
-jasmine.Block.prototype.execute = function(onComplete) {
- try {
- this.func.apply(this.spec);
- } catch (e) {
- this.spec.fail(e);
- }
- onComplete();
-};
-/** JavaScript API reporter.
- *
- * @constructor
- */
-jasmine.JsApiReporter = function() {
- this.started = false;
- this.finished = false;
- this.suites_ = [];
- this.results_ = {};
-};
-
-jasmine.JsApiReporter.prototype.reportRunnerStarting = function(runner) {
- this.started = true;
- var suites = runner.topLevelSuites();
- for (var i = 0; i < suites.length; i++) {
- var suite = suites[i];
- this.suites_.push(this.summarize_(suite));
- }
-};
-
-jasmine.JsApiReporter.prototype.suites = function() {
- return this.suites_;
-};
-
-jasmine.JsApiReporter.prototype.summarize_ = function(suiteOrSpec) {
- var isSuite = suiteOrSpec instanceof jasmine.Suite;
- var summary = {
- id: suiteOrSpec.id,
- name: suiteOrSpec.description,
- type: isSuite ? 'suite' : 'spec',
- children: []
- };
-
- if (isSuite) {
- var children = suiteOrSpec.children();
- for (var i = 0; i < children.length; i++) {
- summary.children.push(this.summarize_(children[i]));
- }
- }
- return summary;
-};
-
-jasmine.JsApiReporter.prototype.results = function() {
- return this.results_;
-};
-
-jasmine.JsApiReporter.prototype.resultsForSpec = function(specId) {
- return this.results_[specId];
-};
-
-//noinspection JSUnusedLocalSymbols
-jasmine.JsApiReporter.prototype.reportRunnerResults = function(runner) {
- this.finished = true;
-};
-
-//noinspection JSUnusedLocalSymbols
-jasmine.JsApiReporter.prototype.reportSuiteResults = function(suite) {
-};
-
-//noinspection JSUnusedLocalSymbols
-jasmine.JsApiReporter.prototype.reportSpecResults = function(spec) {
- this.results_[spec.id] = {
- messages: spec.results().getItems(),
- result: spec.results().failedCount > 0 ? "failed" : "passed"
- };
-};
-
-//noinspection JSUnusedLocalSymbols
-jasmine.JsApiReporter.prototype.log = function(str) {
-};
-
-jasmine.JsApiReporter.prototype.resultsForSpecs = function(specIds){
- var results = {};
- for (var i = 0; i < specIds.length; i++) {
- var specId = specIds[i];
- results[specId] = this.summarizeResult_(this.results_[specId]);
- }
- return results;
-};
-
-jasmine.JsApiReporter.prototype.summarizeResult_ = function(result){
- var summaryMessages = [];
- var messagesLength = result.messages.length;
- for (var messageIndex = 0; messageIndex < messagesLength; messageIndex++) {
- var resultMessage = result.messages[messageIndex];
- summaryMessages.push({
- text: resultMessage.type == 'log' ? resultMessage.toString() : jasmine.undefined,
- passed: resultMessage.passed ? resultMessage.passed() : true,
- type: resultMessage.type,
- message: resultMessage.message,
- trace: {
- stack: resultMessage.passed && !resultMessage.passed() ? resultMessage.trace.stack : jasmine.undefined
- }
- });
- }
-
- return {
- result : result.result,
- messages : summaryMessages
- };
-};
-
-/**
- * @constructor
- * @param {jasmine.Env} env
- * @param actual
- * @param {jasmine.Spec} spec
- */
-jasmine.Matchers = function(env, actual, spec, opt_isNot) {
- this.env = env;
- this.actual = actual;
- this.spec = spec;
- this.isNot = opt_isNot || false;
- this.reportWasCalled_ = false;
-};
-
-// todo: @deprecated as of Jasmine 0.11, remove soon [xw]
-jasmine.Matchers.pp = function(str) {
- throw new Error("jasmine.Matchers.pp() is no longer supported, please use jasmine.pp() instead!");
-};
-
-// todo: @deprecated Deprecated as of Jasmine 0.10. Rewrite your custom matchers to return true or false. [xw]
-jasmine.Matchers.prototype.report = function(result, failing_message, details) {
- throw new Error("As of jasmine 0.11, custom matchers must be implemented differently -- please see jasmine docs");
-};
-
-jasmine.Matchers.wrapInto_ = function(prototype, matchersClass) {
- for (var methodName in prototype) {
- if (methodName == 'report') continue;
- var orig = prototype[methodName];
- matchersClass.prototype[methodName] = jasmine.Matchers.matcherFn_(methodName, orig);
- }
-};
-
-jasmine.Matchers.matcherFn_ = function(matcherName, matcherFunction) {
- return function() {
- var matcherArgs = jasmine.util.argsToArray(arguments);
- var result = matcherFunction.apply(this, arguments);
-
- if (this.isNot) {
- result = !result;
- }
-
- if (this.reportWasCalled_) return result;
-
- var message;
- if (!result) {
- if (this.message) {
- message = this.message.apply(this, arguments);
- if (jasmine.isArray_(message)) {
- message = message[this.isNot ? 1 : 0];
- }
- } else {
- var englishyPredicate = matcherName.replace(/[A-Z]/g, function(s) { return ' ' + s.toLowerCase(); });
- message = "Expected " + jasmine.pp(this.actual) + (this.isNot ? " not " : " ") + englishyPredicate;
- if (matcherArgs.length > 0) {
- for (var i = 0; i < matcherArgs.length; i++) {
- if (i > 0) message += ",";
- message += " " + jasmine.pp(matcherArgs[i]);
- }
- }
- message += ".";
- }
- }
- var expectationResult = new jasmine.ExpectationResult({
- matcherName: matcherName,
- passed: result,
- expected: matcherArgs.length > 1 ? matcherArgs : matcherArgs[0],
- actual: this.actual,
- message: message
- });
- this.spec.addMatcherResult(expectationResult);
- return jasmine.undefined;
- };
-};
-
-
-
-
-/**
- * toBe: compares the actual to the expected using ===
- * @param expected
- */
-jasmine.Matchers.prototype.toBe = function(expected) {
- return this.actual === expected;
-};
-
-/**
- * toNotBe: compares the actual to the expected using !==
- * @param expected
- * @deprecated as of 1.0. Use not.toBe() instead.
- */
-jasmine.Matchers.prototype.toNotBe = function(expected) {
- return this.actual !== expected;
-};
-
-/**
- * toEqual: compares the actual to the expected using common sense equality. Handles Objects, Arrays, etc.
- *
- * @param expected
- */
-jasmine.Matchers.prototype.toEqual = function(expected) {
- return this.env.equals_(this.actual, expected);
-};
-
-/**
- * toNotEqual: compares the actual to the expected using the ! of jasmine.Matchers.toEqual
- * @param expected
- * @deprecated as of 1.0. Use not.toNotEqual() instead.
- */
-jasmine.Matchers.prototype.toNotEqual = function(expected) {
- return !this.env.equals_(this.actual, expected);
-};
-
-/**
- * Matcher that compares the actual to the expected using a regular expression. Constructs a RegExp, so takes
- * a pattern or a String.
- *
- * @param expected
- */
-jasmine.Matchers.prototype.toMatch = function(expected) {
- return new RegExp(expected).test(this.actual);
-};
-
-/**
- * Matcher that compares the actual to the expected using the boolean inverse of jasmine.Matchers.toMatch
- * @param expected
- * @deprecated as of 1.0. Use not.toMatch() instead.
- */
-jasmine.Matchers.prototype.toNotMatch = function(expected) {
- return !(new RegExp(expected).test(this.actual));
-};
-
-/**
- * Matcher that compares the actual to jasmine.undefined.
- */
-jasmine.Matchers.prototype.toBeDefined = function() {
- return (this.actual !== jasmine.undefined);
-};
-
-/**
- * Matcher that compares the actual to jasmine.undefined.
- */
-jasmine.Matchers.prototype.toBeUndefined = function() {
- return (this.actual === jasmine.undefined);
-};
-
-/**
- * Matcher that compares the actual to null.
- */
-jasmine.Matchers.prototype.toBeNull = function() {
- return (this.actual === null);
-};
-
-/**
- * Matcher that boolean not-nots the actual.
- */
-jasmine.Matchers.prototype.toBeTruthy = function() {
- return !!this.actual;
-};
-
-
-/**
- * Matcher that boolean nots the actual.
- */
-jasmine.Matchers.prototype.toBeFalsy = function() {
- return !this.actual;
-};
-
-
-/**
- * Matcher that checks to see if the actual, a Jasmine spy, was called.
- */
-jasmine.Matchers.prototype.toHaveBeenCalled = function() {
- if (arguments.length > 0) {
- throw new Error('toHaveBeenCalled does not take arguments, use toHaveBeenCalledWith');
- }
-
- if (!jasmine.isSpy(this.actual)) {
- throw new Error('Expected a spy, but got ' + jasmine.pp(this.actual) + '.');
- }
-
- this.message = function() {
- return [
- "Expected spy " + this.actual.identity + " to have been called.",
- "Expected spy " + this.actual.identity + " not to have been called."
- ];
- };
-
- return this.actual.wasCalled;
-};
-
-/** @deprecated Use expect(xxx).toHaveBeenCalled() instead */
-jasmine.Matchers.prototype.wasCalled = jasmine.Matchers.prototype.toHaveBeenCalled;
-
-/**
- * Matcher that checks to see if the actual, a Jasmine spy, was not called.
- *
- * @deprecated Use expect(xxx).not.toHaveBeenCalled() instead
- */
-jasmine.Matchers.prototype.wasNotCalled = function() {
- if (arguments.length > 0) {
- throw new Error('wasNotCalled does not take arguments');
- }
-
- if (!jasmine.isSpy(this.actual)) {
- throw new Error('Expected a spy, but got ' + jasmine.pp(this.actual) + '.');
- }
-
- this.message = function() {
- return [
- "Expected spy " + this.actual.identity + " to not have been called.",
- "Expected spy " + this.actual.identity + " to have been called."
- ];
- };
-
- return !this.actual.wasCalled;
-};
-
-/**
- * Matcher that checks to see if the actual, a Jasmine spy, was called with a set of parameters.
- *
- * @example
- *
- */
-jasmine.Matchers.prototype.toHaveBeenCalledWith = function() {
- var expectedArgs = jasmine.util.argsToArray(arguments);
- if (!jasmine.isSpy(this.actual)) {
- throw new Error('Expected a spy, but got ' + jasmine.pp(this.actual) + '.');
- }
- this.message = function() {
- if (this.actual.callCount === 0) {
- // todo: what should the failure message for .not.toHaveBeenCalledWith() be? is this right? test better. [xw]
- return [
- "Expected spy " + this.actual.identity + " to have been called with " + jasmine.pp(expectedArgs) + " but it was never called.",
- "Expected spy " + this.actual.identity + " not to have been called with " + jasmine.pp(expectedArgs) + " but it was."
- ];
- } else {
- return [
- "Expected spy " + this.actual.identity + " to have been called with " + jasmine.pp(expectedArgs) + " but was called with " + jasmine.pp(this.actual.argsForCall),
- "Expected spy " + this.actual.identity + " not to have been called with " + jasmine.pp(expectedArgs) + " but was called with " + jasmine.pp(this.actual.argsForCall)
- ];
- }
- };
-
- return this.env.contains_(this.actual.argsForCall, expectedArgs);
-};
-
-/** @deprecated Use expect(xxx).toHaveBeenCalledWith() instead */
-jasmine.Matchers.prototype.wasCalledWith = jasmine.Matchers.prototype.toHaveBeenCalledWith;
-
-/** @deprecated Use expect(xxx).not.toHaveBeenCalledWith() instead */
-jasmine.Matchers.prototype.wasNotCalledWith = function() {
- var expectedArgs = jasmine.util.argsToArray(arguments);
- if (!jasmine.isSpy(this.actual)) {
- throw new Error('Expected a spy, but got ' + jasmine.pp(this.actual) + '.');
- }
-
- this.message = function() {
- return [
- "Expected spy not to have been called with " + jasmine.pp(expectedArgs) + " but it was",
- "Expected spy to have been called with " + jasmine.pp(expectedArgs) + " but it was"
- ];
- };
-
- return !this.env.contains_(this.actual.argsForCall, expectedArgs);
-};
-
-/**
- * Matcher that checks that the expected item is an element in the actual Array.
- *
- * @param {Object} expected
- */
-jasmine.Matchers.prototype.toContain = function(expected) {
- return this.env.contains_(this.actual, expected);
-};
-
-/**
- * Matcher that checks that the expected item is NOT an element in the actual Array.
- *
- * @param {Object} expected
- * @deprecated as of 1.0. Use not.toNotContain() instead.
- */
-jasmine.Matchers.prototype.toNotContain = function(expected) {
- return !this.env.contains_(this.actual, expected);
-};
-
-jasmine.Matchers.prototype.toBeLessThan = function(expected) {
- return this.actual < expected;
-};
-
-jasmine.Matchers.prototype.toBeGreaterThan = function(expected) {
- return this.actual > expected;
-};
-
-/**
- * Matcher that checks that the expected item is equal to the actual item
- * up to a given level of decimal precision (default 2).
- *
- * @param {Number} expected
- * @param {Number} precision
- */
-jasmine.Matchers.prototype.toBeCloseTo = function(expected, precision) {
- if (!(precision === 0)) {
- precision = precision || 2;
- }
- var multiplier = Math.pow(10, precision);
- var actual = Math.round(this.actual * multiplier);
- expected = Math.round(expected * multiplier);
- return expected == actual;
-};
-
-/**
- * Matcher that checks that the expected exception was thrown by the actual.
- *
- * @param {String} expected
- */
-jasmine.Matchers.prototype.toThrow = function(expected) {
- var result = false;
- var exception;
- if (typeof this.actual != 'function') {
- throw new Error('Actual is not a function');
- }
- try {
- this.actual();
- } catch (e) {
- exception = e;
- }
- if (exception) {
- result = (expected === jasmine.undefined || this.env.equals_(exception.message || exception, expected.message || expected));
- }
-
- var not = this.isNot ? "not " : "";
-
- this.message = function() {
- if (exception && (expected === jasmine.undefined || !this.env.equals_(exception.message || exception, expected.message || expected))) {
- return ["Expected function " + not + "to throw", expected ? expected.message || expected : "an exception", ", but it threw", exception.message || exception].join(' ');
- } else {
- return "Expected function to throw an exception.";
- }
- };
-
- return result;
-};
-
-jasmine.Matchers.Any = function(expectedClass) {
- this.expectedClass = expectedClass;
-};
-
-jasmine.Matchers.Any.prototype.matches = function(other) {
- if (this.expectedClass == String) {
- return typeof other == 'string' || other instanceof String;
- }
-
- if (this.expectedClass == Number) {
- return typeof other == 'number' || other instanceof Number;
- }
-
- if (this.expectedClass == Function) {
- return typeof other == 'function' || other instanceof Function;
- }
-
- if (this.expectedClass == Object) {
- return typeof other == 'object';
- }
-
- return other instanceof this.expectedClass;
-};
-
-jasmine.Matchers.Any.prototype.toString = function() {
- return '<jasmine.any(' + this.expectedClass + ')>';
-};
-
-/**
- * @constructor
- */
-jasmine.MultiReporter = function() {
- this.subReporters_ = [];
-};
-jasmine.util.inherit(jasmine.MultiReporter, jasmine.Reporter);
-
-jasmine.MultiReporter.prototype.addReporter = function(reporter) {
- this.subReporters_.push(reporter);
-};
-
-(function() {
- var functionNames = [
- "reportRunnerStarting",
- "reportRunnerResults",
- "reportSuiteResults",
- "reportSpecStarting",
- "reportSpecResults",
- "log"
- ];
- for (var i = 0; i < functionNames.length; i++) {
- var functionName = functionNames[i];
- jasmine.MultiReporter.prototype[functionName] = (function(functionName) {
- return function() {
- for (var j = 0; j < this.subReporters_.length; j++) {
- var subReporter = this.subReporters_[j];
- if (subReporter[functionName]) {
- subReporter[functionName].apply(subReporter, arguments);
- }
- }
- };
- })(functionName);
- }
-})();
-/**
- * Holds results for a set of Jasmine spec. Allows for the results array to hold another jasmine.NestedResults
- *
- * @constructor
- */
-jasmine.NestedResults = function() {
- /**
- * The total count of results
- */
- this.totalCount = 0;
- /**
- * Number of passed results
- */
- this.passedCount = 0;
- /**
- * Number of failed results
- */
- this.failedCount = 0;
- /**
- * Was this suite/spec skipped?
- */
- this.skipped = false;
- /**
- * @ignore
- */
- this.items_ = [];
-};
-
-/**
- * Roll up the result counts.
- *
- * @param result
- */
-jasmine.NestedResults.prototype.rollupCounts = function(result) {
- this.totalCount += result.totalCount;
- this.passedCount += result.passedCount;
- this.failedCount += result.failedCount;
-};
-
-/**
- * Adds a log message.
- * @param values Array of message parts which will be concatenated later.
- */
-jasmine.NestedResults.prototype.log = function(values) {
- this.items_.push(new jasmine.MessageResult(values));
-};
-
-/**
- * Getter for the results: message & results.
- */
-jasmine.NestedResults.prototype.getItems = function() {
- return this.items_;
-};
-
-/**
- * Adds a result, tracking counts (total, passed, & failed)
- * @param {jasmine.ExpectationResult|jasmine.NestedResults} result
- */
-jasmine.NestedResults.prototype.addResult = function(result) {
- if (result.type != 'log') {
- if (result.items_) {
- this.rollupCounts(result);
- } else {
- this.totalCount++;
- if (result.passed()) {
- this.passedCount++;
- } else {
- this.failedCount++;
- }
- }
- }
- this.items_.push(result);
-};
-
-/**
- * @returns {Boolean} True if <b>everything</b> below passed
- */
-jasmine.NestedResults.prototype.passed = function() {
- return this.passedCount === this.totalCount;
-};
-/**
- * Base class for pretty printing for expectation results.
- */
-jasmine.PrettyPrinter = function() {
- this.ppNestLevel_ = 0;
-};
-
-/**
- * Formats a value in a nice, human-readable string.
- *
- * @param value
- */
-jasmine.PrettyPrinter.prototype.format = function(value) {
- if (this.ppNestLevel_ > 40) {
- throw new Error('jasmine.PrettyPrinter: format() nested too deeply!');
- }
-
- this.ppNestLevel_++;
- try {
- if (value === jasmine.undefined) {
- this.emitScalar('undefined');
- } else if (value === null) {
- this.emitScalar('null');
- } else if (value === jasmine.getGlobal()) {
- this.emitScalar('<global>');
- } else if (value instanceof jasmine.Matchers.Any) {
- this.emitScalar(value.toString());
- } else if (typeof value === 'string') {
- this.emitString(value);
- } else if (jasmine.isSpy(value)) {
- this.emitScalar("spy on " + value.identity);
- } else if (value instanceof RegExp) {
- this.emitScalar(value.toString());
- } else if (typeof value === 'function') {
- this.emitScalar('Function');
- } else if (typeof value.nodeType === 'number') {
- this.emitScalar('HTMLNode');
- } else if (value instanceof Date) {
- this.emitScalar('Date(' + value + ')');
- } else if (value.__Jasmine_been_here_before__) {
- this.emitScalar('<circular reference: ' + (jasmine.isArray_(value) ? 'Array' : 'Object') + '>');
- } else if (jasmine.isArray_(value) || typeof value == 'object') {
- value.__Jasmine_been_here_before__ = true;
- if (jasmine.isArray_(value)) {
- this.emitArray(value);
- } else {
- this.emitObject(value);
- }
- delete value.__Jasmine_been_here_before__;
- } else {
- this.emitScalar(value.toString());
- }
- } finally {
- this.ppNestLevel_--;
- }
-};
-
-jasmine.PrettyPrinter.prototype.iterateObject = function(obj, fn) {
- for (var property in obj) {
- if (property == '__Jasmine_been_here_before__') continue;
- fn(property, obj.__lookupGetter__ ? (obj.__lookupGetter__(property) !== jasmine.undefined &&
- obj.__lookupGetter__(property) !== null) : false);
- }
-};
-
-jasmine.PrettyPrinter.prototype.emitArray = jasmine.unimplementedMethod_;
-jasmine.PrettyPrinter.prototype.emitObject = jasmine.unimplementedMethod_;
-jasmine.PrettyPrinter.prototype.emitScalar = jasmine.unimplementedMethod_;
-jasmine.PrettyPrinter.prototype.emitString = jasmine.unimplementedMethod_;
-
-jasmine.StringPrettyPrinter = function() {
- jasmine.PrettyPrinter.call(this);
-
- this.string = '';
-};
-jasmine.util.inherit(jasmine.StringPrettyPrinter, jasmine.PrettyPrinter);
-
-jasmine.StringPrettyPrinter.prototype.emitScalar = function(value) {
- this.append(value);
-};
-
-jasmine.StringPrettyPrinter.prototype.emitString = function(value) {
- this.append("'" + value + "'");
-};
-
-jasmine.StringPrettyPrinter.prototype.emitArray = function(array) {
- this.append('[ ');
- for (var i = 0; i < array.length; i++) {
- if (i > 0) {
- this.append(', ');
- }
- this.format(array[i]);
- }
- this.append(' ]');
-};
-
-jasmine.StringPrettyPrinter.prototype.emitObject = function(obj) {
- var self = this;
- this.append('{ ');
- var first = true;
-
- this.iterateObject(obj, function(property, isGetter) {
- if (first) {
- first = false;
- } else {
- self.append(', ');
- }
-
- self.append(property);
- self.append(' : ');
- if (isGetter) {
- self.append('<getter>');
- } else {
- self.format(obj[property]);
- }
- });
-
- this.append(' }');
-};
-
-jasmine.StringPrettyPrinter.prototype.append = function(value) {
- this.string += value;
-};
-jasmine.Queue = function(env) {
- this.env = env;
- this.blocks = [];
- this.running = false;
- this.index = 0;
- this.offset = 0;
- this.abort = false;
-};
-
-jasmine.Queue.prototype.addBefore = function(block) {
- this.blocks.unshift(block);
-};
-
-jasmine.Queue.prototype.add = function(block) {
- this.blocks.push(block);
-};
-
-jasmine.Queue.prototype.insertNext = function(block) {
- this.blocks.splice((this.index + this.offset + 1), 0, block);
- this.offset++;
-};
-
-jasmine.Queue.prototype.start = function(onComplete) {
- this.running = true;
- this.onComplete = onComplete;
- this.next_();
-};
-
-jasmine.Queue.prototype.isRunning = function() {
- return this.running;
-};
-
-jasmine.Queue.LOOP_DONT_RECURSE = true;
-
-jasmine.Queue.prototype.next_ = function() {
- var self = this;
- var goAgain = true;
-
- while (goAgain) {
- goAgain = false;
-
- if (self.index < self.blocks.length && !this.abort) {
- var calledSynchronously = true;
- var completedSynchronously = false;
-
- var onComplete = function () {
- if (jasmine.Queue.LOOP_DONT_RECURSE && calledSynchronously) {
- completedSynchronously = true;
- return;
- }
-
- if (self.blocks[self.index].abort) {
- self.abort = true;
- }
-
- self.offset = 0;
- self.index++;
-
- var now = new Date().getTime();
- if (self.env.updateInterval && now - self.env.lastUpdate > self.env.updateInterval) {
- self.env.lastUpdate = now;
- self.env.setTimeout(function() {
- self.next_();
- }, 0);
- } else {
- if (jasmine.Queue.LOOP_DONT_RECURSE && completedSynchronously) {
- goAgain = true;
- } else {
- self.next_();
- }
- }
- };
- self.blocks[self.index].execute(onComplete);
-
- calledSynchronously = false;
- if (completedSynchronously) {
- onComplete();
- }
-
- } else {
- self.running = false;
- if (self.onComplete) {
- self.onComplete();
- }
- }
- }
-};
-
-jasmine.Queue.prototype.results = function() {
- var results = new jasmine.NestedResults();
- for (var i = 0; i < this.blocks.length; i++) {
- if (this.blocks[i].results) {
- results.addResult(this.blocks[i].results());
- }
- }
- return results;
-};
-
-
-/**
- * Runner
- *
- * @constructor
- * @param {jasmine.Env} env
- */
-jasmine.Runner = function(env) {
- var self = this;
- self.env = env;
- self.queue = new jasmine.Queue(env);
- self.before_ = [];
- self.after_ = [];
- self.suites_ = [];
-};
-
-jasmine.Runner.prototype.execute = function() {
- var self = this;
- if (self.env.reporter.reportRunnerStarting) {
- self.env.reporter.reportRunnerStarting(this);
- }
- self.queue.start(function () {
- self.finishCallback();
- });
-};
-
-jasmine.Runner.prototype.beforeEach = function(beforeEachFunction) {
- beforeEachFunction.typeName = 'beforeEach';
- this.before_.splice(0,0,beforeEachFunction);
-};
-
-jasmine.Runner.prototype.afterEach = function(afterEachFunction) {
- afterEachFunction.typeName = 'afterEach';
- this.after_.splice(0,0,afterEachFunction);
-};
-
-
-jasmine.Runner.prototype.finishCallback = function() {
- this.env.reporter.reportRunnerResults(this);
-};
-
-jasmine.Runner.prototype.addSuite = function(suite) {
- this.suites_.push(suite);
-};
-
-jasmine.Runner.prototype.add = function(block) {
- if (block instanceof jasmine.Suite) {
- this.addSuite(block);
- }
- this.queue.add(block);
-};
-
-jasmine.Runner.prototype.specs = function () {
- var suites = this.suites();
- var specs = [];
- for (var i = 0; i < suites.length; i++) {
- specs = specs.concat(suites[i].specs());
- }
- return specs;
-};
-
-jasmine.Runner.prototype.suites = function() {
- return this.suites_;
-};
-
-jasmine.Runner.prototype.topLevelSuites = function() {
- var topLevelSuites = [];
- for (var i = 0; i < this.suites_.length; i++) {
- if (!this.suites_[i].parentSuite) {
- topLevelSuites.push(this.suites_[i]);
- }
- }
- return topLevelSuites;
-};
-
-jasmine.Runner.prototype.results = function() {
- return this.queue.results();
-};
-/**
- * Internal representation of a Jasmine specification, or test.
- *
- * @constructor
- * @param {jasmine.Env} env
- * @param {jasmine.Suite} suite
- * @param {String} description
- */
-jasmine.Spec = function(env, suite, description) {
- if (!env) {
- throw new Error('jasmine.Env() required');
- }
- if (!suite) {
- throw new Error('jasmine.Suite() required');
- }
- var spec = this;
- spec.id = env.nextSpecId ? env.nextSpecId() : null;
- spec.env = env;
- spec.suite = suite;
- spec.description = description;
- spec.queue = new jasmine.Queue(env);
-
- spec.afterCallbacks = [];
- spec.spies_ = [];
-
- spec.results_ = new jasmine.NestedResults();
- spec.results_.description = description;
- spec.matchersClass = null;
-};
-
-jasmine.Spec.prototype.getFullName = function() {
- return this.suite.getFullName() + ' ' + this.description + '.';
-};
-
-
-jasmine.Spec.prototype.results = function() {
- return this.results_;
-};
-
-/**
- * All parameters are pretty-printed and concatenated together, then written to the spec's output.
- *
- * Be careful not to leave calls to <code>jasmine.log</code> in production code.
- */
-jasmine.Spec.prototype.log = function() {
- return this.results_.log(arguments);
-};
-
-jasmine.Spec.prototype.runs = function (func) {
- var block = new jasmine.Block(this.env, func, this);
- this.addToQueue(block);
- return this;
-};
-
-jasmine.Spec.prototype.addToQueue = function (block) {
- if (this.queue.isRunning()) {
- this.queue.insertNext(block);
- } else {
- this.queue.add(block);
- }
-};
-
-/**
- * @param {jasmine.ExpectationResult} result
- */
-jasmine.Spec.prototype.addMatcherResult = function(result) {
- this.results_.addResult(result);
-};
-
-jasmine.Spec.prototype.expect = function(actual) {
- var positive = new (this.getMatchersClass_())(this.env, actual, this);
- positive.not = new (this.getMatchersClass_())(this.env, actual, this, true);
- return positive;
-};
-
-/**
- * Waits a fixed time period before moving to the next block.
- *
- * @deprecated Use waitsFor() instead
- * @param {Number} timeout milliseconds to wait
- */
-jasmine.Spec.prototype.waits = function(timeout) {
- var waitsFunc = new jasmine.WaitsBlock(this.env, timeout, this);
- this.addToQueue(waitsFunc);
- return this;
-};
-
-/**
- * Waits for the latchFunction to return true before proceeding to the next block.
- *
- * @param {Function} latchFunction
- * @param {String} optional_timeoutMessage
- * @param {Number} optional_timeout
- */
-jasmine.Spec.prototype.waitsFor = function(latchFunction, optional_timeoutMessage, optional_timeout) {
- var latchFunction_ = null;
- var optional_timeoutMessage_ = null;
- var optional_timeout_ = null;
-
- for (var i = 0; i < arguments.length; i++) {
- var arg = arguments[i];
- switch (typeof arg) {
- case 'function':
- latchFunction_ = arg;
- break;
- case 'string':
- optional_timeoutMessage_ = arg;
- break;
- case 'number':
- optional_timeout_ = arg;
- break;
- }
- }
-
- var waitsForFunc = new jasmine.WaitsForBlock(this.env, optional_timeout_, latchFunction_, optional_timeoutMessage_, this);
- this.addToQueue(waitsForFunc);
- return this;
-};
-
-jasmine.Spec.prototype.fail = function (e) {
- var expectationResult = new jasmine.ExpectationResult({
- passed: false,
- message: e ? jasmine.util.formatException(e) : 'Exception',
- trace: { stack: e.stack }
- });
- this.results_.addResult(expectationResult);
-};
-
-jasmine.Spec.prototype.getMatchersClass_ = function() {
- return this.matchersClass || this.env.matchersClass;
-};
-
-jasmine.Spec.prototype.addMatchers = function(matchersPrototype) {
- var parent = this.getMatchersClass_();
- var newMatchersClass = function() {
- parent.apply(this, arguments);
- };
- jasmine.util.inherit(newMatchersClass, parent);
- jasmine.Matchers.wrapInto_(matchersPrototype, newMatchersClass);
- this.matchersClass = newMatchersClass;
-};
-
-jasmine.Spec.prototype.finishCallback = function() {
- this.env.reporter.reportSpecResults(this);
-};
-
-jasmine.Spec.prototype.finish = function(onComplete) {
- this.removeAllSpies();
- this.finishCallback();
- if (onComplete) {
- onComplete();
- }
-};
-
-jasmine.Spec.prototype.after = function(doAfter) {
- if (this.queue.isRunning()) {
- this.queue.add(new jasmine.Block(this.env, doAfter, this));
- } else {
- this.afterCallbacks.unshift(doAfter);
- }
-};
-
-jasmine.Spec.prototype.execute = function(onComplete) {
- var spec = this;
- if (!spec.env.specFilter(spec)) {
- spec.results_.skipped = true;
- spec.finish(onComplete);
- return;
- }
-
- this.env.reporter.reportSpecStarting(this);
-
- spec.env.currentSpec = spec;
-
- spec.addBeforesAndAftersToQueue();
-
- spec.queue.start(function () {
- spec.finish(onComplete);
- });
-};
-
-jasmine.Spec.prototype.addBeforesAndAftersToQueue = function() {
- var runner = this.env.currentRunner();
- var i;
-
- for (var suite = this.suite; suite; suite = suite.parentSuite) {
- for (i = 0; i < suite.before_.length; i++) {
- this.queue.addBefore(new jasmine.Block(this.env, suite.before_[i], this));
- }
- }
- for (i = 0; i < runner.before_.length; i++) {
- this.queue.addBefore(new jasmine.Block(this.env, runner.before_[i], this));
- }
- for (i = 0; i < this.afterCallbacks.length; i++) {
- this.queue.add(new jasmine.Block(this.env, this.afterCallbacks[i], this));
- }
- for (suite = this.suite; suite; suite = suite.parentSuite) {
- for (i = 0; i < suite.after_.length; i++) {
- this.queue.add(new jasmine.Block(this.env, suite.after_[i], this));
- }
- }
- for (i = 0; i < runner.after_.length; i++) {
- this.queue.add(new jasmine.Block(this.env, runner.after_[i], this));
- }
-};
-
-jasmine.Spec.prototype.explodes = function() {
- throw 'explodes function should not have been called';
-};
-
-jasmine.Spec.prototype.spyOn = function(obj, methodName, ignoreMethodDoesntExist) {
- if (obj == jasmine.undefined) {
- throw "spyOn could not find an object to spy upon for " + methodName + "()";
- }
-
- if (!ignoreMethodDoesntExist && obj[methodName] === jasmine.undefined) {
- throw methodName + '() method does not exist';
- }
-
- if (!ignoreMethodDoesntExist && obj[methodName] && obj[methodName].isSpy) {
- throw new Error(methodName + ' has already been spied upon');
- }
-
- var spyObj = jasmine.createSpy(methodName);
-
- this.spies_.push(spyObj);
- spyObj.baseObj = obj;
- spyObj.methodName = methodName;
- spyObj.originalValue = obj[methodName];
-
- obj[methodName] = spyObj;
-
- return spyObj;
-};
-
-jasmine.Spec.prototype.removeAllSpies = function() {
- for (var i = 0; i < this.spies_.length; i++) {
- var spy = this.spies_[i];
- spy.baseObj[spy.methodName] = spy.originalValue;
- }
- this.spies_ = [];
-};
-
-/**
- * Internal representation of a Jasmine suite.
- *
- * @constructor
- * @param {jasmine.Env} env
- * @param {String} description
- * @param {Function} specDefinitions
- * @param {jasmine.Suite} parentSuite
- */
-jasmine.Suite = function(env, description, specDefinitions, parentSuite) {
- var self = this;
- self.id = env.nextSuiteId ? env.nextSuiteId() : null;
- self.description = description;
- self.queue = new jasmine.Queue(env);
- self.parentSuite = parentSuite;
- self.env = env;
- self.before_ = [];
- self.after_ = [];
- self.children_ = [];
- self.suites_ = [];
- self.specs_ = [];
-};
-
-jasmine.Suite.prototype.getFullName = function() {
- var fullName = this.description;
- for (var parentSuite = this.parentSuite; parentSuite; parentSuite = parentSuite.parentSuite) {
- fullName = parentSuite.description + ' ' + fullName;
- }
- return fullName;
-};
-
-jasmine.Suite.prototype.finish = function(onComplete) {
- this.env.reporter.reportSuiteResults(this);
- this.finished = true;
- if (typeof(onComplete) == 'function') {
- onComplete();
- }
-};
-
-jasmine.Suite.prototype.beforeEach = function(beforeEachFunction) {
- beforeEachFunction.typeName = 'beforeEach';
- this.before_.unshift(beforeEachFunction);
-};
-
-jasmine.Suite.prototype.afterEach = function(afterEachFunction) {
- afterEachFunction.typeName = 'afterEach';
- this.after_.unshift(afterEachFunction);
-};
-
-jasmine.Suite.prototype.results = function() {
- return this.queue.results();
-};
-
-jasmine.Suite.prototype.add = function(suiteOrSpec) {
- this.children_.push(suiteOrSpec);
- if (suiteOrSpec instanceof jasmine.Suite) {
- this.suites_.push(suiteOrSpec);
- this.env.currentRunner().addSuite(suiteOrSpec);
- } else {
- this.specs_.push(suiteOrSpec);
- }
- this.queue.add(suiteOrSpec);
-};
-
-jasmine.Suite.prototype.specs = function() {
- return this.specs_;
-};
-
-jasmine.Suite.prototype.suites = function() {
- return this.suites_;
-};
-
-jasmine.Suite.prototype.children = function() {
- return this.children_;
-};
-
-jasmine.Suite.prototype.execute = function(onComplete) {
- var self = this;
- this.queue.start(function () {
- self.finish(onComplete);
- });
-};
-jasmine.WaitsBlock = function(env, timeout, spec) {
- this.timeout = timeout;
- jasmine.Block.call(this, env, null, spec);
-};
-
-jasmine.util.inherit(jasmine.WaitsBlock, jasmine.Block);
-
-jasmine.WaitsBlock.prototype.execute = function (onComplete) {
- if (jasmine.VERBOSE) {
- this.env.reporter.log('>> Jasmine waiting for ' + this.timeout + ' ms...');
- }
- this.env.setTimeout(function () {
- onComplete();
- }, this.timeout);
-};
-/**
- * A block which waits for some condition to become true, with timeout.
- *
- * @constructor
- * @extends jasmine.Block
- * @param {jasmine.Env} env The Jasmine environment.
- * @param {Number} timeout The maximum time in milliseconds to wait for the condition to become true.
- * @param {Function} latchFunction A function which returns true when the desired condition has been met.
- * @param {String} message The message to display if the desired condition hasn't been met within the given time period.
- * @param {jasmine.Spec} spec The Jasmine spec.
- */
-jasmine.WaitsForBlock = function(env, timeout, latchFunction, message, spec) {
- this.timeout = timeout || env.defaultTimeoutInterval;
- this.latchFunction = latchFunction;
- this.message = message;
- this.totalTimeSpentWaitingForLatch = 0;
- jasmine.Block.call(this, env, null, spec);
-};
-jasmine.util.inherit(jasmine.WaitsForBlock, jasmine.Block);
-
-jasmine.WaitsForBlock.TIMEOUT_INCREMENT = 10;
-
-jasmine.WaitsForBlock.prototype.execute = function(onComplete) {
- if (jasmine.VERBOSE) {
- this.env.reporter.log('>> Jasmine waiting for ' + (this.message || 'something to happen'));
- }
- var latchFunctionResult;
- try {
- latchFunctionResult = this.latchFunction.apply(this.spec);
- } catch (e) {
- this.spec.fail(e);
- onComplete();
- return;
- }
-
- if (latchFunctionResult) {
- onComplete();
- } else if (this.totalTimeSpentWaitingForLatch >= this.timeout) {
- var message = 'timed out after ' + this.timeout + ' msec waiting for ' + (this.message || 'something to happen');
- this.spec.fail({
- name: 'timeout',
- message: message
- });
-
- this.abort = true;
- onComplete();
- } else {
- this.totalTimeSpentWaitingForLatch += jasmine.WaitsForBlock.TIMEOUT_INCREMENT;
- var self = this;
- this.env.setTimeout(function() {
- self.execute(onComplete);
- }, jasmine.WaitsForBlock.TIMEOUT_INCREMENT);
- }
-};
-// Mock setTimeout, clearTimeout
-// Contributed by Pivotal Computer Systems, www.pivotalsf.com
-
-jasmine.FakeTimer = function() {
- this.reset();
-
- var self = this;
- self.setTimeout = function(funcToCall, millis) {
- self.timeoutsMade++;
- self.scheduleFunction(self.timeoutsMade, funcToCall, millis, false);
- return self.timeoutsMade;
- };
-
- self.setInterval = function(funcToCall, millis) {
- self.timeoutsMade++;
- self.scheduleFunction(self.timeoutsMade, funcToCall, millis, true);
- return self.timeoutsMade;
- };
-
- self.clearTimeout = function(timeoutKey) {
- self.scheduledFunctions[timeoutKey] = jasmine.undefined;
- };
-
- self.clearInterval = function(timeoutKey) {
- self.scheduledFunctions[timeoutKey] = jasmine.undefined;
- };
-
-};
-
-jasmine.FakeTimer.prototype.reset = function() {
- this.timeoutsMade = 0;
- this.scheduledFunctions = {};
- this.nowMillis = 0;
-};
-
-jasmine.FakeTimer.prototype.tick = function(millis) {
- var oldMillis = this.nowMillis;
- var newMillis = oldMillis + millis;
- this.runFunctionsWithinRange(oldMillis, newMillis);
- this.nowMillis = newMillis;
-};
-
-jasmine.FakeTimer.prototype.runFunctionsWithinRange = function(oldMillis, nowMillis) {
- var scheduledFunc;
- var funcsToRun = [];
- for (var timeoutKey in this.scheduledFunctions) {
- scheduledFunc = this.scheduledFunctions[timeoutKey];
- if (scheduledFunc != jasmine.undefined &&
- scheduledFunc.runAtMillis >= oldMillis &&
- scheduledFunc.runAtMillis <= nowMillis) {
- funcsToRun.push(scheduledFunc);
- this.scheduledFunctions[timeoutKey] = jasmine.undefined;
- }
- }
-
- if (funcsToRun.length > 0) {
- funcsToRun.sort(function(a, b) {
- return a.runAtMillis - b.runAtMillis;
- });
- for (var i = 0; i < funcsToRun.length; ++i) {
- try {
- var funcToRun = funcsToRun[i];
- this.nowMillis = funcToRun.runAtMillis;
- funcToRun.funcToCall();
- if (funcToRun.recurring) {
- this.scheduleFunction(funcToRun.timeoutKey,
- funcToRun.funcToCall,
- funcToRun.millis,
- true);
- }
- } catch(e) {
- }
- }
- this.runFunctionsWithinRange(oldMillis, nowMillis);
- }
-};
-
-jasmine.FakeTimer.prototype.scheduleFunction = function(timeoutKey, funcToCall, millis, recurring) {
- this.scheduledFunctions[timeoutKey] = {
- runAtMillis: this.nowMillis + millis,
- funcToCall: funcToCall,
- recurring: recurring,
- timeoutKey: timeoutKey,
- millis: millis
- };
-};
-
-/**
- * @namespace
- */
-jasmine.Clock = {
- defaultFakeTimer: new jasmine.FakeTimer(),
-
- reset: function() {
- jasmine.Clock.assertInstalled();
- jasmine.Clock.defaultFakeTimer.reset();
- },
-
- tick: function(millis) {
- jasmine.Clock.assertInstalled();
- jasmine.Clock.defaultFakeTimer.tick(millis);
- },
-
- runFunctionsWithinRange: function(oldMillis, nowMillis) {
- jasmine.Clock.defaultFakeTimer.runFunctionsWithinRange(oldMillis, nowMillis);
- },
-
- scheduleFunction: function(timeoutKey, funcToCall, millis, recurring) {
- jasmine.Clock.defaultFakeTimer.scheduleFunction(timeoutKey, funcToCall, millis, recurring);
- },
-
- useMock: function() {
- if (!jasmine.Clock.isInstalled()) {
- var spec = jasmine.getEnv().currentSpec;
- spec.after(jasmine.Clock.uninstallMock);
-
- jasmine.Clock.installMock();
- }
- },
-
- installMock: function() {
- jasmine.Clock.installed = jasmine.Clock.defaultFakeTimer;
- },
-
- uninstallMock: function() {
- jasmine.Clock.assertInstalled();
- jasmine.Clock.installed = jasmine.Clock.real;
- },
-
- real: {
- setTimeout: jasmine.getGlobal().setTimeout,
- clearTimeout: jasmine.getGlobal().clearTimeout,
- setInterval: jasmine.getGlobal().setInterval,
- clearInterval: jasmine.getGlobal().clearInterval
- },
-
- assertInstalled: function() {
- if (!jasmine.Clock.isInstalled()) {
- throw new Error("Mock clock is not installed, use jasmine.Clock.useMock()");
- }
- },
-
- isInstalled: function() {
- return jasmine.Clock.installed == jasmine.Clock.defaultFakeTimer;
- },
-
- installed: null
-};
-jasmine.Clock.installed = jasmine.Clock.real;
-
-//else for IE support
-jasmine.getGlobal().setTimeout = function(funcToCall, millis) {
- if (jasmine.Clock.installed.setTimeout.apply) {
- return jasmine.Clock.installed.setTimeout.apply(this, arguments);
- } else {
- return jasmine.Clock.installed.setTimeout(funcToCall, millis);
- }
-};
-
-jasmine.getGlobal().setInterval = function(funcToCall, millis) {
- if (jasmine.Clock.installed.setInterval.apply) {
- return jasmine.Clock.installed.setInterval.apply(this, arguments);
- } else {
- return jasmine.Clock.installed.setInterval(funcToCall, millis);
- }
-};
-
-jasmine.getGlobal().clearTimeout = function(timeoutKey) {
- if (jasmine.Clock.installed.clearTimeout.apply) {
- return jasmine.Clock.installed.clearTimeout.apply(this, arguments);
- } else {
- return jasmine.Clock.installed.clearTimeout(timeoutKey);
- }
-};
-
-jasmine.getGlobal().clearInterval = function(timeoutKey) {
- if (jasmine.Clock.installed.clearTimeout.apply) {
- return jasmine.Clock.installed.clearInterval.apply(this, arguments);
- } else {
- return jasmine.Clock.installed.clearInterval(timeoutKey);
- }
-};
-
-jasmine.version_= {
- "major": 1,
- "minor": 1,
- "build": 0,
- "revision": 1320442951
-};
diff --git a/external/jasmine/jasmine_favicon.png b/external/jasmine/jasmine_favicon.png
deleted file mode 100644
index 81ad355..0000000
Binary files a/external/jasmine/jasmine_favicon.png and /dev/null differ
diff --git a/package.json b/package.json
index c2d9e31..d790651 100644
--- a/package.json
+++ b/package.json
@@ -4,6 +4,7 @@
"devDependencies": {
"gulp": "^3.9.1",
"gulp-util": "^3.0.7",
+ "jasmine-core": "^2.4.1",
"jsdoc": "^3.3.0-alpha9",
"jshint": "~2.8.0",
"node-ensure": "^0.0.0",
diff --git a/test/font/font_core_spec.js b/test/font/font_core_spec.js
index ab9ba4d..2aed924 100644
--- a/test/font/font_core_spec.js
+++ b/test/font/font_core_spec.js
@@ -3,15 +3,13 @@
describe('font1', function() {
var font1_1 = decodeFontData('T1RUTwAJAIAAAwAQQ0ZGIP/t0rAAAACcAAADKU9TLzJDxycMAAADyAAAAGBjbWFwwFIBcgAABCgAAABUaGVhZKsnTJ4AAAR8AAAANmhoZWEDHvxTAAAEtAAAACRobXR4AAAAAAAABNgAAAA4bWF4cAAOUAAAAAUQAAAABm5hbWX8Fq+xAAAFGAAAAfhwb3N0AAMAAAAABxAAAAAgAQAEAgABAQEMS0hQRkxFK01UU1kAAQEBOfgeAPgfAfggAvghA/gXBIv+Tvqn+bAFHQAAAMgPHQAAAL0QHQAAANsRHQAAACcdAAADARL4IAwWAAcBAQgUGx5TV19yYWRpY2FsY2lyY2xlY29weXJ0c2ltaWxhcjEuMUNvcHlyaWdodCAoQykgMTk5MiwgMTk5MyBUaGUgVGVYcGxvcmF0b3JzIENvcnBvcmF0aW9uTVRTWU1hdGhUaW1lAAAA [...]
describe('test harness testing', function() {
- it('returns output', function() {
- var output;
- waitsFor(function() { return output; }, 10000);
- ttx(font1_1, function(result) { output = result; });
- runs(function() {
+ it('returns output', function(done) {
+ ttx(font1_1, function(output) {
verifyTtxOutput(output);
expect(/<ttFont /.test(output)).toEqual(true);
expect(/<\/ttFont>/.test(output)).toEqual(true);
+ done();
});
});
});
-});
\ No newline at end of file
+});
diff --git a/test/font/font_fpgm_spec.js b/test/font/font_fpgm_spec.js
index 5af5878..87557d7 100644
--- a/test/font/font_fpgm_spec.js
+++ b/test/font/font_fpgm_spec.js
@@ -3,9 +3,7 @@
describe('font_fpgm', function() {
var font2324 = decodeFontData('AAEAAAANAIAAAwBQT1MvMlNlbJwAAADcAAAAYGNtYXDrAFO9AAABPAAALKxjdnQgAzYCuwAALegAAAAMZnBnbQgKVdkAAC30AAACaGdseWa+m03rAAAwXAAAOERoZWFk9BT7TwAAaKAAAAA4aGhlYQWlFpUAAGjYAAAAJGhtdHgPKyHAAABo/AAAUqRsb2NhBA9dxAAAu6AAAFKobWF4cBY1AjUAAQ5IAAAAIG5hbWXZdYwDAAEOaAAAAhBwb3N0AAMAAAABEHgAAAAgcHJlcFyRbmMAARCYAAAAVAADAiQB9AAFAAACigK7AAAAjAKKArsAAAHfADEBAgAAAAAGAAAAAAAAAOAAEAFQAP3/AAAAIAAAAAQqMjEqAAAAIP//A+j+1ABkBBoB1QAAAAAAAAAAAgwC2QAAACAAAwAAAAEAAwABAAAADAAELKAAAADQAIAABgBQAH4 [...]
describe('Fixes fpgm table', function() {
- it('table was truncated in the middle of functions', function() {
- var output;
- waitsFor(function() { return output; }, 10000);
+ it('table was truncated in the middle of functions', function(done) {
CMapFactory.create(new Name('Identity-H')).then(function (cMap) {
var font = new Font("font", new Stream(font2324), {
loadedName: 'font',
@@ -15,10 +13,10 @@ describe('font_fpgm', function() {
cMap: cMap,
toUnicode: new ToUnicodeMap([])
});
- ttx(font.data, function(result) { output = result; });
- runs(function() {
+ ttx(font.data, function(output) {
verifyTtxOutput(output);
expect(/(ENDF\[ \]|SVTCA\[0\])\s*<\/assembly>\s*<\/fpgm>/.test(output)).toEqual(true);
+ done();
});
});
});
diff --git a/test/font/font_os2_spec.js b/test/font/font_os2_spec.js
index 4b2e5ce..ae3dc55 100644
--- a/test/font/font_os2_spec.js
+++ b/test/font/font_os2_spec.js
@@ -4,9 +4,7 @@ describe('font_post', function() {
var font2154 = decodeFontData('AAEAAAANAIAAAwBQT1MvMpxkBm8AAADcAAAAVmNtYXDwD/A1AAABNAAAAC5jdnQgJsYFBAAAAWQAAADuZnBnbTQnXAoAAAJUAAACh2dseWbDL/rtAAAE3AAAAGBoZWFkxW7T6QAABTwAAAA2aGhlYQ37B2cAAAV0AAAAJGhtdHhvP0naAAAFmAAAA8hsb2NhFrAWsAAACWAAAAHmbWF4cAJLAyUAAAtIAAAAIG5hbWUnzzMmAAALaAAAA3pwb3N0AAMAAAAADuQAAAAgcHJlcFbFIB8AAA8EAAABhwABAxMBkAAFAAYFmgUzAAABJQWaBTMAAAOgAGYCEgAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAABHbHlmsUAAIPtPBeH94QAABeECBgAAACAAAAAAAAAAAAABAAMAAQAAAAwABAAiAAAABAAEAAEAAPAA//8AAPAA//8 [...]
var font1282 = decodeFontData('AAEAAAANAIAAAwBQT1MvMlJpU/gAAADcAAAATmNtYXCFppKjAAABLAAACnpjdnQglnDSdgAAC6gAAAYwZnBnbcx5WZoAABHYAAAGbmdseWYHpqdrAAAYSAAAEkZoZWFkzS3ungAAKpAAAAA2aGhlYRJtEaoAACrIAAAAJGhtdHjKonNAAAAq7AAAFKBsb2NhAFYgrgAAP4wAABSkbWF4cAnkAZUAAFQwAAAAIG5hbWWb1QwoAABUUAAAAPhwb3N0AAMAAAAAVUgAAAAgcHJlcFL+xOkAAFVoAAAK/wAABAABkAAFAAAEAAQAAAAEAAQABAAAAAQAAGYCEgwAAQEBAQEBAQEBAQAAAAAAAAAAAAAAAAAAAAA/Pz8/AEDwIPAACAACAADMCAwDmAAAAAAAAQADAAEAAAAMAAQKbgAAAAQABAABAADlJv//AADgAP//AAAAAQAEAAA [...]
describe('OS/2 table removal on bad post table values', function() {
- it('has invalid version number', function() {
- var output;
- waitsFor(function() { return output; }, 10000);
+ it('has invalid version number', function(done) {
var font = new Font("font", new Stream(font2154), {
loadedName: 'font',
type: 'TrueType',
@@ -14,16 +12,14 @@ describe('font_post', function() {
defaultEncoding: [],
toUnicode: new ToUnicodeMap([])
});
- ttx(font.data, function(result) { output = result; });
- runs(function() {
+ ttx(font.data, function(output) {
verifyTtxOutput(output);
expect(/<OS_2>\s*<version value="3"\/>/.test(output)).toEqual(true);
+ done();
});
});
- it('has invalid selection attributes presence', function() {
- var output;
- waitsFor(function() { return output; }, 10000);
+ it('has invalid selection attributes presence', function(done) {
CMapFactory.create(new Name('Identity-H')).then(function (cMap) {
var font = new Font("font", new Stream(font1282), {
loadedName: 'font',
@@ -33,10 +29,10 @@ describe('font_post', function() {
cMap: cMap,
toUnicode: new ToUnicodeMap([])
});
- ttx(font.data, function(result) { output = result; });
- runs(function() {
+ ttx(font.data, function(output) {
verifyTtxOutput(output);
expect(/<OS_2>\s*<version value="3"\/>/.test(output)).toEqual(true);
+ done();
});
});
});
diff --git a/test/font/font_post_spec.js b/test/font/font_post_spec.js
index f152c5e..59ad677 100644
--- a/test/font/font_post_spec.js
+++ b/test/font/font_post_spec.js
@@ -5,9 +5,7 @@ describe('font_post', function() {
var font2189 = decodeFontData('AAEAAAANAIAAAwBQT1MvMh4+B14AAADcAAAATmNtYXDgP1MtAAABKgAABDpjdnQgLo0mKQAABWQAAAB8ZnBnbc8o3EMAAAXgAAADMGdseWahy/nuAAAJEAAAEjRoZWFkm0JpbAAAG0QAAAA2aGhlYQy+mqoAABt6AAAAJGhtdHjH3jT1AAAbngAAA5Rsb2NhOW89kgAAHzIAAAHMbWF4cAK6BnMAACD+AAAAIG5hbWW6+eSEAAAhHgAABONwb3N0v0GJkgAAJgEAAAggcHJlcOsuWysAAC4hAAAEngAAA2oCvAAFAAADAAQAAAACAAMABAAAAAQAAGYCcwAAAgIIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAIPACBjP+SwDpBxwBzQAAAAIAAQAAAAAAFAADAAEAAAEcAAABBgAAAQAAAAAAAAABAgAAAAIAAAAAAAA [...]
var font2374 = decodeFontData('AAEAAAANAIAAAwBQT1MvMhBzLe8AAADcAAAAVmNtYXDxf/RCAAABNAAAAexjdnQg8yzagQAAAyAAAAfGZnBnbcOmHQEAAAroAAAGMWdseWaod7EbAAARHAAAAHZoZWFkz3sdgwAAEZQAAAA2aGhlYRLvEvYAABHMAAAAJGhtdHixQhbKAAAR8AAAGihsb2NhAAMDnAAALBgAABosbWF4cA0BEK4AAEZEAAAAIG5hbWVj6BQfAABGZAAABipwb3N0AYc0ZgAATJAAAAAncHJlcOQ4lKQAAEy4AAAPEwABAzUBkAAFAAAFmgUzAAABJQWaBTMAAAOgAGYCEgEFAgIGAwUEBQIDBAAAeoeAAAAAAAAACAAAAABNb25vAEAAIP/8BYz+RgEzByEBu0AAAf///wAAAAAAAAABAAMAAQAAAAwABAHgAAAABAAEAAEAAPD///8AAPAg//8 [...]
describe('post table removal on bad post table values', function() {
- it('has invalid version number', function() {
- var output;
- waitsFor(function() { return output; }, 10000);
+ it('has invalid version number', function(done) {
CMapFactory.create(new Name('Identity-H')).then(function (cMap) {
var font = new Font("font", new Stream(font2109), {
loadedName: 'font',
@@ -17,17 +15,15 @@ describe('font_post', function() {
cMap: cMap,
toUnicode: new ToUnicodeMap([])
});
- ttx(font.data, function(result) { output = result; });
- runs(function() {
+ ttx(font.data, function(output) {
verifyTtxOutput(output);
expect(/<post>\s*<formatType value="3\.0"\/>/.test(output)).toEqual(true);
+ done();
});
});
});
- it('has invalid glyph name indexes', function() {
- var output;
- waitsFor(function() { return output; }, 10000);
+ it('has invalid glyph name indexes', function(done) {
var font = new Font("font", new Stream(font2189), {
loadedName: 'font',
type: 'TrueType',
@@ -35,16 +31,14 @@ describe('font_post', function() {
defaultEncoding: [],
toUnicode: new ToUnicodeMap([])
});
- ttx(font.data, function(result) { output = result; });
- runs(function() {
+ ttx(font.data, function(output) {
verifyTtxOutput(output);
expect(/<post>\s*<formatType value="3\.0"\/>/.test(output)).toEqual(true);
+ done();
});
});
- it('has right amount of glyphs specified', function() {
- var output;
- waitsFor(function() { return output; }, 10000);
+ it('has right amount of glyphs specified', function(done) {
var font = new Font("font", new Stream(font2374), {
loadedName: 'font',
type: 'TrueType',
@@ -52,10 +46,10 @@ describe('font_post', function() {
defaultEncoding: [],
toUnicode: new ToUnicodeMap([])
});
- ttx(font.data, function(result) { output = result; });
- runs(function() {
+ ttx(font.data, function(output) {
verifyTtxOutput(output);
expect(/<post>\s*<formatType value="3\.0"\/>/.test(output)).toEqual(true);
+ done();
});
});
});
diff --git a/test/font/font_test.html b/test/font/font_test.html
index 0cf0b0e..86f6645 100644
--- a/test/font/font_test.html
+++ b/test/font/font_test.html
@@ -3,13 +3,14 @@
<head>
<title>pdf.js unit test</title>
- <link rel="shortcut icon" type="image/png" href="../../external/jasmine/jasmine_favicon.png">
- <link rel="stylesheet" type="text/css" href="../../external/jasmine/jasmine.css">
+ <link rel="stylesheet" type="text/css" href="../../node_modules/jasmine-core/lib/jasmine-core/jasmine.css">
<script src="../../node_modules/requirejs/require.js"></script>
- <script src="../../external/jasmine/jasmine.js"></script>
- <script src="../../external/jasmine/jasmine-html.js"></script>
+ <script src="../../node_modules/jasmine-core/lib/jasmine-core/jasmine.js"></script>
+ <script src="../../node_modules/jasmine-core/lib/jasmine-core/jasmine-html.js"></script>
<script src="../unit/testreporter.js"></script>
+ <script src="jasmine-boot.js"></script>
+
<script src="fontutils.js"></script>
<!-- include spec files here... -->
@@ -17,68 +18,6 @@
<script src="font_os2_spec.js"></script>
<script src="font_post_spec.js"></script>
<script src="font_fpgm_spec.js"></script>
-
- <script>
- 'use strict';
-
- function initializePDFJS(callback) {
- require.config({paths: {'pdfjs': '../../src'}});
- require(['pdfjs/core/fonts', 'pdfjs/core/stream', 'pdfjs/core/primitives',
- 'pdfjs/core/cmap'], function (fonts, stream, primitives, cmap) {
- // Expose some of the PDFJS members to global scope for tests.
- window.Font = fonts.Font;
- window.ToUnicodeMap = fonts.ToUnicodeMap;
- window.Stream = stream.Stream;
- window.Name = primitives.Name;
- window.CMapFactory = cmap.CMapFactory;
-
- callback();
- });
- }
-
- (function pdfJsUnitTest() {
- function queryParams() {
- var qs = window.location.search.substring(1);
- var kvs = qs.split('&');
- var params = { };
- for (var i = 0; i < kvs.length; ++i) {
- var kv = kvs[i].split('=');
- params[unescape(kv[0])] = unescape(kv[1]);
- }
- return params;
- }
-
- var jasmineEnv = jasmine.getEnv();
- jasmineEnv.updateInterval = 1000;
-
- var trivialReporter = new jasmine.TrivialReporter();
-
- jasmineEnv.addReporter(trivialReporter);
-
- var params = queryParams();
- if (params['browser']) {
- var testReporter = new TestReporter(params['browser'], params['path']);
- jasmineEnv.addReporter(testReporter);
- }
-
- jasmineEnv.specFilter = function pdfJsUnitTestSpecFilter(spec) {
- return trivialReporter.specFilter(spec);
- };
-
- var currentWindowOnload = window.onload;
-
- window.onload = function pdfJsUnitTestOnload() {
- if (currentWindowOnload) {
- currentWindowOnload();
- }
- initializePDFJS(execJasmine);
- };
-
- function execJasmine() {
- jasmineEnv.execute();
- }
- })();
- </script>
</head>
<body>
</body>
diff --git a/test/font/jasmine-boot.js b/test/font/jasmine-boot.js
new file mode 100644
index 0000000..0260e8a
--- /dev/null
+++ b/test/font/jasmine-boot.js
@@ -0,0 +1,157 @@
+/* Copyright 2016 Mozilla Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ Copyright (c) 2008-2016 Pivotal Labs
+
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+/*globals jasmineRequire, jasmine, TestReporter */
+
+// Modified jasmine's boot.js file to load PDF.js libraries async.
+
+'use strict';
+
+function initializePDFJS(callback) {
+ require.config({paths: {'pdfjs': '../../src'}});
+ require(['pdfjs/core/fonts', 'pdfjs/core/stream', 'pdfjs/core/primitives',
+ 'pdfjs/core/cmap'], function (fonts, stream, primitives, cmap) {
+ // Expose some of the PDFJS members to global scope for tests.
+ window.Font = fonts.Font;
+ window.ToUnicodeMap = fonts.ToUnicodeMap;
+ window.Stream = stream.Stream;
+ window.Name = primitives.Name;
+ window.CMapFactory = cmap.CMapFactory;
+
+ callback();
+ });
+}
+
+(function() {
+ window.jasmine = jasmineRequire.core(jasmineRequire);
+
+ jasmineRequire.html(jasmine);
+
+ var env = jasmine.getEnv();
+
+ var jasmineInterface = jasmineRequire.interface(jasmine, env);
+ extend(window, jasmineInterface);
+
+ // Runner Parameters
+ var queryString = new jasmine.QueryString({
+ getWindowLocation: function() { return window.location; }
+ });
+
+ var catchingExceptions = queryString.getParam('catch');
+ env.catchExceptions(typeof catchingExceptions === 'undefined' ?
+ true : catchingExceptions);
+
+ var throwingExpectationFailures = queryString.getParam('throwFailures');
+ env.throwOnExpectationFailure(throwingExpectationFailures);
+
+ var random = queryString.getParam('random');
+ env.randomizeTests(random);
+
+ var seed = queryString.getParam('seed');
+ if (seed) {
+ env.seed(seed);
+ }
+
+ // Reporters
+ var htmlReporter = new jasmine.HtmlReporter({
+ env: env,
+ onRaiseExceptionsClick: function() {
+ queryString.navigateWithNewParam('catch', !env.catchingExceptions());
+ },
+ onThrowExpectationsClick: function() {
+ queryString.navigateWithNewParam('throwFailures',
+ !env.throwingExpectationFailures());
+ },
+ onRandomClick: function() {
+ queryString.navigateWithNewParam('random', !env.randomTests());
+ },
+ addToExistingQueryString: function(key, value) {
+ return queryString.fullStringWithNewParam(key, value);
+ },
+ getContainer: function() { return document.body; },
+ createElement: function() {
+ return document.createElement.apply(document, arguments);
+ },
+ createTextNode: function() {
+ return document.createTextNode.apply(document, arguments);
+ },
+ timer: new jasmine.Timer()
+ });
+
+ env.addReporter(htmlReporter);
+
+ if (queryString.getParam('browser')) {
+ var testReporter = new TestReporter(queryString.getParam('browser'),
+ queryString.getParam('path'));
+ env.addReporter(testReporter);
+ }
+
+ // Filter which specs will be run by matching the start of the full name
+ // against the `spec` query param.
+ var specFilter = new jasmine.HtmlSpecFilter({
+ filterString: function() { return queryString.getParam('spec'); }
+ });
+
+ env.specFilter = function(spec) {
+ return specFilter.matches(spec.getFullName());
+ };
+
+ // Sets longer timeout.
+ jasmine.DEFAULT_TIMEOUT_INTERVAL = 30000;
+
+ // Replace the browser window's `onload`, ensure it's called, and then run
+ // all of the loaded specs. This includes initializing the `HtmlReporter`
+ // instance and then executing the loaded Jasmine environment.
+ var currentWindowOnload = window.onload;
+
+ window.onload = function() {
+ if (currentWindowOnload) {
+ currentWindowOnload();
+ }
+
+ initializePDFJS(function () {
+ htmlReporter.initialize();
+ env.execute();
+ });
+ };
+
+ function extend(destination, source) {
+ for (var property in source) {
+ destination[property] = source[property];
+ }
+ return destination;
+ }
+}());
diff --git a/test/unit/annotation_layer_spec.js b/test/unit/annotation_layer_spec.js
index df44e62..788ff9a 100644
--- a/test/unit/annotation_layer_spec.js
+++ b/test/unit/annotation_layer_spec.js
@@ -1,25 +1,10 @@
/* globals expect, it, describe, Dict, Name, Annotation, AnnotationBorderStyle,
AnnotationBorderStyleType, AnnotationFlag, PDFJS, combineUrl,
- waitsFor, beforeEach, afterEach, stringToBytes */
+ beforeEach, afterEach, stringToBytes */
'use strict';
describe('Annotation layer', function() {
- function waitsForPromiseResolved(promise, successCallback) {
- var resolved = false;
- promise.then(function(val) {
- resolved = true;
- successCallback(val);
- },
- function(error) {
- // Shouldn't get here.
- expect(error).toEqual('the promise should not have been rejected');
- });
- waitsFor(function() {
- return resolved;
- }, 20000);
- }
-
describe('Annotation', function() {
it('should set and get flags', function() {
var dict = new Dict();
@@ -66,7 +51,7 @@ describe('Annotation layer', function() {
var annotation = new Annotation({ dict: dict, ref: 0 });
annotation.setColor('red');
- expect(annotation.color).toEqual([0, 0, 0]);
+ expect(annotation.color).toEqual(new Uint8Array([0, 0, 0]));
});
it('should set and get a transparent color', function() {
@@ -84,7 +69,7 @@ describe('Annotation layer', function() {
var annotation = new Annotation({ dict: dict, ref: 0 });
annotation.setColor([0.4]);
- expect(annotation.color).toEqual([102, 102, 102]);
+ expect(annotation.color).toEqual(new Uint8Array([102, 102, 102]));
});
it('should set and get an RGB color', function() {
@@ -93,7 +78,7 @@ describe('Annotation layer', function() {
var annotation = new Annotation({ dict: dict, ref: 0 });
annotation.setColor([0, 0, 1]);
- expect(annotation.color).toEqual([0, 0, 255]);
+ expect(annotation.color).toEqual(new Uint8Array([0, 0, 255]));
});
it('should set and get a CMYK color', function() {
@@ -102,7 +87,7 @@ describe('Annotation layer', function() {
var annotation = new Annotation({ dict: dict, ref: 0 });
annotation.setColor([0.1, 0.92, 0.84, 0.02]);
- expect(annotation.color).toEqual([233, 59, 47]);
+ expect(annotation.color).toEqual(new Uint8Array([233, 59, 47]));
});
it('should not set and get an invalid color', function() {
@@ -111,7 +96,7 @@ describe('Annotation layer', function() {
var annotation = new Annotation({ dict: dict, ref: 0 });
annotation.setColor([0.4, 0.6]);
- expect(annotation.color).toEqual([0, 0, 0]);
+ expect(annotation.color).toEqual(new Uint8Array([0, 0, 0]));
});
});
@@ -193,17 +178,19 @@ describe('Annotation layer', function() {
var loadingTask;
var annotations;
- beforeEach(function() {
+ beforeEach(function(done) {
var pdfUrl = combineUrl(window.location.href,
'../pdfs/annotation-fileattachment.pdf');
loadingTask = PDFJS.getDocument(pdfUrl);
- waitsForPromiseResolved(loadingTask.promise, function(pdfDocument) {
- waitsForPromiseResolved(pdfDocument.getPage(1), function(pdfPage) {
- waitsForPromiseResolved(pdfPage.getAnnotations(),
- function (pdfAnnotations) {
+ loadingTask.promise.then(function(pdfDocument) {
+ return pdfDocument.getPage(1).then(function(pdfPage) {
+ return pdfPage.getAnnotations().then(function (pdfAnnotations) {
annotations = pdfAnnotations;
+ done();
});
});
+ }).catch(function (reason) {
+ done.fail(reason);
});
});
diff --git a/test/unit/api_spec.js b/test/unit/api_spec.js
index a1ce751..3ef16be 100644
--- a/test/unit/api_spec.js
+++ b/test/unit/api_spec.js
@@ -1,4 +1,4 @@
-/* globals PDFJS, expect, it, describe, Promise, combineUrl, waitsFor,
+/* globals PDFJS, expect, it, describe, Promise, combineUrl,
InvalidPDFException, MissingPDFException, StreamType, FontType,
PDFDocumentProxy, PasswordException, PasswordResponses,
PDFPageProxy, createPromiseCapability, beforeEach, afterEach */
@@ -8,35 +8,7 @@
describe('api', function() {
var basicApiUrl = combineUrl(window.location.href, '../pdfs/basicapi.pdf');
var basicApiFileLength = 105779; // bytes
- var TEST_TIMEOUT = 20000;
- function waitsForPromiseResolved(promise, successCallback) {
- var resolved = false;
- promise.then(function(val) {
- resolved = true;
- successCallback(val);
- },
- function(error) {
- // Shouldn't get here.
- expect(error).toEqual('the promise should not have been rejected');
- });
- waitsFor(function() {
- return resolved;
- }, TEST_TIMEOUT);
- }
- function waitsForPromiseRejected(promise, failureCallback) {
- var rejected = false;
- promise.then(function(val) {
- // Shouldn't get here.
- expect(false).toEqual(true);
- },
- function(error) {
- rejected = true;
- failureCallback(error);
- });
- waitsFor(function() {
- return rejected;
- }, TEST_TIMEOUT);
- }
+
function waitSome(callback) {
var WAIT_TIMEOUT = 10;
setTimeout(function () {
@@ -46,7 +18,7 @@ describe('api', function() {
describe('PDFJS', function() {
describe('getDocument', function() {
- it('creates pdf doc from URL', function() {
+ it('creates pdf doc from URL', function(done) {
var loadingTask = PDFJS.getDocument(basicApiUrl);
var isProgressReportedResolved = false;
@@ -65,34 +37,43 @@ describe('api', function() {
progressReportedCapability.promise,
loadingTask.promise
];
- waitsForPromiseResolved(Promise.all(promises), function (data) {
+ Promise.all(promises).then(function (data) {
expect((data[0].loaded / data[0].total) > 0).toEqual(true);
expect(data[1] instanceof PDFDocumentProxy).toEqual(true);
expect(loadingTask).toEqual(data[1].loadingTask);
loadingTask.destroy();
+ done();
+ }).catch(function (reason) {
+ done.fail(reason);
});
});
it('creates pdf doc from URL and aborts before worker initialized',
- function() {
+ function(done) {
var loadingTask = PDFJS.getDocument(basicApiUrl);
loadingTask.destroy();
- waitsForPromiseRejected(loadingTask.promise, function(reason) {
+ loadingTask.promise.then(function(reason) {
+ done.fail('shall fail loading');
+ }).catch(function (reason) {
expect(true).toEqual(true);
+ done();
});
});
it('creates pdf doc from URL and aborts loading after worker initialized',
- function() {
+ function(done) {
var loadingTask = PDFJS.getDocument(basicApiUrl);
// This can be somewhat random -- we cannot guarantee perfect
// 'Terminate' message to the worker before/after setting up pdfManager.
var destroyed = loadingTask._worker.promise.then(function () {
return loadingTask.destroy();
});
- waitsForPromiseResolved(destroyed, function (data) {
+ destroyed.then(function (data) {
expect(true).toEqual(true);
+ done();
+ }).catch(function (reason) {
+ done.fail(reason);
});
});
- it('creates pdf doc from typed array', function() {
+ it('creates pdf doc from typed array', function(done) {
var nonBinaryRequest = PDFJS.disableWorker;
var request = new XMLHttpRequest();
request.open('GET', basicApiUrl, false);
@@ -123,32 +104,41 @@ describe('api', function() {
expect(typedArrayPdf.length).toEqual(basicApiFileLength);
var loadingTask = PDFJS.getDocument(typedArrayPdf);
- waitsForPromiseResolved(loadingTask.promise, function(data) {
+ loadingTask.promise.then(function(data) {
expect(data instanceof PDFDocumentProxy).toEqual(true);
loadingTask.destroy();
+ done();
+ }).catch(function (reason) {
+ done.fail(reason);
});
});
- it('creates pdf doc from invalid PDF file', function() {
+ it('creates pdf doc from invalid PDF file', function(done) {
// A severely corrupt PDF file (even Adobe Reader fails to open it).
var url = combineUrl(window.location.href, '../pdfs/bug1020226.pdf');
var loadingTask = PDFJS.getDocument(url);
- waitsForPromiseRejected(loadingTask.promise, function (error) {
+ loadingTask.promise.then(function () {
+ done.fail('shall fail loading');
+ }).catch(function (error) {
expect(error instanceof InvalidPDFException).toEqual(true);
loadingTask.destroy();
+ done();
});
});
- it('creates pdf doc from non-existent URL', function() {
+ it('creates pdf doc from non-existent URL', function(done) {
var nonExistentUrl = combineUrl(window.location.href,
'../pdfs/non-existent.pdf');
var loadingTask = PDFJS.getDocument(nonExistentUrl);
- waitsForPromiseRejected(loadingTask.promise, function(error) {
+ loadingTask.promise.then(function(error) {
+ done.fail('shall fail loading');
+ }).catch(function (error) {
expect(error instanceof MissingPDFException).toEqual(true);
loadingTask.destroy();
+ done();
});
});
it('creates pdf doc from PDF file protected with user and owner password',
- function () {
+ function (done) {
var url = combineUrl(window.location.href, '../pdfs/pr6531_1.pdf');
var loadingTask = PDFJS.getDocument(url);
@@ -185,50 +175,62 @@ describe('api', function() {
passwordIncorrectCapability.promise,
loadingTask.promise
];
- waitsForPromiseResolved(Promise.all(promises), function (data) {
+ Promise.all(promises).then(function (data) {
expect(data[2] instanceof PDFDocumentProxy).toEqual(true);
loadingTask.destroy();
+ done();
+ }).catch(function (reason) {
+ done.fail(reason);
});
});
it('creates pdf doc from PDF file protected with only a user password',
- function () {
+ function (done) {
var url = combineUrl(window.location.href, '../pdfs/pr6531_2.pdf');
var passwordNeededLoadingTask = PDFJS.getDocument({
url: url, password: '',
});
- waitsForPromiseRejected(passwordNeededLoadingTask.promise,
- function (data) {
+ var result1 = passwordNeededLoadingTask.promise.then(function () {
+ done.fail('shall fail with no password');
+ return passwordNeededLoadingTask.destroy();
+ }, function (data) {
expect(data instanceof PasswordException).toEqual(true);
expect(data.code).toEqual(PasswordResponses.NEED_PASSWORD);
- passwordNeededLoadingTask.destroy();
+ return passwordNeededLoadingTask.destroy();
});
var passwordIncorrectLoadingTask = PDFJS.getDocument({
url: url, password: 'qwerty',
});
- waitsForPromiseRejected(passwordIncorrectLoadingTask.promise,
- function (data) {
+ var result2 = passwordIncorrectLoadingTask.promise.then(function () {
+ done.fail('shall fail with wrong password');
+ return passwordNeededLoadingTask.destroy();
+ }, function (data) {
expect(data instanceof PasswordException).toEqual(true);
expect(data.code).toEqual(PasswordResponses.INCORRECT_PASSWORD);
- passwordIncorrectLoadingTask.destroy();
+ return passwordIncorrectLoadingTask.destroy();
});
var passwordAcceptedLoadingTask = PDFJS.getDocument({
url: url, password: 'asdfasdf',
});
- waitsForPromiseResolved(passwordAcceptedLoadingTask.promise,
- function (data) {
+
+ var result3 = passwordAcceptedLoadingTask.promise.then(function (data) {
expect(data instanceof PDFDocumentProxy).toEqual(true);
- passwordAcceptedLoadingTask.destroy();
+ return passwordAcceptedLoadingTask.destroy();
+ });
+ Promise.all([result1, result2, result3]).then(function () {
+ done();
+ }).catch(function (reason) {
+ done.fail(reason);
});
});
});
});
describe('PDFWorker', function() {
- it('worker created or destroyed', function () {
+ it('worker created or destroyed', function (done) {
var worker = new PDFJS.PDFWorker('test1');
- waitsForPromiseResolved(worker.promise, function () {
+ worker.promise.then(function () {
expect(worker.name).toEqual('test1');
expect(!!worker.port).toEqual(true);
expect(worker.destroyed).toEqual(false);
@@ -238,12 +240,15 @@ describe('api', function() {
worker.destroy();
expect(!!worker.port).toEqual(false);
expect(worker.destroyed).toEqual(true);
+ done();
+ }).catch(function (reason) {
+ done.fail(reason);
});
});
- it('worker created or destroyed by getDocument', function () {
+ it('worker created or destroyed by getDocument', function (done) {
var loadingTask = PDFJS.getDocument(basicApiUrl);
var worker;
- waitsForPromiseResolved(loadingTask.promise, function () {
+ loadingTask.promise.then(function () {
worker = loadingTask._worker;
expect(!!worker).toEqual(true);
});
@@ -251,16 +256,19 @@ describe('api', function() {
var destroyPromise = loadingTask.promise.then(function () {
return loadingTask.destroy();
});
- waitsForPromiseResolved(destroyPromise, function () {
+ destroyPromise.then(function () {
var destroyedWorker = loadingTask._worker;
expect(!!destroyedWorker).toEqual(false);
expect(worker.destroyed).toEqual(true);
+ done();
+ }).catch(function (reason) {
+ done.fail(reason);
});
});
- it('worker created and can be used in getDocument', function () {
+ it('worker created and can be used in getDocument', function (done) {
var worker = new PDFJS.PDFWorker('test1');
var loadingTask = PDFJS.getDocument({url: basicApiUrl, worker: worker});
- waitsForPromiseResolved(loadingTask.promise, function () {
+ loadingTask.promise.then(function () {
var docWorker = loadingTask._worker;
expect(!!docWorker).toEqual(false);
// checking is the same port is used in the MessageHandler
@@ -271,24 +279,30 @@ describe('api', function() {
var destroyPromise = loadingTask.promise.then(function () {
return loadingTask.destroy();
});
- waitsForPromiseResolved(destroyPromise, function () {
+ destroyPromise.then(function () {
expect(worker.destroyed).toEqual(false);
worker.destroy();
+ done();
+ }).catch(function (reason) {
+ done.fail(reason);
});
});
- it('creates more than one worker', function () {
+ it('creates more than one worker', function (done) {
var worker1 = new PDFJS.PDFWorker('test1');
var worker2 = new PDFJS.PDFWorker('test2');
var worker3 = new PDFJS.PDFWorker('test3');
var ready = Promise.all([worker1.promise, worker2.promise,
worker3.promise]);
- waitsForPromiseResolved(ready, function () {
+ ready.then(function () {
expect(worker1.port !== worker2.port &&
worker1.port !== worker3.port &&
worker2.port !== worker3.port).toEqual(true);
worker1.destroy();
worker2.destroy();
worker3.destroy();
+ done();
+ }).catch(function (reason) {
+ done.fail(reason);
});
});
});
@@ -296,10 +310,11 @@ describe('api', function() {
var loadingTask;
var doc;
- beforeEach(function() {
+ beforeEach(function(done) {
loadingTask = PDFJS.getDocument(basicApiUrl);
- waitsForPromiseResolved(loadingTask.promise, function(data) {
+ loadingTask.promise.then(function(data) {
doc = data;
+ done();
});
});
@@ -315,54 +330,75 @@ describe('api', function() {
expect(typeof fingerprint).toEqual('string');
expect(fingerprint.length > 0).toEqual(true);
});
- it('gets page', function() {
+ it('gets page', function(done) {
var promise = doc.getPage(1);
- waitsForPromiseResolved(promise, function(data) {
+ promise.then(function(data) {
expect(data instanceof PDFPageProxy).toEqual(true);
expect(data.pageIndex).toEqual(0);
+ done();
+ }).catch(function (reason) {
+ done.fail(reason);
});
});
- it('gets non-existent page', function() {
+ it('gets non-existent page', function(done) {
var promise = doc.getPage(100);
- waitsForPromiseRejected(promise, function(data) {
+ promise.then(function () {
+ done.fail('shall fail for non-existent page');
+ }, function(data) {
expect(data instanceof Error).toEqual(true);
+ done();
});
});
- it('gets page index', function() {
+ it('gets page index', function(done) {
// reference to second page
var ref = {num: 17, gen: 0};
var promise = doc.getPageIndex(ref);
- waitsForPromiseResolved(promise, function(pageIndex) {
+ promise.then(function(pageIndex) {
expect(pageIndex).toEqual(1);
+ done();
+ }).catch(function (reason) {
+ done.fail(reason);
});
});
- it('gets destinations', function() {
+ it('gets destinations', function(done) {
var promise = doc.getDestinations();
- waitsForPromiseResolved(promise, function(data) {
+ promise.then(function(data) {
expect(data).toEqual({ chapter1: [{ gen: 0, num: 17 }, { name: 'XYZ' },
0, 841.89, null] });
+ done();
+ }).catch(function (reason) {
+ done.fail(reason);
});
});
- it('gets a destination', function() {
+ it('gets a destination', function(done) {
var promise = doc.getDestination('chapter1');
- waitsForPromiseResolved(promise, function(data) {
+ promise.then(function(data) {
expect(data).toEqual([{ gen: 0, num: 17 }, { name: 'XYZ' },
0, 841.89, null]);
+ done();
+ }).catch(function (reason) {
+ done.fail(reason);
});
});
- it('gets a non-existent destination', function() {
+ it('gets a non-existent destination', function(done) {
var promise = doc.getDestination('non-existent-named-destination');
- waitsForPromiseResolved(promise, function(data) {
+ promise.then(function(data) {
expect(data).toEqual(null);
+ done();
+ }).catch(function (reason) {
+ done.fail(reason);
});
});
- it('gets non-existent page labels', function () {
+ it('gets non-existent page labels', function (done) {
var promise = doc.getPageLabels();
- waitsForPromiseResolved(promise, function (data) {
+ promise.then(function (data) {
expect(data).toEqual(null);
+ done();
+ }).catch(function (reason) {
+ done.fail(reason);
});
});
- it('gets page labels', function () {
+ it('gets page labels', function (done) {
// PageLabels with Roman/Arabic numerals.
var url0 = combineUrl(window.location.href, '../pdfs/bug793632.pdf');
var loadingTask0 = PDFJS.getDocument(url0);
@@ -384,8 +420,7 @@ describe('api', function() {
return pdfDoc.getPageLabels();
});
- waitsForPromiseResolved(Promise.all([promise0, promise1, promise2]),
- function (pageLabels) {
+ Promise.all([promise0, promise1, promise2]).then(function (pageLabels) {
expect(pageLabels[0]).toEqual(['i', 'ii', 'iii', '1']);
expect(pageLabels[1]).toEqual(['Front Page1']);
expect(pageLabels[2]).toEqual(['1', '2']);
@@ -393,66 +428,86 @@ describe('api', function() {
loadingTask0.destroy();
loadingTask1.destroy();
loadingTask2.destroy();
+ done();
+ }).catch(function (reason) {
+ done.fail(reason);
});
});
- it('gets attachments', function() {
+ it('gets attachments', function(done) {
var promise = doc.getAttachments();
- waitsForPromiseResolved(promise, function (data) {
+ promise.then(function (data) {
expect(data).toEqual(null);
+ done();
+ }).catch(function (reason) {
+ done.fail(reason);
});
});
- it('gets javascript', function() {
+ it('gets javascript', function(done) {
var promise = doc.getJavaScript();
- waitsForPromiseResolved(promise, function (data) {
+ promise.then(function (data) {
expect(data).toEqual([]);
+ done();
+ }).catch(function (reason) {
+ done.fail(reason);
});
});
// Keep this in sync with the pattern in viewer.js. The pattern is used to
// detect whether or not to automatically start printing.
var viewerPrintRegExp = /\bprint\s*\(/;
- it('gets javascript with printing instructions (Print action)', function() {
+ it('gets javascript with printing instructions (Print action)',
+ function(done) {
// PDF document with "Print" Named action in OpenAction
var pdfUrl = combineUrl(window.location.href, '../pdfs/bug1001080.pdf');
var loadingTask = PDFJS.getDocument(pdfUrl);
var promise = loadingTask.promise.then(function(doc) {
return doc.getJavaScript();
});
- waitsForPromiseResolved(promise, function (data) {
+ promise.then(function (data) {
expect(data).toEqual(['print({});']);
expect(data[0]).toMatch(viewerPrintRegExp);
loadingTask.destroy();
+ done();
+ }).catch(function (reason) {
+ done.fail(reason);
});
});
- it('gets javascript with printing instructions (JS action)', function() {
+ it('gets javascript with printing instructions (JS action)',
+ function(done) {
// PDF document with "JavaScript" action in OpenAction
var pdfUrl = combineUrl(window.location.href, '../pdfs/issue6106.pdf');
var loadingTask = PDFJS.getDocument(pdfUrl);
var promise = loadingTask.promise.then(function(doc) {
return doc.getJavaScript();
});
- waitsForPromiseResolved(promise, function (data) {
+ promise.then(function (data) {
expect(data).toEqual(
['this.print({bUI:true,bSilent:false,bShrinkToFit:true});']);
expect(data[0]).toMatch(viewerPrintRegExp);
loadingTask.destroy();
+ done();
+ }).catch(function (reason) {
+ done.fail(reason);
});
});
- it('gets non-existent outline', function() {
+ it('gets non-existent outline', function(done) {
var url = combineUrl(window.location.href, '../pdfs/tracemonkey.pdf');
var loadingTask = PDFJS.getDocument(url);
var promise = loadingTask.promise.then(function (pdfDocument) {
return pdfDocument.getOutline();
});
- waitsForPromiseResolved(promise, function (outline) {
+ promise.then(function (outline) {
expect(outline).toEqual(null);
loadingTask.destroy();
+ done();
+ }).catch(function (reason) {
+ done.fail(reason);
});
});
- it('gets outline', function() {
+ it('gets outline', function(done) {
var promise = doc.getOutline();
- waitsForPromiseResolved(promise, function(outline) {
+ promise.then(function(outline) {
// Two top level entries.
expect(outline instanceof Array).toEqual(true);
expect(outline.length).toEqual(2);
@@ -468,9 +523,12 @@ describe('api', function() {
expect(outlineItem.items.length).toEqual(1);
expect(outlineItem.items[0].title).toEqual('Paragraph 1.1');
+ done();
+ }).catch(function (reason) {
+ done.fail(reason);
});
});
- it('gets outline containing a url', function() {
+ it('gets outline containing a url', function(done) {
var pdfUrl = combineUrl(window.location.href, '../pdfs/issue3214.pdf');
var loadingTask = PDFJS.getDocument(pdfUrl);
@@ -490,38 +548,53 @@ describe('api', function() {
expect(outlineItemOne.color).toEqual(new Uint8Array([0, 0, 0]));
loadingTask.destroy(); // Cleanup the worker.
+ done();
});
+ }).catch(function (reason) {
+ done.fail(reason);
});
});
- it('gets metadata', function() {
+ it('gets metadata', function(done) {
var promise = doc.getMetadata();
- waitsForPromiseResolved(promise, function(metadata) {
+ promise.then(function(metadata) {
expect(metadata.info['Title']).toEqual('Basic API Test');
expect(metadata.info['PDFFormatVersion']).toEqual('1.7');
expect(metadata.metadata.get('dc:title')).toEqual('Basic API Test');
+ done();
+ }).catch(function (reason) {
+ done.fail(reason);
});
});
- it('gets data', function() {
+ it('gets data', function(done) {
var promise = doc.getData();
- waitsForPromiseResolved(promise, function (data) {
+ promise.then(function (data) {
expect(data instanceof Uint8Array).toEqual(true);
expect(data.length).toEqual(basicApiFileLength);
+ done();
+ }).catch(function (reason) {
+ done.fail(reason);
});
});
- it('gets download info', function() {
+ it('gets download info', function(done) {
var promise = doc.getDownloadInfo();
- waitsForPromiseResolved(promise, function (data) {
+ promise.then(function (data) {
expect(data).toEqual({ length: basicApiFileLength });
+ done();
+ }).catch(function (reason) {
+ done.fail(reason);
});
});
- it('gets stats', function() {
+ it('gets stats', function(done) {
var promise = doc.getStats();
- waitsForPromiseResolved(promise, function (stats) {
+ promise.then(function (stats) {
expect(stats).toEqual({ streamTypes: [], fontTypes: [] });
+ done();
+ }).catch(function (reason) {
+ done.fail(reason);
});
});
- it('checks that fingerprints are unique', function() {
+ it('checks that fingerprints are unique', function(done) {
var url1 = combineUrl(window.location.href, '../pdfs/issue4436r.pdf');
var loadingTask1 = PDFJS.getDocument(url1);
@@ -530,7 +603,7 @@ describe('api', function() {
var promises = [loadingTask1.promise,
loadingTask2.promise];
- waitsForPromiseResolved(Promise.all(promises), function (data) {
+ Promise.all(promises).then(function (data) {
var fingerprint1 = data[0].fingerprint;
expect(typeof fingerprint1).toEqual('string');
expect(fingerprint1.length > 0).toEqual(true);
@@ -543,6 +616,9 @@ describe('api', function() {
loadingTask1.destroy();
loadingTask2.destroy();
+ done();
+ }).catch(function (reason) {
+ done.fail(reason);
});
});
});
@@ -550,13 +626,16 @@ describe('api', function() {
var loadingTask;
var pdfDocument, page;
- beforeEach(function() {
+ beforeEach(function(done) {
loadingTask = PDFJS.getDocument(basicApiUrl);
- waitsForPromiseResolved(loadingTask.promise, function(doc) {
+ loadingTask.promise.then(function(doc) {
pdfDocument = doc;
- waitsForPromiseResolved(pdfDocument.getPage(1), function(data) {
+ pdfDocument.getPage(1).then(function(data) {
page = data;
+ done();
});
+ }).catch(function (reason) {
+ done.fail(reason);
});
});
@@ -585,23 +664,28 @@ describe('api', function() {
expect(viewport.width).toEqual(1262.835);
expect(viewport.height).toEqual(892.92);
});
- it('gets annotations', function () {
- var defaultPromise = page.getAnnotations();
- waitsForPromiseResolved(defaultPromise, function (data) {
+ it('gets annotations', function (done) {
+ var defaultPromise = page.getAnnotations().then(function (data) {
expect(data.length).toEqual(4);
});
- var displayPromise = page.getAnnotations({ intent: 'display' });
- waitsForPromiseResolved(displayPromise, function (data) {
+ var displayPromise = page.getAnnotations({ intent: 'display' }).then(
+ function (data) {
expect(data.length).toEqual(4);
});
- var printPromise = page.getAnnotations({ intent: 'print' });
- waitsForPromiseResolved(printPromise, function (data) {
+ var printPromise = page.getAnnotations({ intent: 'print' }).then(
+ function (data) {
expect(data.length).toEqual(4);
});
+ Promise.all([defaultPromise, displayPromise, printPromise]).then(
+ function () {
+ done();
+ }).catch(function (reason) {
+ done.fail(reason);
+ });
});
- it('gets text content', function () {
+ it('gets text content', function (done) {
var defaultPromise = page.getTextContent();
var normalizeWhitespacePromise = page.getTextContent({
normalizeWhitespace: true });
@@ -610,24 +694,30 @@ describe('api', function() {
defaultPromise,
normalizeWhitespacePromise
];
- waitsForPromiseResolved(Promise.all(promises), function (data) {
+ Promise.all(promises).then(function (data) {
expect(!!data[0].items).toEqual(true);
expect(data[0].items.length).toEqual(7);
expect(!!data[0].styles).toEqual(true);
// A simple check that ensures the two `textContent` object match.
expect(JSON.stringify(data[0])).toEqual(JSON.stringify(data[1]));
+ done();
+ }).catch(function (reason) {
+ done.fail(reason);
});
});
- it('gets operator list', function() {
+ it('gets operator list', function(done) {
var promise = page.getOperatorList();
- waitsForPromiseResolved(promise, function (oplist) {
+ promise.then(function (oplist) {
expect(!!oplist.fnArray).toEqual(true);
expect(!!oplist.argsArray).toEqual(true);
expect(oplist.lastChunk).toEqual(true);
+ done();
+ }).catch(function (reason) {
+ done.fail(reason);
});
});
- it('gets stats after parsing page', function () {
+ it('gets stats after parsing page', function (done) {
var promise = page.getOperatorList().then(function () {
return pdfDocument.getStats();
});
@@ -637,9 +727,12 @@ describe('api', function() {
expectedFontTypes[FontType.TYPE1] = true;
expectedFontTypes[FontType.CIDFONTTYPE2] = true;
- waitsForPromiseResolved(promise, function (stats) {
+ promise.then(function (stats) {
expect(stats).toEqual({ streamTypes: expectedStreamTypes,
fontTypes: expectedFontTypes });
+ done();
+ }).catch(function (reason) {
+ done.fail(reason);
});
});
});
@@ -677,23 +770,25 @@ describe('api', function() {
});
}
- afterEach(function() {
+ afterEach(function(done) {
// Issue 6205 reported an issue with font rendering, so clear the loaded
// fonts so that we can see whether loading PDFs in parallel does not
// cause any issues with the rendered fonts.
var destroyPromises = pdfDocuments.map(function(pdfDocument) {
return pdfDocument.destroy();
});
- waitsForPromiseResolved(Promise.all(destroyPromises), function() {});
// Destroy the workers.
- destroyPromises = loadingTasks.map(function(loadingTask) {
+ var destroyPromises2 = loadingTasks.map(function(loadingTask) {
return loadingTask.destroy();
});
- waitsForPromiseResolved(Promise.all(destroyPromises), function() {});
+
+ Promise.all(destroyPromises.concat(destroyPromises2)).then(function() {
+ done();
+ });
});
- it('should correctly render PDFs in parallel', function() {
+ it('should correctly render PDFs in parallel', function(done) {
var baseline1, baseline2, baseline3;
var promiseDone = renderPDF(pdf1).then(function(data1) {
baseline1 = data1;
@@ -714,7 +809,11 @@ describe('api', function() {
expect(dataUrls[2]).toEqual(baseline3);
return true;
});
- waitsForPromiseResolved(promiseDone, function() {});
+ promiseDone.then(function() {
+ done();
+ }).catch(function (reason) {
+ done.fail(reason);
+ });
});
});
describe('PDFDataRangeTransport', function () {
@@ -734,7 +833,7 @@ describe('api', function() {
});
return loadPromise;
}
- it('should fetch document info and page using ranges', function () {
+ it('should fetch document info and page using ranges', function (done) {
var transport;
var initialDataLength = 4000;
var fetches = 0;
@@ -758,14 +857,17 @@ describe('api', function() {
return pagePromise;
});
- waitsForPromiseResolved(getPagePromise, function (page) {
+ getPagePromise.then(function (page) {
expect(pdfDocument.numPages).toEqual(14);
expect(page.rotate).toEqual(0);
expect(fetches).toBeGreaterThan(2);
+ done();
+ }).catch(function (reason) {
+ done.fail(reason);
});
});
it('should fetch document info and page using range and streaming',
- function () {
+ function (done) {
var transport;
var initialDataLength = 4000;
var fetches = 0;
@@ -792,10 +894,13 @@ describe('api', function() {
return pagePromise;
});
- waitsForPromiseResolved(getPagePromise, function (page) {
+ getPagePromise.then(function (page) {
expect(pdfDocument.numPages).toEqual(14);
expect(page.rotate).toEqual(0);
expect(fetches).toEqual(1);
+ done();
+ }).catch(function (reason) {
+ done.fail(reason);
});
});
});
diff --git a/test/unit/cmap_spec.js b/test/unit/cmap_spec.js
index 9a8462a..d1fc025 100644
--- a/test/unit/cmap_spec.js
+++ b/test/unit/cmap_spec.js
@@ -1,5 +1,5 @@
/* globals expect, it, describe, StringStream, CMapFactory, Name, CMap,
- IdentityCMap, waitsFor */
+ IdentityCMap */
'use strict';
@@ -7,93 +7,92 @@ var cMapUrl = '../../external/bcmaps/';
var cMapPacked = true;
describe('cmap', function() {
- var TEST_TIMEOUT = 20000;
- function waitsForPromiseResolved(promise, successCallback) {
- var resolved = false;
- promise.then(function(val) {
- resolved = true;
- successCallback(val);
- },
- function(error) {
- // Shouldn't get here.
- expect(error).toEqual('the promise should not have been rejected');
- });
- waitsFor(function() {
- return resolved;
- }, TEST_TIMEOUT);
- }
-
- it('parses beginbfchar', function() {
+ it('parses beginbfchar', function(done) {
var str = '2 beginbfchar\n' +
'<03> <00>\n' +
'<04> <01>\n' +
'endbfchar\n';
var stream = new StringStream(str);
var cmapPromise = CMapFactory.create(stream);
- waitsForPromiseResolved(cmapPromise, function (cmap) {
+ cmapPromise.then(function (cmap) {
expect(cmap.lookup(0x03)).toEqual(String.fromCharCode(0x00));
expect(cmap.lookup(0x04)).toEqual(String.fromCharCode(0x01));
expect(cmap.lookup(0x05)).toBeUndefined();
+ done();
+ }).catch(function (reason) {
+ done.fail(reason);
});
});
- it('parses beginbfrange with range', function() {
+ it('parses beginbfrange with range', function(done) {
var str = '1 beginbfrange\n' +
'<06> <0B> 0\n' +
'endbfrange\n';
var stream = new StringStream(str);
var cmapPromise = CMapFactory.create(stream);
- waitsForPromiseResolved(cmapPromise, function (cmap) {
+ cmapPromise.then(function (cmap) {
expect(cmap.lookup(0x05)).toBeUndefined();
expect(cmap.lookup(0x06)).toEqual(String.fromCharCode(0x00));
expect(cmap.lookup(0x0B)).toEqual(String.fromCharCode(0x05));
expect(cmap.lookup(0x0C)).toBeUndefined();
+ done();
+ }).catch(function (reason) {
+ done.fail(reason);
});
});
- it('parses beginbfrange with array', function() {
+ it('parses beginbfrange with array', function(done) {
var str = '1 beginbfrange\n' +
'<0D> <12> [ 0 1 2 3 4 5 ]\n' +
'endbfrange\n';
var stream = new StringStream(str);
var cmapPromise = CMapFactory.create(stream);
- waitsForPromiseResolved(cmapPromise, function (cmap) {
+ cmapPromise.then(function (cmap) {
expect(cmap.lookup(0x0C)).toBeUndefined();
expect(cmap.lookup(0x0D)).toEqual(0x00);
expect(cmap.lookup(0x12)).toEqual(0x05);
expect(cmap.lookup(0x13)).toBeUndefined();
+ done();
+ }).catch(function (reason) {
+ done.fail(reason);
});
});
- it('parses begincidchar', function() {
+ it('parses begincidchar', function(done) {
var str = '1 begincidchar\n' +
'<14> 0\n' +
'endcidchar\n';
var stream = new StringStream(str);
var cmapPromise = CMapFactory.create(stream);
- waitsForPromiseResolved(cmapPromise, function (cmap) {
+ cmapPromise.then(function (cmap) {
expect(cmap.lookup(0x14)).toEqual(0x00);
expect(cmap.lookup(0x15)).toBeUndefined();
+ done();
+ }).catch(function (reason) {
+ done.fail(reason);
});
});
- it('parses begincidrange', function() {
+ it('parses begincidrange', function(done) {
var str = '1 begincidrange\n' +
'<0016> <001B> 0\n' +
'endcidrange\n';
var stream = new StringStream(str);
var cmapPromise = CMapFactory.create(stream);
- waitsForPromiseResolved(cmapPromise, function (cmap) {
+ cmapPromise.then(function (cmap) {
expect(cmap.lookup(0x15)).toBeUndefined();
expect(cmap.lookup(0x16)).toEqual(0x00);
expect(cmap.lookup(0x1B)).toEqual(0x05);
expect(cmap.lookup(0x1C)).toBeUndefined();
+ done();
+ }).catch(function (reason) {
+ done.fail(reason);
});
});
- it('decodes codespace ranges', function() {
+ it('decodes codespace ranges', function(done) {
var str = '1 begincodespacerange\n' +
'<01> <02>\n' +
'<00000003> <00000004>\n' +
'endcodespacerange\n';
var stream = new StringStream(str);
var cmapPromise = CMapFactory.create(stream);
- waitsForPromiseResolved(cmapPromise, function (cmap) {
+ cmapPromise.then(function (cmap) {
var c = {};
cmap.readCharCode(String.fromCharCode(1), 0, c);
expect(c.charcode).toEqual(1);
@@ -101,70 +100,91 @@ describe('cmap', function() {
cmap.readCharCode(String.fromCharCode(0, 0, 0, 3), 0, c);
expect(c.charcode).toEqual(3);
expect(c.length).toEqual(4);
+ done();
+ }).catch(function (reason) {
+ done.fail(reason);
});
});
- it('decodes 4 byte codespace ranges', function() {
+ it('decodes 4 byte codespace ranges', function(done) {
var str = '1 begincodespacerange\n' +
'<8EA1A1A1> <8EA1FEFE>\n' +
'endcodespacerange\n';
var stream = new StringStream(str);
var cmapPromise = CMapFactory.create(stream);
- waitsForPromiseResolved(cmapPromise, function (cmap) {
+ cmapPromise.then(function (cmap) {
var c = {};
cmap.readCharCode(String.fromCharCode(0x8E, 0xA1, 0xA1, 0xA1), 0, c);
expect(c.charcode).toEqual(0x8EA1A1A1);
expect(c.length).toEqual(4);
+ done();
+ }).catch(function (reason) {
+ done.fail(reason);
});
});
- it('read usecmap', function() {
+ it('read usecmap', function(done) {
var str = '/Adobe-Japan1-1 usecmap\n';
var stream = new StringStream(str);
var cmapPromise = CMapFactory.create(stream,
{ url: cMapUrl, packed: cMapPacked }, null);
- waitsForPromiseResolved(cmapPromise, function (cmap) {
+ cmapPromise.then(function (cmap) {
expect(cmap instanceof CMap).toEqual(true);
expect(cmap.useCMap).not.toBeNull();
expect(cmap.builtInCMap).toBeFalsy();
expect(cmap.length).toEqual(0x20A7);
expect(cmap.isIdentityCMap).toEqual(false);
+ done();
+ }).catch(function (reason) {
+ done.fail(reason);
});
});
- it('parses cmapname', function() {
+ it('parses cmapname', function(done) {
var str = '/CMapName /Identity-H def\n';
var stream = new StringStream(str);
var cmapPromise = CMapFactory.create(stream);
- waitsForPromiseResolved(cmapPromise, function (cmap) {
+ cmapPromise.then(function (cmap) {
expect(cmap.name).toEqual('Identity-H');
+ done();
+ }).catch(function (reason) {
+ done.fail(reason);
});
});
- it('parses wmode', function() {
+ it('parses wmode', function(done) {
var str = '/WMode 1 def\n';
var stream = new StringStream(str);
var cmapPromise = CMapFactory.create(stream);
- waitsForPromiseResolved(cmapPromise, function (cmap) {
+ cmapPromise.then(function (cmap) {
expect(cmap.vertical).toEqual(true);
+ done();
+ }).catch(function (reason) {
+ done.fail(reason);
});
});
- it('loads built in cmap', function() {
+ it('loads built in cmap', function(done) {
var cmapPromise = CMapFactory.create(new Name('Adobe-Japan1-1'),
{ url: cMapUrl, packed: cMapPacked }, null);
- waitsForPromiseResolved(cmapPromise, function (cmap) {
+ cmapPromise.then(function (cmap) {
expect(cmap instanceof CMap).toEqual(true);
expect(cmap.useCMap).toBeNull();
expect(cmap.builtInCMap).toBeTruthy();
expect(cmap.length).toEqual(0x20A7);
expect(cmap.isIdentityCMap).toEqual(false);
+ done();
+ }).catch(function (reason) {
+ done.fail(reason);
});
});
- it('loads built in identity cmap', function() {
+ it('loads built in identity cmap', function(done) {
var cmapPromise = CMapFactory.create(new Name('Identity-H'),
{ url: cMapUrl, packed: cMapPacked }, null);
- waitsForPromiseResolved(cmapPromise, function (cmap) {
+ cmapPromise.then(function (cmap) {
expect(cmap instanceof IdentityCMap).toEqual(true);
expect(cmap.vertical).toEqual(false);
expect(cmap.length).toEqual(0x10000);
expect(function() { return cmap.isIdentityCMap; }).toThrow(
new Error('should not access .isIdentityCMap'));
+ done();
+ }).catch(function (reason) {
+ done.fail(reason);
});
});
});
diff --git a/test/unit/crypto_spec.js b/test/unit/crypto_spec.js
index 5bd01cd..60242ec 100644
--- a/test/unit/crypto_spec.js
+++ b/test/unit/crypto_spec.js
@@ -599,16 +599,20 @@ describe('CipherTransformFactory', function() {
describe('AES256 Revision 5', function () {
it('should accept user password', function () {
new CipherTransformFactory(new DictMock(aes256Map), fileID1, 'user');
+ expect(true).toEqual(true);
});
it('should accept owner password', function () {
new CipherTransformFactory(new DictMock(aes256Map), fileID1, 'owner');
+ expect(true).toEqual(true);
});
it('should not accept wrong password', function () {
ensureCipherTransformFactoryPasswordIncorrect(
new DictMock(aes256Map), fileID1, 'wrong');
+ expect(true).toEqual(true);
});
it('should accept blank password', function () {
new CipherTransformFactory(new DictMock(aes256BlankMap), fileID1);
+ expect(true).toEqual(true);
});
});
@@ -616,34 +620,42 @@ describe('CipherTransformFactory', function() {
it('should accept user password', function () {
new CipherTransformFactory(new DictMock(aes256IsoMap), fileID1,
'user');
+ expect(true).toEqual(true);
});
it('should accept owner password', function () {
new CipherTransformFactory(new DictMock(aes256IsoMap), fileID1,
'owner');
+ expect(true).toEqual(true);
});
it('should not accept wrong password', function () {
ensureCipherTransformFactoryPasswordIncorrect(
new DictMock(aes256IsoMap), fileID1, 'wrong');
+ expect(true).toEqual(true);
});
it('should accept blank password', function () {
new CipherTransformFactory(new DictMock(aes256IBlankMap), fileID1);
+ expect(true).toEqual(true);
});
});
it('should accept user password', function() {
new CipherTransformFactory(new DictMock(map1), fileID1, '123456');
+ expect(true).toEqual(true);
});
it('should accept owner password', function() {
new CipherTransformFactory(new DictMock(map1), fileID1, '654321');
+ expect(true).toEqual(true);
});
it('should not accept wrong password', function() {
ensureCipherTransformFactoryPasswordIncorrect(
new DictMock(map1), fileID1, 'wrong');
+ expect(true).toEqual(true);
});
it('should accept no password', function() {
new CipherTransformFactory(new DictMock(map2), fileID2);
+ expect(true).toEqual(true);
});
});
});
diff --git a/test/unit/evaluator_spec.js b/test/unit/evaluator_spec.js
index 5b1c374..e3c2571 100644
--- a/test/unit/evaluator_spec.js
+++ b/test/unit/evaluator_spec.js
@@ -1,5 +1,5 @@
/* globals expect, it, describe, PartialEvaluator, StringStream, OPS,
- OperatorList, waitsFor, runs, Dict, Name, Stream, WorkerTask */
+ OperatorList, Dict, Name, Stream, WorkerTask */
'use strict';
@@ -29,24 +29,17 @@ describe('evaluator', function() {
function PdfManagerMock() { }
- function runOperatorListCheck(evaluator, stream, resources, check) {
- var done = false;
- runs(function () {
- var result = new OperatorList();
- var task = new WorkerTask('OperatorListCheck');
- evaluator.getOperatorList(stream, task, resources, result).then(
- function () {
- check(result);
- done = true;
- });
- });
- waitsFor(function () {
- return done;
+ function runOperatorListCheck(evaluator, stream, resources, callback) {
+ var result = new OperatorList();
+ var task = new WorkerTask('OperatorListCheck');
+ evaluator.getOperatorList(stream, task, resources, result).then(
+ function () {
+ callback(result);
});
}
describe('splitCombinedOperations', function() {
- it('should reject unknown operations', function() {
+ it('should reject unknown operations', function(done) {
var evaluator = new PartialEvaluator(new PdfManagerMock(),
new XrefMock(), new HandlerMock(),
'prefix');
@@ -58,10 +51,11 @@ describe('evaluator', function() {
expect(result.fnArray.length).toEqual(1);
expect(result.fnArray[0]).toEqual(OPS.fill);
expect(result.argsArray[0]).toEqual(null);
+ done();
});
});
- it('should handle one operations', function() {
+ it('should handle one operations', function(done) {
var evaluator = new PartialEvaluator(new PdfManagerMock(),
new XrefMock(), new HandlerMock(),
'prefix');
@@ -71,10 +65,11 @@ describe('evaluator', function() {
expect(!!result.fnArray && !!result.argsArray).toEqual(true);
expect(result.fnArray.length).toEqual(1);
expect(result.fnArray[0]).toEqual(OPS.restore);
+ done();
});
});
- it('should handle two glued operations', function() {
+ it('should handle two glued operations', function(done) {
var evaluator = new PartialEvaluator(new PdfManagerMock(),
new XrefMock(), new HandlerMock(),
'prefix');
@@ -86,10 +81,11 @@ describe('evaluator', function() {
expect(result.fnArray.length).toEqual(2);
expect(result.fnArray[0]).toEqual(OPS.paintXObject);
expect(result.fnArray[1]).toEqual(OPS.restore);
+ done();
});
});
- it('should handle tree glued operations', function() {
+ it('should handle tree glued operations', function(done) {
var evaluator = new PartialEvaluator(new PdfManagerMock(),
new XrefMock(), new HandlerMock(),
'prefix');
@@ -101,10 +97,11 @@ describe('evaluator', function() {
expect(result.fnArray[0]).toEqual(OPS.fill);
expect(result.fnArray[1]).toEqual(OPS.fill);
expect(result.fnArray[2]).toEqual(OPS.fill);
+ done();
});
});
- it('should handle three glued operations #2', function() {
+ it('should handle three glued operations #2', function(done) {
var evaluator = new PartialEvaluator(new PdfManagerMock(),
new XrefMock(), new HandlerMock(),
'prefix');
@@ -117,10 +114,11 @@ describe('evaluator', function() {
expect(result.fnArray[0]).toEqual(OPS.eoFillStroke);
expect(result.fnArray[1]).toEqual(OPS.fillStroke);
expect(result.fnArray[2]).toEqual(OPS.eoFill);
+ done();
});
});
- it('should handle glued operations and operands', function() {
+ it('should handle glued operations and operands', function(done) {
var evaluator = new PartialEvaluator(new PdfManagerMock(),
new XrefMock(), new HandlerMock(),
'prefix');
@@ -134,10 +132,11 @@ describe('evaluator', function() {
expect(result.argsArray.length).toEqual(2);
expect(result.argsArray[1].length).toEqual(1);
expect(result.argsArray[1][0]).toEqual(5);
+ done();
});
});
- it('should handle glued operations and literals', function() {
+ it('should handle glued operations and literals', function(done) {
var evaluator = new PartialEvaluator(new PdfManagerMock(),
new XrefMock(), new HandlerMock(),
'prefix');
@@ -155,12 +154,13 @@ describe('evaluator', function() {
expect(result.argsArray[1].length).toEqual(1);
expect(result.argsArray[1][0]).toEqual(false);
expect(result.argsArray[2]).toEqual(null);
+ done();
});
});
});
describe('validateNumberOfArgs', function() {
- it('should execute if correct number of arguments', function() {
+ it('should execute if correct number of arguments', function(done) {
var evaluator = new PartialEvaluator(new PdfManagerMock(),
new XrefMock(), new HandlerMock(),
'prefix');
@@ -170,9 +170,10 @@ describe('evaluator', function() {
expect(result.argsArray[0][0]).toEqual(5);
expect(result.argsArray[0][1]).toEqual(1);
expect(result.fnArray[0]).toEqual(OPS.setCharWidth);
+ done();
});
});
- it('should execute if too many arguments', function() {
+ it('should execute if too many arguments', function(done) {
var evaluator = new PartialEvaluator(new PdfManagerMock(),
new XrefMock(), new HandlerMock(),
'prefix');
@@ -182,9 +183,10 @@ describe('evaluator', function() {
expect(result.argsArray[0][0]).toEqual(1);
expect(result.argsArray[0][1]).toEqual(4);
expect(result.fnArray[0]).toEqual(OPS.setCharWidth);
+ done();
});
});
- it('should execute if nested commands', function() {
+ it('should execute if nested commands', function(done) {
var evaluator = new PartialEvaluator(new PdfManagerMock(),
new XrefMock(), new HandlerMock(),
'prefix');
@@ -199,9 +201,10 @@ describe('evaluator', function() {
expect(result.argsArray[0].length).toEqual(1);
expect(result.argsArray[1].length).toEqual(1);
expect(result.argsArray[2].length).toEqual(2);
+ done();
});
});
- it('should skip if too few arguments', function() {
+ it('should skip if too few arguments', function(done) {
var evaluator = new PartialEvaluator(new PdfManagerMock(),
new XrefMock(), new HandlerMock(),
'prefix');
@@ -210,9 +213,10 @@ describe('evaluator', function() {
function (result) {
expect(result.argsArray).toEqual([]);
expect(result.fnArray).toEqual([]);
+ done();
});
});
- it('should close opened saves', function() {
+ it('should close opened saves', function(done) {
var evaluator = new PartialEvaluator(new PdfManagerMock(),
new XrefMock(), new HandlerMock(),
'prefix');
@@ -225,9 +229,10 @@ describe('evaluator', function() {
expect(result.fnArray[1]).toEqual(OPS.save);
expect(result.fnArray[2]).toEqual(OPS.restore);
expect(result.fnArray[3]).toEqual(OPS.restore);
+ done();
});
});
- it('should skip paintXObject if name is missing', function() {
+ it('should skip paintXObject if name is missing', function(done) {
var evaluator = new PartialEvaluator(new PdfManagerMock(),
new XrefMock(), new HandlerMock(),
'prefix');
@@ -236,9 +241,10 @@ describe('evaluator', function() {
function (result) {
expect(result.argsArray).toEqual([]);
expect(result.fnArray).toEqual([]);
+ done();
});
});
- it('should skip paintXObject if subtype is PS', function() {
+ it('should skip paintXObject if subtype is PS', function(done) {
var evaluator = new PartialEvaluator(new PdfManagerMock(),
new XrefMock(), new HandlerMock(),
'prefix');
@@ -256,51 +262,41 @@ describe('evaluator', function() {
runOperatorListCheck(evaluator, stream, resources, function (result) {
expect(result.argsArray).toEqual([]);
expect(result.fnArray).toEqual([]);
+ done();
});
});
});
describe('thread control', function() {
- it('should abort operator list parsing', function () {
+ it('should abort operator list parsing', function (done) {
var evaluator = new PartialEvaluator(new PdfManagerMock(),
new XrefMock(), new HandlerMock(),
'prefix');
var stream = new StringStream('qqQQ');
var resources = new ResourcesMock();
- var done = false;
- runs(function () {
- var result = new OperatorList();
- var task = new WorkerTask('OperatorListAbort');
- task.terminate();
- evaluator.getOperatorList(stream, task, resources, result).catch(
- function () {
- done = true;
- expect(!!result.fnArray && !!result.argsArray).toEqual(true);
- expect(result.fnArray.length).toEqual(0);
- });
- });
- waitsFor(function () {
- return done;
- });
+ var result = new OperatorList();
+ var task = new WorkerTask('OperatorListAbort');
+ task.terminate();
+ evaluator.getOperatorList(stream, task, resources, result).catch(
+ function () {
+ expect(!!result.fnArray && !!result.argsArray).toEqual(true);
+ expect(result.fnArray.length).toEqual(0);
+ done();
+ });
});
- it('should abort text parsing parsing', function () {
+ it('should abort text parsing parsing', function (done) {
var resources = new ResourcesMock();
var evaluator = new PartialEvaluator(new PdfManagerMock(),
new XrefMock(), new HandlerMock(),
'prefix');
var stream = new StringStream('qqQQ');
- var done = false;
- runs(function () {
- var task = new WorkerTask('TextContentAbort');
- task.terminate();
- evaluator.getTextContent(stream, task, resources).catch(
- function () {
- done = true;
- });
- });
- waitsFor(function () {
- return done;
- });
+ var task = new WorkerTask('TextContentAbort');
+ task.terminate();
+ evaluator.getTextContent(stream, task, resources).catch(
+ function () {
+ expect(true).toEqual(true);
+ done();
+ });
});
});
diff --git a/test/unit/font_spec.js b/test/unit/font_spec.js
index 66c239b..d881516 100644
--- a/test/unit/font_spec.js
+++ b/test/unit/font_spec.js
@@ -29,6 +29,14 @@ describe('font', function() {
}
};
+ function createWithNullProto(obj) {
+ var result = Object.create(null);
+ for (var i in obj) {
+ result[i] = obj[i];
+ }
+ return result;
+ }
+
describe('CFFParser', function() {
var parser = new CFFParser(fontData, {});
var cff = parser.parse();
@@ -226,7 +234,7 @@ describe('font', function() {
]);
parser.bytes = bytes;
var encoding = parser.parseEncoding(2, {}, new CFFStrings(), null);
- expect(encoding.encoding).toEqual({0x8: 1});
+ expect(encoding.encoding).toEqual(createWithNullProto({0x8: 1}));
});
it('parses encoding format 1', function() {
@@ -239,7 +247,8 @@ describe('font', function() {
]);
parser.bytes = bytes;
var encoding = parser.parseEncoding(2, {}, new CFFStrings(), null);
- expect(encoding.encoding).toEqual({0x7: 0x01, 0x08: 0x02});
+ expect(encoding.encoding).toEqual(
+ createWithNullProto({0x7: 0x01, 0x08: 0x02}));
});
it('parses fdselect format 0', function() {
diff --git a/test/unit/function_spec.js b/test/unit/function_spec.js
index a2f8c11..e699a55 100644
--- a/test/unit/function_spec.js
+++ b/test/unit/function_spec.js
@@ -1,4 +1,4 @@
-/* globals expect, it, describe, beforeEach, isArray, StringStream,
+/* globals jasmine, expect, it, describe, beforeEach, isArray, StringStream,
PostScriptParser, PostScriptLexer, PostScriptEvaluator,
PostScriptCompiler*/
@@ -6,31 +6,42 @@
describe('function', function() {
beforeEach(function() {
- this.addMatchers({
- toMatchArray: function(expected) {
- var actual = this.actual;
- if (actual.length !== expected.length) {
- return false;
- }
- for (var i = 0; i < expected.length; i++) {
- var a = actual[i], b = expected[i];
- if (isArray(b)) {
- if (a.length !== b.length) {
- return false;
+ jasmine.addMatchers({
+ toMatchArray: function(util, customEqualityTesters) {
+ return {
+ compare: function (actual, expected) {
+ var result = {};
+ if (actual.length !== expected.length) {
+ result.pass = false;
+ result.message = 'Array length: ' + actual.length +
+ ', expected: ' + expected.length;
+ return result;
}
- for (var j = 0; j < a.length; j++) {
- var suba = a[j], subb = b[j];
- if (suba !== subb) {
- return false;
+ result.pass = true;
+ for (var i = 0; i < expected.length; i++) {
+ var a = actual[i], b = expected[i];
+ if (isArray(b)) {
+ if (a.length !== b.length) {
+ result.pass = false;
+ break;
+ }
+ for (var j = 0; j < a.length; j++) {
+ var suba = a[j], subb = b[j];
+ if (suba !== subb) {
+ result.pass = false;
+ break;
+ }
+ }
+ } else {
+ if (a !== b) {
+ result.pass = false;
+ break;
+ }
}
}
- } else {
- if (a !== b) {
- return false;
- }
+ return result;
}
- }
- return true;
+ };
}
});
});
diff --git a/test/unit/jasmine-boot.js b/test/unit/jasmine-boot.js
new file mode 100644
index 0000000..2c344c5
--- /dev/null
+++ b/test/unit/jasmine-boot.js
@@ -0,0 +1,208 @@
+/* Copyright 2016 Mozilla Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ Copyright (c) 2008-2016 Pivotal Labs
+
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+/*globals jasmineRequire, jasmine, TestReporter */
+
+// Modified jasmine's boot.js file to load PDF.js libraries async.
+
+'use strict';
+
+var pdfjsLibs;
+
+function initializePDFJS(callback) {
+ require.config({paths: {'pdfjs': '../../src'}});
+ require(['pdfjs/shared/util', 'pdfjs/display/global', 'pdfjs/core/primitives',
+ 'pdfjs/core/annotation', 'pdfjs/core/crypto', 'pdfjs/core/stream',
+ 'pdfjs/core/fonts', 'pdfjs/core/ps_parser', 'pdfjs/core/function',
+ 'pdfjs/core/parser', 'pdfjs/core/evaluator', 'pdfjs/core/cmap',
+ 'pdfjs/core/worker', 'pdfjs/core/network', 'pdfjs/display/api',
+ 'pdfjs/display/metadata', 'pdfjs/display/dom_utils'],
+ function (sharedUtil, displayGlobal, corePrimitives, coreAnnotation,
+ coreCrypto, coreStream, coreFonts, corePsParser, coreFunction,
+ coreParser, coreEvaluator, coreCMap, coreWorker, coreNetwork,
+ displayAPI, displayMetadata, displayDOMUtils) {
+
+ pdfjsLibs = {
+ sharedUtil: sharedUtil,
+ displayGlobal: displayGlobal,
+ corePrimitives: corePrimitives,
+ coreAnnotation: coreAnnotation,
+ coreCrypto: coreCrypto,
+ coreStream: coreStream,
+ coreFonts: coreFonts,
+ corePsParser: corePsParser,
+ coreFunction: coreFunction,
+ coreParser: coreParser,
+ coreEvaluator: coreEvaluator,
+ coreCMap: coreCMap,
+ coreWorker: coreWorker,
+ coreNetwork: coreNetwork,
+ displayAPI: displayAPI,
+ displayMetadata: displayMetadata,
+ displayDOMUtils: displayDOMUtils
+ };
+
+ // Expose all loaded internal exported members to global scope.
+ Object.keys(pdfjsLibs).forEach(function (libName) {
+ var lib = pdfjsLibs[libName];
+ Object.keys(lib).forEach(function (name) {
+ if (Object.getOwnPropertyDescriptor(window, name)) {
+ return; // ignoring if already set
+ }
+ window[name] = lib[name];
+ });
+ });
+
+ // Configure the worker.
+ displayGlobal.PDFJS.workerSrc = '../../src/worker_loader.js';
+
+ // Release describe() calls.
+ window.describe = oldDescribe;
+ describeQueue.forEach(function (args) {
+ oldDescribe.apply(window, args);
+ });
+
+ callback();
+ });
+}
+
+(function() {
+ window.jasmine = jasmineRequire.core(jasmineRequire);
+
+ jasmineRequire.html(jasmine);
+
+ var env = jasmine.getEnv();
+
+ var jasmineInterface = jasmineRequire.interface(jasmine, env);
+ extend(window, jasmineInterface);
+
+ // Runner Parameters
+ var queryString = new jasmine.QueryString({
+ getWindowLocation: function() { return window.location; }
+ });
+
+ var catchingExceptions = queryString.getParam('catch');
+ env.catchExceptions(typeof catchingExceptions === 'undefined' ?
+ true : catchingExceptions);
+
+ var throwingExpectationFailures = queryString.getParam('throwFailures');
+ env.throwOnExpectationFailure(throwingExpectationFailures);
+
+ var random = queryString.getParam('random');
+ env.randomizeTests(random);
+
+ var seed = queryString.getParam('seed');
+ if (seed) {
+ env.seed(seed);
+ }
+
+ // Reporters
+ var htmlReporter = new jasmine.HtmlReporter({
+ env: env,
+ onRaiseExceptionsClick: function() {
+ queryString.navigateWithNewParam('catch', !env.catchingExceptions());
+ },
+ onThrowExpectationsClick: function() {
+ queryString.navigateWithNewParam('throwFailures',
+ !env.throwingExpectationFailures());
+ },
+ onRandomClick: function() {
+ queryString.navigateWithNewParam('random', !env.randomTests());
+ },
+ addToExistingQueryString: function(key, value) {
+ return queryString.fullStringWithNewParam(key, value);
+ },
+ getContainer: function() { return document.body; },
+ createElement: function() {
+ return document.createElement.apply(document, arguments);
+ },
+ createTextNode: function() {
+ return document.createTextNode.apply(document, arguments);
+ },
+ timer: new jasmine.Timer()
+ });
+
+ env.addReporter(htmlReporter);
+
+ if (queryString.getParam('browser')) {
+ var testReporter = new TestReporter(queryString.getParam('browser'),
+ queryString.getParam('path'));
+ env.addReporter(testReporter);
+ }
+
+ // Filter which specs will be run by matching the start of the full name
+ // against the `spec` query param.
+ var specFilter = new jasmine.HtmlSpecFilter({
+ filterString: function() { return queryString.getParam('spec'); }
+ });
+
+ env.specFilter = function(spec) {
+ return specFilter.matches(spec.getFullName());
+ };
+
+ // Sets longer timeout.
+ jasmine.DEFAULT_TIMEOUT_INTERVAL = 30000;
+
+ // Replace the browser window's `onload`, ensure it's called, and then run
+ // all of the loaded specs. This includes initializing the `HtmlReporter`
+ // instance and then executing the loaded Jasmine environment.
+ var currentWindowOnload = window.onload;
+
+ window.onload = function() {
+ if (currentWindowOnload) {
+ currentWindowOnload();
+ }
+
+ initializePDFJS(function () {
+ htmlReporter.initialize();
+ env.execute();
+ });
+ };
+
+ function extend(destination, source) {
+ for (var property in source) {
+ destination[property] = source[property];
+ }
+ return destination;
+ }
+}());
+
+// Hacking describe() to wait for PDFJS to be loaded, since Jasmine executes
+// it without waiting for libs to be loaded and fails to use PDFJS members.
+var oldDescribe = window.describe, describeQueue = [];
+window.describe = function () {
+ describeQueue.push(Array.prototype.slice.call(arguments, 0));
+};
diff --git a/test/unit/network_spec.js b/test/unit/network_spec.js
index 16e5371..c1bed49 100644
--- a/test/unit/network_spec.js
+++ b/test/unit/network_spec.js
@@ -1,4 +1,4 @@
-/* globals expect, it, describe, waitsFor, combineUrl, PDFNetworkStream */
+/* globals expect, it, describe, combineUrl, PDFNetworkStream */
'use strict';
@@ -8,23 +8,7 @@ describe('network', function() {
var pdf2 = combineUrl(window.location.href, '../pdfs/pdf.pdf');
var pdf2Length = 32472771;
- function waitsForPromiseResolved(promise, successCallback) {
- var TEST_TIMEOUT = 20000;
- var resolved = false;
- promise.then(function(val) {
- resolved = true;
- successCallback(val);
- },
- function(error) {
- // Shouldn't get here.
- expect(error).toEqual('the promise should not have been rejected');
- });
- waitsFor(function() {
- return resolved;
- }, TEST_TIMEOUT);
- }
-
- it('read without stream and range', function() {
+ it('read without stream and range', function(done) {
var stream = new PDFNetworkStream({
source: {
url: pdf1,
@@ -56,21 +40,26 @@ describe('network', function() {
var readPromise = read();
- waitsForPromiseResolved(readPromise, function (page) {
+ readPromise.then(function (page) {
expect(len).toEqual(pdf1Length);
expect(count).toEqual(1);
expect(isStreamingSupported).toEqual(false);
expect(isRangeSupported).toEqual(false);
+ done();
+ }).catch(function (reason) {
+ done.fail(reason);
});
});
- it('read with streaming', function() {
+ it('read with streaming', function(done) {
var userAgent = window.navigator.userAgent;
// The test is valid for FF only: the XHR has support of the
// 'moz-chunked-array' response type.
// TODO enable for other browsers, e.g. when fetch/streams API is supported.
var m = /Mozilla\/5.0.*?rv:(\d+).*? Gecko/.exec(userAgent);
if (!m || m[1] < 9) {
+ expect(true).toEqual(true);
+ done();
return;
}
@@ -105,14 +94,17 @@ describe('network', function() {
var readPromise = read();
- waitsForPromiseResolved(readPromise, function (page) {
+ readPromise.then(function () {
expect(len).toEqual(pdf2Length);
expect(count).toBeGreaterThan(1);
expect(isStreamingSupported).toEqual(true);
+ done();
+ }).catch(function (reason) {
+ done.fail(reason);
});
});
- it('read custom ranges', function () {
+ it('read custom ranges', function (done) {
// We don't test on browsers that don't support range request, so
// requiring this test to pass.
var rangeSize = 32768;
@@ -159,11 +151,14 @@ describe('network', function() {
read(range2Reader, result2),
promise]);
- waitsForPromiseResolved(readPromises, function (page) {
+ readPromises.then(function () {
expect(result1.value).toEqual(rangeSize);
expect(result2.value).toEqual(tailSize);
expect(isRangeSupported).toEqual(true);
expect(fullReaderCancelled).toEqual(true);
+ done();
+ }).catch(function (reason) {
+ done.fail(reason);
});
});
});
diff --git a/test/unit/primitives_spec.js b/test/unit/primitives_spec.js
index 20482ea..74c0d51 100644
--- a/test/unit/primitives_spec.js
+++ b/test/unit/primitives_spec.js
@@ -110,11 +110,12 @@ describe('primitives', function() {
dictWithManyKeys.forEach(callbackSpy);
- expect(callbackSpy).wasCalled();
- expect(callbackSpy.argsForCall[0]).toEqual(['FontFile', testFontFile]);
- expect(callbackSpy.argsForCall[1]).toEqual(['FontFile2', testFontFile2]);
- expect(callbackSpy.argsForCall[2]).toEqual(['FontFile3', testFontFile3]);
- expect(callbackSpy.callCount).toEqual(3);
+ expect(callbackSpy).toHaveBeenCalled();
+ var callbackSpyCalls = callbackSpy.calls;
+ expect(callbackSpyCalls.argsFor(0)).toEqual(['FontFile', testFontFile]);
+ expect(callbackSpyCalls.argsFor(1)).toEqual(['FontFile2', testFontFile2]);
+ expect(callbackSpyCalls.argsFor(2)).toEqual(['FontFile3', testFontFile3]);
+ expect(callbackSpyCalls.count()).toEqual(3);
});
});
diff --git a/test/unit/stream_spec.js b/test/unit/stream_spec.js
index 41766bb..2d44de8 100644
--- a/test/unit/stream_spec.js
+++ b/test/unit/stream_spec.js
@@ -1,22 +1,32 @@
-/* globals expect, it, describe, beforeEach, Stream, PredictorStream, Dict */
+/* globals jasmine, expect, it, describe, beforeEach, Stream, PredictorStream,
+ Dict */
'use strict';
describe('stream', function() {
beforeEach(function() {
- this.addMatchers({
- toMatchTypedArray: function(expected) {
- var actual = this.actual;
- if (actual.length !== expected.length) {
- return false;
- }
- for (var i = 0, ii = expected.length; i < ii; i++) {
- var a = actual[i], b = expected[i];
- if (a !== b) {
- return false;
+ jasmine.addMatchers({
+ toMatchTypedArray: function(util, customEqualityTesters) {
+ return {
+ compare: function (actual, expected) {
+ var result = {};
+ if (actual.length !== expected.length) {
+ result.pass = false;
+ result.message = 'Array length: ' + actual.length +
+ ', expected: ' + expected.length;
+ return result;
+ }
+ result.pass = true;
+ for (var i = 0, ii = expected.length; i < ii; i++) {
+ var a = actual[i], b = expected[i];
+ if (a !== b) {
+ result.pass = false;
+ break;
+ }
+ }
+ return result;
}
- }
- return true;
+ };
}
});
});
diff --git a/test/unit/testreporter.js b/test/unit/testreporter.js
index 070faf4..594ad93 100644
--- a/test/unit/testreporter.js
+++ b/test/unit/testreporter.js
@@ -46,34 +46,31 @@ var TestReporter = function(browser, appPath) {
return new Date().getTime();
};
- this.reportRunnerStarting = function() {
+ this.jasmineStarted = function(suiteInfo) {
this.runnerStartTime = this.now();
sendInfo('Started unit tests for ' + browser + '.');
};
- this.reportSpecStarting = function() { };
+ this.suiteStarted = function(result) { };
- this.reportSpecResults = function(spec) {
- var results = spec.results();
- if (results.skipped) {
- sendResult('TEST-SKIPPED', results.description);
- } else if (results.passed()) {
- sendResult('TEST-PASSED', results.description);
+ this.specStarted = function(result) { };
+
+ this.specDone = function(result) {
+ if (result.failedExpectations.length === 0) {
+ sendResult('TEST-PASSED', result.description);
} else {
var failedMessages = '';
- var items = results.getItems();
+ var items = result.failedExpectations;
for (var i = 0, ii = items.length; i < ii; i++) {
- if (!items[i].passed()) {
- failedMessages += items[i].message + ' ';
- }
+ failedMessages += items[i].message + ' ';
}
- sendResult('TEST-UNEXPECTED-FAIL', results.description, failedMessages);
+ sendResult('TEST-UNEXPECTED-FAIL', result.description, failedMessages);
}
};
- this.reportSuiteResults = function(suite) { };
+ this.suiteDone = function(result) { };
- this.reportRunnerResults = function(runner) {
+ this.jasmineDone = function() {
// Give the test.py some time process any queued up requests
setTimeout(sendQuitRequest, 500);
};
diff --git a/test/unit/unit_test.html b/test/unit/unit_test.html
index 44762c8..dcef372 100644
--- a/test/unit/unit_test.html
+++ b/test/unit/unit_test.html
@@ -3,25 +3,16 @@
<head>
<title>pdf.js unit test</title>
- <link rel="shortcut icon" type="image/png" href="../../external/jasmine/jasmine_favicon.png">
- <link rel="stylesheet" type="text/css" href="../../external/jasmine/jasmine.css">
+ <link rel="stylesheet" type="text/css" href="../../node_modules/jasmine-core/lib/jasmine-core/jasmine.css">
<script src="../../node_modules/requirejs/require.js"></script>
- <script src="../../external/jasmine/jasmine.js"></script>
- <script src="../../external/jasmine/jasmine-html.js"></script>
+ <script src="../../node_modules/jasmine-core/lib/jasmine-core/jasmine.js"></script>
+ <script src="../../node_modules/jasmine-core/lib/jasmine-core/jasmine-html.js"></script>
<script src="testreporter.js"></script>
+ <script src="jasmine-boot.js"></script>
<script src="../../web/ui_utils.js"></script>
- <script>
- // Hacking describe() to wait for PDFJS to be loaded, since Jasmine executes
- // it without waiting for libs to be loaded and fails to use PDFJS members.
- var oldDescribe = window.describe, describeQueue = [];
- window.describe = function () {
- describeQueue.push(Array.prototype.slice.call(arguments, 0));
- };
- </script>
-
<!-- include spec files here... -->
<script src="primitives_spec.js"></script>
<script src="font_spec.js"></script>
@@ -38,112 +29,6 @@
<script src="annotation_layer_spec.js"></script>
<script src="network_spec.js"></script>
<script src="dom_utils_spec.js"></script>
-
- <script>
- 'use strict';
-
- var pdfjsLibs;
-
- function initializePDFJS(callback) {
- require.config({paths: {'pdfjs': '../../src'}});
- require(['pdfjs/shared/util', 'pdfjs/display/global', 'pdfjs/core/primitives',
- 'pdfjs/core/annotation', 'pdfjs/core/crypto', 'pdfjs/core/stream',
- 'pdfjs/core/fonts', 'pdfjs/core/ps_parser', 'pdfjs/core/function',
- 'pdfjs/core/parser', 'pdfjs/core/evaluator', 'pdfjs/core/cmap',
- 'pdfjs/core/worker', 'pdfjs/core/network', 'pdfjs/display/api',
- 'pdfjs/display/metadata', 'pdfjs/display/dom_utils'],
- function (sharedUtil, displayGlobal, corePrimitives, coreAnnotation,
- coreCrypto, coreStream, coreFonts, corePsParser, coreFunction,
- coreParser, coreEvaluator, coreCMap, coreWorker, coreNetwork,
- displayAPI, displayMetadata, displayDOMUtils) {
-
- pdfjsLibs = {
- sharedUtil: sharedUtil,
- displayGlobal: displayGlobal,
- corePrimitives: corePrimitives,
- coreAnnotation: coreAnnotation,
- coreCrypto: coreCrypto,
- coreStream: coreStream,
- coreFonts: coreFonts,
- corePsParser: corePsParser,
- coreFunction: coreFunction,
- coreParser: coreParser,
- coreEvaluator: coreEvaluator,
- coreCMap: coreCMap,
- coreWorker: coreWorker,
- coreNetwork: coreNetwork,
- displayAPI: displayAPI,
- displayMetadata: displayMetadata,
- displayDOMUtils: displayDOMUtils
- };
-
- // Expose all loaded internal exported members to global scope.
- Object.keys(pdfjsLibs).forEach(function (libName) {
- var lib = pdfjsLibs[libName];
- Object.keys(lib).forEach(function (name) {
- if (Object.getOwnPropertyDescriptor(window, name)) {
- return; // ignoring if already set
- }
- window[name] = lib[name];
- });
- });
-
- // Configure the worker.
- PDFJS.workerSrc = '../../src/worker_loader.js';
-
- // Release describe() calls.
- window.describe = oldDescribe;
- describeQueue.forEach(function (args) {
- oldDescribe.apply(window, args);
- });
-
- callback();
- });
- }
-
- (function pdfJsUnitTest() {
- function queryParams() {
- var qs = window.location.search.substring(1);
- var kvs = qs.split('&');
- var params = { };
- for (var i = 0; i < kvs.length; ++i) {
- var kv = kvs[i].split('=');
- params[unescape(kv[0])] = unescape(kv[1]);
- }
- return params;
- }
-
- var jasmineEnv = jasmine.getEnv();
- jasmineEnv.updateInterval = 1000;
-
- var trivialReporter = new jasmine.TrivialReporter();
-
- jasmineEnv.addReporter(trivialReporter);
-
- var params = queryParams();
- if (params['browser']) {
- var testReporter = new TestReporter(params['browser'], params['path']);
- jasmineEnv.addReporter(testReporter);
- }
-
- jasmineEnv.specFilter = function pdfJsUnitTestSpecFilter(spec) {
- return trivialReporter.specFilter(spec);
- };
-
- var currentWindowOnload = window.onload;
-
- window.onload = function pdfJsUnitTestOnload() {
- if (currentWindowOnload) {
- currentWindowOnload();
- }
- initializePDFJS(execJasmine);
- };
-
- function execJasmine() {
- jasmineEnv.execute();
- }
- })();
- </script>
</head>
<body>
</body>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/pdf.js.git
More information about the Pkg-javascript-commits
mailing list