ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Updated tests to match recent developments.

Browse Source 
git-svn-id: http://svn.openlayers.org/trunk/openlayers@1183 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
Schuyler Erle
2006-08-10 00:26:38 +00:00
parent 02e8c1ba00
commit d2f4337828
4 changed files with 9 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/test_Layer_Grid.html
+2 -7
View File
@@ -42,7 +42,7 @@
} }
function test_03_Layer_Grid_clearTiles (t) { function test_03_Layer_Grid_clearTiles (t) {
t.plan( 2 ); t.plan(1);
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);
map.addLayer(layer); map.addLayer(layer);
@@ -56,9 +56,6 @@
layer.clearGrid(); layer.clearGrid();
t.ok( layer.grid != null, "layer.grid does not get nullified" ); t.ok( layer.grid != null, "layer.grid does not get nullified" );
t.ok( (tile.layer == null) &&
(tile.bounds == null) &&
(tile.size == null), "tiles appropriately destroyed")
} }
@@ -218,9 +215,7 @@
layer.destroy(); layer.destroy();
t.ok( (tile.layer == null) && t.ok( layer.grid == null, "tiles appropriately destroyed")
(tile.bounds == null) &&
(tile.size == null), "tiles appropriately destroyed")
} }
// --> // -->
tests/test_Layer_KaMap.html
+2 -7
View File
@@ -36,7 +36,7 @@
} }
function test_03_Layer_KaMap_clearTiles (t) { function test_03_Layer_KaMap_clearTiles (t) {
t.plan( 2 ); t.plan( 1 );
var map = new OpenLayers.Map('map'); var map = new OpenLayers.Map('map');
layer = new OpenLayers.Layer.KaMap(name, url, params, units); layer = new OpenLayers.Layer.KaMap(name, url, params, units);
map.addLayer(layer); map.addLayer(layer);
@@ -49,9 +49,6 @@
layer.clearGrid(); layer.clearGrid();
t.ok( layer.grid != null, "layer.grid does not get nullified" ); t.ok( layer.grid != null, "layer.grid does not get nullified" );
t.ok( (tile.layer == null) &&
(tile.bounds == null) &&
(tile.size == null), "tiles appropriately destroyed")
} }
@@ -209,9 +206,7 @@
layer.destroy(); layer.destroy();
t.ok( (tile.layer == null) && t.ok( layer.grid == null, "tiles appropriately destroyed");
(tile.bounds == null) &&
(tile.size == null), "tiles appropriately destroyed")
} }
// --> // -->
tests/test_Layer_WMS.html
+1 -5
View File
@@ -149,7 +149,7 @@
function test_99_Layer_WMS_destroy (t) { function test_99_Layer_WMS_destroy (t) {
t.plan( 2 ); t.plan( 1 );
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);
@@ -165,10 +165,6 @@
// checks to make sure superclass (grid) destroy() was called // checks to make sure superclass (grid) destroy() was called
t.ok( layer.grid == null, "grid set to null"); t.ok( layer.grid == null, "grid set to null");
t.ok( (tile.layer == null) &&
(tile.bounds == null) &&
(tile.size == null), "tiles appropriately destroyed")
} }
// --> // -->
</script> </script>
tests/test_Map.html
+4 -2
View File
@@ -43,7 +43,7 @@
t.ok( map.getCenter().equals(ll), "map center is correct after calling setCenter"); t.ok( map.getCenter().equals(ll), "map center is correct after calling setCenter");
} }
function test_03_Map_add_layers(t) { function test_03_Map_add_layers(t) {
t.plan(5); t.plan(6);
map = new OpenLayers.Map($('map')); map = new OpenLayers.Map($('map'));
var layer1 = new OpenLayers.Layer.WMS("Layer 1", var layer1 = new OpenLayers.Layer.WMS("Layer 1",
"http://octo.metacarta.com/cgi-bin/mapserv?", "http://octo.metacarta.com/cgi-bin/mapserv?",
@@ -56,8 +56,10 @@
t.ok( map.layers[0] === layer1, "1st layer is layer1" ); t.ok( map.layers[0] === layer1, "1st layer is layer1" );
t.ok( map.layers[1] === layer2, "2nd layer is layer2" ); t.ok( map.layers[1] === layer2, "2nd layer is layer2" );
t.ok( layer1.map === map, "layer.map is map" ); t.ok( layer1.map === map, "layer.map is map" );
t.eq( parseInt(layer1.div.style.zIndex), map.Z_INDEX_BASE['Layer'], t.eq( parseInt(layer1.div.style.zIndex), map.Z_INDEX_BASE['BaseLayer'],
"layer1 zIndex is set" ); "layer1 zIndex is set" );
t.eq( parseInt(layer2.div.style.zIndex), map.Z_INDEX_BASE['BaseLayer'] + 5,
"layer2 zIndex is set" );
} }
function test_04_Map_options(t) { function test_04_Map_options(t) {
t.plan(2); t.plan(2);