updating some coding style in tests. let's give function declarations a closing semicolon. seems the right thing to do (and reduces syntax bugs in my editor ;-) -- a couple other small stylistic changes here too. test still passes in IE6 and FF though - no worries

git-svn-id: http://svn.openlayers.org/trunk/openlayers@4152 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
euzuro
2007-08-31 12:22:09 +00:00
parent e221a6acd6
commit 0c108138e8
+34 -38
View File
@@ -4,11 +4,12 @@
<script type="text/javascript"> <script type="text/javascript">
var isMozilla = (navigator.userAgent.indexOf("compatible") == -1); var isMozilla = (navigator.userAgent.indexOf("compatible") == -1);
var map; var map;
function test_01_Util_getImagesLocation (t) { function test_01_Util_getImagesLocation (t) {
t.plan( 1 ); t.plan( 1 );
t.ok( OpenLayers.Util.getImagesLocation(), "../img/", t.ok( OpenLayers.Util.getImagesLocation(), "../img/",
"getImagesLocation()" ); "getImagesLocation()" );
} };
function test_02_Util_Strings(t) { function test_02_Util_Strings(t) {
t.plan(5); t.plan(5);
@@ -27,7 +28,7 @@
t.eq(trimmedStr.startsWith("dolphin"), false, "String.startsWith correctly does not find turkey"); t.eq(trimmedStr.startsWith("dolphin"), false, "String.startsWith correctly does not find turkey");
} };
function test_03_Util_Array(t) { function test_03_Util_Array(t) {
t.plan( 1 ); t.plan( 1 );
@@ -36,7 +37,7 @@
OpenLayers.Util.removeItem(array, 3); OpenLayers.Util.removeItem(array, 3);
t.eq( array.toString(), "1,2,4,5", "Util.removeItem works"); t.eq( array.toString(), "1,2,4,5", "Util.removeItem works");
} };
function test_04_Util_createDiv(t) { function test_04_Util_createDiv(t) {
t.plan( 24 ); t.plan( 24 );
@@ -97,7 +98,7 @@
t.ok( !div.style.opacity, "element.style.opacity set correctly"); t.ok( !div.style.opacity, "element.style.opacity set correctly");
t.ok( !div.style.filter, "element.style.filter set correctly"); t.ok( !div.style.filter, "element.style.filter set correctly");
} };
function test_05_Util_createImage(t) { function test_05_Util_createImage(t) {
t.plan( 22 ); t.plan( 22 );
@@ -150,19 +151,21 @@
t.ok( !image.style.opacity, "element.style.opacity default unset"); t.ok( !image.style.opacity, "element.style.opacity default unset");
t.ok( !image.style.filter, "element.style.filter default unset"); t.ok( !image.style.filter, "element.style.filter default unset");
} };
function test_06_Util_applyDefaults(t) { function test_06_Util_applyDefaults(t) {
t.plan(4); t.plan(4);
var to = { a: "abra", var to = {
b: "blorg" 'a': "abra",
}; 'b': "blorg"
};
var from = { b: "zoink", var from = {
c: "press" 'b': "zoink",
}; 'c': "press"
};
OpenLayers.Util.applyDefaults(to, from); OpenLayers.Util.applyDefaults(to, from);
@@ -170,14 +173,14 @@
t.eq( to["a"], "abra", "key present in to but not from maintained"); t.eq( to["a"], "abra", "key present in to but not from maintained");
t.eq( to["b"], "blorg", "key present in to and from, maintained in to"); t.eq( to["b"], "blorg", "key present in to and from, maintained in to");
t.eq( to["c"], "press", "key present in from and not to successfully copied to to"); t.eq( to["c"], "press", "key present in from and not to successfully copied to to");
} };
function test_07_Util_getParameterString(t) { function test_07_Util_getParameterString(t) {
t.plan( 4 ); t.plan( 4 );
var params = { foo: "bar", var params = { foo: "bar",
chicken: 1.5 chicken: 1.5
} };
t.eq( OpenLayers.Util.getParameterString(params), "foo=bar&chicken=1.5", "getParameterString returns correctly"); t.eq( OpenLayers.Util.getParameterString(params), "foo=bar&chicken=1.5", "getParameterString returns correctly");
t.eq( OpenLayers.Util.getParameterString({'a:':'b='}), "a%3A=b%3D", "getParameterString returns correctly with non-ascii keys/values"); t.eq( OpenLayers.Util.getParameterString({'a:':'b='}), "a%3A=b%3D", "getParameterString returns correctly with non-ascii keys/values");
@@ -190,7 +193,7 @@
var params = { foo: ["bar","baz,"] }; var params = { foo: ["bar","baz,"] };
t.eq( OpenLayers.Util.getParameterString(params), "foo=bar,baz%2C", "getParameterString returns with list of CSVs when given a list. "); t.eq( OpenLayers.Util.getParameterString(params), "foo=bar,baz%2C", "getParameterString returns with list of CSVs when given a list. ");
} };
function test_08_Util_createAlphaImageDiv(t) { function test_08_Util_createAlphaImageDiv(t) {
t.plan( 19 ); t.plan( 19 );
@@ -271,7 +274,7 @@
t.ok(true); t.ok(true);
} }
} };
function test_09_Util_modifyDOMElement(t) { function test_09_Util_modifyDOMElement(t) {
@@ -303,7 +306,7 @@
t.eq( parseFloat(element.style.opacity), opacity, "element.style.opacity set correctly"); t.eq( parseFloat(element.style.opacity), opacity, "element.style.opacity set correctly");
var filterString = 'alpha(opacity=' + (opacity * 100) + ')'; var filterString = 'alpha(opacity=' + (opacity * 100) + ')';
t.eq( element.style.filter, filterString, "element.style.filter set correctly"); t.eq( element.style.filter, filterString, "element.style.filter set correctly");
} };
function test_09_Util_modifyAlphaImageDiv(t) { function test_09_Util_modifyAlphaImageDiv(t) {
t.plan( 19 ); t.plan( 19 );
@@ -384,7 +387,7 @@
t.ok(true); t.ok(true);
} }
} };
function test_10_Util_upperCaseObject(t) { function test_10_Util_upperCaseObject(t) {
@@ -415,7 +418,7 @@
t.eq(uObj[aKey.toUpperCase()], aValue, "new uppercase value present"); t.eq(uObj[aKey.toUpperCase()], aValue, "new uppercase value present");
t.eq(uObj[bKey.toUpperCase()], bValue, "new uppercase value present"); t.eq(uObj[bKey.toUpperCase()], bValue, "new uppercase value present");
} };
function test_11_Util_createUniqueID(t) { function test_11_Util_createUniqueID(t) {
t.plan(2); t.plan(2);
@@ -425,10 +428,9 @@
var id = OpenLayers.Util.createUniqueID("chicken"); var id = OpenLayers.Util.createUniqueID("chicken");
t.ok( id.startsWith("chicken"), "OpenLayers.Util.createUniqueID starts id correctly"); t.ok( id.startsWith("chicken"), "OpenLayers.Util.createUniqueID starts id correctly");
} };
function test_12_Util_limitSigDigs(t) { function test_12_Util_limitSigDigs(t) {
t.plan(7); t.plan(7);
var x; var x;
@@ -448,10 +450,7 @@
x = 0; x = 0;
t.eq(x.limitSigDigs(2), 0, "correctly handles 0 number"); t.eq(x.limitSigDigs(2), 0, "correctly handles 0 number");
};
}
function test_13_Util_normalizeScale(t) { function test_13_Util_normalizeScale(t) {
t.plan(2); t.plan(2);
@@ -463,9 +462,7 @@
//funky scale //funky scale
var scale = 5; var scale = 5;
t.eq( OpenLayers.Util.normalizeScale(scale), 1/5, "normalizing a wrong scale works!"); t.eq( OpenLayers.Util.normalizeScale(scale), 1/5, "normalizing a wrong scale works!");
};
}
function test_13_Util_getScaleResolutionTranslation(t) { function test_13_Util_getScaleResolutionTranslation(t) {
t.plan(4); t.plan(4);
@@ -485,7 +482,8 @@
scale = 150000000; scale = 150000000;
resolution = OpenLayers.Util.getResolutionFromScale(scale); resolution = OpenLayers.Util.getResolutionFromScale(scale);
t.eq(OpenLayers.Util.getScaleFromResolution(resolution), scale, "scale->resolution->scale works"); t.eq(OpenLayers.Util.getScaleFromResolution(resolution), scale, "scale->resolution->scale works");
} };
function test_14_Util_getImgLocation(t) { function test_14_Util_getImgLocation(t) {
t.plan(3); t.plan(3);
OpenLayers.ImgPath = "foo/"; OpenLayers.ImgPath = "foo/";
@@ -495,7 +493,7 @@
OpenLayers.ImgPath = ''; OpenLayers.ImgPath = '';
t.eq(OpenLayers.Util.getImagesLocation().substr(OpenLayers.Util.getImagesLocation().length-4,4), "img/", "ImgPath works as expected when set to ''."); t.eq(OpenLayers.Util.getImagesLocation().substr(OpenLayers.Util.getImagesLocation().length-4,4), "img/", "ImgPath works as expected when set to ''.");
} };
function test_15_Util_isEquivalentUrl(t) { function test_15_Util_isEquivalentUrl(t) {
t.plan(8); t.plan(8);
@@ -556,16 +554,15 @@
url2 = "../tests/../tests/foo.html?bar=now#go"; url2 = "../tests/../tests/foo.html?bar=now#go";
t.ok(OpenLayers.Util.isEquivalentUrl(url1, url2), "relative vs. absolute paths works"); t.ok(OpenLayers.Util.isEquivalentUrl(url1, url2), "relative vs. absolute paths works");
};
}
function test_Util_createUniqueIDSeq(t) { function test_Util_createUniqueIDSeq(t) {
t.plan(1); t.plan(1);
OpenLayers.Util.lastSeqID = 0; OpenLayers.Util.lastSeqID = 0;
OpenLayers.Util.createDiv(); OpenLayers.Util.createDiv();
OpenLayers.Util.createDiv(); OpenLayers.Util.createDiv();
t.eq(OpenLayers.Util.createDiv().id, "OpenLayersDiv3", "Div created is sequential, starting at lastSeqID in Util."); t.eq(OpenLayers.Util.createDiv().id, "OpenLayersDiv3", "Div created is sequential, starting at lastSeqID in Util.");
} };
function test_Util_getParameters(t) { function test_Util_getParameters(t) {
t.plan(6); t.plan(6);
@@ -585,7 +582,7 @@
t.eq(OpenLayers.Util.getParameters('http://www.example.com?foo=bar,pub,disco'), t.eq(OpenLayers.Util.getParameters('http://www.example.com?foo=bar,pub,disco'),
{'foo': ['bar', 'pub', 'disco']}, {'foo': ['bar', 'pub', 'disco']},
"getParameters works with a comma-separated value (parses into array)"); "getParameters works with a comma-separated value (parses into array)");
} };
function test_Util_getArgs(t) { function test_Util_getArgs(t) {
//DEPRECATED -- to be removed in 3.0 //DEPRECATED -- to be removed in 3.0
@@ -610,7 +607,7 @@
OpenLayers.Console.warn = temp; OpenLayers.Console.warn = temp;
OpenLayers.Util.getParameters = temp2; OpenLayers.Util.getParameters = temp2;
} };
function tests_Util_extend(t) { function tests_Util_extend(t) {
t.plan(5); t.plan(5);
@@ -636,7 +633,7 @@
t.eq(destination.toString(), "source", t.eq(destination.toString(), "source",
"extend properly sets custom toString method"); "extend properly sets custom toString method");
t.eq(window.property, undefined, "Property variable not clobbered."); t.eq(window.property, undefined, "Property variable not clobbered.");
} };
function test_XX_Util_Try(t) { function test_XX_Util_Try(t) {
t.plan(7); t.plan(7);
@@ -669,8 +666,7 @@
var ret = OpenLayers.Util.Try(func1, func2, func3, func4); var ret = OpenLayers.Util.Try(func1, func2, func3, func4);
t.ok(ret == g_TestVal3, "try returns first sucessfully executed function's return"); t.ok(ret == g_TestVal3, "try returns first sucessfully executed function's return");
} };
</script> </script>
</head> </head>