From afaee6880db9984ef303e8184a794b1e1d5f47d0 Mon Sep 17 00:00:00 2001
From: Bart van den Eijnden <bartvde@opengeo.org>
Date: Fri, 7 Jun 2013 01:39:18 -0700
Subject: [PATCH] Merge pull request #1003 from openlayers/notilemgrtest

Whenever we run tests *with* the tileManager, we cannot inspect any grid...(r=@ahocevar)
---
 tests/Layer/Grid.html                 | 2 +-
 tests/Tile/Image.html                 | 8 ++++----
 tests/deprecated/Layer/MapServer.html | 4 ++--
 tests/deprecated/Layer/WMS.html       | 4 ++--
 tests/list-tests.html                 | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/Layer/Grid.html b/tests/Layer/Grid.html
index aeb903ab55..61670b9c27 100644
--- a/tests/Layer/Grid.html
+++ b/tests/Layer/Grid.html
@@ -682,7 +682,7 @@
 
         t.plan( 9 );
 
-        var map = new OpenLayers.Map('map');
+        var map = new OpenLayers.Map('map', {tileManager: null});
         layer = new OpenLayers.Layer.Grid(name, url, params);
         map.addLayer(layer);
         layer.destroy();
diff --git a/tests/Tile/Image.html b/tests/Tile/Image.html
index 6cd2aacb87..5e4d61148a 100644
--- a/tests/Tile/Image.html
+++ b/tests/Tile/Image.html
@@ -282,7 +282,7 @@
                        format: 'image/png'};
 
 
-        var map = new OpenLayers.Map('map');
+        var map = new OpenLayers.Map('map', {tileManager: null});
         var layer = new OpenLayers.Layer.WMS(name, url, params, {gutter: gutter});
         map.addLayer(layer);
         map.setCenter(new OpenLayers.LonLat(0,0), 5);
@@ -296,7 +296,7 @@
         map.destroy();
         
         var gutter = 15;
-        var map = new OpenLayers.Map('map');
+        var map = new OpenLayers.Map('map', {tileManager: null});
         var layer = new OpenLayers.Layer.WMS(name, url, params, {gutter: gutter});
         map.addLayer(layer);
         map.setCenter(new OpenLayers.LonLat(0,0), 5);
@@ -320,7 +320,7 @@
     function test_createBackBuffer(t) {
         t.plan(3);
 
-        var map = new OpenLayers.Map('map');
+        var map = new OpenLayers.Map('map', {tileManager: null});
         var layer = new OpenLayers.Layer.WMS( "OpenLayers WMS", 
             "../../img/blank.gif", {layers: 'basic'});
         map.addLayer(layer);
@@ -345,7 +345,7 @@
     function test_onImageLoad(t) {
         t.plan(3);
 
-        var map = new OpenLayers.Map('map');
+        var map = new OpenLayers.Map('map', {tileManager: null});
         var layer = new OpenLayers.Layer.WMS( "OpenLayers WMS",
             "../../img/blank.gif", {layers: 'basic'}, {opacity: 0.5});
         map.addLayer(layer);
diff --git a/tests/deprecated/Layer/MapServer.html b/tests/deprecated/Layer/MapServer.html
index 101646e933..d65fef6b28 100644
--- a/tests/deprecated/Layer/MapServer.html
+++ b/tests/deprecated/Layer/MapServer.html
@@ -23,7 +23,7 @@
             t.debug_print("Can't test google reprojection in Opera or Safari.");
         } else if(validkey) {
             t.plan(5);
-            var map = new OpenLayers.Map('map');
+            var map = new OpenLayers.Map('map', {tileManager: null});
             var layer = new OpenLayers.Layer.Google("Google");
             map.addLayer(layer);
             layer = new OpenLayers.Layer.MapServer(name, url, params, {reproject: true, isBaseLayer: false, buffer: 2});
@@ -42,7 +42,7 @@
                           window.location.host);
         }
 
-        var map = new OpenLayers.Map('map');
+        var map = new OpenLayers.Map('map', {tileManager: null});
         layer = new OpenLayers.Layer.MapServer(name, url, params, {buffer:2});
         map.addLayer(layer);
         map.setCenter(new OpenLayers.LonLat(0,0), 5);
diff --git a/tests/deprecated/Layer/WMS.html b/tests/deprecated/Layer/WMS.html
index 4cbf6e2297..43977c843c 100644
--- a/tests/deprecated/Layer/WMS.html
+++ b/tests/deprecated/Layer/WMS.html
@@ -23,7 +23,7 @@
         } else if(validkey) {
             t.plan(5);
 
-            var map = new OpenLayers.Map('map');
+            var map = new OpenLayers.Map('map', {tileManager: null});
             var layer = new OpenLayers.Layer.Google("Google");
             map.addLayer(layer);
             var wmslayer = new OpenLayers.Layer.WMS(name, url, params,
@@ -43,7 +43,7 @@
                           window.location.host);
         }
 
-        var map = new OpenLayers.Map('map');
+        var map = new OpenLayers.Map('map', {tileManager: null});
         layer = new OpenLayers.Layer.WMS(name, url, params, {buffer: 2});
         map.addLayer(layer);
         map.setCenter(new OpenLayers.LonLat(0,0), 5);
diff --git a/tests/list-tests.html b/tests/list-tests.html
index f59c477b40..c353755091 100644
--- a/tests/list-tests.html
+++ b/tests/list-tests.html
@@ -231,7 +231,7 @@
     <li>Tile/Image.html</li>
     <li>Tile/Image/IFrame.html</li>
     <li>Tile/UTFGrid.html</li>
-    <li>TileManager.html</li>
+    <li>TileManager.html?visible</li>
     <li>Tween.html</li>
     <li>Kinetic.html</li>
     <li>Util.html?visible</li>