Changeset 1896 for trunk

Timestamp:

2011-04-19 11:48:54 (13 months ago)

Author:

mpo

Message:

upgrade for qunit

Note the important changes to the test api:

• equals deprecated for equal,
• isSet removed (change to deepEqual or own sameJq)

Also note: equal() fails on object-graphs with circular dependencies (which kauri forms happens to have for all controls -> form, and form being a control will have form -> form)

Location:

trunk/modules

Files:

• kauri-forms/kauri-forms-framework/src/test/crosscheck/tests.js (modified) (3 diffs)
• kauri-forms/kauri-forms-framework/src/test/kauri.forms/test-basic-controls.js (modified) (17 diffs)
• kauri-forms/kauri-forms-framework/src/test/kauri.forms/test-basic-fields.js (modified) (2 diffs)
• kauri-forms/kauri-forms-framework/src/test/kauri.forms/test-basic-formatters.js (modified) (2 diffs)
• kauri-forms/kauri-forms-framework/src/test/kauri.forms/test-basic-validators.js (modified) (6 diffs)
• kauri-forms/kauri-forms-framework/src/test/kauri.forms/test-case.js (modified) (4 diffs)
• kauri-forms/kauri-forms-framework/src/test/kauri.forms/test-collection.js (modified) (11 diffs)
• kauri-forms/kauri-forms-framework/src/test/kauri.forms/test-composite.js (modified) (7 diffs)
• kauri-forms/kauri-forms-framework/src/test/kauri.forms/test-date.js (modified) (7 diffs)
• kauri-forms/kauri-forms-framework/src/test/kauri.forms/test-form.js (modified) (28 diffs)
• kauri-forms/kauri-forms-framework/src/test/kauri.forms/test-numeric-range.js (modified) (4 diffs)
• kauri-forms/kauri-forms-framework/src/test/kauri.forms/testPage.html (modified) (5 diffs)
• kauri-jquery/src/test/qunit/qunit-readme.txt (added)
• kauri-jquery/src/test/qunit/qunit.css (added)
• kauri-jquery/src/test/qunit/qunit.js (added)
• kauri-jquery/src/test/qunit/testrunner.js (deleted)
• kauri-jquery/src/test/qunit/testsuite.css (deleted)

trunk/modules/kauri-forms/kauri-forms-framework/src/test/crosscheck/tests.js

@@ -11 +11 @@
     crosscheck.addPath('../../kauri-jquery/src/test/qunit/');                        
     crosscheck.addPath('../../kauri-jquery/src/test/kauri.util/');                        
-    crosscheck.addPath('../../kauri-jquery/src/main/kauri/static/jquery/jquery-1.3.2/');                        
-    crosscheck.addPath('../../kauri-jquery/src/main/kauri/static/jquery.ui/jquery.ui-1.7.1/js/');
+    crosscheck.addPath('../../kauri-jquery/src/main/kauri/static/jquery/jquery-1.5.2/');                        
+    crosscheck.addPath('../../kauri-jquery/src/main/kauri/static/jquery.ui/jquery.ui-1.8.11/js/');
     crosscheck.addPath('../../kauri-jquery/src/main/kauri/static-{build}.key/kauri.util/');
 
@@ -20 +20 @@
     crosscheck.addPath('../kauri-jquery/src/test/qunit/');                        
     crosscheck.addPath('../kauri-jquery/src/test/kauri.util/');                        
-    crosscheck.addPath('../kauri-jquery/src/main/kauri/static/jquery/jquery-1.3.2/');                        
-    crosscheck.addPath('../kauri-jquery/src/main/kauri/static/jquery.ui/jquery.ui-1.7.1/js/');
+    crosscheck.addPath('../kauri-jquery/src/main/kauri/static/jquery/jquery-1.5.2/');                        
+    crosscheck.addPath('../kauri-jquery/src/main/kauri/static/jquery.ui/jquery.ui-1.8.11/js/');
     crosscheck.addPath('../kauri-jquery/src/main/kauri/static-{build}.key/kauri.util/');
 
@@ -29 +29 @@
     crosscheck.addPath('modules/kauri-jquery/src/test/qunit/');                        
     crosscheck.addPath('modules/kauri-jquery/src/test/kauri.util/');                        
-    crosscheck.addPath('modules/kauri-jquery/src/main/kauri/static/jquery/jquery-1.3.2/');                        
-    crosscheck.addPath('modules/kauri-jquery/src/main/kauri/static/jquery.ui/jquery.ui-1.7.1/js/');
+    crosscheck.addPath('modules/kauri-jquery/src/main/kauri/static/jquery/jquery-1.5.2/');                        
+    crosscheck.addPath('modules/kauri-jquery/src/main/kauri/static/jquery.ui/jquery.ui-1.8.11/js/');
     crosscheck.addPath('modules/kauri-jquery/src/main/kauri/static-{build}.key/kauri.util/');
 
-    crosscheck.load('jquery-1.3.2.js');
-    crosscheck.load('jquery-ui-1.7.1.min.js');
-    crosscheck.load('testrunner.js');
+    crosscheck.load('jquery-1.5.2.js');
+    crosscheck.load('jquery-ui-1.8.11.min.js');
+    crosscheck.load('qunit.js');
 
     crosscheck.load('core.js');

trunk/modules/kauri-forms/kauri-forms-framework/src/test/kauri.forms/test-basic-controls.js

@@ +1 @@
+$(document).ready(function(){
+
 module('Basic Control Testing');
-
-var kf = $.org.kauriproject.forms;
-
 
 test("form element indexing", function() {
@@ -43 +42 @@
 });
 
-
 function indexElements( space, form) {
 
@@ -61 +59 @@
         var index = $this.attr('kauri-index');
         var assertIndex = $this.attr('assert-index');
-        equals(index, assertIndex, "checked attribute addition");
+        equal(index, assertIndex, "checked attribute addition");
     });
     revElms.each( function( i) {
@@ -69 +67 @@
         var rev = $this.attr('kauri-role');
         var assertElm = form.getElementIndex(index, rev).get(0);
-        equals(this, assertElm, "checked element index registration");
+        equal(this, assertElm, "checked element index registration");
     });
 }
@@ -94 +92 @@
 
     var form = new $.org.kauriproject.forms.Form($form, fconf);
+
     
     expect(12);
@@ -100 +99 @@
     var c = form.findControl(id);
     ok(c != null, "control creation passed");
-    equals(c.getForm(), form, "control form ok");
-    equals(c.getId(), id, "control id checked");
-    
+    ok(c.getForm() == form, "control form ok");
+    equal(c.getId(), id, "control id checked");
+
     // verify creation  of control elements
     var $input = $('input[kauri-idref*="'+id+'"]', $form);
     var $messages = $("span[kauri-idref*='"+id+"']", $form);
     $messages.html("text that should get cleared upon validation");
-    isSet(c.getElement(), $input, "input element found and indexed.");
-    isSet(c.getElement('messages'), $messages, "messages element found and indexed.")  
+    sameJq(c.getElement(), $input, "input element found and indexed.");
+    sameJq(c.getElement('messages'), $messages, "messages element found and indexed.")  
     
     // verify setting some value
     c.setWireValue(okValue);
 
-    equals($messages.html(), "", "validation error clearing.");
-    equals(c.getValue(), okValue, "get-set value match.");
+    equal($messages.html(), "", "validation error clearing.");
+    equal(c.getValue(), okValue, "get-set value match.");
 
     
@@ -126 +125 @@
     $input.val(nokValue).change();
 
