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

add expectWithTrim to all test cases and protect numericIf against failure

Browse Source
This commit is contained in:
Bart van den Eijnden
2012-03-21 13:15:16 +01:00
parent 430d09eb55
commit 221292436a
2 changed files with 25 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/OpenLayers/BaseTypes.js
+1 -1
View File
@@ -197,7 +197,7 @@ OpenLayers.String = {
*/ */
numericIf: function(value, trimWhitespace) { numericIf: function(value, trimWhitespace) {
var originalValue = value; var originalValue = value;
if (trimWhitespace === true) { if (trimWhitespace === true && value != null && value.replace) {
value = value.replace(/^\s*|\s*$/g, ""); value = value.replace(/^\s*|\s*$/g, "");
} }
return OpenLayers.String.isNumeric(value) ? parseFloat(value) : originalValue; return OpenLayers.String.isNumeric(value) ? parseFloat(value) : originalValue;
tests/BaseTypes.html
+24 -34
View File
@@ -201,38 +201,30 @@
function test_Number_numericIf(t) { function test_Number_numericIf(t) {
var cases = [ var cases = [
{value: "3", expect: 3}, {value: "3", expect: 3, expectWithTrim: 3},
{value: "+3", expect: 3}, {value: "+3", expect: 3, expectWithTrim: 3},
{value: "-3", expect: -3}, {value: "-3", expect: -3, expectWithTrim: -3},
{value: "3.0", expect: 3}, {value: "3.0", expect: 3, expectWithTrim: 3},
{value: "+3.0", expect: 3}, {value: "+3.0", expect: 3, expectWithTrim: 3},
{value: "-3.0", expect: -3}, {value: "-3.0", expect: -3, expectWithTrim: -3},
{value: "6.02e23", expect: 6.02e23}, {value: "6.02e23", expect: 6.02e23, expectWithTrim: 6.02e23},
{value: "+1.0e-100", expect: 1e-100}, {value: "+1.0e-100", expect: 1e-100, expectWithTrim: 1e-100},
{value: "-1.0e+100", expect: -1e100}, {value: "-1.0e+100", expect: -1e100, expectWithTrim: -1e100},
{value: "1E100", expect: 1e100}, {value: "1E100", expect: 1e100, expectWithTrim: 1e100},
{value: null, expect: null}, {value: null, expect: null, expectWithTrim: null},
{value: true, expect: true}, {value: true, expect: true, expectWithTrim: true},
{value: false, expect: false}, {value: false, expect: false, expectWithTrim: false},
{value: undefined, expect: undefined}, {value: undefined, expect: undefined, expectWithTrim: undefined},
{value: "", expect: ""}, {value: "", expect: "", expectWithTrim: ""},
{value: "3 ", expect: "3 "}, {value: "3 ", expect: "3 ", expectWithTrim: 3},
{value: " 3", expect: " 3"}, {value: " 3", expect: " 3", expectWithTrim: 3},
{value: "1e", expect: "1e"}, {value: "1e", expect: "1e", expectWithTrim: "1e"},
{value: "1+e", expect: "1+e"}, {value: "1+e", expect: "1+e", expectWithTrim: "1+e"},
{value: "1-e", expect: "1-e"}, {value: "1-e", expect: "1-e", expectWithTrim: "1-e"},
{value: " 27 ", expect: " 27 ", expectWithTrim: 27}, {value: " 27 ", expect: " 27 ", expectWithTrim: 27},
{value: " abc ", expect: " abc ", expectWithTrim: " abc "} {value: " abc ", expect: " abc ", expectWithTrim: " abc "}
]; ];
var count = 0; t.plan(cases.length*2);
for (var i=0, ii=cases.length; i<ii; ++i) {
if (cases[i].expectWithTrim !== undefined) {
count += 2;
} else {
count++;
}
}
t.plan(count);
var func = OpenLayers.String.numericIf; var func = OpenLayers.String.numericIf;
var obj, val, got, exp; var obj, val, got, exp;
@@ -242,11 +234,9 @@
exp = obj.expect; exp = obj.expect;
got = func(val); got = func(val);
t.eq(got, exp, "'" + val + "' returns " + exp); t.eq(got, exp, "'" + val + "' returns " + exp);
if (obj.expectWithTrim !== undefined) { got = func(val, true);
got = func(val, true); exp = obj.expectWithTrim;
exp = obj.expectWithTrim; t.eq(got, exp, "'" + val + "' returns " + exp + " with trimWhitespace true");
t.eq(got, exp, "'" + val + "' returns " + exp + " with trimWhitespace true");
}
} }
} }