From b133435e061eb10f25d2f5a54ce0820f3916bfb1 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Mon, 27 Aug 2007 18:27:23 +0000 Subject: [PATCH] conditionally run Google tests based on protocol and host - print debug statements if key is not valid - this means that tests do not fail with an invalid key git-svn-id: http://svn.openlayers.org/trunk/openlayers@4060 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf --- tests/Layer/test_Google.html | 180 +++++++++++++++++++------------- tests/Layer/test_MapServer.html | 36 ++++--- tests/Layer/test_WMS.html | 43 +++++--- 3 files changed, 156 insertions(+), 103 deletions(-) diff --git a/tests/Layer/test_Google.html b/tests/Layer/test_Google.html index 56a689bcaa..4f36c66e16 100644 --- a/tests/Layer/test_Google.html +++ b/tests/Layer/test_Google.html @@ -5,96 +5,128 @@ diff --git a/tests/Layer/test_MapServer.html b/tests/Layer/test_MapServer.html index 9618c7ef45..ec32e9dc69 100644 --- a/tests/Layer/test_MapServer.html +++ b/tests/Layer/test_MapServer.html @@ -199,19 +199,29 @@ } function test_20_Layer_MapServer_Reproject (t) { - t.plan(5); - var map = new OpenLayers.Map('map'); - var layer = new OpenLayers.Layer.Google("Google"); - map.addLayer(layer); - layer = new OpenLayers.Layer.MapServer(name, url, params, {isBaseLayer: false, reproject: true}); - layer.isBaseLayer=false; - map.addLayer(layer); - map.setCenter(new OpenLayers.LonLat(0,0), 5); - var tile = layer.grid[0][0]; - t.eq( tile.bounds.left, -22.5, "left side matches" ); - t.eq( tile.bounds.right, -11.25, "top side matches" ); - t.eq( tile.bounds.bottom.toFixed(6), '11.178402', "bottom side matches" ); - t.eq( tile.bounds.top.toFixed(6), '21.943046', "top side matches" ); + var validkey = (window.location.protocol == "file:") || + (window.location.host == "localhost") || + (window.location.host == "openlayers.org"); + + if(validkey) { + t.plan(5); + var map = new OpenLayers.Map('map'); + var layer = new OpenLayers.Layer.Google("Google"); + map.addLayer(layer); + layer = new OpenLayers.Layer.MapServer(name, url, params, {isBaseLayer: false, reproject: true}); + layer.isBaseLayer=false; + map.addLayer(layer); + map.setCenter(new OpenLayers.LonLat(0,0), 5); + var tile = layer.grid[0][0]; + t.eq( tile.bounds.left, -22.5, "left side matches" ); + t.eq( tile.bounds.right, -11.25, "top side matches" ); + t.eq( tile.bounds.bottom.toFixed(6), '11.178402', "bottom side matches" ); + t.eq( tile.bounds.top.toFixed(6), '21.943046', "top side matches" ); + } else { + t.plan(1); + t.debug_print("can't test google layer from " + + window.location.host); + } var map = new OpenLayers.Map('map'); layer = new OpenLayers.Layer.MapServer(name, url, params); diff --git a/tests/Layer/test_WMS.html b/tests/Layer/test_WMS.html index c9954d31c0..56dd100a2d 100644 --- a/tests/Layer/test_WMS.html +++ b/tests/Layer/test_WMS.html @@ -270,23 +270,34 @@ map.destroy(); } - function test_20_Layer_WMS_Reproject (t) { - t.plan(5); - - var map = new OpenLayers.Map('map'); - var layer = new OpenLayers.Layer.Google("Google"); - map.addLayer(layer); - wmslayer = new OpenLayers.Layer.WMS(name, url, params, {isBaseLayer: false}); - wmslayer.isBaseLayer=false; - map.addLayer(wmslayer); - map.setCenter(new OpenLayers.LonLat(0,0), 5); + function test_20_Layer_WMS_Reproject (t) { + var validkey = (window.location.protocol == "file:") || + (window.location.host == "localhost") || + (window.location.host == "openlayers.org"); - var tile = wmslayer.grid[0][0]; - t.eq( tile.bounds.left, -22.5, "left side matches" ); - t.eq( tile.bounds.right, -11.25, "top side matches" ); - t.eq( tile.bounds.bottom.toFixed(6), '11.178402', "bottom side matches" ); - t.eq( tile.bounds.top.toFixed(6), '21.943046', "top side matches" ); - map.destroy(); + if(validkey) { + t.plan(5); + + var map = new OpenLayers.Map('map'); + var layer = new OpenLayers.Layer.Google("Google"); + map.addLayer(layer); + var wmslayer = new OpenLayers.Layer.WMS(name, url, params, + {isBaseLayer: false}); + wmslayer.isBaseLayer=false; + map.addLayer(wmslayer); + map.setCenter(new OpenLayers.LonLat(0,0), 5); + + var tile = wmslayer.grid[0][0]; + t.eq( tile.bounds.left, -22.5, "left side matches" ); + t.eq( tile.bounds.right, -11.25, "top side matches" ); + t.eq( tile.bounds.bottom.toFixed(6), '11.178402', "bottom side matches" ); + t.eq( tile.bounds.top.toFixed(6), '21.943046', "top side matches" ); + map.destroy(); + } else { + t.plan(1); + t.debug_print("can't test google layer from " + + window.location.host); + } var map = new OpenLayers.Map('map'); layer = new OpenLayers.Layer.WMS(name, url, params);