-    equals(changes, 1, "receiving value-change event");
-    equals(c.hasChanges(), true, "change state")
-    equals($messages.html(), mockMsg, "validation error setting.");
-    equals(c.getValue(), nokValue, "get-set value match.");
+    equal(changes, 1, "receiving value-change event");
+    equal(c.hasChanges(), true, "change state")
+    equal($messages.html(), mockMsg, "validation error setting.");
+    equal(c.getValue(), nokValue, "get-set value match.");
 
     // mock user interaction: blur without change
     c.getElement("input").blur();
 
-    equals(changes, 1, "checking possible duplicate value-change event");
+    equal(changes, 1, "checking possible duplicate value-change event");
 
     // cleanup
@@ -171 +170 @@
     var c = form.findControl(id);
     ok(c != null, "control creation passed");
-    equals(c.getForm(), form, "control form ok");
-    equals(c.getId(), id, "control id checked");
+    ok(c.getForm() == form, "control form ok");
+    equal(c.getId(), id, "control id checked");
     
     // verify creation  of control elements
@@ -178 +177 @@
     var $messages = $("span[kauri-idref*='"+id+"']", $form);
     $messages.html("text that should get cleared upon validation");
-    isSet(c.getElement(), $input, "input element found and indexed.");
-    isSet(c.getElement('messages'), $messages, "messages element found and indexed.")  
+    sameJq(c.getElement(), $input, "input element found and indexed.");
+    sameJq(c.getElement('messages'), $messages, "messages element found and indexed.")  
     
     // verify setting some value
     c.setWireValue(okValue);
 
-    equals($messages.html(), "", "validation error clearing.");
-    equals(c.getValue(), okValue, "get-set value match.");
+    equal($messages.html(), "", "validation error clearing.");
+    equal(c.getValue(), okValue, "get-set value match.");
 
     
@@ -197 +196 @@
     $input.removeAttr('checked').click();
 
-    equals(changes, 1, "receiving value-change event");
-    equals(c.hasChanges(), true, "change state");
-    equals($messages.html(), mockMsg, "validation error setting.");
-    equals(c.getValue(), nokValue, "get-set value match.");
+    equal(changes, 1, "receiving value-change event");
+    equal(c.hasChanges(), true, "change state");
+    equal($messages.html(), mockMsg, "validation error setting.");
+    equal(c.getValue(), nokValue, "get-set value match.");
 
     // mock user interaction: set 'true' again and check values
     $input.attr('checked', 'checked').click();
 
-    equals(changes, 2, "receiving 2nd value-change event");
-    equals(c.hasChanges(), true, "change state"); 
-    equals($messages.html(), "", "validation error cleared.");
-    equals(c.getValue(), okValue, "get-set value match.");
+    equal(changes, 2, "receiving 2nd value-change event");
+    equal(c.hasChanges(), true, "change state"); 
+    equal($messages.html(), "", "validation error cleared.");
+    equal(c.getValue(), okValue, "get-set value match.");
 
     // cleanup
@@ -252 +251 @@
     var c = form.findControl(id);
     ok(c != null, "control creation passed");
-    equals(c.getForm(), form, "control form ok");
-    equals(c.getId(), id, "control id checked");
+    ok(c.getForm() == form, "control form ok");
+    equal(c.getId(), id, "control id checked");
         
     // verify setting some valid value in untrimmed version
     c.setWireValue(options[1]);
-    equals(c.getValue(), options[1], "checking that the untrimmed value was selected to second option");
+    equal(c.getValue(), options[1], "checking that the untrimmed value was selected to second option");
     
     // verify setting untrimmed value via UI
@@ -265 +264 @@
     $options.eq(2).attr("selected","selected");
     $input.change();
-    equals(c.getValue(), options[2], "checking that the untrimmed value was selected to third option");
+    equal(c.getValue(), options[2], "checking that the untrimmed value was selected to third option");
     
     // verify setting untrimmed value
     $input.val(options[3]);
     $input.change();
-    equals(c.getValue(), options[3], "checking that the untrimmed value was selected to fourth option");
+    equal(c.getValue(), options[3], "checking that the untrimmed value was selected to fourth option");
     
     
@@ -316 +315 @@
     var c = form.findControl(id);
     ok(c != null, "control creation passed");
-    equals(c.getForm(), form, "control form ok");
-    equals(c.getId(), id, "control id checked");
+    ok(c.getForm() == form, "control form ok");
+    equal(c.getId(), id, "control id checked");
     
     // verify creation  of control elements
@@ -323 +322 @@
     var $messages = $("span[kauri-idref*='"+id+"']", $form);
     $messages.html("text that should get cleared upon validation");
-    isSet(c.getElement(), $input, "input element found and indexed.");
-    isSet(c.getElement('messages'), $messages, "messages element found and indexed.")  
+    sameJq(c.getElement(), $input, "input element found and indexed.");
+    sameJq(c.getElement('messages'), $messages, "messages element found and indexed.")  
     
     var $options = $("option", $input);
-    equals($options.length, options.length, "Checking if options are available on HTML level.");
-    
-    isSet(c.getValue(), [3], "checking initial value.");
+    equal($options.length, options.length, "Checking if options are available on HTML level.");
+    
+    deepEqual(c.getValue(), [3], "checking initial value.");
     
     // verify setting some valid value
     c.setWireValue([3,4]);
-    equals($messages.html(), "", "validation error clearing.");
-    isSet(c.getValue(), [3,4], "get-set value match.");
+    equal($messages.html(), "", "validation error clearing.");
+    deepEqual(c.getValue(), [3,4], "get-set value match.");
     ok($options.eq(3).attr("selected"), "checking html option set");
     ok(!$options.eq(6).attr("selected"), "checking html option not set");
-    isSet(c.readUserValue(), ["3", "4"], "get-set value match on html level.");
+    deepEqual(c.readUserValue(), ["3", "4"], "get-set value match on html level.");
     
     
@@ -351 +350 @@
     $input.change();
 
-    equals(changes, 1, "receiving value-change event");
-    equals(c.hasChanges(), true, "change state");
-    isSet(c.getValue(), [1, 2], "get-set value match.");
+    equal(changes, 1, "receiving value-change event");
+    equal(c.hasChanges(), true, "change state");
+    deepEqual(c.getValue(), [1, 2], "get-set value match.");
 
     c.setValue([1, 7]);
-    isSet(c.getValue(), [1], "get-set value trimmed to options.");
+    deepEqual(c.getValue(), [1], "get-set value trimmed to options.");
     
     
@@ -363 +362 @@
 
 });
+
+});
+
+
 
 function makeMockValidator( test) {
@@ -384 +387 @@
     return [ validator, errorMessage ];
 }
+

trunk/modules/kauri-forms/kauri-forms-framework/src/test/kauri.forms/test-basic-fields.js

@@ +1 @@
+$(document).ready(function(){
+
 module('Field Type Checking');
 
@@ -50 +52 @@
 });
 
