update tests to skip fullscreen and certain drawer-related events

This commit is contained in:
Tom 2023-11-29 19:04:27 -05:00
parent 6b995c018b
commit 9dc96390fc
3 changed files with 55 additions and 44 deletions

View File

@ -226,49 +226,50 @@
viewer.open('/test/data/testpattern.dzi'); viewer.open('/test/data/testpattern.dzi');
}); });
QUnit.test('FullScreen', function(assert) { // TODO: can this be enabled without breaking tests due to lack of short-duration user interaction?
const done = assert.async(); // QUnit.test('FullScreen', function(assert) {
if (!OpenSeadragon.supportsFullScreen) { // const done = assert.async();
assert.expect(0); // if (!OpenSeadragon.supportsFullScreen) {
done(); // assert.expect(0);
return; // done();
} // return;
// }
viewer.addHandler('open', function () { // viewer.addHandler('open', function () {
assert.ok(!OpenSeadragon.isFullScreen(), 'Started out not fullscreen'); // assert.ok(!OpenSeadragon.isFullScreen(), 'Started out not fullscreen');
const checkEnteringPreFullScreen = (event) => { // const checkEnteringPreFullScreen = (event) => {
viewer.removeHandler('pre-full-screen', checkEnteringPreFullScreen); // viewer.removeHandler('pre-full-screen', checkEnteringPreFullScreen);
assert.ok(event.fullScreen, 'Switching to fullscreen'); // assert.ok(event.fullScreen, 'Switching to fullscreen');
assert.ok(!OpenSeadragon.isFullScreen(), 'Not yet fullscreen'); // assert.ok(!OpenSeadragon.isFullScreen(), 'Not yet fullscreen');
}; // };
const checkExitingFullScreen = (event) => { // const checkExitingFullScreen = (event) => {
viewer.removeHandler('full-screen', checkExitingFullScreen); // viewer.removeHandler('full-screen', checkExitingFullScreen);
assert.ok(!event.fullScreen, 'Disabling fullscreen'); // assert.ok(!event.fullScreen, 'Disabling fullscreen');
assert.ok(!OpenSeadragon.isFullScreen(), 'Fullscreen disabled'); // assert.ok(!OpenSeadragon.isFullScreen(), 'Fullscreen disabled');
done(); // done();
} // }
// The 'new' headless mode allows us to enter fullscreen, so verify // // The 'new' headless mode allows us to enter fullscreen, so verify
// that we see the correct values returned. We will then close out // // that we see the correct values returned. We will then close out
// of fullscreen to check the same values when exiting. // // of fullscreen to check the same values when exiting.
const checkAcquiredFullScreen = (event) => { // const checkAcquiredFullScreen = (event) => {
viewer.removeHandler('full-screen', checkAcquiredFullScreen); // viewer.removeHandler('full-screen', checkAcquiredFullScreen);
viewer.addHandler('full-screen', checkExitingFullScreen); // viewer.addHandler('full-screen', checkExitingFullScreen);
assert.ok(event.fullScreen, 'Acquired fullscreen'); // assert.ok(event.fullScreen, 'Acquired fullscreen');
assert.ok(OpenSeadragon.isFullScreen(), 'Fullscreen enabled'); // assert.ok(OpenSeadragon.isFullScreen(), 'Fullscreen enabled');
viewer.setFullScreen(false); // viewer.setFullScreen(false);
}; // };
viewer.addHandler('pre-full-screen', checkEnteringPreFullScreen); // viewer.addHandler('pre-full-screen', checkEnteringPreFullScreen);
viewer.addHandler('full-screen', checkAcquiredFullScreen); // viewer.addHandler('full-screen', checkAcquiredFullScreen);
viewer.setFullScreen(true); // viewer.setFullScreen(true);
}); // });
viewer.open('/test/data/testpattern.dzi'); // viewer.open('/test/data/testpattern.dzi');
}); // });
QUnit.test('Close', function(assert) { QUnit.test('Close', function(assert) {
var done = assert.async(); var done = assert.async();

View File

@ -1158,7 +1158,12 @@
// ---------- // ----------
QUnit.test( 'Viewer: event count test with \'tile-drawing\'', function (assert) { QUnit.test( 'Viewer: event count test with \'tile-drawing\'', function (assert) {
var done = assert.async(); var done = assert.async();
var previousValue = viewer.drawer.continuousTileRefresh; if(viewer.drawer.getType() !== 'canvas'){
assert.expect(0);
done();
return;
}
// var previousValue = viewer.drawer.continuousTileRefresh;
assert.ok(viewer.numberOfHandlers('tile-drawing') === 0, assert.ok(viewer.numberOfHandlers('tile-drawing') === 0,
"'tile-drawing' event is empty by default."); "'tile-drawing' event is empty by default.");
@ -1166,7 +1171,7 @@
viewer.removeHandler( 'tile-drawing', tileDrawing ); viewer.removeHandler( 'tile-drawing', tileDrawing );
assert.ok(viewer.numberOfHandlers('tile-drawing') === 0, assert.ok(viewer.numberOfHandlers('tile-drawing') === 0,
"'tile-drawing' deleted: count is 0."); "'tile-drawing' deleted: count is 0.");
viewer.drawer.continuousTileRefresh = previousValue; // reset property // viewer.drawer.continuousTileRefresh = previousValue; // reset property
viewer.close(); viewer.close();
done(); done();
}; };
@ -1185,13 +1190,18 @@
assert.ok(viewer.numberOfHandlers('tile-drawing') === 1, assert.ok(viewer.numberOfHandlers('tile-drawing') === 1,
"'tile-drawing' deleted once: count is 1."); "'tile-drawing' deleted once: count is 1.");
viewer.drawer.continuousTileRefresh = true; // set to true so the tile-drawing event fires // viewer.drawer.continuousTileRefresh = true; // set to true so the tile-drawing event fires
viewer.open( '/test/data/testpattern.dzi' ); viewer.open( '/test/data/testpattern.dzi' );
} ); } );
QUnit.test( 'Viewer: tile-drawing event', function (assert) { QUnit.test( 'Viewer: tile-drawing event', function (assert) {
var done = assert.async(); var done = assert.async();
var previousValue = viewer.drawer.continuousTileRefresh; if(viewer.drawer.getType() !== 'canvas'){
assert.expect(0);
done();
return;
}
// var previousValue = viewer.drawer.continuousTileRefresh;
var tileDrawing = function ( event ) { var tileDrawing = function ( event ) {
viewer.removeHandler( 'tile-drawing', tileDrawing ); viewer.removeHandler( 'tile-drawing', tileDrawing );
@ -1202,12 +1212,12 @@
assert.ok(event.tile, "Tile should be set"); assert.ok(event.tile, "Tile should be set");
assert.ok(event.rendered, "Rendered should be set"); assert.ok(event.rendered, "Rendered should be set");
} }
viewer.drawer.continuousTileRefresh = previousValue; // reset property // viewer.drawer.continuousTileRefresh = previousValue; // reset property
viewer.close(); viewer.close();
done(); done();
}; };
viewer.drawer.continuousTileRefresh = true; // set to true so the tile-drawing event fires // viewer.drawer.continuousTileRefresh = true; // set to true so the tile-drawing event fires
viewer.addHandler( 'tile-drawing', tileDrawing ); viewer.addHandler( 'tile-drawing', tileDrawing );
viewer.open( '/test/data/testpattern.dzi' ); viewer.open( '/test/data/testpattern.dzi' );
} ); } );

View File

@ -262,12 +262,12 @@
done(); done();
}); });
// trigger a redraw so the event fires
firstImage.redraw();
}); });
} }
}); });
}); });
}); });
}); });