[KSS-checkins] r45749 - kukit/kukit.js/branch/gotcha-code-cleanup/tests

reebalazs at codespeak.net reebalazs at codespeak.net
Thu Aug 16 20:30:00 CEST 2007


Author: reebalazs
Date: Thu Aug 16 20:29:59 2007
New Revision: 45749

Modified:
   kukit/kukit.js/branch/gotcha-code-cleanup/tests/test_kssparser.js
Log:
Adjust tests

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 20:29:59 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');
         }
     };
@@ -118,7 +118,8 @@
         txt= " /* comments; */ apples and  /* more comments and*/ oranges   ;";
         src = new kukit.tk.Cursor(txt);
         this.assertParsingError(kukit.kssp.PropValueInMethod, src, null, true,
-            'Wrong value : [/* comments; */ apples and /* more comments and*/ oranges ;] cannot have spaces.', 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,
-            'Wrong value : unallowed characters after the property.', 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,
-            'Wrong value : unallowed characters after the property.', 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)
@@ -357,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);
@@ -398,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 parms', 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 ";
@@ -450,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    ";
@@ -498,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);
@@ -555,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)  ";


More information about the Kukit-checkins mailing list