+});
+
 function getFieldType( name, ext) {
 

trunk/modules/kauri-forms/kauri-forms-framework/src/test/kauri.forms/test-basic-formatters.js

@@ +1 @@
+$(document).ready(function(){
+
 module('Formatter logic testing.');
 
@@ -100 +102 @@
 
     // be:bank-account format
-        var f = getFormatter("pattern", {
-            pattern :"###-#######-##"
-        });
-
-        assertConvert(f, "format", "737000003679", "737-0000036-79");
-        assertConvert(f, "parse", "  737-0000036-79  ", "737000003679");
-        assertFail(f, "format", "737");
-        assertFail(f, "format", "a");
-        assertFail(f, "format", "0737000003679");
+    var f = getFormatter("pattern", {
+        pattern :"###-#######-##"
     });
 
+    assertConvert(f, "format", "737000003679", "737-0000036-79");
+    assertConvert(f, "parse", "  737-0000036-79  ", "737000003679");
+    assertFail(f, "format", "737");
+    assertFail(f, "format", "a");
+    assertFail(f, "format", "0737000003679");
+});
+
+});
 
 function assertConvert( f, unc, input, out) {

trunk/modules/kauri-forms/kauri-forms-framework/src/test/kauri.forms/test-basic-validators.js

@@ +1 @@
+$(document).ready(function(){
+    
 module('Validator logic testing.');
 
@@ -132 +134 @@
 test("isEmail", function() {
 
-    expect(13);
+    expect(14);
 
     var v = getValidator("isEmail");
@@ -145 +147 @@
     valueCheck(v, "root@localhost.localdomain", true);
     valueCheck(v, "INFO@EXAMPLE.ORG", true);
-    valueCheck(v, "sdf@…@sdf....sdfsdf----+++564|@@@@99;;;;;", false);
+    valueCheck(v, "sdf@sdf.dsf@sdf....sdfsdf----+++564|@@@@99;;;;;", false);
+    valueCheck(v, "Some string with a valid email@address.test is not the same as a valid address!", false);
     valueCheck(v, ".@", false);
     valueCheck(v, "@.", false);
@@ -152 +155 @@
 test("isUrl", function() {
 
-    expect(11);
+    expect(12);
 
     var v = getValidator("isUrl");
@@ -164 +167 @@
     valueCheck(v, "https://example.com:8888/path", true);
     valueCheck(v, "https://example.com:888888/path", false); // port too big
+    valueCheck(v, "Some string with a http://valid/uri is not the same as a valid URI!", false);
     valueCheck(v, "https://127.0.0.1/", true);
     valueCheck(v, "no uri", false);
@@ -210 +214 @@
 
     $.ajaxSetup({async: true}); // reset
+
+});
 
 });

trunk/modules/kauri-forms/kauri-forms-framework/src/test/kauri.forms/test-case.js

@@ +1 @@
+$(document).ready(function(){
+
 module('Case Type/Control Checking');
 
@@ -45 +47 @@
     var c = form.findControl(id);
     ok(c != null, "control creation passed");
-    equals(c.getForm(), form, "control form ok");
-    equals(c.getId(), id, "control id checked");
+    ok(c.getForm() == form, "control form ok");
+    equal(c.getId(), id, "control id checked");
 
     
@@ -57 +59 @@
     
     var $c1Msg = form.findControl(id + "/case-c1").getElement("messages");
-    equals($c1Msg.get(0), $c1.get(1), "lookup of messages element for input control.");
+    equal($c1Msg.get(0), $c1.get(1), "lookup of messages element for input control.");
 
     var $c2Msg = form.findControl(id + "/case-c2").getElement("messages");;
@@ -162 +164 @@
   // cleanup
   $main.html("").hide();
-     
+  
 });
+
+});

trunk/modules/kauri-forms/kauri-forms-framework/src/test/kauri.forms/test-collection.js

@@ +1 @@
+$(document).ready(function(){
+
 module('Collection Control Testing');
 
@@ -32 +34 @@
     var c = form.findControl(id);
     ok(c != null, "control creation passed");
-    equals(c.getForm(), form, "control form ok");
-    equals(c.getId(), id, "control id checked");
+    ok(c.getForm() == form, "control form ok");
+    equal(c.getId(), id, "control id checked");
     
     var changes = 0;
@@ -42 +44 @@
     c.setWireValue( [ okValue, nokValue ]);
     // check creation of child-controls?
-    equals(changes, 1, "initial setting of all values registered");
-    equals(c.hasChanges(), false, "initial set values");
-
-    // equals(validContainer.html(), "", "validation error cleared ok.");
-    equals(c.getValue()[0], okValue, "get-set value match - index 0");
-    equals(c.getValue()[1], nokValue, "get-set value match - index 1.");
-
-    equals(c.getChildByIndex(0).getElement("messages").html(), "", "validation error cleared ok.");
-    equals(c.getChildByIndex(1).getElement("messages").html(), mockMsg, "validation error set correctly");
+    equal(changes, 1, "initial setting of all values registered");
+    equal(c.hasChanges(), false, "initial set values");
+
+    // equal(validContainer.html(), "", "validation error cleared ok.");
+    equal(c.getValue()[0], okValue, "get-set value match - index 0");
+    equal(c.getValue()[1], nokValue, "get-set value match - index 1.");
+
+    equal(c.getChildByIndex(0).getElement("messages").html(), "", "validation error cleared ok.");
+    equal(c.getChildByIndex(1).getElement("messages").html(), mockMsg, "validation error set correctly");
 
     // Mocking user interaction...
     c.findControl("0").getElement("input").val(nokValue).change();
-    equals(changes, 2, "change detection");
+    equal(changes, 2, "change detection");
     c.findControl("1").getElement("input").val(okValue).change();
-    equals(changes, 3, "change detection");
-
-    // equals(validContainer.html(), nvalid.getMessage(), "validation error set correctly.");
-    equals(c.getValue()[0], nokValue, "get-set value match - index 0");
-    equals(c.getValue()[1], okValue, "get-set value match - index 1.");
-
-    equals(c.getChildByIndex(0).getElement("messages").html(), mockMsg, "validation error set correctly");
-    equals(c.getChildByIndex(1).getElement("messages").html(), "", "validation error cleared ok.");
+    equal(changes, 3, "change detection");
+
+    // equal(validContainer.html(), nvalid.getMessage(), "validation error set correctly.");
+    equal(c.getValue()[0], nokValue, "get-set value match - index 0");
+    equal(c.getValue()[1], okValue, "get-set value match - index 1.");
+
+    equal(c.getChildByIndex(0).getElement("messages").html(), mockMsg, "validation error set correctly");
+    equal(c.getChildByIndex(1).getElement("messages").html(), "", "validation error cleared ok.");
 
     // cleanup
@@ -113 +115 @@
     var c = form.findControl(id);
     ok(c != null, "control creation passed");
-    equals(c.getForm(), form, "control form ok");
-    equals(c.getId(), id, "control id checked");
+    ok(c.getForm() == form, "control form ok");
+    equal(c.getId(), id, "control id checked");
     
     var changes = 0;
@@ -128 +130 @@
         "m2" :true
     } ]);
-    equals(changes, 1, "registration of all initial setValue events");
+    equal(changes, 1, "registration of all initial setValue events");
 
     var gotValue = c.getValue();
-    equals(gotValue[0].m1, okValue, "get-set value match - member m1");
-    equals(gotValue[0].m2, false, "get-set value match - member m2.");
+    equal(gotValue[0].m1, okValue, "get-set value match - member m1");
+    equal(gotValue[0].m2, false, "get-set value match - member m2.");
     var m01 = c.findControl("0/m1");
-    equals(m01.getElement("messages").html(), "", "validation error cleared ok.");
-    equals(gotValue[1].m1, nokValue, "get-set value match - member m1");
-    equals(gotValue[1].m2, true, "get-set value match - member m2.");
+    equal(m01.getElement("messages").html(), "", "validation error cleared ok.");
+    equal(gotValue[1].m1, nokValue, "get-set value match - member m1");
+    equal(gotValue[1].m2, true, "get-set value match - member m2.");
     var m02 = m01.findControl("../../1/m1");
