mirror/openseadragon
1
0
Fork 0
mirror of https://github.com/openseadragon/openseadragon.git synced 2024-11-29 08:36:10 +03:00
Code Issues Projects Releases Wiki Activity

Incorporate code review feedback - instantiate the viewer for looping ZoomLevel tests, change a few little syntax things

Browse Source
This commit is contained in:
nein09 2014-11-18 13:05:58 -08:00
parent 20711c485b
commit 614261876d
1 changed files with 63 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

113
test/viewport.js
View File

@ -2,6 +2,9 @@
(function () { (function () {
var viewer; var viewer;
var VIEWER_ID = "example";
var PREFIX_URL = "/build/openseadragon/images";
var SPRING_STIFFNESS = 100; // Faster animation = faster tests
module("viewport", { module("viewport", {
setup: function () { setup: function () {
@ -10,9 +13,9 @@
testLog.reset(); testLog.reset();
viewer = OpenSeadragon({ viewer = OpenSeadragon({
id: 'example', id: VIEWER_ID,
prefixUrl: '/build/openseadragon/images/', prefixUrl: PREFIX_URL,
springStiffness: 100 // Faster animation = faster tests springStiffness: SPRING_STIFFNESS
}); });
}, },
teardown: function () { teardown: function () {
@ -93,7 +96,6 @@
var openHandler = function(event) { var openHandler = function(event) {
viewer.removeHandler('open', openHandler); viewer.removeHandler('open', openHandler);
var viewport = viewer.viewport; var viewport = viewer.viewport;
viewport.zoomTo(ZOOM_FACTOR, null, true);
equal(viewport.getMinZoom(), .9, "Test default min zoom level") equal(viewport.getMinZoom(), .9, "Test default min zoom level")
start(); start();
@ -106,7 +108,6 @@
var openHandler = function(event) { var openHandler = function(event) {
viewer.removeHandler('open', openHandler); viewer.removeHandler('open', openHandler);
var viewport = viewer.viewport; var viewport = viewer.viewport;
viewport.zoomTo(ZOOM_FACTOR, null, true);
equal(viewport.getMaxZoom(), 2.2, "Test default max zoom level") equal(viewport.getMaxZoom(), 2.2, "Test default max zoom level")
start(); start();
@ -118,13 +119,12 @@
asyncTest('getMinZoom', function() { asyncTest('getMinZoom', function() {
var expected, level, i = 0; var expected, level, i = 0;
var openHandler = function(event) { var openHandler = function(event) {
viewer.removeHandler('open', openHandler);
var viewport = viewer.viewport; var viewport = viewer.viewport;
viewport.zoomTo(ZOOM_FACTOR, null, true);
if(level == 0) { // 0 means use the default if(level == 0) { // 0 means use the default
expected = 0.9; expected = 0.9;
} } else if(level > 1){
else if(level > 1){
expected = 1; // min zoom won't go bigger than 1. expected = 1; // min zoom won't go bigger than 1.
} }
@ -135,34 +135,34 @@
); );
i++; i++;
if(i < testZoomLevels.length){ if(i < testZoomLevels.length){
level = testZoomLevels[i]; level = expected = testZoomLevels[i];
viewer.minZoomLevel = level; viewer = OpenSeadragon({
expected = level; id: VIEWER_ID,
prefixUrl: PREFIX_URL,
springStiffness: SPRING_STIFFNESS,
minZoomLevel: level
});
viewer.addHandler('open', openHandler);
viewer.open(DZI_PATH); viewer.open(DZI_PATH);
} } else {
else {
viewer.removeHandler('open', openHandler);
start(); start();
} }
}; };
viewer.addHandler('open', openHandler); viewer.addHandler('open', openHandler);
level = testZoomLevels[i]; level = expected = testZoomLevels[i];
viewer.minZoomLevel = level; viewer.minZoomLevel = level;
expected = level;
viewer.open(DZI_PATH); viewer.open(DZI_PATH);
}); });
asyncTest('getMaxZoom', function() { asyncTest('getMaxZoom', function() {
var expected, level, i = 0; var expected, level, i = 0;
var openHandler = function(event) { var openHandler = function(event) {
viewer.removeHandler('open', openHandler);
var viewport = viewer.viewport; var viewport = viewer.viewport;
viewport.zoomTo(ZOOM_FACTOR, null, true);
if(level == 0){ // 0 means use the default if(level == 0){ // 0 means use the default
expected = 2.2; expected = 2.2;
} } else if(level < 1){
else if(level < 1){
expected = 1; // max zoom won't go smaller than 1. expected = 1; // max zoom won't go smaller than 1.
} }
@ -173,35 +173,36 @@
); );
i++; i++;
if(i < testZoomLevels.length){ if(i < testZoomLevels.length){
level = testZoomLevels[i]; level = expected = testZoomLevels[i];
viewer.maxZoomLevel = level; viewer = OpenSeadragon({
expected = level; id: VIEWER_ID,
prefixUrl: PREFIX_URL,
springStiffness: SPRING_STIFFNESS,
maxZoomLevel: level
});
viewer.addHandler('open', openHandler);
viewer.open(DZI_PATH); viewer.open(DZI_PATH);
} } else {
else {
viewer.removeHandler('open', openHandler);
start(); start();
} }
}; };
viewer.addHandler('open', openHandler); viewer.addHandler('open', openHandler);
level = testZoomLevels[i]; level = expected = testZoomLevels[i];
viewer.maxZoomLevel = level; viewer.maxZoomLevel = level;
expected = level;
viewer.open(DZI_PATH); viewer.open(DZI_PATH);
}); });
asyncTest('getHomeBounds', function() { asyncTest('getHomeBounds', function() {
var expected, i = 0; var expected, i = 0;
var openHandler = function(event) { var openHandler = function(event) {
viewer.removeHandler('open', openHandler);
var viewport = viewer.viewport; var viewport = viewer.viewport;
viewport.zoomTo(ZOOM_FACTOR, null, true); viewport.zoomTo(ZOOM_FACTOR, null, true);
// Have to special case this to avoid dividing by 0 // Have to special case this to avoid dividing by 0
if(testZoomLevels[i] == 0){ if(testZoomLevels[i] == 0){
expected = new OpenSeadragon.Rect(0, 0, 1, 1); expected = new OpenSeadragon.Rect(0, 0, 1, 1);
} } else {
else{
var sideLength = 1.0 / viewer.defaultZoomLevel; // it's a square in this case var sideLength = 1.0 / viewer.defaultZoomLevel; // it's a square in this case
var position = 0.5 - (sideLength / 2.0); var position = 0.5 - (sideLength / 2.0);
expected = new OpenSeadragon.Rect(position, position, sideLength, sideLength); expected = new OpenSeadragon.Rect(position, position, sideLength, sideLength);
@ -213,15 +214,18 @@
); );
i++; i++;
if(i < testZoomLevels.length){ if(i < testZoomLevels.length){
viewer.defaultZoomLevel = testZoomLevels[i]; viewer = OpenSeadragon({
id: VIEWER_ID,
prefixUrl: PREFIX_URL,
springStiffness: SPRING_STIFFNESS,
defaultZoomLevel: testZoomLevels[i]
});
viewer.addHandler('open', openHandler);
viewer.open(DZI_PATH); viewer.open(DZI_PATH);
} } else {
else {
viewer.removeHandler('open', openHandler);
start(); start();
} }
}; };
viewer.addHandler('open', openHandler); viewer.addHandler('open', openHandler);
viewer.defaultZoomLevel = testZoomLevels[i]; viewer.defaultZoomLevel = testZoomLevels[i];
viewer.open(DZI_PATH); viewer.open(DZI_PATH);
@ -230,6 +234,7 @@
asyncTest('getHomeZoom', function() { asyncTest('getHomeZoom', function() {
var expected, i = 0; var expected, i = 0;
var openHandler = function(event) { var openHandler = function(event) {
viewer.removeHandler('open', openHandler);
var viewport = viewer.viewport; var viewport = viewer.viewport;
viewport.zoomTo(ZOOM_FACTOR, null, true); viewport.zoomTo(ZOOM_FACTOR, null, true);
@ -245,15 +250,18 @@
i++; i++;
if(i < testZoomLevels.length){ if(i < testZoomLevels.length){
expected = testZoomLevels[i]; expected = testZoomLevels[i];
viewer.defaultZoomLevel = expected; viewer = OpenSeadragon({
id: VIEWER_ID,
prefixUrl: PREFIX_URL,
springStiffness: SPRING_STIFFNESS,
defaultZoomLevel: expected
});
viewer.addHandler('open', openHandler);
viewer.open(DZI_PATH); viewer.open(DZI_PATH);
} } else {
else {
viewer.removeHandler('open', openHandler);
start(); start();
} }
}; };
viewer.addHandler('open', openHandler); viewer.addHandler('open', openHandler);
expected = testZoomLevels[i]; expected = testZoomLevels[i];
viewer.defaultZoomLevel = expected; viewer.defaultZoomLevel = expected;
@ -261,13 +269,14 @@
}); });
asyncTest('getHomeZoomWithHomeFillsViewer', function() { asyncTest('getHomeZoomWithHomeFillsViewer', function() {
var expected, i = 0; var expected, level, i = 0;
var openHandler = function(event) { var openHandler = function(event) {
viewer.removeHandler('open', openHandler);
var viewport = viewer.viewport; var viewport = viewer.viewport;
viewport.zoomTo(ZOOM_FACTOR, null, true); viewport.zoomTo(ZOOM_FACTOR, null, true);
// If the default zoom level is set to 0, then we expect the home zoom to be 1. // If the default zoom level is set to 0, then we expect the home zoom to be 1.
if(expected == 0){ if(level == 0){
expected = 1; expected = 1;
} }
@ -278,18 +287,22 @@
); );
i++; i++;
if(i < testZoomLevels.length){ if(i < testZoomLevels.length){
expected = testZoomLevels[i]; level = expected = testZoomLevels[i];
viewer.defaultZoomLevel = expected; viewer = OpenSeadragon({
id: VIEWER_ID,
prefixUrl: PREFIX_URL,
springStiffness: SPRING_STIFFNESS,
defaultZoomLevel: level,
homeFillsViewer: true
});
viewer.addHandler('open', openHandler);
viewer.open(TALL_PATH); // use a different image for homeFillsViewer viewer.open(TALL_PATH); // use a different image for homeFillsViewer
} } else {
else {
viewer.removeHandler('open', openHandler);
start(); start();
} }
}; };
viewer.addHandler('open', openHandler); viewer.addHandler('open', openHandler);
expected = testZoomLevels[i]; level = expected = testZoomLevels[i];
viewer.homeFillsViewer = true; viewer.homeFillsViewer = true;
viewer.defaultZoomLevel = expected; viewer.defaultZoomLevel = expected;
viewer.open(TALL_PATH); // use a different image for homeFillsViewer viewer.open(TALL_PATH); // use a different image for homeFillsViewer