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
This commit is contained in:
Tim Schaub
2007-08-27 18:27:23 +00:00
parent e4d857b167
commit b133435e06
3 changed files with 156 additions and 103 deletions
+33 -1
View File
@@ -5,8 +5,12 @@
<script src="../../lib/OpenLayers.js"></script> <script src="../../lib/OpenLayers.js"></script>
<script type="text/javascript"> <script type="text/javascript">
var layer; var layer;
var validkey = (window.location.protocol == "file:") ||
(window.location.host == "localhost") ||
(window.location.host == "openlayers.org");
function test_01_Layer_Google_constructor (t) { function test_01_Layer_Google_constructor (t) {
if(validkey) {
t.plan( 4 ); t.plan( 4 );
var map = new OpenLayers.Map('map'); var map = new OpenLayers.Map('map');
@@ -20,18 +24,30 @@
t.eq( layer.name, "Goog Layer", "layer.name is correct" ); t.eq( layer.name, "Goog Layer", "layer.name is correct" );
t.ok ( layer.mapObject != null, "GMap2 Object correctly loaded"); t.ok ( layer.mapObject != null, "GMap2 Object correctly loaded");
} else {
t.plan(0);
t.debug_print("Google tests can't be run from " +
window.location.host);
}
} }
function test_02_Layer_Google_isBaseLayer (t) { function test_02_Layer_Google_isBaseLayer (t) {
if(validkey) {
t.plan(1); t.plan(1);
var layer = new OpenLayers.Layer.Google('Goog Layer'); var layer = new OpenLayers.Layer.Google('Goog Layer');
t.ok(layer.isBaseLayer, "a default load of google layer responds as a base layer"); t.ok(layer.isBaseLayer, "a default load of google layer responds as a base layer");
} else {
t.plan(0);
t.debug_print("Google tests can't be run from " +
window.location.host);
}
} }
function test_03_Layer_Google_Translation_lonlat (t) { function test_03_Layer_Google_Translation_lonlat (t) {
if(validkey) {
t.plan( 4 ); t.plan( 4 );
var map = new OpenLayers.Map('map'); var map = new OpenLayers.Map('map');
@@ -53,10 +69,15 @@
t.ok( layer.getMapObjectLonLatFromOLLonLat(null) == null, "getGLatLngFromOLLonLat(null) returns null"); t.ok( layer.getMapObjectLonLatFromOLLonLat(null) == null, "getGLatLngFromOLLonLat(null) returns null");
t.ok( layer.getOLLonLatFromMapObjectLonLat(null) == null, "getOLLonLatFromGLatLng(null) returns null"); t.ok( layer.getOLLonLatFromMapObjectLonLat(null) == null, "getOLLonLatFromGLatLng(null) returns null");
} else {
t.plan(0);
t.debug_print("Google tests can't be run from " +
window.location.host);
}
} }
function test_04_Layer_Google_Translation_pixel (t) { function test_04_Layer_Google_Translation_pixel (t) {
if(validkey) {
t.plan( 4 ); t.plan( 4 );
var map = new OpenLayers.Map('map'); var map = new OpenLayers.Map('map');
@@ -78,9 +99,15 @@
t.ok( layer.getMapObjectPixelFromOLPixel(null) == null, "getGPointFromOLPixel(null) returns null"); t.ok( layer.getMapObjectPixelFromOLPixel(null) == null, "getGPointFromOLPixel(null) returns null");
t.ok( layer.getOLPixelFromMapObjectPixel(null) == null, "getOLPixelFromGPoint(null) returns null"); t.ok( layer.getOLPixelFromMapObjectPixel(null) == null, "getOLPixelFromGPoint(null) returns null");
} else {
t.plan(0);
t.debug_print("Google tests can't be run from " +
window.location.host);
}
} }
function test_99_Layer_destroy (t) { function test_99_Layer_destroy (t) {
if(validkey) {
t.plan( 5 ); t.plan( 5 );
var map = new OpenLayers.Map('map'); var map = new OpenLayers.Map('map');
@@ -95,6 +122,11 @@
t.eq( layer.map, null, "layer.map is null after destroy" ); t.eq( layer.map, null, "layer.map is null after destroy" );
t.eq( layer.options, null, "layer.options is null after destroy" ); t.eq( layer.options, null, "layer.options is null after destroy" );
t.eq( layer.gmap, null, "layer.gmap is null after destroy" ); t.eq( layer.gmap, null, "layer.gmap is null after destroy" );
} else {
t.plan(0);
t.debug_print("Google tests can't be run from " +
window.location.host);
}
} }
</script> </script>
+10
View File
@@ -199,6 +199,11 @@
} }
function test_20_Layer_MapServer_Reproject (t) { function test_20_Layer_MapServer_Reproject (t) {
var validkey = (window.location.protocol == "file:") ||
(window.location.host == "localhost") ||
(window.location.host == "openlayers.org");
if(validkey) {
t.plan(5); t.plan(5);
var map = new OpenLayers.Map('map'); var map = new OpenLayers.Map('map');
var layer = new OpenLayers.Layer.Google("Google"); var layer = new OpenLayers.Layer.Google("Google");
@@ -212,6 +217,11 @@
t.eq( tile.bounds.right, -11.25, "top 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.bottom.toFixed(6), '11.178402', "bottom side matches" );
t.eq( tile.bounds.top.toFixed(6), '21.943046', "top 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'); var map = new OpenLayers.Map('map');
layer = new OpenLayers.Layer.MapServer(name, url, params); layer = new OpenLayers.Layer.MapServer(name, url, params);
+12 -1
View File
@@ -271,12 +271,18 @@
} }
function test_20_Layer_WMS_Reproject (t) { function test_20_Layer_WMS_Reproject (t) {
var validkey = (window.location.protocol == "file:") ||
(window.location.host == "localhost") ||
(window.location.host == "openlayers.org");
if(validkey) {
t.plan(5); t.plan(5);
var map = new OpenLayers.Map('map'); var map = new OpenLayers.Map('map');
var layer = new OpenLayers.Layer.Google("Google"); var layer = new OpenLayers.Layer.Google("Google");
map.addLayer(layer); map.addLayer(layer);
wmslayer = new OpenLayers.Layer.WMS(name, url, params, {isBaseLayer: false}); var wmslayer = new OpenLayers.Layer.WMS(name, url, params,
{isBaseLayer: false});
wmslayer.isBaseLayer=false; wmslayer.isBaseLayer=false;
map.addLayer(wmslayer); map.addLayer(wmslayer);
map.setCenter(new OpenLayers.LonLat(0,0), 5); map.setCenter(new OpenLayers.LonLat(0,0), 5);
@@ -287,6 +293,11 @@
t.eq( tile.bounds.bottom.toFixed(6), '11.178402', "bottom 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" ); t.eq( tile.bounds.top.toFixed(6), '21.943046', "top side matches" );
map.destroy(); map.destroy();
} else {
t.plan(1);
t.debug_print("can't test google layer from " +
window.location.host);
}
var map = new OpenLayers.Map('map'); var map = new OpenLayers.Map('map');
layer = new OpenLayers.Layer.WMS(name, url, params); layer = new OpenLayers.Layer.WMS(name, url, params);