-    equals(m02.getElement("messages").html(), mockMsg, "validation error set correctly");
+    equal(m02.getElement("messages").html(), mockMsg, "validation error set correctly");
 
 
@@ -182 +184 @@
     var c = form.findControl(id);
     ok(c != null, "control creation passed");
-    equals(c.getForm(), form, "control form ok");
-    equals(c.getId(), id, "control id checked");
+    ok(c.getForm() == form, "control form ok");
+    equal(c.getId(), id, "control id checked");
     
     var changes = 0;
@@ -192 +194 @@
     c.setWireValue( [ okValue, nokValue ]);
     
-    equals(changes, 1, "initial setting of all values registered");
-    equals(c.hasChanges(), false, "initial set values");
+    equal(changes, 1, "initial setting of all values registered");
+    equal(c.hasChanges(), false, "initial set values");
 
  
     // Mocking user interaction...
     c.findControl("0").getElement("input").val(okValue + "2").change();
-    equals(changes, 2, "change detection");
+    equal(changes, 2, "change detection");
     c.findControl("1").getElement("input").val(okValue + "3").change();
-    equals(changes, 3, "change detection");
-    
-    
-    equals(c.getElement("messages").html(), $("<p>Length not in range 3 &#x2a7d; Length &#x2a7e; 6.</p>").html(), "validation error set correctly");
+    equal(changes, 3, "change detection");
+    
+    
+    equal(c.getElement("messages").html(), $("<p>Length not in range 3 &#x2a7d; Length &#x2a7e; 6.</p>").html(), "validation error set correctly");
     
     c.addChild().getElement("input").val(okValue + "4").change();
-    equals(changes, 4, "change detection");
-
-    equals(c.getElement("messages").html(), "", "validation error cleared");
+    equal(changes, 4, "change detection");
+
+    equal(c.getElement("messages").html(), "", "validation error cleared");
     
     // cleanup
@@ -246 +248 @@
     
     ok(c != null, "control creation passed");
-    equals(c.getForm(), form, "control form ok");
-    equals(c.getId(), id, "control id checked");
-    
-    equals(c.viewState, $.org.kauriproject.forms.Control.STATE_HIDDEN, "initial hidden");
-    equals(c.getElement().css('display'),'none', "initial hidden");
+    ok(c.getForm() == form, "control form ok");
+    equal(c.getId(), id, "control id checked");
+    
+    equal(c.viewState, $.org.kauriproject.forms.Control.STATE_HIDDEN, "initial hidden");
+    equal(c.getElement().css('display'),'none', "initial hidden");
 
     c.hide();
 
-    equals(c.viewState, $.org.kauriproject.forms.Control.STATE_HIDDEN, "double check hidden");
-    equals(c.getElement().css('display'),'none', "double check hidden");
+    equal(c.viewState, $.org.kauriproject.forms.Control.STATE_HIDDEN, "double check hidden");
+    equal(c.getElement().css('display'),'none', "double check hidden");
     
     c.show();
@@ -265 +267 @@
         var child = c.findControl(""+i);
 
-        equals(child.viewState, $.org.kauriproject.forms.Control.STATE_HIDDEN, "double check hidden for child " + i);
-        equals(child.getElement().css('display'),'none', "double check hidden for child " + i);
+        equal(child.viewState, $.org.kauriproject.forms.Control.STATE_HIDDEN, "double check hidden for child " + i);
+        equal(child.getElement().css('display'),'none', "double check hidden for child " + i);
     }
     
@@ -312 +314 @@
     // baseline checks
     ok(c != null, "control creation passed");
-    equals(c.getForm(), form, "control form ok");
-    equals(c.getId(), id, "control id checked");
+    ok(c.getForm() == form, "control form ok");
+    equal(c.getId(), id, "control id checked");
     
     // test that there are 0 children initially
-    equals(0, c.getChildren().length, "collection control should have 0 children");
+    equal(0, c.getChildren().length, "collection control should have 0 children");
 
     // find the 'ads' button and click it
@@ -325 +327 @@
 
     // test that there is a child.
-    equals(1, c.getChildren().length, "collection control should have one element");
-
-    // cleanup
-    $main.html("").hide();
-});
+    equal(1, c.getChildren().length, "collection control should have one element");
+
+    // cleanup
+    $main.html("").hide();
+});
+
+});
+

trunk/modules/kauri-forms/kauri-forms-framework/src/test/kauri.forms/test-composite.js

@@ +1 @@
+$(document).ready(function(){
+
 module('Composite Type/Control Checking');
 
@@ -51 +53 @@
     var c = form.findControl(id);
     ok(c != null, "control creation passed");
-    equals(c.getForm(), form, "control form ok");
-    equals(c.getId(), id, "control id checked");
+    ok(c.getForm() == form, "control form ok");
+    equal(c.getId(), id, "control id checked");
     
     var changes = 0;
@@ -59 +61 @@
     });
 
-    equals(c.findControl("m1").getElement("messages").get(0), $m1.get(1), "lookup of messages element for input control.");
+    equal(c.findControl("m1").getElement("messages").get(0), $m1.get(1), "lookup of messages element for input control.");
 
     ok(c.findControl("m2").getElement("messages"), "creation of messages element for checkbox control.");
@@ -68 +70 @@
     });
 
-    equals(changes, 1, "both members changes");
-    equals(c.hasChanges(), false, "initial value set");
-
-    // equals(validContainer.html(), "", "validation error cleared ok.");
-    equals(c.getValue().m1, okValue, "get-set value match - member m1");
-    equals(c.getValue().m2, false, "get-set value match - member m2.");
-
-
-    equals(c.getChildren().m1.getElement("messages").html(), "", "validation error cleared ok.");
+    equal(changes, 1, "both members changes");
+    equal(c.hasChanges(), false, "initial value set");
+
+    // equal(validContainer.html(), "", "validation error cleared ok.");
+    equal(c.getValue().m1, okValue, "get-set value match - member m1");
+    equal(c.getValue().m2, false, "get-set value match - member m2.");
+
+
+    equal(c.getChildren().m1.getElement("messages").html(), "", "validation error cleared ok.");
 
     // Mocking user interaction...
     c.findControl("m1").getElement("input").val(nokValue).change();
-    equals(changes, 2, "change detection");
+    equal(changes, 2, "change detection");
     c.findControl("m2").getElement("input").attr("checked", "checked").click();
-    equals(changes, 3, "change detection");
-
-    // equals(validContainer.html(), nvalid.getMessage(), "validation error set correctly.");
-    equals(c.getValue().m1, nokValue, "get-set value match - member m1");
-    equals(c.getValue().m2, true, "get-set value match - member m2.");
-
-    equals(c.getChildren().m1.getElement("messages").html(), mockMsg, "validation error set correctly");
+    equal(changes, 3, "change detection");
+
+    // equal(validContainer.html(), nvalid.getMessage(), "validation error set correctly.");
+    equal(c.getValue().m1, nokValue, "get-set value match - member m1");
+    equal(c.getValue().m2, true, "get-set value match - member m2.");
+
+    equal(c.getChildren().m1.getElement("messages").html(), mockMsg, "validation error set correctly");
 
     // cleanup
@@ -134 +136 @@
     var c = form.findControl(id);
     ok(c != null, "control creation passed");
-    equals(c.getForm(), form, "control form ok");
-    equals(c.getId(), id, "control id checked");
+    ok(c.getForm() == form, "control form ok");
+    equal(c.getId(), id, "control id checked");
 
     c.setWireValue( {"m1" : 5, "m2" : 2 });
     
-    isSet(c.getElement("messages"), $msg, "used created messages.");
+    sameJq(c.getElement("messages"), $msg, "used created messages.");
     ok(c.getElement("messages").html().indexOf("is not") == -1, "validation error set correctly");
     c.findControl("m1").getElement("input").val(1).change();
