Changeset 1908

Timestamp:

11/18/06 10:29:32 (2 years ago)

Author:

crschmidt

Message:

Update tests in preperation for #381 -- this closes #383. The primary purpose
of this patch is to change the purpose of the getFullRequestString tests to actually
test that function, rather than testing both that function and getParameterString.

Files:

• trunk/openlayers/tests/test_Layer_HTTPRequest.html (modified) (7 diffs)
• trunk/openlayers/tests/test_Layer_WMS.html (modified) (4 diffs)
• trunk/openlayers/tests/test_Tile_Image.html (modified) (2 diffs)

trunk/openlayers/tests/test_Layer_HTTPRequest.html

@@ -96 +96 @@
-        layer = new OpenLayers.Layer.HTTPRequest(name, tUrl, tParams, null);
-        str = layer.getFullRequestString();
-"http://octo.metacarta.com/cgi-bin/mapserv?layers=basic&format=image/png"
+tUrl + '?' + OpenLayers.Util.getParameterString(tParams)
-
-
@@ -103 +103 @@
-        layer = new OpenLayers.Layer.HTTPRequest(name, tUrl, tParams, null);
-        str = layer.getFullRequestString();
-"http://octo.metacarta.com/cgi-bin/mapserv?layers=basic&format=image/png"
+tUrl + OpenLayers.Util.getParameterString(tParams)
-
-  // with ?param1=5
@@ -115 +115 @@
-        layer = new OpenLayers.Layer.HTTPRequest(name, tUrl, tParams, null);
-        str = layer.getFullRequestString();
-"http://octo.metacarta.com/cgi-bin/mapserv?param1=5&format=image/jpeg&layers=basic"
+tUrl + '&' + OpenLayers.Util.getParameterString({'layers':'basic'})
-
- 
@@ -122 +122 @@
-        layer = new OpenLayers.Layer.HTTPRequest(name, tUrl, tParams, null);
-        str = layer.getFullRequestString();
-"http://octo.metacarta.com/cgi-bin/mapserv?param1=5&layers=basic&format=image/png"
+tUrl + OpenLayers.Util.getParameterString(tParams)
-  
-
@@ -130 +130 @@
-        str = layer.getFullRequestString( { chicken: 6, 
-                                            layers:"road" } );
-"http://octo.metacarta.com/cgi-bin/mapserv?param1=5&layers=road&format=image/png&chicken=6"
+tUrl + OpenLayers.Util.getParameterString({layers: 'road', format: "image/png", chicken: 6})
-
-  // layer with null params
-        layer = new OpenLayers.Layer.HTTPRequest(name, tUrl, null, null);
-        str = layer.getFullRequestString();
-"http://octo.metacarta.com/cgi-bin/mapserv?param1=5&"
+tUrl + OpenLayers.Util.getParameterString({})
-
-  // layer with null params passing in new params
@@ -141 +141 @@
-        str = layer.getFullRequestString( { chicken: 6, 
-                                            layers:"road" } );
-"http://octo.metacarta.com/cgi-bin/mapserv?param1=5&chicken=6&layers=road"
+tUrl + OpenLayers.Util.getParameterString({chicken: 6, layers: "road"})
-
-  // with specified altUrl parameter
@@ -147 +147 @@
-        layer = new OpenLayers.Layer.HTTPRequest(name, "chicken", tParams, null);
-        str = layer.getFullRequestString(null, tUrl);
-"http://octo.metacarta.com/cgi-bin/mapserv?layers=basic&format=image/png"
+tUrl + '?' + OpenLayers.Util.getParameterString(tParams)
-
-    }

trunk/openlayers/tests/test_Layer_WMS.html

@@ -39 +39 @@
-
-        var img = tile.imgDiv;
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-        t.eq( tile.imgDiv.style.top, "6px", "image top is set correctly via addtile" );
-        t.eq( tile.imgDiv.style.left, "5px", "image top is set correctly via addtile" );
@@ -49 +59 @@
-        else
-            t.ok( firstChild instanceof HTMLElement, "div first child is an image object" );
-
+
+
+
-        t.eq( tile.position.toString(), "x=5,y=6", "Position of tile is set correctly." );
-    }
@@ -131 +143 @@
-        
-        t.plan( 2 );
-
-        var map = new OpenLayers.Map('map');
-        map.projection = "xx";
@@ -140 +151 @@
-        map.addLayer(tLayer);
-        str = tLayer.getFullRequestString();
-
+
+
+
+
+
+
+
+
- 
-        tLayer.projection = "none";
-        str = tLayer.getFullRequestString();
-
+
+
+
+
- 
-    }

trunk/openlayers/tests/test_Tile_Image.html

@@ -49 +49 @@
-        else
-            t.ok( img instanceof HTMLImageElement, "tile.draw creates an image");
-
+
+
+
+
+
+
+
+
+
+
-        t.eq( tile.imgDiv.style.width, "5px", "Image width is correct" );
-        t.eq( tile.imgDiv.style.height, "6px", "Image height is correct" );
@@ -68 +77 @@
-        tile = new OpenLayers.Tile.Image(layer, position, new OpenLayers.Bounds(-181,-91,180,90), url, size);
-        tile.draw()
-
+
+
+
+
+
+
+
+
+
+
-        tile = new OpenLayers.Tile.Image(layer, position, new OpenLayers.Bounds(-181,-90,180,90), url, size);
-        tile.draw()
-
+
+
+
+
-        tile = new OpenLayers.Tile.Image(layer, position, new OpenLayers.Bounds(-180,-90,180,90), url, size);
-        tile.draw()
-
+
+
+
+
-        tile = new OpenLayers.Tile.Image(layer, position, new OpenLayers.Bounds(-80,-45,80,45), url, size);
-        tile.draw()
-
+
+
+
+
-        tile = new OpenLayers.Tile.Image(layer, position, new OpenLayers.Bounds(-185,-95,185,95), url, size);
-        tile.draw()
-
-
+
+
+
+
+
-        layer.displayOutsideMaxExtent=1;
-        tile = new OpenLayers.Tile.Image(layer, position, new OpenLayers.Bounds(-185,-90,-180,90), url, size);
-        tile.draw()
-
+
+
+
+
-        tile = new OpenLayers.Tile.Image(layer, position, new OpenLayers.Bounds(-181,-90,180,90), url, size);
-        tile.draw()
-
+
+
+
+
-        tile = new OpenLayers.Tile.Image(layer, position, new OpenLayers.Bounds(-180,-90,180,90), url, size);
-        tile.draw()
-
+
+
+
+
-        tile = new OpenLayers.Tile.Image(layer, position, new OpenLayers.Bounds(-80,-45,80,45), url, size);
-        tile.draw()
-
+
+
+
+
-        tile = new OpenLayers.Tile.Image(layer, position, new OpenLayers.Bounds(-185,-95,185,95), url, size);
-        tile.draw()
-
+
+
+
+
-    } 
-    function test_04_Tile_Image_Display_After_Move(t) {