[KSS-checkins] r45753 - in kukit/kukit.js/trunk: . doc tests
gotcha at codespeak.net
gotcha at codespeak.net
Thu Aug 16 22:33:11 CEST 2007
Author: gotcha
Date: Thu Aug 16 22:33:10 2007
New Revision: 45753
Added:
kukit/kukit.js/trunk/HISTORY.txt
- copied unchanged from r45751, kukit/kukit.js/branch/gotcha-code-cleanup/HISTORY.txt
Modified:
kukit/kukit.js/trunk/doc/CREDITS.txt
kukit/kukit.js/trunk/tests/test_kssparser.js
kukit/kukit.js/trunk/tests/test_requestmanager.js
Log:
merge gotcha-code-cleanup
Modified: kukit/kukit.js/trunk/doc/CREDITS.txt
==============================================================================
--- kukit/kukit.js/trunk/doc/CREDITS.txt (original)
+++ kukit/kukit.js/trunk/doc/CREDITS.txt Thu Aug 16 22:33:10 2007
@@ -2,4 +2,5 @@
Tarek Ziade (ziade.tarek at gmail.com)
Florian Schulze (florian.schulze at gmx.net)
Balazs Ree (ree at greenfinity.hu)
+Martin Heidegger (mastakaneda at gmail.com)
Jeroen Vloothuis (jeroen.vloothuis at xs4all.nl)
Modified: kukit/kukit.js/trunk/tests/test_kssparser.js
==============================================================================
--- kukit/kukit.js/trunk/tests/test_kssparser.js (original)
+++ kukit/kukit.js/trunk/tests/test_kssparser.js Thu Aug 16 22:33:10 2007
@@ -39,7 +39,7 @@
if (! a.isMethod) {
this.assertEquals(a.txt, b.txt, reason + 'text mismatch' );
} else {
- this.assertEquals(a.methodname, b.methodname, reason + 'methodname mismatch');
+ this.assertEquals(a.methodName, b.methodName, reason + 'methodName mismatch');
this.assertListEquals(a.args, b.args, reason + 'args mismatch');
}
};
@@ -94,31 +94,32 @@
txt= " in /* valid */ 'a string';";
src = new kukit.tk.Cursor(txt);
- this.assertParsingError(kukit.kssp.PropValueInMethod, src, null, true, 'Excess characters before the string in property value');
+ this.assertParsingError(kukit.kssp.PropValueInMethod, src, null, true, 'Wrong value : unallowed characters [in] before a string.');
txt= " 'a string' trashy;";
src = new kukit.tk.Cursor(txt);
- this.assertParsingError(kukit.kssp.PropValueInMethod, src, null, true, 'Excess characters after the property value');
+ this.assertParsingError(kukit.kssp.PropValueInMethod, src, null, true, 'Wrong value : unallowed characters after the property.');
txt= " 'a string' trashy \"trishy\";";
src = new kukit.tk.Cursor(txt);
- this.assertParsingError(kukit.kssp.PropValueInMethod, src, null, true, 'Excess characters after the property value');
+ this.assertParsingError(kukit.kssp.PropValueInMethod, src, null, true, 'Wrong value : unallowed characters after the property.');
// multiword not ok
txt= "b c";
src = new kukit.tk.Cursor(txt);
this.assertParsingError(kukit.kssp.PropValueInMethod, src, null, true,
- 'Property value must be one word', 5);
+ 'Wrong value : [b c] cannot have spaces.', 5);
txt= " apples and oranges ;";
src = new kukit.tk.Cursor(txt);
this.assertParsingError(kukit.kssp.PropValueInMethod, src, null, true,
- 'Property value must be one word', 25);
+ 'Wrong value : [apples and oranges] cannot have spaces.', 25);
txt= " /* comments; */ apples and /* more comments and*/ oranges ;";
src = new kukit.tk.Cursor(txt);
this.assertParsingError(kukit.kssp.PropValueInMethod, src, null, true,
- 'Property value must be one word', 62);
+ //'Wrong value : [/* comments; */ apples and /* more comments and*/ oranges ;] cannot have spaces.', 62);
+ 'Wrong value : [apples and oranges] cannot have spaces.', 62);
// in string, multiword ok even in method
txt= "'b c' ";
@@ -132,13 +133,13 @@
txt= "a'b c'";
src = new kukit.tk.Cursor(txt);
this.assertParsingError(kukit.kssp.PropValueInMethod, src, null, true,
- 'Excess characters before the string in property value', 6);
+ 'Wrong value : unallowed characters [a] before a string', 6);
// Not ok
txt= "'a''b c'";
src = new kukit.tk.Cursor(txt);
this.assertParsingError(kukit.kssp.PropValueInMethod, src, null, true,
- 'Excess characters after the property value', 8);
+ 'Wrong value : unallowed characters after the property.', 6);
};
@@ -180,7 +181,7 @@
parser = new kukit.kssp.PropValue(src, null, true);
this.assertEquals(parser.finished, true);
this.assertEquals(parser.value.isMethod, true);
- this.assertEquals(parser.value.methodname, 'formVar');
+ this.assertEquals(parser.value.methodName, 'formVar');
this.assertListEquals(parser.value.args, ['x', 'y']);
// params ok
@@ -189,7 +190,7 @@
parser = new kukit.kssp.PropValue(src, null, true);
this.assertEquals(parser.finished, true);
this.assertEquals(parser.value.isMethod, true);
- this.assertEquals(parser.value.methodname, 'formVar');
+ this.assertEquals(parser.value.methodName, 'formVar');
this.assertListEquals(parser.value.args, ['x', 'y']);
//ok
@@ -198,23 +199,23 @@
parser = new kukit.kssp.PropValue(src, null, true);
this.assertEquals(parser.finished, true);
this.assertEquals(parser.value.isMethod, true);
- this.assertEquals(parser.value.methodname, 'formVar');
+ this.assertEquals(parser.value.methodName, 'formVar');
this.assertListEquals(parser.value.args, ['x', 'y']);
txt= " a formVar(x, y)";
src = new kukit.tk.Cursor(txt);
this.assertParsingError(kukit.kssp.PropValue, src, null, true,
- 'Method property value must have a one-word method name', 16);
+ 'Wrong value : method name [a formVar] cannot have spaces.', 16);
txt= " 'formVar'(x, y)";
src = new kukit.tk.Cursor(txt);
this.assertParsingError(kukit.kssp.PropValue, src, null, true,
- 'Excess characters after the property value', 16);
+ 'Wrong value : unallowed characters after the property', 16);
txt= "formVar(x, y) xxx";
src = new kukit.tk.Cursor(txt);
this.assertParsingError(kukit.kssp.PropValue, src, null, true,
- 'Excess characters after the property value', 17);
+ 'Wrong value : unallowed characters after the property', 17);
};
this.testPropValueInPseudo = function() {
@@ -224,7 +225,7 @@
var src = new kukit.tk.Cursor(txt);
var parser = new kukit.kssp.PropValueInPseudo(src, null, true);
this.assertEquals(parser.finished, true);
- this.assertEquals(parser.value.methodname, 'b');
+ this.assertEquals(parser.value.methodName, 'b');
// multiword ok but does not finish
txt= "b c";
@@ -232,7 +233,7 @@
parser = new kukit.kssp.PropValueInPseudo(src, null, true);
this.assertEquals(parser.finished, true);
this.assertEquals(src.pos, 1);
- this.assertEquals(parser.value.methodname, 'b');
+ this.assertEquals(parser.value.methodName, 'b');
// space ok but does not finish
txt= " b";
@@ -240,7 +241,7 @@
parser = new kukit.kssp.PropValueInPseudo(src, null, true);
this.assertEquals(parser.finished, true);
this.assertEquals(src.pos, 0);
- this.assertEquals(parser.value.methodname, '');
+ this.assertEquals(parser.value.methodName, '');
// ok, does not finish
txt= "apples/* more comments and*/";
@@ -248,14 +249,14 @@
parser = new kukit.kssp.PropValueInPseudo(src, null, true);
this.assertEquals(parser.finished, true);
this.assertEquals(src.pos, 6);
- this.assertEquals(parser.value.methodname, 'apples');
+ this.assertEquals(parser.value.methodName, 'apples');
// params ok
txt= "click(x)";
src = new kukit.tk.Cursor(txt);
parser = new kukit.kssp.PropValueInPseudo(src, null, true);
this.assertEquals(parser.finished, true);
- this.assertEquals(parser.value.methodname, 'click');
+ this.assertEquals(parser.value.methodName, 'click');
this.assertListEquals(parser.value.args, ['x']);
// more then 1 args not ok (but we check it only from kss selector)
@@ -305,12 +306,12 @@
txt= "(a, b c )";
src = new kukit.tk.Cursor(txt);
this.assertParsingError(kukit.kssp.MethodArgs, src, kukit.kssp.openparent, true,
- 'Argument value must be one word', 9);
+ 'Wrong method argument [b c] : value cannot have spaces', 9);
txt= "(a, b 'x' )";
src = new kukit.tk.Cursor(txt);
this.assertParsingError(kukit.kssp.MethodArgs, src, kukit.kssp.openparent, true,
- 'Expected [comma], found [string]', 11);
+ 'Unexpected token : [string] found, [comma] was expected.', 11);
};
@@ -339,7 +340,8 @@
var txt= "a:dnd-drag-toomuch(hello)";
var src = new kukit.tk.Cursor(txt);
this.assertParsingError(kukit.kssp.KssSelector, src, null, true,
- 'Kss event selector must be name or namespace-name but no more dashes, "dnd-drag-toomuch"', 25);
+ 'Wrong event selector [dnd-drag-toomuch] : qualifier should be :<EVENTNAME> or :<NAMESPACE>'
+ , 25);
// maybe in std css space is not allowed in the parents,
// but we tolerate it
@@ -356,13 +358,13 @@
txt= " a div#id:drag (hello)";
src = new kukit.tk.Cursor(txt);
this.assertParsingError(kukit.kssp.KssSelector, src, null, true,
- 'Kss event selector must end with an event qualifier :event or :event(id)', 25);
+ 'Wrong event selector : missing event qualifier :<EVENTNAME> or :<EVENTNAME>(<ID>).', 25);
// We do not allow space here
txt= " a div#id: drag(hello)";
src = new kukit.tk.Cursor(txt);
this.assertParsingError(kukit.kssp.KssSelector, src, null, true,
- 'Kss event selector must end with an event qualifier :event or :event(id)', 23);
+ 'Wrong event selector : missing event qualifier :<EVENTNAME> or :<EVENTNAME>(<ID>).', 23);
txt= "a div#id:drop ";
src = new kukit.tk.Cursor(txt);
@@ -397,34 +399,34 @@
txt= "a:drop('hello', bello)";
src = new kukit.tk.Cursor(txt);
this.assertParsingError(kukit.kssp.KssSelector, src, null, true,
- 'Kss pseudo value must not have more then one parameters', 22);
+ 'Wrong event selector ::<EVENTNAME>(<ID>) can have only one parameter.', 22);
// zero params: not std css but tolerated
txt= "a:drop()";
src = new kukit.tk.Cursor(txt);
parser = new kukit.kssp.KssSelector(src, null, true);
this.assertParsingError(kukit.kssp.KssSelector, src, null, true,
- 'Kss event selector must end with an event qualifier :event or :event(id)', 8);
+ 'Wrong event selector : missing event qualifier :<EVENTNAME> or :<EVENTNAME>(<ID>).', 8);
txt= " (hello)";
src = new kukit.tk.Cursor(txt);
this.assertParsingError(kukit.kssp.KssSelector, src, null, true,
- 'Kss event selector must end with an event qualifier :event or :event(id)', 10);
+ 'Wrong event selector : missing event qualifier :<EVENTNAME> or :<EVENTNAME>(<ID>).', 10);
txt= "hello ('bello')";
src = new kukit.tk.Cursor(txt);
this.assertParsingError(kukit.kssp.KssSelector, src, null, true,
- 'Kss event selector must end with an event qualifier :event or :event(id)', 16);
+ 'Wrong event selector : missing event qualifier :<EVENTNAME> or :<EVENTNAME>(<ID>).', 16);
txt= "a:lang(hu) (hello)";
src = new kukit.tk.Cursor(txt);
this.assertParsingError(kukit.kssp.KssSelector, src, null, true,
- 'Kss event selector must end with an event qualifier :event or :event(id)', 19);
+ 'Wrong event selector : missing event qualifier :<EVENTNAME> or :<EVENTNAME>(<ID>).', 19);
txt= "a:lang(hu) b (hello)";
src = new kukit.tk.Cursor(txt);
this.assertParsingError(kukit.kssp.KssSelector, src, null, true,
- 'Kss event selector must end with an event qualifier :event or :event(id)', 20);
+ 'Wrong event selector : missing event qualifier :<EVENTNAME> or :<EVENTNAME>(<ID>).', 20);
// A valid attr selector in the css selector part.
txt= "a[href=hello].class:lang(hu) div#id:click ";
@@ -449,7 +451,7 @@
txt= " a:lang(hu) click ";
src = new kukit.tk.Cursor(txt);
this.assertParsingError(kukit.kssp.KssSelector, src, null, true,
- 'Kss event selector must end with an event qualifier :event or :event(id)', 20);
+ 'Wrong event selector : missing event qualifier :<EVENTNAME> or :<EVENTNAME>(<ID>).', 20);
// Spaces in the end
txt= " a:lang(hu, uh) b:click ";
@@ -497,22 +499,22 @@
txt= "a:click:clack ";
src = new kukit.tk.Cursor(txt);
this.assertParsingError(kukit.kssp.KssSelector, src, null, true,
- 'Kss event selector must end with an event qualifier :event or :event(id)', 14);
+ 'Wrong event selector : missing event qualifier :<EVENTNAME> or :<EVENTNAME>(<ID>).', 14);
txt= "a:click :clack ";
src = new kukit.tk.Cursor(txt);
this.assertParsingError(kukit.kssp.KssSelector, src, null, true,
- 'In kss event selector no space can be before the colon', 18);
+ 'Wrong event selector : space before the colon. at row', 18);
txt= "a:click/*comment */:clack ";
src = new kukit.tk.Cursor(txt);
this.assertParsingError(kukit.kssp.KssSelector, src, null, true,
- 'Kss event selector must end with an event qualifier :event or :event(id)', 26);
+ 'Wrong event selector : missing event qualifier :<EVENTNAME> or :<EVENTNAME>(<ID>).', 26);
txt= "click/*comment here*/:clack ";
src = new kukit.tk.Cursor(txt);
this.assertParsingError(kukit.kssp.KssSelector, src, null, true,
- 'Kss event selector must end with an event qualifier :event or :event(id)', 28);
+ 'Wrong event selector : missing event qualifier :<EVENTNAME> or :<EVENTNAME>(<ID>).', 28);
txt= "/*comment here*/click:clack ";
src = new kukit.tk.Cursor(txt);
@@ -554,12 +556,12 @@
txt= "document";
src = new kukit.tk.Cursor(txt);
this.assertParsingError(kukit.kssp.KssSelector, src, null, true,
- 'Kss event selector must end with an event qualifier :event or :event(id)', 8);
+ 'Wrong event selector : missing event qualifier :<EVENTNAME> or :<EVENTNAME>(<ID>).', 8);
txt= "document: ";
src = new kukit.tk.Cursor(txt);
this.assertParsingError(kukit.kssp.KssSelector, src, null, true,
- 'Kss event selector must have a one-word name after the colon', 10);
+ 'Wrong event selector : event name cannot have spaces. at row', 10);
// also, "behaviour:" works
txt= " behaviour:click(hello) ";
@@ -669,11 +671,11 @@
// }
rule = parser.eventRules[0];
this.assertDictEquals(rule.parms, {});
- this.assertEquals(rule.kss_selector.isEventSelector, true);
- this.assertEquals(rule.kss_selector.css, '#calendar-previous a');
- this.assertEquals(rule.kss_selector.name, 'click');
- this.assertEquals(rule.kss_selector.namespace, null);
- this.assertEquals(rule.kss_selector.id, null);
+ this.assertEquals(rule.kssSelector.isEventSelector, true);
+ this.assertEquals(rule.kssSelector.css, '#calendar-previous a');
+ this.assertEquals(rule.kssSelector.name, 'click');
+ this.assertEquals(rule.kssSelector.namespace, null);
+ this.assertEquals(rule.kssSelector.id, null);
action = rule.actions.content['kukitresponse/kukitGetPreviousMonth'];
this.assertEquals(action.type, 'S');
this.assertEquals(action.name, 'kukitresponse/kukitGetPreviousMonth');
@@ -688,11 +690,11 @@
// }
rule = parser.eventRules[1];
this.assertDictEquals(rule.parms, {'delay': '2000'});
- this.assertEquals(rule.kss_selector.isEventSelector, true);
- this.assertEquals(rule.kss_selector.css, 'div#update-area');
- this.assertEquals(rule.kss_selector.name, 'timeout');
- this.assertEquals(rule.kss_selector.namespace, null);
- this.assertEquals(rule.kss_selector.id, null);
+ this.assertEquals(rule.kssSelector.isEventSelector, true);
+ this.assertEquals(rule.kssSelector.css, 'div#update-area');
+ this.assertEquals(rule.kssSelector.name, 'timeout');
+ this.assertEquals(rule.kssSelector.namespace, null);
+ this.assertEquals(rule.kssSelector.id, null);
action = rule.actions.content['getCurrentTime'];
this.assertEquals(action.type, 'S');
this.assertEquals(action.name, 'getCurrentTime');
@@ -707,11 +709,11 @@
// }
rule = parser.eventRules[2];
this.assertDictEquals(rule.parms, {});
- this.assertEquals(rule.kss_selector.css, '#calendar-previous a');
- this.assertEquals(rule.kss_selector.isEventSelector, true);
- this.assertEquals(rule.kss_selector.name, 'click');
- this.assertEquals(rule.kss_selector.namespace, null);
- this.assertEquals(rule.kss_selector.id, null);
+ this.assertEquals(rule.kssSelector.css, '#calendar-previous a');
+ this.assertEquals(rule.kssSelector.isEventSelector, true);
+ this.assertEquals(rule.kssSelector.name, 'click');
+ this.assertEquals(rule.kssSelector.namespace, null);
+ this.assertEquals(rule.kssSelector.id, null);
action = rule.actions.content['kukitresponse/kukitGetPreviousMonth'];
this.assertEquals(action.type, 'S');
this.assertEquals(action.name, 'kukitresponse/kukitGetPreviousMonth');
@@ -725,11 +727,11 @@
// }
rule = parser.eventRules[3];
this.assertDictEquals(rule.parms, {});
- this.assertEquals(rule.kss_selector.css, '#calendar-previous a');
- this.assertEquals(rule.kss_selector.isEventSelector, true);
- this.assertEquals(rule.kss_selector.name, 'click');
- this.assertEquals(rule.kss_selector.namespace, null);
- this.assertEquals(rule.kss_selector.id, null);
+ this.assertEquals(rule.kssSelector.css, '#calendar-previous a');
+ this.assertEquals(rule.kssSelector.isEventSelector, true);
+ this.assertEquals(rule.kssSelector.name, 'click');
+ this.assertEquals(rule.kssSelector.namespace, null);
+ this.assertEquals(rule.kssSelector.id, null);
action = rule.actions.content['kukitGetPreviousMonth'];
this.assertEquals(action.type, 'S');
this.assertEquals(action.name, 'kukitGetPreviousMonth');
@@ -744,11 +746,11 @@
// }
rule = parser.eventRules[4];
this.assertDictEquals(rule.parms, {});
- this.assertEquals(rule.kss_selector.css, '#calendar-previous a');
- this.assertEquals(rule.kss_selector.isEventSelector, true);
- this.assertEquals(rule.kss_selector.name, 'drag');
- this.assertEquals(rule.kss_selector.namespace, 'dnd');
- this.assertEquals(rule.kss_selector.id, 'shelve');
+ this.assertEquals(rule.kssSelector.css, '#calendar-previous a');
+ this.assertEquals(rule.kssSelector.isEventSelector, true);
+ this.assertEquals(rule.kssSelector.name, 'drag');
+ this.assertEquals(rule.kssSelector.namespace, 'dnd');
+ this.assertEquals(rule.kssSelector.id, 'shelve');
action = rule.actions.content['whatever'];
this.assertEquals(action.type, 'S');
this.assertEquals(action.name, 'whatever');
@@ -763,11 +765,11 @@
//}
rule = parser.eventRules[5];
this.assertDictEquals(rule.parms, {});
- this.assertEquals(rule.kss_selector.css, '#button-one');
- this.assertEquals(rule.kss_selector.isEventSelector, true);
- this.assertEquals(rule.kss_selector.name, 'click');
- this.assertEquals(rule.kss_selector.namespace, 'annoyClicker');
- this.assertEquals(rule.kss_selector.id, 'annoy-me');
+ this.assertEquals(rule.kssSelector.css, '#button-one');
+ this.assertEquals(rule.kssSelector.isEventSelector, true);
+ this.assertEquals(rule.kssSelector.name, 'click');
+ this.assertEquals(rule.kssSelector.namespace, 'annoyClicker');
+ this.assertEquals(rule.kssSelector.id, 'annoy-me');
action = rule.actions.content['clickedButton'];
this.assertEquals(action.type, 'S');
this.assertEquals(action.name, 'clickedButton');
@@ -783,11 +785,11 @@
//}
rule = parser.eventRules[6];
this.assertDictEquals(rule.parms, {});
- this.assertEquals(rule.kss_selector.css, 'document');
- this.assertEquals(rule.kss_selector.isMethodSelector, true);
- this.assertEquals(rule.kss_selector.name, 'annoy');
- this.assertEquals(rule.kss_selector.namespace, null);
- this.assertEquals(rule.kss_selector.id, 'annoyMe');
+ this.assertEquals(rule.kssSelector.css, 'document');
+ this.assertEquals(rule.kssSelector.isMethodSelector, true);
+ this.assertEquals(rule.kssSelector.name, 'annoy');
+ this.assertEquals(rule.kssSelector.namespace, null);
+ this.assertEquals(rule.kssSelector.id, 'annoyMe');
action = rule.actions.content['alert'];
this.assertEquals(action.type, 'C');
this.assertEquals(action.name, 'alert');
@@ -804,11 +806,11 @@
//}
rule = parser.eventRules[7];
this.assertDictEquals(rule.parms, {});
- this.assertEquals(rule.kss_selector.css, 'document');
- this.assertEquals(rule.kss_selector.isMethodSelector, true);
- this.assertEquals(rule.kss_selector.name, 'annoy');
- this.assertEquals(rule.kss_selector.namespace, 'annoyClicker');
- this.assertEquals(rule.kss_selector.id, 'annoyMe');
+ this.assertEquals(rule.kssSelector.css, 'document');
+ this.assertEquals(rule.kssSelector.isMethodSelector, true);
+ this.assertEquals(rule.kssSelector.name, 'annoy');
+ this.assertEquals(rule.kssSelector.namespace, 'annoyClicker');
+ this.assertEquals(rule.kssSelector.id, 'annoyMe');
action = rule.actions.content['alert'];
this.assertEquals(action.type, 'C');
this.assertEquals(action.name, 'alert');
@@ -820,11 +822,11 @@
// rule 8
rule = parser.eventRules[8];
this.assertDictEquals(rule.parms, {'delay': '2000'});
- this.assertEquals(rule.kss_selector.isEventSelector, true);
- this.assertEquals(rule.kss_selector.css, 'div#update-area');
- this.assertEquals(rule.kss_selector.name, 'timeout');
- this.assertEquals(rule.kss_selector.namespace, null);
- this.assertEquals(rule.kss_selector.id, null);
+ this.assertEquals(rule.kssSelector.isEventSelector, true);
+ this.assertEquals(rule.kssSelector.css, 'div#update-area');
+ this.assertEquals(rule.kssSelector.name, 'timeout');
+ this.assertEquals(rule.kssSelector.namespace, null);
+ this.assertEquals(rule.kssSelector.id, null);
action = rule.actions.content['getCurrentTime'];
this.assertEquals(action.type, 'S');
this.assertEquals(action.name, 'getCurrentTime');
@@ -848,11 +850,11 @@
//}
rule = parser.eventRules[9];
this.assertDictEquals(rule.parms, {'preventdefault': 'true'});
- this.assertEquals(rule.kss_selector.css, 'document');
- this.assertEquals(rule.kss_selector.isMethodSelector, true);
- this.assertEquals(rule.kss_selector.name, 'annoy');
- this.assertEquals(rule.kss_selector.namespace, 'annoyClicker');
- this.assertEquals(rule.kss_selector.id, 'annoyMe');
+ this.assertEquals(rule.kssSelector.css, 'document');
+ this.assertEquals(rule.kssSelector.isMethodSelector, true);
+ this.assertEquals(rule.kssSelector.name, 'annoy');
+ this.assertEquals(rule.kssSelector.namespace, 'annoyClicker');
+ this.assertEquals(rule.kssSelector.id, 'annoyMe');
action = rule.actions.content['namespaced-alert'];
this.assertEquals(action.type, 'C');
this.assertEquals(action.name, 'namespaced-alert');
@@ -871,11 +873,11 @@
rule = parser.eventRules[10];
this.assertDictEquals(rule.parms, {});
- this.assertEquals(rule.kss_selector.isEventSelector, true);
- this.assertEquals(rule.kss_selector.css, '#button_1');
- this.assertEquals(rule.kss_selector.name, 'click');
- this.assertEquals(rule.kss_selector.namespace, null);
- this.assertEquals(rule.kss_selector.id, null);
+ this.assertEquals(rule.kssSelector.isEventSelector, true);
+ this.assertEquals(rule.kssSelector.css, '#button_1');
+ this.assertEquals(rule.kssSelector.name, 'click');
+ this.assertEquals(rule.kssSelector.namespace, null);
+ this.assertEquals(rule.kssSelector.id, null);
action = rule.actions.content['setStyle'];
this.assertEquals(action.type, 'C');
this.assertEquals(action.name, 'setStyle');
@@ -897,11 +899,11 @@
rule = parser.eventRules[11];
this.assertDictEquals(rule.parms, {});
- this.assertEquals(rule.kss_selector.isEventSelector, true);
- this.assertEquals(rule.kss_selector.css, '#button_3');
- this.assertEquals(rule.kss_selector.name, 'click');
- this.assertEquals(rule.kss_selector.namespace, null);
- this.assertEquals(rule.kss_selector.id, null);
+ this.assertEquals(rule.kssSelector.isEventSelector, true);
+ this.assertEquals(rule.kssSelector.css, '#button_3');
+ this.assertEquals(rule.kssSelector.name, 'click');
+ this.assertEquals(rule.kssSelector.namespace, null);
+ this.assertEquals(rule.kssSelector.id, null);
action = rule.actions.content['setStyle'];
this.assertEquals(action.type, 'C');
this.assertEquals(action.name, 'setStyle');
Modified: kukit/kukit.js/trunk/tests/test_requestmanager.js
==============================================================================
--- kukit/kukit.js/trunk/tests/test_requestmanager.js (original)
+++ kukit/kukit.js/trunk/tests/test_requestmanager.js Thu Aug 16 22:33:10 2007
@@ -54,21 +54,21 @@
q.push(i3);
var i4 = new kukit.rm.RequestItem(null, 4, null, 10000, 4000);
q.push(i4);
- this.assertEquals(q.nr, 4);
+ this.assertEquals(q.count, 4);
// pop 2, 4
this.assertEquals(q.pop(i2), true);
this.assertEquals(q.pop(i4), true);
- this.assertEquals(q.nr, 2);
+ this.assertEquals(q.count, 2);
this.assertEquals(expired.length, 0);
// expire 1, 2
q.handleExpiration(12010);
- this.assertEquals(q.nr, 1);
+ this.assertEquals(q.count, 1);
this.assertEquals(expired.length, 1);
this.assertEquals(expired[0].url, 1);
// pop 1, 3
this.assertEquals(q.pop(i1), false);
this.assertEquals(q.pop(i3), true);
- this.assertEquals(q.nr, 0);
+ this.assertEquals(q.count, 0);
this.assertEquals(expired.length, 1);
};
More information about the Kukit-checkins
mailing list