@@ -180 +182 @@
     var c = form.findControl(id);
     ok(c != null, "control creation passed");
-    equals(c.getForm(), form, "control form ok");
-    equals(c.getId(), id, "control id checked");
+    ok(c.getForm() == form, "control form ok");
+    equal(c.getId(), id, "control id checked");
 
     c.hide();
@@ -201 +203 @@
     // cleanup
     $main.html("").hide();
-});
+
+});
+
+});

trunk/modules/kauri-forms/kauri-forms-framework/src/test/kauri.forms/test-date.js

@@ +1 @@
+$(document).ready(function(){
+
 module('Date Testing type and control');
 
@@ -198 +200 @@
     var c = form.findControl(id);
     ok(c != null, "control creation passed");
-    equals(c.getForm(), form, "control form ok");
-    equals(c.getId(), id, "control id checked");
+    ok(c.getForm() == form, "control form ok");
+    equal(c.getId(), id, "control id checked");
     
     
@@ -214 +216 @@
     c.setWireValue(wireValue);     
     ok($.valueCompare(okValue,c.getValue()), "get-set value match.");
-    equals(changes, 1, "missed a value-change event");
+    equal(changes, 1, "missed a value-change event");
     
     // mock user interaction: change value to something that doesn't validate
     c.getChild("start").getElement("input").val(nokUserValue.start).change();
     c.getChild("end").getElement("input").val(nokUserValue.end).change();
-    equals(changes, 3, "missed a value-changed event");
-    
-    equals(c.hasChanges(), true, "change state");
+    equal(changes, 3, "missed a value-changed event");
+    
+    equal(c.hasChanges(), true, "change state");
     ok(c.getChild("start").getElement("messages").html().indexOf("Could not parse the date") >= 0, "validation error setting.");
     var val = c.getValue();
-    equals(val, undefined, "get-set value match.");
+    equal(val, undefined, "get-set value match.");
 
     // mock user interaction: change value trigger change
     c.getChild("start").getElement("input").val(okUserValue.start).change();
     c.getChild("end").getElement("input").val(okUserValue.end).change();
-    equals(changes, 5, "receiving value-change event");
-    equals(c.hasChanges(), true, "change state")
+    equal(changes, 5, "receiving value-change event");
+    equal(c.hasChanges(), true, "change state")
 
     // cleanup
@@ -236 +238 @@
 });
 
-
-// TODO implement the datetime control
+//TODO implement the datetime control
 /*
 test("datetime-control", function() {
@@ -246 +247 @@
 });
 */
+
+});
+
 function runDateControlTests (fieldTypeName, controlValues) {
 
@@ -275 +279 @@
     var c = form.findControl(id);
     ok(c != null, "control creation passed");
-    equals(c.getForm(), form, "control form ok");
-    equals(c.getId(), id, "control id checked");
+    ok(c.getForm() == form, "control form ok");
+    equal(c.getId(), id, "control id checked");
     
     var changes = 0;
@@ -294 +298 @@
     c.setWireValue(wireValue);
 
-    equals($msg.html(), "", "validation error clearing.");
+    equal($msg.html(), "", "validation error clearing.");
     ok($.valueCompare($.datepicker.parseDate("dd/mm/yy",okValue),c.getValue()), "get-set value match.");
     
     // mock user interaction: change value to something that doesn't validate
     c.getElement("input").val(nokValue).change();
-    equals(changes, 2, "this should not be receiving value-change events");
-    equals(c.hasChanges(), true, "change state");
+    equal(changes, 2, "this should not be receiving value-change events");
+    equal(c.hasChanges(), true, "change state");
     ok(String($msg.html()).indexOf("Could not parse the date") >= 0, "validation error setting.");
-    equals( c.getValue(), undefined, "get-set value match.");
+    equal( c.getValue(), undefined, "get-set value match.");
 
     // mock user interaction: change value trigger change
     c.getElement("input").val(ok2Value).change();
-    equals(changes, 3, "receiving value-change event");
-    equals(c.hasChanges(), true, "change state")
+    equal(changes, 3, "receiving value-change event");
+    equal(c.hasChanges(), true, "change state")
 
     // cleanup

trunk/modules/kauri-forms/kauri-forms-framework/src/test/kauri.forms/test-form.js

@@ +1 @@
+$(document).ready(function(){
+
 module('Form Checking');
 
@@ -60 +62 @@
 
                     var form = this.getForm();
-                    equals(form.isComplete(), true, "checking form.isComplete while initializing...");
+                    equal(form.isComplete(), true, "checking form.isComplete while initializing...");
                     this.wiringCalls++;
                 }
@@ -69 +71 @@
     var form = new $.org.kauriproject.forms.Form($form, fconf);
 
-    equals(form.isComplete(), true, "checking form.isComplete after initializing...");
+    equal(form.isComplete(), true, "checking form.isComplete after initializing...");
     var m1c = form.findControl("/m1");
-    equals(m1c.wiringCalls, 1, "checking wiring-call happened after initializing...");
+    equal(m1c.wiringCalls, 1, "checking wiring-call happened after initializing...");
 
     // normally one should never be calling this directly, but test shows the initEventWiring will only be called once
     form.initComplete();
-    equals(m1c.wiringCalls, 1, "checking wiring-call unregistered itself after execution...");
+    equal(m1c.wiringCalls, 1, "checking wiring-call unregistered itself after execution...");
 
 
@@ -83 +85 @@
     });
 
-    // equals(validContainer.html(), "", "validation error cleared ok.");
-    equals(form.getValue().m1, okValue, "get-set value match - member m1");
-    equals(form.getValue().m2, false, "get-set value match - member m2.");
-
-    equals(form.getChildren().m1.getElement("messages").html(), "", "validation error cleared ok.");
+    // equal(validContainer.html(), "", "validation error cleared ok.");
+    equal(form.getValue().m1, okValue, "get-set value match - member m1");
+    equal(form.getValue().m2, false, "get-set value match - member m2.");
+
+    equal(form.getChildren().m1.getElement("messages").html(), "", "validation error cleared ok.");
 
     form.setValue( {
@@ -94 +96 @@
     });
 
-    // equals(validContainer.html(), nvalid.getMessage(), "validation error set correctly.");
-    equals(form.getValue().m1, nokValue, "get-set value match - member m1");
-    equals(form.getValue().m2, true, "get-set value match - member m2.");
-
-    equals(form.getChildren().m1.getElement("messages").html(), mockMsg, "validation error set correctly");
+    // equal(validContainer.html(), nvalid.getMessage(), "validation error set correctly.");
+    equal(form.getValue().m1, nokValue, "get-set value match - member m1");
+    equal(form.getValue().m2, true, "get-set value match - member m2.");
+
+    equal(form.getChildren().m1.getElement("messages").html(), mockMsg, "validation error set correctly");
 
     // cleanup
@@ -152 +154 @@
     
     
-    equals(form.isComplete(), true, "checking form.isComplete after initializing...");
+    equal(form.isComplete(), true, "checking form.isComplete after initializing...");
     var m1c = form.findControl("/m1");
-    equals(m1c.getType(), "FieldType('my-string')", "checking wiring-call happened after initializing...");
+    equal(m1c.getType(), "FieldType('my-string')", "checking wiring-call happened after initializing...");
     
     // normally one should never be calling this directly, but test shows thet initEventWiring will only be called once
     form.initComplete();
