Changeset 3731

Timestamp:

07/13/07 11:41:33 (1 year ago)

Author:

euzuro

Message:

fix for #746 - add console.error()s when wrong number of argumetns passed to add()

Files:

• trunk/openlayers/lib/OpenLayers/BaseTypes/Bounds.js (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/BaseTypes/LonLat.js (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/BaseTypes/Pixel.js (modified) (1 diff)
• trunk/openlayers/tests/BaseTypes/test_Bounds.html (modified) (1 diff)
• trunk/openlayers/tests/BaseTypes/test_LonLat.html (modified) (1 diff)
• trunk/openlayers/tests/BaseTypes/test_Pixel.html (modified) (1 diff)

trunk/openlayers/lib/OpenLayers/BaseTypes/Bounds.js

@@ -192 +192 @@
-     */
-    add:function(x, y) {
+        if ( (x == null) || (y == null) ) {
+            var msg = "You must pass both x and y values to the add function.";
+            OpenLayers.Console.error(msg);
+            return null;
+        }
-        return new OpenLayers.Bounds(this.left + x, this.bottom + y,
-                                     this.right + x, this.top + y);

trunk/openlayers/lib/OpenLayers/BaseTypes/LonLat.js

@@ -85 +85 @@
-     */
-    add:function(lon, lat) {
+        if ( (lon == null) || (lat == null) ) {
+            var msg = "You must pass both lon and lat values " +
+                      "to the add function.";
+            OpenLayers.Console.error(msg);
+            return null;
+        }
-        return new OpenLayers.LonLat(this.lon + lon, this.lat + lat);
-    },

trunk/openlayers/lib/OpenLayers/BaseTypes/Pixel.js

@@ -92 +92 @@
-     */
-    add:function(x, y) {
+        if ( (x == null) || (y == null) ) {
+            var msg = "You must pass both x and y values to the add function.";
+            OpenLayers.Console.error(msg);
+            return null;
+        }
-        return new OpenLayers.Pixel(this.x + x, this.y + y);
-    },

trunk/openlayers/tests/BaseTypes/test_Bounds.html

@@ -473 +473 @@
-      }
-
+    function test_17_Bounds_add(t) {
+        t.plan( 8 );
+
+        origBounds = new OpenLayers.Bounds(1,2,3,4);
+        testBounds = origBounds.clone();
+
+        var bounds = testBounds.add(5, 50);
+        t.ok( testBounds.equals(origBounds), "testBounds is not modified by add operation");
+
+        var b = new OpenLayers.Bounds(6,52,8,54);
+        t.ok( bounds.equals(b), "bounds is set correctly");
+        
+    //null values
+        var desiredMsg = "You must pass both x and y values to the add function.";
+        OpenLayers.Console.error = function(msg) {
+            t.eq(msg, desiredMsg, "error correctly reported");
+        }
+    
+        bounds = testBounds.add(null, 50);
+        t.ok( testBounds.equals(origBounds), "testBounds is not modified by erroneous add operation (null x)");
+        t.ok(bounds == null, "returns null on erroneous add operation (null x)");
+ 
+        bounds = testBounds.add(5, null);
+        t.ok( testBounds.equals(origBounds), "testBounds is not modified by erroneous add operation (null y)");
+        t.ok(bounds == null, "returns null on erroneous add operation (null y)");
+    }
+
-  // -->
-  </script>

trunk/openlayers/tests/BaseTypes/test_LonLat.html

@@ -48 +48 @@
-
-    function test_04_LonLat_add(t) {
-2
+8
-
-
+
+
-
-        addpx = lonlatA.add(5, 50);
-
-
+
-
-        var ll = new OpenLayers.LonLat(15,150);
-        t.ok( addpx.equals(ll), "addpx is set correctly");
+        
+    //null values
+        var desiredMsg = "You must pass both lon and lat values to the add function.";
+        OpenLayers.Console.error = function(msg) {
+            t.eq(msg, desiredMsg, "error correctly reported");
+        }
+    
+        addpx = lonlatA.add(null, 50);
+        t.ok( lonlatA.equals(origLL), "lonlatA is not modified by erroneous add operation (null lon)");
+        t.ok(addpx == null, "returns null on erroneous add operation (null lon)");
+ 
+        addpx = lonlatA.add(5, null);
+        t.ok( lonlatA.equals(origLL), "lonlatA is not modified by erroneous add operation (null lat)");
+        t.ok(addpx == null, "returns null on erroneous add operation (null lat)");
-    }
-    

trunk/openlayers/tests/BaseTypes/test_Pixel.html

@@ -62 +62 @@
-
-    function test_07_Pixel_add(t) {
-
-
+
-
-
+
+
-
-
-
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-