From a2d31e961036d66baa79df0a52b2e5c76c22b8a8 Mon Sep 17 00:00:00 2001 From: Tom Date: Thu, 18 Jan 2024 16:05:35 -0500 Subject: [PATCH] cleaned up additional viewers in tests --- test/modules/ajax-post-data.js | 4 +++- test/modules/controls.js | 5 ++--- test/modules/events.js | 5 ++--- test/modules/formats.js | 5 ++--- test/modules/imageloader.js | 5 ++--- test/modules/multi-image.js | 1 - test/modules/navigator.js | 5 ++--- test/modules/referencestrip.js | 5 ++--- test/modules/tiledimage.js | 5 ++--- test/modules/tilesource-dynamic-url.js | 5 ++--- test/modules/units.js | 5 ++--- test/modules/viewerretrieval.js | 8 -------- test/modules/viewport.js | 12 ++++++------ test/modules/world.js | 5 ++--- 14 files changed, 29 insertions(+), 46 deletions(-) diff --git a/test/modules/ajax-post-data.js b/test/modules/ajax-post-data.js index e0f298a9..a4e16dfb 100644 --- a/test/modules/ajax-post-data.js +++ b/test/modules/ajax-post-data.js @@ -27,6 +27,7 @@ }; var viewer = null; + var DONE = false; var OriginalLoader = OpenSeadragon.ImageLoader; var OriginalAjax = OpenSeadragon.makeAjaxRequest; @@ -156,7 +157,7 @@ ASSERT = null; if (viewer && viewer.close) { - viewer.close(); + DONE ? viewer.destroy () : viewer.close(); } viewer = null; @@ -271,6 +272,7 @@ return "d1=a1&d2=a2###"; }, }, true, true); + DONE = true; // mark the module as completed so the viewer can be destroyed }); })(); diff --git a/test/modules/controls.js b/test/modules/controls.js index e2aeff9b..a0949a64 100644 --- a/test/modules/controls.js +++ b/test/modules/controls.js @@ -17,9 +17,8 @@ }, afterEach: function () { if (viewer){ - - viewer.destroy(); - } + viewer.destroy(); + } viewer = null; } diff --git a/test/modules/events.js b/test/modules/events.js index 90a0a9fe..8075869d 100644 --- a/test/modules/events.js +++ b/test/modules/events.js @@ -18,9 +18,8 @@ }, afterEach: function () { if (viewer){ - - viewer.destroy(); - } + viewer.destroy(); + } viewer = null; } } ); diff --git a/test/modules/formats.js b/test/modules/formats.js index 50913702..6b5c7fb6 100644 --- a/test/modules/formats.js +++ b/test/modules/formats.js @@ -15,9 +15,8 @@ }, afterEach: function () { if (viewer){ - - viewer.destroy(); - } + viewer.destroy(); + } viewer = null; } diff --git a/test/modules/imageloader.js b/test/modules/imageloader.js index eb3bebcd..7a7d6768 100644 --- a/test/modules/imageloader.js +++ b/test/modules/imageloader.js @@ -16,9 +16,8 @@ }, afterEach: function () { if (viewer){ - - viewer.destroy(); - } + viewer.destroy(); + } viewer = null; } diff --git a/test/modules/multi-image.js b/test/modules/multi-image.js index 210821ae..7edf894f 100644 --- a/test/modules/multi-image.js +++ b/test/modules/multi-image.js @@ -22,7 +22,6 @@ }, afterEach: function() { if (viewer){ - viewer.destroy(); } diff --git a/test/modules/navigator.js b/test/modules/navigator.js index 45f6585b..cb5c425f 100644 --- a/test/modules/navigator.js +++ b/test/modules/navigator.js @@ -43,9 +43,8 @@ resetTestVariables(); if (viewer){ - - viewer.destroy(); - } + viewer.destroy(); + } viewer = null; } diff --git a/test/modules/referencestrip.js b/test/modules/referencestrip.js index 63a5c267..86e0c5ee 100644 --- a/test/modules/referencestrip.js +++ b/test/modules/referencestrip.js @@ -11,9 +11,8 @@ }, afterEach: function () { if (viewer){ - - viewer.destroy(); - } + viewer.destroy(); + } viewer = null; } diff --git a/test/modules/tiledimage.js b/test/modules/tiledimage.js index 3b5c4045..6c33b752 100644 --- a/test/modules/tiledimage.js +++ b/test/modules/tiledimage.js @@ -21,9 +21,8 @@ }, afterEach: function() { if (viewer){ - - viewer.destroy(); - } + viewer.destroy(); + } viewer = null; } diff --git a/test/modules/tilesource-dynamic-url.js b/test/modules/tilesource-dynamic-url.js index d1ac806a..099530af 100644 --- a/test/modules/tilesource-dynamic-url.js +++ b/test/modules/tilesource-dynamic-url.js @@ -137,9 +137,8 @@ ASSERT = null; if (viewer){ - - viewer.destroy(); - } + viewer.destroy(); + } viewer = null; diff --git a/test/modules/units.js b/test/modules/units.js index ecd9b40f..e1190603 100644 --- a/test/modules/units.js +++ b/test/modules/units.js @@ -20,9 +20,8 @@ }, afterEach: function () { if (viewer){ - - viewer.destroy(); - } + viewer.destroy(); + } viewer = null; } diff --git a/test/modules/viewerretrieval.js b/test/modules/viewerretrieval.js index 81fa5b2a..4df84ed4 100644 --- a/test/modules/viewerretrieval.js +++ b/test/modules/viewerretrieval.js @@ -26,17 +26,9 @@ afterEach: function () { 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(); } 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(); } viewer1 = viewer2 = null; diff --git a/test/modules/viewport.js b/test/modules/viewport.js index a9ba9f2a..8fcdf21c 100644 --- a/test/modules/viewport.js +++ b/test/modules/viewport.js @@ -8,7 +8,7 @@ var SPRING_STIFFNESS = 100; // Faster animation = faster tests var EPSILON = 0.0000000001; - QUnit.module.only("viewport", { + QUnit.module("viewport", { beforeEach: function () { $('
').appendTo("#qunit-fixture"); @@ -22,7 +22,7 @@ }, afterEach: function () { if (viewer){ - Util.logWebGLInfo(viewer); + // Util.logWebGLInfo(viewer); viewer.destroy(); } @@ -82,7 +82,7 @@ }; if (viewer){ - Util.logWebGLInfo(viewer); + // Util.logWebGLInfo(viewer); viewer.destroy(); } viewerConfig[config.property] = level; @@ -103,7 +103,7 @@ viewerConfig[config.property] = level; if (viewer){ - Util.logWebGLInfo(viewer); + // Util.logWebGLInfo(viewer); viewer.destroy(); } viewer = OpenSeadragon(viewerConfig); @@ -383,7 +383,7 @@ i++; if (i < testZoomLevels.length) { if (viewer){ - Util.logWebGLInfo(viewer); + // Util.logWebGLInfo(viewer); viewer.destroy(); } viewer = OpenSeadragon({ @@ -400,7 +400,7 @@ } }; if (viewer){ - Util.logWebGLInfo(viewer); + // Util.logWebGLInfo(viewer); viewer.destroy(); } viewer = OpenSeadragon({ diff --git a/test/modules/world.js b/test/modules/world.js index be309749..49253fd5 100644 --- a/test/modules/world.js +++ b/test/modules/world.js @@ -17,9 +17,8 @@ }, afterEach: function () { if (viewer){ - - viewer.destroy(); - } + viewer.destroy(); + } viewer = null; }