From f6c67b2159b71806f2fe2adc6d0e938eaf121a47 Mon Sep 17 00:00:00 2001 From: Tom Date: Thu, 18 Jan 2024 12:56:03 -0500 Subject: [PATCH] remove additional test logging for testing travis ci --- src/webgldrawer.js | 11 ----------- test/modules/ajax-tiles.js | 7 +------ test/modules/basic.js | 7 +------ test/modules/controls.js | 7 +------ test/modules/events.js | 7 +------ test/modules/formats.js | 7 +------ test/modules/imageloader.js | 7 +------ test/modules/multi-image.js | 7 +------ test/modules/navigator.js | 7 +------ test/modules/referencestrip.js | 7 +------ test/modules/tiledimage.js | 7 +------ test/modules/tilesource-dynamic-url.js | 7 +------ test/modules/units.js | 7 +------ test/modules/viewport.js | 7 +------ test/modules/world.js | 7 +------ 15 files changed, 14 insertions(+), 95 deletions(-) diff --git a/src/webgldrawer.js b/src/webgldrawer.js index a67803bf..1ea3fa38 100644 --- a/src/webgldrawer.js +++ b/src/webgldrawer.js @@ -90,10 +90,6 @@ this.context = this._outputContext; // API required by tests - // for use with qunit tests - this._numGlMaxTextureErrors = 0; - this._numGlMaxTextureOks = 0; - } // Public API required by all Drawer implementations @@ -278,13 +274,6 @@ } let maxTextures = this._gl.getParameter(this._gl.MAX_TEXTURE_IMAGE_UNITS); - if(maxTextures <= 0){ - this._numGlMaxTextureErrors += 1; - $.console.error(`There was a WebGL problem: bad value for MAX_TEXTURE_IMAGE_UNITS (${maxTextures})`); - return; - } else { - this._numGlMaxTextureOks += 1; - } let texturePositionArray = new Float32Array(maxTextures * 12); // 6 vertices (2 triangles) x 2 coordinates per vertex let textureDataArray = new Array(maxTextures); let matrixArray = new Array(maxTextures); diff --git a/test/modules/ajax-tiles.js b/test/modules/ajax-tiles.js index 25574ed3..f55c1e31 100644 --- a/test/modules/ajax-tiles.js +++ b/test/modules/ajax-tiles.js @@ -54,12 +54,7 @@ }, afterEach: function() { if (viewer){ - let errors = viewer.drawer._numGlMaxTextureErrors; - if(errors > 0){ - console.log('Number of times MAX_TEXTURE_IMAGE_UNITS had a bad value:', errors); - } else { - console.log('Num OK draw calls', viewer.drawer._numGlMaxTextureOks); - } + viewer.destroy(); } diff --git a/test/modules/basic.js b/test/modules/basic.js index 096707f3..24f6a7e7 100644 --- a/test/modules/basic.js +++ b/test/modules/basic.js @@ -17,12 +17,7 @@ }, afterEach: function () { if (viewer){ - let errors = viewer.drawer._numGlMaxTextureErrors; - if(errors > 0){ - console.log('Number of times MAX_TEXTURE_IMAGE_UNITS had a bad value:', errors); - } else { - console.log('Num OK draw calls', viewer.drawer._numGlMaxTextureOks); - } + viewer.destroy(); } diff --git a/test/modules/controls.js b/test/modules/controls.js index 1706951d..e2aeff9b 100644 --- a/test/modules/controls.js +++ b/test/modules/controls.js @@ -17,12 +17,7 @@ }, afterEach: function () { if (viewer){ - let errors = viewer.drawer._numGlMaxTextureErrors; - if(errors > 0){ - console.log('Number of times MAX_TEXTURE_IMAGE_UNITS had a bad value:', errors); - } else { - console.log('Num OK draw calls', viewer.drawer._numGlMaxTextureOks); - } + viewer.destroy(); } diff --git a/test/modules/events.js b/test/modules/events.js index 5454b8af..90a0a9fe 100644 --- a/test/modules/events.js +++ b/test/modules/events.js @@ -18,12 +18,7 @@ }, afterEach: function () { if (viewer){ - let errors = viewer.drawer._numGlMaxTextureErrors; - if(errors > 0){ - console.log('Number of times MAX_TEXTURE_IMAGE_UNITS had a bad value:', errors); - } else { - console.log('Num OK draw calls', viewer.drawer._numGlMaxTextureOks); - } + viewer.destroy(); } viewer = null; diff --git a/test/modules/formats.js b/test/modules/formats.js index bb595328..50913702 100644 --- a/test/modules/formats.js +++ b/test/modules/formats.js @@ -15,12 +15,7 @@ }, afterEach: function () { if (viewer){ - let errors = viewer.drawer._numGlMaxTextureErrors; - if(errors > 0){ - console.log('Number of times MAX_TEXTURE_IMAGE_UNITS had a bad value:', errors); - } else { - console.log('Num OK draw calls', viewer.drawer._numGlMaxTextureOks); - } + viewer.destroy(); } diff --git a/test/modules/imageloader.js b/test/modules/imageloader.js index ef42165c..eb3bebcd 100644 --- a/test/modules/imageloader.js +++ b/test/modules/imageloader.js @@ -16,12 +16,7 @@ }, afterEach: function () { if (viewer){ - let errors = viewer.drawer._numGlMaxTextureErrors; - if(errors > 0){ - console.log('Number of times MAX_TEXTURE_IMAGE_UNITS had a bad value:', errors); - } else { - console.log('Num OK draw calls', viewer.drawer._numGlMaxTextureOks); - } + viewer.destroy(); } diff --git a/test/modules/multi-image.js b/test/modules/multi-image.js index 6c356c0a..210821ae 100644 --- a/test/modules/multi-image.js +++ b/test/modules/multi-image.js @@ -22,12 +22,7 @@ }, afterEach: function() { if (viewer){ - let errors = viewer.drawer._numGlMaxTextureErrors; - if(errors > 0){ - console.log('Number of times MAX_TEXTURE_IMAGE_UNITS had a bad value:', errors); - } else { - console.log('Num OK draw calls', viewer.drawer._numGlMaxTextureOks); - } + viewer.destroy(); } diff --git a/test/modules/navigator.js b/test/modules/navigator.js index db3fca03..45f6585b 100644 --- a/test/modules/navigator.js +++ b/test/modules/navigator.js @@ -43,12 +43,7 @@ resetTestVariables(); if (viewer){ - let errors = viewer.drawer._numGlMaxTextureErrors; - if(errors > 0){ - console.log('Number of times MAX_TEXTURE_IMAGE_UNITS had a bad value:', errors); - } else { - console.log('Num OK draw calls', viewer.drawer._numGlMaxTextureOks); - } + viewer.destroy(); } diff --git a/test/modules/referencestrip.js b/test/modules/referencestrip.js index 07f18ed5..63a5c267 100644 --- a/test/modules/referencestrip.js +++ b/test/modules/referencestrip.js @@ -11,12 +11,7 @@ }, afterEach: function () { if (viewer){ - let errors = viewer.drawer._numGlMaxTextureErrors; - if(errors > 0){ - console.log('Number of times MAX_TEXTURE_IMAGE_UNITS had a bad value:', errors); - } else { - console.log('Num OK draw calls', viewer.drawer._numGlMaxTextureOks); - } + viewer.destroy(); } diff --git a/test/modules/tiledimage.js b/test/modules/tiledimage.js index 5115d734..3b5c4045 100644 --- a/test/modules/tiledimage.js +++ b/test/modules/tiledimage.js @@ -21,12 +21,7 @@ }, afterEach: function() { if (viewer){ - let errors = viewer.drawer._numGlMaxTextureErrors; - if(errors > 0){ - console.log('Number of times MAX_TEXTURE_IMAGE_UNITS had a bad value:', errors); - } else { - console.log('Num OK draw calls', viewer.drawer._numGlMaxTextureOks); - } + viewer.destroy(); } diff --git a/test/modules/tilesource-dynamic-url.js b/test/modules/tilesource-dynamic-url.js index 0ab36223..d1ac806a 100644 --- a/test/modules/tilesource-dynamic-url.js +++ b/test/modules/tilesource-dynamic-url.js @@ -137,12 +137,7 @@ ASSERT = null; if (viewer){ - let errors = viewer.drawer._numGlMaxTextureErrors; - if(errors > 0){ - console.log('Number of times MAX_TEXTURE_IMAGE_UNITS had a bad value:', errors); - } else { - console.log('Num OK draw calls', viewer.drawer._numGlMaxTextureOks); - } + viewer.destroy(); } diff --git a/test/modules/units.js b/test/modules/units.js index e5181810..ecd9b40f 100644 --- a/test/modules/units.js +++ b/test/modules/units.js @@ -20,12 +20,7 @@ }, afterEach: function () { if (viewer){ - let errors = viewer.drawer._numGlMaxTextureErrors; - if(errors > 0){ - console.log('Number of times MAX_TEXTURE_IMAGE_UNITS had a bad value:', errors); - } else { - console.log('Num OK draw calls', viewer.drawer._numGlMaxTextureOks); - } + viewer.destroy(); } diff --git a/test/modules/viewport.js b/test/modules/viewport.js index 49fef2e1..2fbe50b0 100644 --- a/test/modules/viewport.js +++ b/test/modules/viewport.js @@ -22,12 +22,7 @@ }, afterEach: function () { if (viewer){ - let errors = viewer.drawer._numGlMaxTextureErrors; - if(errors > 0){ - console.log('Number of times MAX_TEXTURE_IMAGE_UNITS had a bad value:', errors); - } else { - console.log('Num OK draw calls', viewer.drawer._numGlMaxTextureOks); - } + viewer.destroy(); } diff --git a/test/modules/world.js b/test/modules/world.js index 9214aa1d..be309749 100644 --- a/test/modules/world.js +++ b/test/modules/world.js @@ -17,12 +17,7 @@ }, afterEach: function () { if (viewer){ - let errors = viewer.drawer._numGlMaxTextureErrors; - if(errors > 0){ - console.log('Number of times MAX_TEXTURE_IMAGE_UNITS had a bad value:', errors); - } else { - console.log('Num OK draw calls', viewer.drawer._numGlMaxTextureOks); - } + viewer.destroy(); }