mirror/openseadragon
1
0
Fork 0
mirror of https://github.com/openseadragon/openseadragon.git synced 2024-11-21 20:56:09 +03:00
Code Issues Projects Releases Wiki Activity

cleaned up additional viewers in tests

Browse Source
This commit is contained in:
Tom 2024-01-18 16:05:35 -05:00
parent 8271b6d8b2
commit a2d31e9610
14 changed files with 29 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/modules/ajax-post-data.js
View File

@ -27,6 +27,7 @@
}; };
var viewer = null; var viewer = null;
var DONE = false;
var OriginalLoader = OpenSeadragon.ImageLoader; var OriginalLoader = OpenSeadragon.ImageLoader;
var OriginalAjax = OpenSeadragon.makeAjaxRequest; var OriginalAjax = OpenSeadragon.makeAjaxRequest;
@ -156,7 +157,7 @@
ASSERT = null; ASSERT = null;
if (viewer && viewer.close) { if (viewer && viewer.close) {
viewer.close(); DONE ? viewer.destroy () : viewer.close();
} }
viewer = null; viewer = null;
@ -271,6 +272,7 @@
return "d1=a1&d2=a2###"; return "d1=a1&d2=a2###";
}, },
}, true, true); }, true, true);
DONE = true; // mark the module as completed so the viewer can be destroyed
}); });
})(); })();

5
test/modules/controls.js vendored
View File

@ -17,9 +17,8 @@
}, },
afterEach: function () { afterEach: function () {
if (viewer){ if (viewer){
viewer.destroy();
viewer.destroy(); }
}
viewer = null; viewer = null;
} }

5
test/modules/events.js
View File

@ -18,9 +18,8 @@
}, },
afterEach: function () { afterEach: function () {
if (viewer){ if (viewer){
viewer.destroy();
viewer.destroy(); }
}
viewer = null; viewer = null;
} }
} ); } );

5
test/modules/formats.js
View File

@ -15,9 +15,8 @@
}, },
afterEach: function () { afterEach: function () {
if (viewer){ if (viewer){
viewer.destroy();
viewer.destroy(); }
}
viewer = null; viewer = null;
} }

5
test/modules/imageloader.js
View File

@ -16,9 +16,8 @@
}, },
afterEach: function () { afterEach: function () {
if (viewer){ if (viewer){
viewer.destroy();
viewer.destroy(); }
}
viewer = null; viewer = null;
} }

1
test/modules/multi-image.js
View File

@ -22,7 +22,6 @@
}, },
afterEach: function() { afterEach: function() {
if (viewer){ if (viewer){
viewer.destroy(); viewer.destroy();
} }

5
test/modules/navigator.js
View File

@ -43,9 +43,8 @@
resetTestVariables(); resetTestVariables();
if (viewer){ if (viewer){
viewer.destroy();
viewer.destroy(); }
}
viewer = null; viewer = null;
} }

5
test/modules/referencestrip.js
View File

@ -11,9 +11,8 @@
}, },
afterEach: function () { afterEach: function () {
if (viewer){ if (viewer){
viewer.destroy();
viewer.destroy(); }
}
viewer = null; viewer = null;
} }

5
test/modules/tiledimage.js
View File

@ -21,9 +21,8 @@
}, },
afterEach: function() { afterEach: function() {
if (viewer){ if (viewer){
viewer.destroy();
viewer.destroy(); }
}
viewer = null; viewer = null;
} }

5
test/modules/tilesource-dynamic-url.js
View File

@ -137,9 +137,8 @@
ASSERT = null; ASSERT = null;
if (viewer){ if (viewer){
viewer.destroy();
viewer.destroy(); }
}
viewer = null; viewer = null;

5
test/modules/units.js
View File

@ -20,9 +20,8 @@
}, },
afterEach: function () { afterEach: function () {
if (viewer){ if (viewer){
viewer.destroy();
viewer.destroy(); }
}
viewer = null; viewer = null;
} }

8
test/modules/viewerretrieval.js
View File

@ -26,17 +26,9 @@
afterEach: function () { afterEach: function () {
if (viewer1){ if (viewer1){
let errors = viewer1.drawer._numGlMaxTextureErrors;
if(errors > 0){
console.log('Number of times MAX_TEXTURE_IMAGE_UNITS had a bad value:', errors);
}
viewer1.destroy(); viewer1.destroy();
} }
if (viewer2){ if (viewer2){
let errors = viewer2.drawer._numGlMaxTextureErrors;
if(errors > 0){
console.log('Number of times MAX_TEXTURE_IMAGE_UNITS had a bad value:', errors);
}
viewer2.destroy(); viewer2.destroy();
} }
viewer1 = viewer2 = null; viewer1 = viewer2 = null;

12
test/modules/viewport.js
View File

@ -8,7 +8,7 @@
var SPRING_STIFFNESS = 100; // Faster animation = faster tests var SPRING_STIFFNESS = 100; // Faster animation = faster tests
var EPSILON = 0.0000000001; var EPSILON = 0.0000000001;
QUnit.module.only("viewport", { QUnit.module("viewport", {
beforeEach: function () { beforeEach: function () {
$('<div id="example"></div>').appendTo("#qunit-fixture"); $('<div id="example"></div>').appendTo("#qunit-fixture");
@ -22,7 +22,7 @@
}, },
afterEach: function () { afterEach: function () {
if (viewer){ if (viewer){
Util.logWebGLInfo(viewer); // Util.logWebGLInfo(viewer);
viewer.destroy(); viewer.destroy();
} }
@ -82,7 +82,7 @@
}; };
if (viewer){ if (viewer){
Util.logWebGLInfo(viewer); // Util.logWebGLInfo(viewer);
viewer.destroy(); viewer.destroy();
} }
viewerConfig[config.property] = level; viewerConfig[config.property] = level;
@ -103,7 +103,7 @@
viewerConfig[config.property] = level; viewerConfig[config.property] = level;
if (viewer){ if (viewer){
Util.logWebGLInfo(viewer); // Util.logWebGLInfo(viewer);
viewer.destroy(); viewer.destroy();
} }
viewer = OpenSeadragon(viewerConfig); viewer = OpenSeadragon(viewerConfig);
@ -383,7 +383,7 @@
i++; i++;
if (i < testZoomLevels.length) { if (i < testZoomLevels.length) {
if (viewer){ if (viewer){
Util.logWebGLInfo(viewer); // Util.logWebGLInfo(viewer);
viewer.destroy(); viewer.destroy();
} }
viewer = OpenSeadragon({ viewer = OpenSeadragon({
@ -400,7 +400,7 @@
} }
}; };
if (viewer){ if (viewer){
Util.logWebGLInfo(viewer); // Util.logWebGLInfo(viewer);
viewer.destroy(); viewer.destroy();
} }
viewer = OpenSeadragon({ viewer = OpenSeadragon({

5
test/modules/world.js
View File

@ -17,9 +17,8 @@
}, },
afterEach: function () { afterEach: function () {
if (viewer){ if (viewer){
viewer.destroy();
viewer.destroy(); }
}
viewer = null; viewer = null;
} }