From b4b1ec882539e07665ee3ec93b46a2a022391c0d Mon Sep 17 00:00:00 2001
From: nein09 <nein09@nein09.com>
Date: Mon, 4 Dec 2017 16:51:16 -0800
Subject: [PATCH] Make timeWatcher args make more sense, add utils tests
---
test/helpers/test.js | 2 +-
test/modules/utils.js | 83 ++++++++++++++++++++++---------------------
test/test.html | 4 +--
3 files changed, 45 insertions(+), 44 deletions(-)
diff --git a/test/helpers/test.js b/test/helpers/test.js
index f68aff8a..5d712e71 100644
--- a/test/helpers/test.js
+++ b/test/helpers/test.js
@@ -87,7 +87,7 @@
},
// ----------
- timeWatcher: function ( time, assert ) {
+ timeWatcher: function ( assert, time ) {
var done = assert.async();
time = time || 2000;
var finished = false;
diff --git a/test/modules/utils.js b/test/modules/utils.js
index 92538375..8fbc1737 100644
--- a/test/modules/utils.js
+++ b/test/modules/utils.js
@@ -1,133 +1,134 @@
-/* global module, asyncTest, $, ok, equal, strictEqual, notEqual, start, test, Util, testLog */
+/* global QUnit, Util */
(function() {
- module("utils");
+ QUnit.module("utils");
// ----------
- test("addRemoveClass", function() {
+ QUnit.test("addRemoveClass", function(assert) {
var div = OpenSeadragon.makeNeutralElement('div');
- strictEqual(div.className, '',
+ assert.strictEqual(div.className, '',
"makeNeutralElement set no classes");
OpenSeadragon.addClass(div, 'foo');
- strictEqual(div.className, 'foo',
+ assert.strictEqual(div.className, 'foo',
"Added first class");
OpenSeadragon.addClass(div, 'bar');
- strictEqual(div.className, 'foo bar',
+ assert.strictEqual(div.className, 'foo bar',
"Added second class");
OpenSeadragon.addClass(div, 'baz');
- strictEqual(div.className, 'foo bar baz',
+ assert.strictEqual(div.className, 'foo bar baz',
"Added third class");
OpenSeadragon.addClass(div, 'plugh');
- strictEqual(div.className, 'foo bar baz plugh',
+ assert.strictEqual(div.className, 'foo bar baz plugh',
"Added fourth class");
OpenSeadragon.addClass(div, 'foo');
- strictEqual(div.className, 'foo bar baz plugh',
+ assert.strictEqual(div.className, 'foo bar baz plugh',
"Re-added first class");
OpenSeadragon.addClass(div, 'bar');
- strictEqual(div.className, 'foo bar baz plugh',
+ assert.strictEqual(div.className, 'foo bar baz plugh',
"Re-added middle class");
OpenSeadragon.addClass(div, 'plugh');
- strictEqual(div.className, 'foo bar baz plugh',
+ assert.strictEqual(div.className, 'foo bar baz plugh',
"Re-added last class");
OpenSeadragon.removeClass(div, 'xyzzy');
- strictEqual(div.className, 'foo bar baz plugh',
+ assert.strictEqual(div.className, 'foo bar baz plugh',
"Removed nonexistent class");
OpenSeadragon.removeClass(div, 'ba');
- strictEqual(div.className, 'foo bar baz plugh',
+ assert.strictEqual(div.className, 'foo bar baz plugh',
"Removed nonexistent class with existent substring");
OpenSeadragon.removeClass(div, 'bar');
- strictEqual(div.className, 'foo baz plugh',
+ assert.strictEqual(div.className, 'foo baz plugh',
"Removed middle class");
OpenSeadragon.removeClass(div, 'plugh');
- strictEqual(div.className, 'foo baz',
+ assert.strictEqual(div.className, 'foo baz',
"Removed last class");
OpenSeadragon.removeClass(div, 'foo');
- strictEqual(div.className, 'baz',
+ assert.strictEqual(div.className, 'baz',
"Removed first class");
OpenSeadragon.removeClass(div, 'baz');
- strictEqual(div.className, '',
+ assert.strictEqual(div.className, '',
"Removed only class");
});
// ----------
- asyncTest("makeAjaxRequest", function() {
- var timeWatcher = Util.timeWatcher();
+ QUnit.test("makeAjaxRequest", function(assert) {
+ var timeWatcher = Util.timeWatcher(assert);
OpenSeadragon.makeAjaxRequest('data/testpattern.dzi',
function(xhr) {
- equal(xhr.status, 200, 'Success callback called for HTTP 200');
- ok(/deepzoom/.test(xhr.responseText), 'Success function called');
+ assert.equal(xhr.status, 200, 'Success callback called for HTTP 200');
+ assert.ok(/deepzoom/.test(xhr.responseText), 'Success function called');
timeWatcher.done();
},
function(xhr) {
- ok(false, 'Error callback should not be called');
+ assert.ok(false, 'Error callback should not be called');
timeWatcher.done();
}
);
});
- asyncTest("makeAjaxRequest for invalid file", function() {
- var timeWatcher = Util.timeWatcher();
+ QUnit.test("makeAjaxRequest for invalid file", function(assert) {
+ var timeWatcher = Util.timeWatcher(assert);
OpenSeadragon.makeAjaxRequest('not-a-real-dzi-file',
function(xhr) {
- ok(false, 'Success function should not be called for errors');
+ assert.ok(false, 'Success function should not be called for errors');
timeWatcher.done();
},
function(xhr) {
- equal(xhr.status, 404, 'Error callback called for HTTP 404');
- ok(true, 'Error function should be called for errors');
+ assert.equal(xhr.status, 404, 'Error callback called for HTTP 404');
+ assert.ok(true, 'Error function should be called for errors');
timeWatcher.done();
}
);
});
- test("getUrlProtocol", function() {
+ QUnit.test("getUrlProtocol", function(assert) {
- equal(OpenSeadragon.getUrlProtocol("test"), window.location.protocol,
+ assert.equal(OpenSeadragon.getUrlProtocol("test"), window.location.protocol,
"'test' url protocol should be window.location.protocol");
- equal(OpenSeadragon.getUrlProtocol("/test"), window.location.protocol,
+ assert.equal(OpenSeadragon.getUrlProtocol("/test"), window.location.protocol,
"'/test' url protocol should be window.location.protocol");
- equal(OpenSeadragon.getUrlProtocol("//test"), window.location.protocol,
+ assert.equal(OpenSeadragon.getUrlProtocol("//test"), window.location.protocol,
"'//test' url protocol should be window.location.protocol");
- equal(OpenSeadragon.getUrlProtocol("http://test"), "http:",
+ assert.equal(OpenSeadragon.getUrlProtocol("http://test"), "http:",
"'http://test' url protocol should be http:");
- equal(OpenSeadragon.getUrlProtocol("https://test"), "https:",
+ assert.equal(OpenSeadragon.getUrlProtocol("https://test"), "https:",
"'https://test' url protocol should be https:");
- equal(OpenSeadragon.getUrlProtocol("file://test"), "file:",
+ assert.equal(OpenSeadragon.getUrlProtocol("file://test"), "file:",
"'file://test' url protocol should be file:");
- equal(OpenSeadragon.getUrlProtocol("FTP://test"), "ftp:",
+ assert.equal(OpenSeadragon.getUrlProtocol("FTP://test"), "ftp:",
"'FTP://test' url protocol should be ftp:");
});
// ----------
- asyncTest("requestAnimationFrame", function() {
- var timeWatcher = Util.timeWatcher();
+ QUnit.test("requestAnimationFrame", function(assert) {
+ var timeWatcher = Util.timeWatcher(assert);
OpenSeadragon.requestAnimationFrame(function() {
- ok(true, 'frame fired');
+ assert.ok(true, 'frame fired');
timeWatcher.done();
});
});
// ----------
- asyncTest("cancelAnimationFrame", function() {
+ QUnit.test("cancelAnimationFrame", function(assert) {
+ var done = assert.async();
var frameFired = false;
setTimeout(function() {
- strictEqual(frameFired, false, 'the frame never fired');
- start();
+ assert.strictEqual(frameFired, false, 'the frame never fired');
+ done();
}, 150);
var frameId = OpenSeadragon.requestAnimationFrame(function() {
diff --git a/test/test.html b/test/test.html
index 0f2127ed..efcac50e 100644
--- a/test/test.html
+++ b/test/test.html
@@ -25,8 +25,8 @@
<script src="/test/modules/basic.js"></script>
<script src="/test/modules/strings.js"></script>
<script src="/test/modules/formats.js"></script>
-<!-- <script src="/test/modules/utils.js"></script>
- <script src="/test/modules/events.js"></script>
+ <script src="/test/modules/utils.js"></script>
+ <!--<script src="/test/modules/events.js"></script>
<script src="/test/modules/units.js"></script>
<script src="/test/modules/multi-image.js"></script>
<script src="/test/modules/overlays.js"></script>