-    equals(m1c.getType(), "FieldType('my-string')", "checking wiring-call unregistered itself after execution...");
+    equal(m1c.getType(), "FieldType('my-string')", "checking wiring-call unregistered itself after execution...");
     
     
@@ -166 +168 @@
     });
     
-    //equals(validContainer.html(), "", "validation error cleared ok.");
-    equals(form.getValue().m1, "test", "get-set value match - member m1");
-    equals(form.getValue().m2, false, "get-set value match - member m2.");
-    
-    equals(form.getChildren().m1.getElement("messages").html(), "", "validation error cleared ok.");
+    //equal(validContainer.html(), "", "validation error cleared ok.");
+    equal(form.getValue().m1, "test", "get-set value match - member m1");
+    equal(form.getValue().m2, false, "get-set value match - member m2.");
+    
+    equal(form.getChildren().m1.getElement("messages").html(), "", "validation error cleared ok.");
     
     form.setValue({
@@ -177 +179 @@
     });
     
-    //equals(validContainer.html(), nvalid.getMessage(), "validation error set correctly.");
-    equals(form.getValue().m1, nokValue, "get-set value match - member m1");
-    equals(form.getValue().m2, true, "get-set value match - member m2.");
-    
-    equals(form.getChildren().m1.getElement("messages").html(), mockMsg, "validation error set correctly");
+    //equal(validContainer.html(), nvalid.getMessage(), "validation error set correctly.");
+    equal(form.getValue().m1, nokValue, "get-set value match - member m1");
+    equal(form.getValue().m2, true, "get-set value match - member m2.");
+    
+    equal(form.getChildren().m1.getElement("messages").html(), mockMsg, "validation error set correctly");
 
     // cleanup
@@ -238 +240 @@
     });
     
-    equals(form.findControl('details/0/val1').getValue(), 51, "value checked");
-    equals(form.findControl('details/1/val2').getValue(), 62, "value checked");
+    equal(form.findControl('details/0/val1').getValue(), 51, "value checked");
+    equal(form.findControl('details/1/val2').getValue(), 62, "value checked");
     
     // cleanup
@@ -313 +315 @@
     var $subOptions = $("option", $subSelect);
     
-    equals($mainOptions.length, 2, "correct number of options on main"); 
-    equals(mainC.getValue(), 'weekdays', "checking initial value set ok");
-    
-    equals($subOptions.length, 7, "correct number of options on sub select");
-    equals(subC.getValue(), 'mon', "checking initial value set ok");
+    equal($mainOptions.length, 2, "correct number of options on main"); 
+    equal(mainC.getValue(), 'weekdays', "checking initial value set ok");
+    
+    equal($subOptions.length, 7, "correct number of options on sub select");
+    equal(subC.getValue(), 'mon', "checking initial value set ok");
     
     // 1. set value on main & check updated list & updateOptions event
@@ -325 +327 @@
     $subOptions = $("option", $subSelect);
     
-    equals(subUpdates, 0, "update of options triggered");
-    equals($subOptions.length, 7, "correct number of options on sub select");
+    equal(subUpdates, 0, "update of options triggered");
+    equal($subOptions.length, 7, "correct number of options on sub select");
     
     // 2. set value on sub & check errors
     $subSelect.val('wed').change(); // fake user input
-    equals(subC.getValue(), 'wed', "checking value set ok");
-    equals(subC.getElement('mark').hasClass('invalid'), false, "checking error cleared.");
-    equals(subC.getElement('mark').hasClass('valid'), true, "checking error cleared.");
+    equal(subC.getValue(), 'wed', "checking value set ok");
+    equal(subC.getElement('mark').hasClass('invalid'), false, "checking error cleared.");
+    equal(subC.getElement('mark').hasClass('valid'), true, "checking error cleared.");
     
     // 3. set other value on main & check - update list - updatedOptions event - check errors
@@ -338 +340 @@
     $subOptions = $("option", $subSelect);
     
-    equals(subUpdates, 1, "update of options triggered");
-    equals($subOptions.length, 12, "correct number of options on sub select");
-    equals(subC.getValue(), 'jan', "checking initial value set ok");
-    equals(subC.getElement('mark').hasClass('invalid'), false, "checking error cleared.");
-    equals(subC.getElement('mark').hasClass('valid'), true, "checking error cleared.");
+    equal(subUpdates, 1, "update of options triggered");
+    equal($subOptions.length, 12, "correct number of options on sub select");
+    equal(subC.getValue(), 'jan', "checking initial value set ok");
+    equal(subC.getElement('mark').hasClass('invalid'), false, "checking error cleared.");
+    equal(subC.getElement('mark').hasClass('valid'), true, "checking error cleared.");
     
     // 4. set other value on sub & check errors
     $subSelect.val('may').change(); // fake user input
-    equals(subC.getValue(), 'may', "checking value set ok");
-    equals(subC.getElement('mark').hasClass('invalid'), false, "checking error cleared.");
-    equals(subC.getElement('mark').hasClass('valid'), true, "checking error cleared.");
+    equal(subC.getValue(), 'may', "checking value set ok");
+    equal(subC.getElement('mark').hasClass('invalid'), false, "checking error cleared.");
+    equal(subC.getElement('mark').hasClass('valid'), true, "checking error cleared.");
         
     // cleanup
@@ -433 +435 @@
     var $mainSelect = mainControl.getElement();
     var $mainOptions = $("option", $mainSelect);
-    equals($mainOptions.length, 2, "correct number of options on main"); 
-    equals(mainControl.getValue(), 'weekdays', "checked initial value of main select"); 
+    equal($mainOptions.length, 2, "correct number of options on main"); 
+    equal(mainControl.getValue(), 'weekdays', "checked initial value of main select"); 
 
     var $subSelects = new Array(num);
@@ -441 +443 @@
         var $subSelect = $subSelects[i];
         var $subOptions = $("option", $subSelect);
-        equals($subOptions.length, 7, "correct number of options on sub select " + i);
-        equals(subControls[i].getValue(), 'mon', "checked initial value of sub select " + i);
-        equals(subControls[i].valueState, kf.Control.STATE_INIT, "checked initial value-state of sub select " + i);
+        equal($subOptions.length, 7, "correct number of options on sub select " + i);
+        equal(subControls[i].getValue(), 'mon', "checked initial value of sub select " + i);
+        equal(subControls[i].valueState, kf.Control.STATE_INIT, "checked initial value-state of sub select " + i);
     }
 
@@ -452 +454 @@
     $mainSelect.val('weekdays').change(); // fake user input
 
-    equals(subUpdates, 0, "update of options not triggered"); // no change compared to default value! options already loaded
+    equal(subUpdates, 0, "update of options not triggered"); // no change compared to default value! options already loaded
 
     var w_set = ['mon', 'wed', 'fri'];
@@ -460 +462 @@
         var $subSelect = $subSelects[i];
         var $subOptions = $("option", $subSelect);
-        equals($subOptions.length, 7, "correct number of options on sub select " + i);
-        equals(subControl.options, subOptions, "all options in the collection are shared. " + i);
+        equal($subOptions.length, 7, "correct number of options on sub select " + i);
+        ok(subControl.options == subOptions, "all options in the collection are shared. " + i);
 
         // 2. set value on sub & check errors
@@ -469 +471 @@
         var subControl = subControls[i];
         
-        equals(subControl.getValue(), w_get[i], "checking value set ok");
-        equals(subControl.getElement('mark').hasClass('invalid'), false, "checking error cleared.");
-        equals(subControl.getElement('mark').hasClass('valid'), true, "checking error cleared.");
+        equal(subControl.getValue(), w_get[i], "checking value set ok");
+        equal(subControl.getElement('mark').hasClass('invalid'), false, "checking error cleared.");
+        equal(subControl.getElement('mark').hasClass('valid'), true, "checking error cleared.");
     }
     
