[KSS-checkins] r45747 - in kukit/kukit.js/branch/gotcha-code-cleanup: kukit tests
gotcha at codespeak.net
gotcha at codespeak.net
Thu Aug 16 19:53:55 CEST 2007
Author: gotcha
Date: Thu Aug 16 19:53:54 2007
New Revision: 45747
Modified:
kukit/kukit.js/branch/gotcha-code-cleanup/kukit/kssparser.js
kukit/kukit.js/branch/gotcha-code-cleanup/tests/test_kssparser.js
Log:
fix tests
Modified: kukit/kukit.js/branch/gotcha-code-cleanup/kukit/kssparser.js
==============================================================================
--- kukit/kukit.js/branch/gotcha-code-cleanup/kukit/kssparser.js (original)
+++ kukit/kukit.js/branch/gotcha-code-cleanup/kukit/kssparser.js Thu Aug 16 19:53:54 2007
@@ -355,7 +355,7 @@
// The previous txt must be all whitespace.
if (txt) {
;;; kukit.E = 'Wrong value : unallowed characters [' + txt + ']';
-;;; kukit.E += 'before a string.';
+;;; kukit.E += ' before a string.';
this.emitError(kukit.E);
}
// the next one must be a string.
Modified: kukit/kukit.js/branch/gotcha-code-cleanup/tests/test_kssparser.js
==============================================================================
--- kukit/kukit.js/branch/gotcha-code-cleanup/tests/test_kssparser.js (original)
+++ kukit/kukit.js/branch/gotcha-code-cleanup/tests/test_kssparser.js Thu Aug 16 19:53:54 2007
@@ -94,31 +94,31 @@
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);
// in string, multiword ok even in method
txt= "'b c' ";
@@ -132,13 +132,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 after the property.', 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.', 8);
};
@@ -305,12 +305,13 @@
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);
+ his.assertParsingError(kukit.kssp.MethodArgs, src, kukit.kssp.openparent, true,
+ '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
@@ -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');
More information about the Kukit-checkins
mailing list