diff --git a/lib/OpenLayers/Util.js b/lib/OpenLayers/Util.js index 8ee49d7adf..f4a0cf0f62 100644 --- a/lib/OpenLayers/Util.js +++ b/lib/OpenLayers/Util.js @@ -442,7 +442,7 @@ Array.prototype.remove = function(rem) { for(var i=0; i diff --git a/tests/test_Events.html b/tests/test_Events.html index 38077cefb3..ebfa2a279e 100644 --- a/tests/test_Events.html +++ b/tests/test_Events.html @@ -4,10 +4,10 @@ diff --git a/tests/test_Layer_Marker.html b/tests/test_Layer_Marker.html index e0141bc0ad..222b7d328f 100644 --- a/tests/test_Layer_Marker.html +++ b/tests/test_Layer_Marker.html @@ -5,27 +5,27 @@ var layer; function test_01_Layer_Marker_constructor (t) { - t.plan( 2 ); - - layer = new OpenLayers.Layer.Marker('Test Layer'); - t.ok( layer instanceof OpenLayers.Layer.Marker, "new OpenLayers.Layer.Marker returns object" ); - t.eq( layer.name, "Test Layer", "layer.name is correct" ); + t.plan( 2 ); + + layer = new OpenLayers.Layer.Marker('Test Layer'); + t.ok( layer instanceof OpenLayers.Layer.Marker, "new OpenLayers.Layer.Marker returns object" ); + t.eq( layer.name, "Test Layer", "layer.name is correct" ); } function test_02_Layer_Marker_addlayer (t) { - t.plan( 3 ); - - layer = new OpenLayers.Layer.Marker('Test Layer'); - t.ok( layer instanceof OpenLayers.Layer.Marker, "new OpenLayers.Layer.Marker returns object" ); - t.eq( layer.name, "Test Layer", "layer.name is correct" ); + t.plan( 3 ); + + layer = new OpenLayers.Layer.Marker('Test Layer'); + t.ok( layer instanceof OpenLayers.Layer.Marker, "new OpenLayers.Layer.Marker returns object" ); + t.eq( layer.name, "Test Layer", "layer.name is correct" ); layer.addMarker(new OpenLayers.Marker(new OpenLayers.Icon(), new OpenLayers.Size())); t.eq( layer.markers.length, 1, "addLayer adds marker to layer." ); } function test_99_Layer_Marker_destroy (t) { - t.plan( 1 ); - layer = new OpenLayers.Layer.Marker('Test Layer'); - layer.destroy(); - t.eq( layer.map, null, "layer.map is null after destroy" ); + t.plan( 1 ); + layer = new OpenLayers.Layer.Marker('Test Layer'); + layer.destroy(); + t.eq( layer.map, null, "layer.map is null after destroy" ); } // --> diff --git a/tests/test_Layer_WMS.html b/tests/test_Layer_WMS.html index 6aa59e586b..6a5c868d49 100644 --- a/tests/test_Layer_WMS.html +++ b/tests/test_Layer_WMS.html @@ -5,20 +5,20 @@ var layer; function test_01_Layer_WMS_constructor (t) { - t.plan( 6 ); - - layer = new OpenLayers.Layer.WMS('Test Layer', "http://octo.metacarta.com/cgi-bin/mapserv", {map: '/mapdata/vmap_wms.map', layers: 'basic', format: 'image/png'}); - t.ok( layer instanceof OpenLayers.Layer.WMS, "new OpenLayers.Layer.WMS returns object" ); - t.eq( layer.name, "Test Layer", "layer.name is correct" ); - t.eq( layer.url, "http://octo.metacarta.com/cgi-bin/mapserv", "layer.url is correct" ); - t.eq( layer.params.map, "/mapdata/vmap_wms.map", "layer.params.map is correct" ); - t.eq( layer.params.format, "image/png", "layer.params.format is correctly overridden" ); - t.eq( layer.params.exceptions, "application/vnd.ogc.se_inimage", - "other default layer.params are set correctly" ); + t.plan( 6 ); + + layer = new OpenLayers.Layer.WMS('Test Layer', "http://octo.metacarta.com/cgi-bin/mapserv", {map: '/mapdata/vmap_wms.map', layers: 'basic', format: 'image/png'}); + t.ok( layer instanceof OpenLayers.Layer.WMS, "new OpenLayers.Layer.WMS returns object" ); + t.eq( layer.name, "Test Layer", "layer.name is correct" ); + t.eq( layer.url, "http://octo.metacarta.com/cgi-bin/mapserv", "layer.url is correct" ); + t.eq( layer.params.map, "/mapdata/vmap_wms.map", "layer.params.map is correct" ); + t.eq( layer.params.format, "image/png", "layer.params.format is correctly overridden" ); + t.eq( layer.params.exceptions, "application/vnd.ogc.se_inimage", + "other default layer.params are set correctly" ); } function test_02_Layer_WMS_addtile (t) { t.plan( 6 ); - layer = new OpenLayers.Layer.WMS('Test Layer', "http://octo.metacarta.com/cgi-bin/mapserv", {map: '/mapdata/vmap_wms.map', layers: 'basic', format: 'image/jpeg'}); + layer = new OpenLayers.Layer.WMS('Test Layer', "http://octo.metacarta.com/cgi-bin/mapserv", {map: '/mapdata/vmap_wms.map', layers: 'basic', format: 'image/jpeg'}); var pixel = new OpenLayers.Pixel(5,6); var tile = layer.addTile(new OpenLayers.Bounds(1,2,3,4), pixel); t.eq( tile.img.src, "http://octo.metacarta.com/cgi-bin/mapserv?bbox=1,2,3,4&width=256&height=256&map=/mapdata/vmap_wms.map&layers=basic&format=image/jpeg&service=WMS&version=1.1.1&request=GetMap&srs=EPSG:4326&styles=&exceptions=application/vnd.ogc.se_inimage", "image src is created correctly via addtile" ); @@ -32,7 +32,7 @@ function test_03_Layer_WMS_inittiles (t) { t.plan( 2 ); var map = new OpenLayers.Map($('map')); - layer = new OpenLayers.Layer.WMS('Test Layer', "http://octo.metacarta.com/cgi-bin/mapserv", {map: '/mapdata/vmap_wms.map', layers: 'basic', format: 'image/jpeg'}); + layer = new OpenLayers.Layer.WMS('Test Layer', "http://octo.metacarta.com/cgi-bin/mapserv", {map: '/mapdata/vmap_wms.map', layers: 'basic', format: 'image/jpeg'}); map.addLayer(layer); map.setCenter(new OpenLayers.LonLat(0,0),5); t.eq( layer.grid.length, 4, "Grid rows is correct." ); @@ -41,10 +41,10 @@ } function test_99_Layer_WMS_destroy (t) { - t.plan( 1 ); - layer = new OpenLayers.Layer.WMS('Test Layer', "http://octo.metacarta.com/cgi-bin/mapserv", {map: '/mapdata/vmap_wms.map', layers: 'basic', format: 'image/jpeg'}); - layer.destroy(); - t.eq( layer.map, null, "layer.map is null after destroy" ); + t.plan( 1 ); + layer = new OpenLayers.Layer.WMS('Test Layer', "http://octo.metacarta.com/cgi-bin/mapserv", {map: '/mapdata/vmap_wms.map', layers: 'basic', format: 'image/jpeg'}); + layer.destroy(); + t.eq( layer.map, null, "layer.map is null after destroy" ); } // --> diff --git a/tests/test_Util.html b/tests/test_Util.html index 1a4beb8394..384c072d32 100644 --- a/tests/test_Util.html +++ b/tests/test_Util.html @@ -4,8 +4,8 @@