@@ -477 +479 @@
     // 3. set other value on main & check - update list - updatedOptions event - check errors
     $mainSelect.val('months').change(); // fake user input
-    equals(subUpdates, 1, "update of options triggered only once");
+    equal(subUpdates, 1, "update of options triggered only once");
 
     var m_set = ['feb', 'xxx', 'sep'];
@@ -484 +486 @@
         var $subSelect = $subSelects[i];
         var $subOptions = $("option", $subSelect);
-        equals($subOptions.length, 12, "correct number of options on sub select " + i);
+        equal($subOptions.length, 12, "correct number of options on sub select " + i);
 
         // 4. set other value on sub & check errors
@@ -492 +494 @@
         var subControl = subControls[i];
 
-        equals(subControl.getValue(), m_get[i], "checking value set ok");
-        equals(subControl.getElement('mark').hasClass('invalid'), false, "checking error cleared.");
-        equals(subControl.getElement('mark').hasClass('valid'), true, "checking error cleared.");
+        equal(subControl.getValue(), m_get[i], "checking value set ok");
+        equal(subControl.getElement('mark').hasClass('invalid'), false, "checking error cleared.");
+        equal(subControl.getElement('mark').hasClass('valid'), true, "checking error cleared.");
     }
 
@@ -585 +587 @@
         var $mainSelect = mainControls[i].getElement();
         var $mainOptions = $("option", $mainSelect);
-        equals($mainOptions.length, 2, "correct number of options on main " + i); 
-        equals(mainControls[i].getValue(), 'weekdays', "checked initial value of main select " + i); 
+        equal($mainOptions.length, 2, "correct number of options on main " + i); 
+        equal(mainControls[i].getValue(), 'weekdays', "checked initial value of main select " + i); 
 
         var $subSelect = subControls[i].getElement();
         var $subOptions = $("option", $subSelect);
-        equals($subOptions.length, 7, "correct number of options on sub select " + i);
-        equals(subControls[i].getValue(), 'mon', "checked initial value of sub select " + i); 
+        equal($subOptions.length, 7, "correct number of options on sub select " + i);
+        equal(subControls[i].getValue(), 'mon', "checked initial value of sub select " + i); 
 
     }
@@ -618 +620 @@
 
         expectedChanges[i] = (main_set[i] === 'weekdays') ? 0 : 1;
-        equals(subUpdates[i], expectedChanges[i], "update of options triggered " + i);
+        equal(subUpdates[i], expectedChanges[i], "update of options triggered " + i);
         
         var $subSelect = subControls[i].getElement();
         var $subOptions = $("option", $subSelect);
-        equals($subOptions.length, opt_lengths[main_set[i]], "correct number of options on sub select " + i);
-        equals(subType, commonSubType, "all types in the collection are shared. " + i);
+        equal($subOptions.length, opt_lengths[main_set[i]], "correct number of options on sub select " + i);
+        equal(subType, commonSubType, "all types in the collection are shared. " + i);
 
         // 2. set value on sub & check errors
@@ -631 +633 @@
         var subControl = subControls[i];
       //  var forced = true;
-        equals(subControl.getValue(), sub_set[i], "checking value set ok " + i);
-       // equals(subControl.isValid(forced), true, "forced validation yields ok " + i);
-        equals(subControl.getElement('mark').hasClass('invalid'), false, "checking error cleared. " + i);
-        equals(subControl.getElement('mark').hasClass('valid'), true, "checking error cleared." + i);
+        equal(subControl.getValue(), sub_set[i], "checking value set ok " + i);
+       // equal(subControl.isValid(forced), true, "forced validation yields ok " + i);
+        equal(subControl.getElement('mark').hasClass('invalid'), false, "checking error cleared. " + i);
+        equal(subControl.getElement('mark').hasClass('valid'), true, "checking error cleared." + i);
     }
 
@@ -647 +649 @@
         var expectedUpdates = expectedChanges[i];
         expectedUpdates += (main_set[i] === main_set2[i]) ?  0 : 1;
-        equals(subUpdates[i], expectedUpdates , "update of options triggered correctly " + i);
+        equal(subUpdates[i], expectedUpdates , "update of options triggered correctly " + i);
         
         var $subSelect = subControls[i].getElement();
         var $subOptions = $("option", $subSelect);
-        equals($subOptions.length, opt_lengths[main_set2[i]], "correct number of options on sub select " + i);
+        equal($subOptions.length, opt_lengths[main_set2[i]], "correct number of options on sub select " + i);
 
         // 2. set value on sub & check errors
@@ -658 +660 @@
     for (var i = 0; i<num; i++){
         var subControl = subControls[i];
-        equals(subControl.getValue(), sub_set2[i], "checking value set ok " + i);
-        equals(subControl.getElement('mark').hasClass('invalid'), false, "checking error cleared." + i);
-        equals(subControl.getElement('mark').hasClass('valid'), true, "checking error cleared. " + i);
+        equal(subControl.getValue(), sub_set2[i], "checking value set ok " + i);
+        equal(subControl.getElement('mark').hasClass('invalid'), false, "checking error cleared." + i);
+        equal(subControl.getElement('mark').hasClass('valid'), true, "checking error cleared. " + i);
     }
     
@@ -832 +834 @@
         }
         
-        equals($casus.hasClass('valid'), valid, "casus should be " + classValidDescr + ".("+when+")");
-        equals($casus.hasClass('invalid'), false, "including no invalid markers.("+when+")");
-        equals(casus.isValid(false), valid, "casus has never been validated, it should be " + classValidDescr + ".("+when+")");
-        equals(casus.isValid(true), true, "but it should be actually valid when checking it.("+when+")");
-        equals($casus.hasClass('valid'), true, "and after checking should be marked as such.("+when+")");
-        equals($casus.hasClass('invalid'), false, "not even invalid ones.("+when+")");
-
-        equals($compos.hasClass('valid'), valid, "compos should be " + classValidDescr + ".("+when+")");
-        equals($compos.hasClass('invalid'), false, "and not invalid.("+when+")");
-        equals(compos.isValid(false), valid, "compos has never been validated, it should be " + classValidDescr + ".("+when+")");
-        equals(compos.isValid(true), true, "but it should be actually valid when checking it.("+when+")");
-        equals($compos.hasClass('valid'), true, "and after checking should be marked as such because it has an own validator.("+when+")");
-        equals($compos.hasClass('invalid'), false, "and thus not have an invalid mark.("+when+")");
-
-        equals($form.hasClass('valid'), valid, "form should be " + classValidDescr + ".("+when+")");
-        equals($form.hasClass('invalid'), false, "including no invalid markers.("+when+")");
-        equals(form.isValid(false), valid, "form has never been validated, it should be " + classValidDescr + ".("+when+")");
-        equals(form.isValid(true), true, "but it turns out to be valid if we really check it.("+when+" and forced validation)");
-        equals($form.hasClass('valid'), true, "and should also carry the mark. ("+when+" and forced validation)");
-        equals($form.hasClass('invalid'), false, "including no invalid markers.("+when+" and forced validation)");
+        equal($casus.hasClass('valid'), valid, "casus should be " + classValidDescr + ".("+when+")");
+        equal($casus.hasClass('invalid'), false, "including no invalid markers.("+when+")");
+        equal(casus.isValid(false), valid, "casus has never been validated, it should be " + classValidDescr + ".("+when+")");
+        equal(casus.isValid(true), true, "but it should be actually valid when checking it.("+when+")");
+        equal($casus.hasClass('valid'), true, "and after checking should be marked as such.("+when+")");
+        equal($casus.hasClass('invalid'), false, "not even invalid ones.("+when+")");
+
+        equal($compos.hasClass('valid'), valid, "compos should be " + classValidDescr + ".("+when+")");
+        equal($compos.hasClass('invalid'), false, "and not invalid.("+when+")");
+        equal(compos.isValid(false), valid, "compos has never been validated, it should be " + classValidDescr + ".("+when+")");
+        equal(compos.isValid(true), true, "but it should be actually valid when checking it.("+when+")");
+        equal($compos.hasClass('valid'), true, "and after checking should be marked as such because it has an own validator.("+when+")");
+        equal($compos.hasClass('invalid'), false, "and thus not have an invalid mark.("+when+")");
+
+        equal($form.hasClass('valid'), valid, "form should be " + classValidDescr + ".("+when+")");
+        equal($form.hasClass('invalid'), false, "including no invalid markers.("+when+")");
+        equal(form.isValid(false), valid, "form has never been validated, it should be " + classValidDescr + ".("+when+")");
+        equal(form.isValid(true), true, "but it turns out to be valid if we really check it.("+when+" and forced validation)");
+        equal($form.hasClass('valid'), true, "and should also carry the mark. ("+when+" and forced validation)");
+        equal($form.hasClass('invalid'), false, "including no invalid markers.("+when+" and forced validation)");
     }
     
@@ -857 +859 @@
     expect(1 + 3*18);
     
-    isSet(form.getElement(), $form,  "the form is the form of course");
+    sameJq(form.getElement(), $form,  "the form is the form of course");
     assertValidState("after creation"); // validstate of css is unmarked
 
@@ -869 +871 @@
     // cleanup
     $main.html("").hide();
-});
+
+});
+
+});

trunk/modules/kauri-forms/kauri-forms-framework/src/test/kauri.forms/test-numeric-range.js

@@ +1 @@
+$(document).ready(function(){
+
 module('Numeric-range testing type and control');
 
@@ -48 +50 @@
     var c = form.findControl(id);
     ok(c != null, "control creation passed");
-    equals(c.getForm(), form, "control form ok");
-    equals(c.getId(), id, "control id checked");    
+    ok(c.getForm() == form, "control form ok");
+    equal(c.getId(), id, "control id checked");    
     
     
@@ -99 +101 @@
     var c = form.findControl(id);
     ok(c != null, "control creation passed");
-    equals(c.getForm(), form, "control form ok");
-    equals(c.getId(), id, "control id checked");    
+    ok(c.getForm() == form, "control form ok");
+    equal(c.getId(), id, "control id checked");    
     
   
@@ -118 +120 @@
     $slider.slider('values', 1, 7); $slider.slider('values', 0, 4);
     var wireval = c.getWireValue();
-    equals(wireval.start, 4, "The control start member should have the same value as the input");
-    equals(wireval.end,  7, "The control end member should have the same value as the input");
+    equal(wireval.start, 4, "The control start member should have the same value as the input");
+    equal(wireval.end,  7, "The control end member should have the same value as the input");
     
     $main.html("").hide();
+
 });
+
+});

trunk/modules/kauri-forms/kauri-forms-framework/src/test/kauri.forms/testPage.html

@@ -5 +5 @@
   <title>Kauri Forms Main Test Page</title>
 
-  <link rel="Stylesheet" media="screen" href="../../../../../kauri-jquery/src/test/qunit/testsuite.css" />
-  <script type="text/javascript" src="../../../../../kauri-jquery/src/main/kauri/static/jquery/jquery-1.4.1/jquery-1.4.1.js"></script>
-  <script type="text/javascript" src="../../../../../kauri-jquery/src/test/qunit/testrunner.js"></script>
+  <link rel="Stylesheet" media="screen" href="../../../../../kauri-jquery/src/test/qunit/qunit.css" />
+  <style type="text/css" >
+    .qunit-like {
+      padding: 0.5em 0.5em 0.5em 2.5em;
+      color: #2B81AF;
+      background-color: #D2E0E6;
+      border-bottom: 1px solid white; 
+      font-size: small; 
+      margin: 0;
+    }
+  </style>
+  <script type="text/javascript" src="../../../../../kauri-jquery/src/main/kauri/static/jquery/jquery-1.5.2/jquery-1.5.2.js"></script>
+  <script type="text/javascript" src="../../../../../kauri-jquery/src/test/qunit/qunit.js"></script>
 
   <!--  Dependencies -->
@@ -15 +25 @@
   <script type="text/javascript" src="../../../../../kauri-jquery/src/main/kauri/static-{build}.key/kauri.util/locale.js" ></script>
 
-  <script type="text/javascript" src="../../../../../kauri-jquery/src/main/kauri/static/jquery.ui/jquery.ui-1.7.1/js/jquery-ui-1.7.1.min.js"></script>
+  <script type="text/javascript" src="../../../../../kauri-jquery/src/main/kauri/static/jquery.ui/jquery.ui-1.8.11/js/jquery-ui-1.8.11.min.js"></script>
     
 
@@ -46 +56 @@
     //tests assume some standard locale setting
     //we override those!
-    ;
+    var kf = $.org.kauriproject.forms;
+
+    function sameJq(first, second, msg) {
+        if (first == null || second == null || first.length != second.length)
+            fail(msg);
+        for (var i=0; i<first.length; i++)
+            if (first.get(i) != second.get(i))
+                fail(msg + " -- not same @index=" + i);
+        ok(true, msg);
+    };
+    
     (function($){
-        var locale = $.org.kauriproject.forms.locale;
+        var locale = kf.locale;
         locale.setId('en-US');
         locale.separator['decimal'] = '.';
         locale.separator['1000'] = ',';
         locale.timezone = 0;
-    })(jQuery);    
+    })(jQuery);   
+
   </script>
   <script type="text/javascript" src="test-basic-validators.js" ></script>
@@ -65 +86 @@
   <script type="text/javascript" src="test-date.js" ></script>
   <script type="text/javascript" src="test-numeric-range.js" ></script>
+   
   <!-- Haven't found a way to test the control since the page has to be completly loaded to be able to load the maps api
   <script type="text/javascript" src="test-location.js" ></script>
   -->
+
+  <!--  
   <link rel="stylesheet" href="../../main/kauri/public/css/datepicker.css"/>
+  -->
   <!-- TODO link to css of ui theme -->
   
@@ -74 +99 @@
 
 <body id="body">
-  <h1 id="header">Kauri Forms Main Test Page</h1>
-  <h2 id="banner"></h2>
-  <h2 id="userAgent"></h2>
-  <h2>Note: to run these tests in google chrome: close all instances and start-up with --allow-file-access-from-files</h2>
+  <h1 id="qunit-header">Kauri Forms Main Test Page</h1>
+  <h2 id="qunit-banner"></h2>
+  <div id="qunit-testrunner-toolbar"></div>
+  <h2 id="qunit-userAgent"></h2>
+  <h2 class="qunit-like">
+    Note: to run these tests in google chrome: close all instances and start-up with --allow-file-access-from-files
+  </h2>
+  
+  <!-- Test HTML -->
+  <div id="main" style="display: none;"></div>
 
-  <!-- Test HTML -->
-  <div id="main" style="display: none;">
-
-  </div>
+  <ol id="qunit-tests"></ol>
+  <div id="qunit-fixture">test markup, will be hidden</div>
   <ol id="tests"></ol>
 </body>