test runner: translated all the ok() with '==' to equals(), as it gives more informat...

diff --git a/test/unit/ajax.js b/test/unit/ajax.js
index c6557f4edc77e276bd8e5caaea0f429edeceb4e6..c8bf2ce4bd93e506215dc3669c52d943fec278d9 100644 (file)
--- a/test/unit/ajax.js
+++ b/test/unit/ajax.js
@@ -167,8 +167,8 @@ test("$.ajax - dataType html", function() {
        testFoo = undefined;
 
        var verifyEvaluation = function() {
-         ok( testFoo == "foo", 'Check if script was evaluated for datatype html' );
-         ok( foobar == "bar", 'Check if script src was evaluated for datatype html' );
+         equals( testFoo, "foo", 'Check if script was evaluated for datatype html' );
+         equals( foobar, "bar", 'Check if script src was evaluated for datatype html' );
          start();
        };
 
@@ -383,8 +383,8 @@ test("load(String, Function) - check file with only a script tag", function() {
        stop();
        testFoo = undefined;
        $('#first').load(url('data/test2.html'), function() {
-               ok( $('#foo').html() == 'foo', 'Check if script evaluation has modified DOM');
-               ok( testFoo == "foo", 'Check if script was evaluated after load' );
+               equals( $('#foo').html(), 'foo', 'Check if script evaluation has modified DOM');
+               equals( testFoo, "foo", 'Check if script was evaluated after load' );
                start();
        });
 });
@@ -652,10 +652,10 @@ test("$.getJSON(String, Hash, Function) - JSON array", function() {
        expect(4);
        stop();
        $.getJSON(url("data/json.php"), {json: "array"}, function(json) {
-         ok( json[0].name == 'John', 'Check JSON: first, name' );
-         ok( json[0].age == 21, 'Check JSON: first, age' );
-         ok( json[1].name == 'Peter', 'Check JSON: second, name' );
-         ok( json[1].age == 25, 'Check JSON: second, age' );
+         equals( json[0].name, 'John', 'Check JSON: first, name' );
+         equals( json[0].age, 21, 'Check JSON: first, age' );
+         equals( json[1].name, 'Peter', 'Check JSON: second, name' );
+         equals( json[1].age, 25, 'Check JSON: second, age' );
          start();
        });
 });
@@ -664,8 +664,8 @@ test("$.getJSON(String, Function) - JSON object", function() {
        expect(2);
        stop();
        $.getJSON(url("data/json.php"), function(json) {
-         ok( json.data.lang == 'en', 'Check JSON: lang' );
-         ok( json.data.length == 25, 'Check JSON: length' );
+         equals( json.data.lang, 'en', 'Check JSON: lang' );
+         equals( json.data.length, 25, 'Check JSON: length' );
          start();
        });
 });
@@ -677,8 +677,8 @@ test("$.getJSON(String, Function) - JSON object with absolute url to local conte
 
        stop();
        $.getJSON(url(base + "data/json.php"), function(json) {
-         ok( json.data.lang == 'en', 'Check JSON: lang' );
-         ok( json.data.length == 25, 'Check JSON: length' );
+         equals( json.data.lang, 'en', 'Check JSON: lang' );
+         equals( json.data.length, 25, 'Check JSON: length' );
          start();
        });
 });
@@ -688,15 +688,15 @@ test("$.post(String, Hash, Function) - simple with xml", function() {
        stop();
        $.post(url("data/name.php"), {xml: "5-2"}, function(xml){
          $('math', xml).each(function() {
-                   ok( $('calculation', this).text() == '5-2', 'Check for XML' );
-                   ok( $('result', this).text() == '3', 'Check for XML' );
+                   equals( $('calculation', this).text(), '5-2', 'Check for XML' );
+                   equals( $('result', this).text(), '3', 'Check for XML' );
                 });
        });
 
        $.post(url("data/name.php?xml=5-2"), {}, function(xml){
          $('math', xml).each(function() {
-                   ok( $('calculation', this).text() == '5-2', 'Check for XML' );
-                   ok( $('result', this).text() == '3', 'Check for XML' );
+                   equals( $('calculation', this).text(), '5-2', 'Check for XML' );
+                   equals( $('result', this).text(), '3', 'Check for XML' );
                 });
          start();
        });
@@ -765,7 +765,7 @@ test("$.ajax - simple get", function() {
          type: "GET",
          url: url("data/name.php?name=foo"),
          success: function(msg){
-           ok( msg == 'bar', 'Check for GET' );
+           equals( msg, 'bar', 'Check for GET' );
            start();
          }
        });
@@ -779,7 +779,7 @@ test("$.ajax - simple post", function() {
          url: url("data/name.php"),
          data: "name=peter",
          success: function(msg){
-           ok( msg == 'pan', 'Check for POST' );
+           equals( msg, 'pan', 'Check for POST' );
            start();
          }
        });
@@ -791,7 +791,7 @@ test("ajaxSetup()", function() {
        $.ajaxSetup({
                url: url("data/name.php?name=foo"),
                success: function(msg){
-               ok( msg == 'bar', 'Check for GET' );
+               equals( msg, 'bar', 'Check for GET' );
                        start();
                }
        });

diff --git a/test/unit/core.js b/test/unit/core.js
index 4cca7d967714f8e8f7b93eaba97a8e0c09b36fc5..2827476934cacc2ffd0b8a27510d5c4c9d4ac5a5 100644 (file)
--- a/test/unit/core.js
+++ b/test/unit/core.js
@@ -94,17 +94,17 @@ test("noConflict", function() {
        var old = jQuery;\r
        var newjQuery = jQuery.noConflict();\r
 \r
-       ok( newjQuery == old, "noConflict returned the jQuery object" );\r
-       ok( jQuery == old, "Make sure jQuery wasn't touched." );\r
-       ok( $ == "$", "Make sure $ was reverted." );\r
+       equals( newjQuery, old, "noConflict returned the jQuery object" );\r
+       equals( jQuery, old, "Make sure jQuery wasn't touched." );\r
+       equals( $, "$", "Make sure $ was reverted." );\r
 \r
        jQuery = $ = old;\r
 \r
        newjQuery = jQuery.noConflict(true);\r
 \r
-       ok( newjQuery == old, "noConflict returned the jQuery object" );\r
-       ok( jQuery == "jQuery", "Make sure jQuery was reverted." );\r
-       ok( $ == "$", "Make sure $ was reverted." );\r
+       equals( newjQuery, old, "noConflict returned the jQuery object" );\r
+       equals( jQuery, "jQuery", "Make sure jQuery was reverted." );\r
+       equals( $, "$", "Make sure $ was reverted." );\r
 \r
        jQuery = $ = old;\r
 });\r
@@ -242,12 +242,12 @@ test("$(selector, xml).text(str) - Loaded via XML document", function() {
 \r
 test("length", function() {\r
        expect(1);\r
-       ok( $("p").length == 6, "Get Number of Elements Found" );\r
+       equals( $("p").length, 6, "Get Number of Elements Found" );\r
 });\r
 \r
 test("size()", function() {\r
        expect(1);\r
-       ok( $("p").size() == 6, "Get Number of Elements Found" );\r
+       equals( $("p").size(), 6, "Get Number of Elements Found" );\r
 });\r
 \r
 test("get()", function() {\r
@@ -257,7 +257,7 @@ test("get()", function() {
 \r
 test("get(Number)", function() {\r
        expect(1);\r
-       ok( $("p").get(0) == document.getElementById("firstp"), "Get A Single Element" );\r
+       equals( $("p").get(0), document.getElementById("firstp"), "Get A Single Element" );\r
 });\r
 \r
 test("add(String|Element|Array|undefined)", function() {\r
@@ -271,12 +271,12 @@ test("add(String|Element|Array|undefined)", function() {
        //equals( $([]).add($("#form")[0].elements).length, $($("#form")[0].elements).length, "Array in constructor must equals array in add()" );\r
        \r
        var x = $([]).add($("<p id='x1'>xxx</p>")).add($("<p id='x2'>xxx</p>"));\r
-       ok( x[0].id == "x1", "Check on-the-fly element1" );\r
-       ok( x[1].id == "x2", "Check on-the-fly element2" );\r
+       equals( x[0].id, "x1", "Check on-the-fly element1" );\r
+       equals( x[1].id, "x2", "Check on-the-fly element2" );\r
        \r
        var x = $([]).add("<p id='x1'>xxx</p>").add("<p id='x2'>xxx</p>");\r
-       ok( x[0].id == "x1", "Check on-the-fly element1" );\r
-       ok( x[1].id == "x2", "Check on-the-fly element2" );\r
+       equals( x[0].id, "x1", "Check on-the-fly element1" );\r
+       equals( x[1].id, "x2", "Check on-the-fly element2" );\r
        \r
        var notDefined;\r
        equals( $([]).add(notDefined).length, 0, "Check that undefined adds nothing." );\r
@@ -295,41 +295,41 @@ test("each(Function)", function() {
 \r
 test("index(Object)", function() {\r
        expect(8);\r
-       ok( $([window, document]).index(window) == 0, "Check for index of elements" );\r
-       ok( $([window, document]).index(document) == 1, "Check for index of elements" );\r
+       equals( $([window, document]).index(window), 0, "Check for index of elements" );\r
+       equals( $([window, document]).index(document), 1, "Check for index of elements" );\r
        var inputElements = $('#radio1,#radio2,#check1,#check2');\r
-       ok( inputElements.index(document.getElementById('radio1')) == 0, "Check for index of elements" );\r
-       ok( inputElements.index(document.getElementById('radio2')) == 1, "Check for index of elements" );\r
-       ok( inputElements.index(document.getElementById('check1')) == 2, "Check for index of elements" );\r
-       ok( inputElements.index(document.getElementById('check2')) == 3, "Check for index of elements" );\r
-       ok( inputElements.index(window) == -1, "Check for not found index" );\r
-       ok( inputElements.index(document) == -1, "Check for not found index" );\r
+       equals( inputElements.index(document.getElementById('radio1')), 0, "Check for index of elements" );\r
+       equals( inputElements.index(document.getElementById('radio2')), 1, "Check for index of elements" );\r
+       equals( inputElements.index(document.getElementById('check1')), 2, "Check for index of elements" );\r
+       equals( inputElements.index(document.getElementById('check2')), 3, "Check for index of elements" );\r
+       equals( inputElements.index(window), -1, "Check for not found index" );\r
+       equals( inputElements.index(document), -1, "Check for not found index" );\r
 });\r
 \r
 test("attr(String)", function() {\r
        expect(20);\r
-       ok( $('#text1').attr('value') == "Test", 'Check for value attribute' );\r
-       ok( $('#text1').attr('value', "Test2").attr('defaultValue') == "Test", 'Check for defaultValue attribute' );\r
-       ok( $('#text1').attr('type') == "text", 'Check for type attribute' );\r
-       ok( $('#radio1').attr('type') == "radio", 'Check for type attribute' );\r
-       ok( $('#check1').attr('type') == "checkbox", 'Check for type attribute' );\r
-       ok( $('#simon1').attr('rel') == "bookmark", 'Check for rel attribute' );\r
-       ok( $('#google').attr('title') == "Google!", 'Check for title attribute' );\r
-       ok( $('#mark').attr('hreflang') == "en", 'Check for hreflang attribute' );\r
-       ok( $('#en').attr('lang') == "en", 'Check for lang attribute' );\r
-       ok( $('#simon').attr('class') == "blog link", 'Check for class attribute' );\r
-       ok( $('#name').attr('name') == "name", 'Check for name attribute' );\r
-       ok( $('#text1').attr('name') == "action", 'Check for name attribute' );\r
+       equals( $('#text1').attr('value'), "Test", 'Check for value attribute' );\r
+       equals( $('#text1').attr('value', "Test2").attr('defaultValue'), "Test", 'Check for defaultValue attribute' );\r
+       equals( $('#text1').attr('type'), "text", 'Check for type attribute' );\r
+       equals( $('#radio1').attr('type'), "radio", 'Check for type attribute' );\r
+       equals( $('#check1').attr('type'), "checkbox", 'Check for type attribute' );\r
+       equals( $('#simon1').attr('rel'), "bookmark", 'Check for rel attribute' );\r
+       equals( $('#google').attr('title'), "Google!", 'Check for title attribute' );\r
+       equals( $('#mark').attr('hreflang'), "en", 'Check for hreflang attribute' );\r
+       equals( $('#en').attr('lang'), "en", 'Check for lang attribute' );\r
+       equals( $('#simon').attr('class'), "blog link", 'Check for class attribute' );\r
+       equals( $('#name').attr('name'), "name", 'Check for name attribute' );\r
+       equals( $('#text1').attr('name'), "action", 'Check for name attribute' );\r
        ok( $('#form').attr('action').indexOf("formaction") >= 0, 'Check for action attribute' );\r
-       ok( $('#text1').attr('maxlength') == '30', 'Check for maxlength attribute' );\r
-       ok( $('#text1').attr('maxLength') == '30', 'Check for maxLength attribute' );\r
-       ok( $('#area1').attr('maxLength') == '30', 'Check for maxLength attribute' );\r
-       ok( $('#select2').attr('selectedIndex') == 3, 'Check for selectedIndex attribute' );\r
-       ok( $('#foo').attr('nodeName') == 'DIV', 'Check for nodeName attribute' );\r
-       ok( $('#foo').attr('tagName') == 'DIV', 'Check for tagName attribute' );\r
+       equals( $('#text1').attr('maxlength'), '30', 'Check for maxlength attribute' );\r
+       equals( $('#text1').attr('maxLength'), '30', 'Check for maxLength attribute' );\r
+       equals( $('#area1').attr('maxLength'), '30', 'Check for maxLength attribute' );\r
+       equals( $('#select2').attr('selectedIndex'), 3, 'Check for selectedIndex attribute' );\r
+       equals( $('#foo').attr('nodeName'), 'DIV', 'Check for nodeName attribute' );\r
+       equals( $('#foo').attr('tagName'), 'DIV', 'Check for tagName attribute' );\r
        \r
        $('<a id="tAnchor5"></a>').attr('href', '#5').appendTo('#main'); // using innerHTML in IE causes href attribute to be serialized to the full path\r
-       ok( $('#tAnchor5').attr('href') == "#5", 'Check for non-absolute href (an anchor)' );\r
+       equals( $('#tAnchor5').attr('href'), "#5", 'Check for non-absolute href (an anchor)' );\r
 });\r
 \r
 if ( !isLocal ) {\r
@@ -337,8 +337,8 @@ if ( !isLocal ) {
                expect(2);\r
                stop();\r
                $.get("data/dashboard.xml", function(xml) {\r
-                       ok( $("locations", xml).attr("class") == "foo", "Check class attribute in XML document" );\r
-                       ok( $("location", xml).attr("for") == "bar", "Check for attribute in XML document" );\r
+                       equals( $("locations", xml).attr("class"), "foo", "Check class attribute in XML document" );\r
+                       equals( $("location", xml).attr("for"), "bar", "Check for attribute in XML document" );\r
                        start();\r
                });\r
        });\r
@@ -346,8 +346,8 @@ if ( !isLocal ) {
 \r
 test("attr(String, Function)", function() {\r
        expect(2);\r
-       ok( $('#text1').attr('value', function() { return this.id })[0].value == "text1", "Set value from id" );\r
-       ok( $('#text1').attr('title', function(i) { return i }).attr('title') == "0", "Set value with an index");\r
+       equals( $('#text1').attr('value', function() { return this.id })[0].value, "text1", "Set value from id" );\r
+       equals( $('#text1').attr('title', function(i) { return i }).attr('title'), "0", "Set value with an index");\r
 });\r
 \r
 test("attr(Hash)", function() {\r
@@ -372,19 +372,19 @@ test("attr(String, Object)", function() {
        ok( $("#foo").attr({"width": null}), "Try to set an attribute to nothing" );    \r
        \r
        $("#name").attr('name', 'something');\r
-       ok( $("#name").attr('name') == 'something', 'Set name attribute' );\r
+       equals( $("#name").attr('name'), 'something', 'Set name attribute' );\r
        $("#check2").attr('checked', true);\r
-       ok( document.getElementById('check2').checked == true, 'Set checked attribute' );\r
+       equals( document.getElementById('check2').checked, true, 'Set checked attribute' );\r
        $("#check2").attr('checked', false);\r
-       ok( document.getElementById('check2').checked == false, 'Set checked attribute' );\r
+       equals( document.getElementById('check2').checked, false, 'Set checked attribute' );\r
        $("#text1").attr('readonly', true);\r
-       ok( document.getElementById('text1').readOnly == true, 'Set readonly attribute' );\r
+       equals( document.getElementById('text1').readOnly, true, 'Set readonly attribute' );\r
        $("#text1").attr('readonly', false);\r
-       ok( document.getElementById('text1').readOnly == false, 'Set readonly attribute' );\r
+       equals( document.getElementById('text1').readOnly, false, 'Set readonly attribute' );\r
        $("#name").attr('maxlength', '5');\r
-       ok( document.getElementById('name').maxLength == '5', 'Set maxlength attribute' );\r
+       equals( document.getElementById('name').maxLength, '5', 'Set maxlength attribute' );\r
        $("#name").attr('maxLength', '10');\r
-       ok( document.getElementById('name').maxLength == '10', 'Set maxlength attribute' );\r
+       equals( document.getElementById('name').maxLength, '10', 'Set maxlength attribute' );\r
 \r
        // for #1070\r
        $("#name").attr('someAttr', '0');\r
@@ -443,7 +443,7 @@ if ( !isLocal ) {
 test("css(String|Hash)", function() {\r
        expect(19);\r
        \r
-       ok( $('#main').css("display") == 'none', 'Check for css property "display"');\r
+       equals( $('#main').css("display"), 'none', 'Check for css property "display"');\r
        \r
        ok( $('#foo').is(':visible'), 'Modifying CSS display: Assert element is visible');\r
        $('#foo').css({display: 'none'});\r
@@ -452,22 +452,22 @@ test("css(String|Hash)", function() {
        ok( $('#foo').is(':visible'), 'Modified CSS display: Assert element is visible');\r
        \r
        $('#floatTest').css({styleFloat: 'right'});\r
-       ok( $('#floatTest').css('styleFloat') == 'right', 'Modified CSS float using "styleFloat": Assert float is right');\r
+       equals( $('#floatTest').css('styleFloat'), 'right', 'Modified CSS float using "styleFloat": Assert float is right');\r
        $('#floatTest').css({cssFloat: 'left'});\r
-       ok( $('#floatTest').css('cssFloat') == 'left', 'Modified CSS float using "cssFloat": Assert float is left');\r
+       equals( $('#floatTest').css('cssFloat'), 'left', 'Modified CSS float using "cssFloat": Assert float is left');\r
        $('#floatTest').css({'float': 'right'});\r
-       ok( $('#floatTest').css('float') == 'right', 'Modified CSS float using "float": Assert float is right');\r
+       equals( $('#floatTest').css('float'), 'right', 'Modified CSS float using "float": Assert float is right');\r
        $('#floatTest').css({'font-size': '30px'});\r
-       ok( $('#floatTest').css('font-size') == '30px', 'Modified CSS font-size: Assert font-size is 30px');\r
+       equals( $('#floatTest').css('font-size'), '30px', 'Modified CSS font-size: Assert font-size is 30px');\r
        \r
        $.each("0,0.25,0.5,0.75,1".split(','), function(i, n) {\r
                $('#foo').css({opacity: n});\r
-               ok( $('#foo').css('opacity') == parseFloat(n), "Assert opacity is " + parseFloat(n) + " as a String" );\r
+               equals( $('#foo').css('opacity'), parseFloat(n), "Assert opacity is " + parseFloat(n) + " as a String" );\r
                $('#foo').css({opacity: parseFloat(n)});\r
-               ok( $('#foo').css('opacity') == parseFloat(n), "Assert opacity is " + parseFloat(n) + " as a Number" );\r
+               equals( $('#foo').css('opacity'), parseFloat(n), "Assert opacity is " + parseFloat(n) + " as a Number" );\r
        });     \r
        $('#foo').css({opacity: ''});\r
-       ok( $('#foo').css('opacity') == '1', "Assert opacity is 1 when set to an empty String" );\r
+       equals( $('#foo').css('opacity'), '1', "Assert opacity is 1 when set to an empty String" );\r
 });\r
 \r
 test("css(String, Object)", function() {\r
@@ -479,22 +479,22 @@ test("css(String, Object)", function() {
        ok( $('#foo').is(':visible'), 'Modified CSS display: Assert element is visible');\r
        \r
        $('#floatTest').css('styleFloat', 'left');\r
-       ok( $('#floatTest').css('styleFloat') == 'left', 'Modified CSS float using "styleFloat": Assert float is left');\r
+       equals( $('#floatTest').css('styleFloat'), 'left', 'Modified CSS float using "styleFloat": Assert float is left');\r
        $('#floatTest').css('cssFloat', 'right');\r
-       ok( $('#floatTest').css('cssFloat') == 'right', 'Modified CSS float using "cssFloat": Assert float is right');\r
+       equals( $('#floatTest').css('cssFloat'), 'right', 'Modified CSS float using "cssFloat": Assert float is right');\r
        $('#floatTest').css('float', 'left');\r
-       ok( $('#floatTest').css('float') == 'left', 'Modified CSS float using "float": Assert float is left');\r
+       equals( $('#floatTest').css('float'), 'left', 'Modified CSS float using "float": Assert float is left');\r
        $('#floatTest').css('font-size', '20px');\r
-       ok( $('#floatTest').css('font-size') == '20px', 'Modified CSS font-size: Assert font-size is 20px');\r
+       equals( $('#floatTest').css('font-size'), '20px', 'Modified CSS font-size: Assert font-size is 20px');\r
        \r
        $.each("0,0.25,0.5,0.75,1".split(','), function(i, n) {\r
                $('#foo').css('opacity', n);\r
-               ok( $('#foo').css('opacity') == parseFloat(n), "Assert opacity is " + parseFloat(n) + " as a String" );\r
+               equals( $('#foo').css('opacity'), parseFloat(n), "Assert opacity is " + parseFloat(n) + " as a String" );\r
                $('#foo').css('opacity', parseFloat(n));\r
-               ok( $('#foo').css('opacity') == parseFloat(n), "Assert opacity is " + parseFloat(n) + " as a Number" );\r
+               equals( $('#foo').css('opacity'), parseFloat(n), "Assert opacity is " + parseFloat(n) + " as a Number" );\r
        });\r
        $('#foo').css('opacity', '');\r
-       ok( $('#foo').css('opacity') == '1', "Assert opacity is 1 when set to an empty String" );\r
+       equals( $('#foo').css('opacity'), '1', "Assert opacity is 1 when set to an empty String" );\r
        // for #1438, IE throws JS error when filter exists but doesn't have opacity in it\r
        if (jQuery.browser.msie) {\r
                $('#foo').css("filter", "progid:DXImageTransform.Microsoft.Chroma(color='red');");\r
@@ -578,21 +578,21 @@ test("height()", function() {
 test("text()", function() {\r
        expect(1);\r
        var expected = "This link has class=\"blog\": Simon Willison's Weblog";\r
-       ok( $('#sap').text() == expected, 'Check for merged text of more then one element.' );\r
+       equals( $('#sap').text(), expected, 'Check for merged text of more then one element.' );\r
 });\r
 \r
 test("wrap(String|Element)", function() {\r
        expect(8);\r
        var defaultText = 'Try them out:'\r
        var result = $('#first').wrap('<div class="red"><span></span></div>').text();\r
-       ok( defaultText == result, 'Check for wrapping of on-the-fly html' );\r
+       equals( defaultText, result, 'Check for wrapping of on-the-fly html' );\r
        ok( $('#first').parent().parent().is('.red'), 'Check if wrapper has class "red"' );\r
 \r
        reset();\r
        var defaultText = 'Try them out:'\r
        var result = $('#first').wrap(document.getElementById('empty')).parent();\r
        ok( result.is('ol'), 'Check for element wrapping' );\r
-       ok( result.text() == defaultText, 'Check for element wrapping' );\r
+       equals( result.text(), defaultText, 'Check for element wrapping' );\r
        \r
        reset();\r
        $('#check1').click(function() {         \r
@@ -649,23 +649,23 @@ test("append(String|Element|Array&lt;Element&gt;|jQuery)", function() {
        expect(21);\r
        var defaultText = 'Try them out:'\r
        var result = $('#first').append('<b>buga</b>');\r
-       ok( result.text() == defaultText + 'buga', 'Check if text appending works' );\r
-       ok( $('#select3').append('<option value="appendTest">Append Test</option>').find('option:last-child').attr('value') == 'appendTest', 'Appending html options to select element');\r
+       equals( result.text(), defaultText + 'buga', 'Check if text appending works' );\r
+       equals( $('#select3').append('<option value="appendTest">Append Test</option>').find('option:last-child').attr('value'), 'appendTest', 'Appending html options to select element');\r
        \r
        reset();\r
        var expected = "This link has class=\"blog\": Simon Willison's WeblogTry them out:";\r
        $('#sap').append(document.getElementById('first'));\r
-       ok( expected == $('#sap').text(), "Check for appending of element" );\r
+       equals( expected, $('#sap').text(), "Check for appending of element" );\r
        \r
        reset();\r
        expected = "This link has class=\"blog\": Simon Willison's WeblogTry them out:Yahoo";\r
        $('#sap').append([document.getElementById('first'), document.getElementById('yahoo')]);\r
-       ok( expected == $('#sap').text(), "Check for appending of array of elements" );\r
+       equals( expected, $('#sap').text(), "Check for appending of array of elements" );\r
        \r
        reset();\r
        expected = "This link has class=\"blog\": Simon Willison's WeblogTry them out:Yahoo";\r
        $('#sap').append($("#first, #yahoo"));\r
-       ok( expected == $('#sap').text(), "Check for appending of jQuery object" );\r
+       equals( expected, $('#sap').text(), "Check for appending of jQuery object" );\r
 \r
        reset();\r
        $("#sap").append( 5 );\r
@@ -682,7 +682,7 @@ test("append(String|Element|Array&lt;Element&gt;|jQuery)", function() {
        \r
        reset();\r
        $("#sap").append(document.getElementById('form'));\r
-       ok( $("#sap>form").size() == 1, "Check for appending a form" ); // Bug #910\r
+       equals( $("#sap>form").size(), 1, "Check for appending a form" ); // Bug #910\r
 \r
        reset();\r
        var pass = true;\r
@@ -700,7 +700,7 @@ test("append(String|Element|Array&lt;Element&gt;|jQuery)", function() {
        \r
        reset();\r
        $('#select1').append('<OPTION>Test</OPTION>');\r
-       ok( $('#select1 option:last').text() == "Test", "Appending &lt;OPTION&gt; (all caps)" );\r
+       equals( $('#select1 option:last').text(), "Test", "Appending &lt;OPTION&gt; (all caps)" );\r
        \r
        $('#table').append('<colgroup></colgroup>');\r
        ok( $('#table colgroup').length, "Append colgroup" );\r
@@ -733,23 +733,23 @@ test("appendTo(String|Element|Array&lt;Element&gt;|jQuery)", function() {
        expect(6);\r
        var defaultText = 'Try them out:'\r
        $('<b>buga</b>').appendTo('#first');\r
-       ok( $("#first").text() == defaultText + 'buga', 'Check if text appending works' );\r
-       ok( $('<option value="appendTest">Append Test</option>').appendTo('#select3').parent().find('option:last-child').attr('value') == 'appendTest', 'Appending html options to select element');\r
+       equals( $("#first").text(), defaultText + 'buga', 'Check if text appending works' );\r
+       equals( $('<option value="appendTest">Append Test</option>').appendTo('#select3').parent().find('option:last-child').attr('value'), 'appendTest', 'Appending html options to select element');\r
        \r
        reset();\r
        var expected = "This link has class=\"blog\": Simon Willison's WeblogTry them out:";\r
        $(document.getElementById('first')).appendTo('#sap');\r
-       ok( expected == $('#sap').text(), "Check for appending of element" );\r
+       equals( expected, $('#sap').text(), "Check for appending of element" );\r
        \r
        reset();\r
        expected = "This link has class=\"blog\": Simon Willison's WeblogTry them out:Yahoo";\r
        $([document.getElementById('first'), document.getElementById('yahoo')]).appendTo('#sap');\r
-       ok( expected == $('#sap').text(), "Check for appending of array of elements" );\r
+       equals( expected, $('#sap').text(), "Check for appending of array of elements" );\r
        \r
        reset();\r
        expected = "This link has class=\"blog\": Simon Willison's WeblogTry them out:Yahoo";\r
        $("#first, #yahoo").appendTo('#sap');\r
-       ok( expected == $('#sap').text(), "Check for appending of jQuery object" );\r
+       equals( expected, $('#sap').text(), "Check for appending of jQuery object" );\r
        \r
        reset();\r
        $('#select1').appendTo('#foo');\r
@@ -760,46 +760,46 @@ test("prepend(String|Element|Array&lt;Element&gt;|jQuery)", function() {
        expect(5);\r
        var defaultText = 'Try them out:'\r
        var result = $('#first').prepend('<b>buga</b>');\r
-       ok( result.text() == 'buga' + defaultText, 'Check if text prepending works' );\r
-       ok( $('#select3').prepend('<option value="prependTest">Prepend Test</option>').find('option:first-child').attr('value') == 'prependTest', 'Prepending html options to select element');\r
+       equals( result.text(), 'buga' + defaultText, 'Check if text prepending works' );\r
+       equals( $('#select3').prepend('<option value="prependTest">Prepend Test</option>').find('option:first-child').attr('value'), 'prependTest', 'Prepending html options to select element');\r
        \r
        reset();\r
        var expected = "Try them out:This link has class=\"blog\": Simon Willison's Weblog";\r
        $('#sap').prepend(document.getElementById('first'));\r
-       ok( expected == $('#sap').text(), "Check for prepending of element" );\r
+       equals( expected, $('#sap').text(), "Check for prepending of element" );\r
 \r
        reset();\r
        expected = "Try them out:YahooThis link has class=\"blog\": Simon Willison's Weblog";\r
        $('#sap').prepend([document.getElementById('first'), document.getElementById('yahoo')]);\r
-       ok( expected == $('#sap').text(), "Check for prepending of array of elements" );\r
+       equals( expected, $('#sap').text(), "Check for prepending of array of elements" );\r
        \r
        reset();\r
        expected = "Try them out:YahooThis link has class=\"blog\": Simon Willison's Weblog";\r
        $('#sap').prepend($("#first, #yahoo"));\r
-       ok( expected == $('#sap').text(), "Check for prepending of jQuery object" );\r
+       equals( expected, $('#sap').text(), "Check for prepending of jQuery object" );\r
 });\r
 \r
 test("prependTo(String|Element|Array&lt;Element&gt;|jQuery)", function() {\r
        expect(6);\r
        var defaultText = 'Try them out:'\r
        $('<b>buga</b>').prependTo('#first');\r
-       ok( $('#first').text() == 'buga' + defaultText, 'Check if text prepending works' );\r
-       ok( $('<option value="prependTest">Prepend Test</option>').prependTo('#select3').parent().find('option:first-child').attr('value') == 'prependTest', 'Prepending html options to select element');\r
+       equals( $('#first').text(), 'buga' + defaultText, 'Check if text prepending works' );\r
+       equals( $('<option value="prependTest">Prepend Test</option>').prependTo('#select3').parent().find('option:first-child').attr('value'), 'prependTest', 'Prepending html options to select element');\r
        \r
        reset();\r
        var expected = "Try them out:This link has class=\"blog\": Simon Willison's Weblog";\r
        $(document.getElementById('first')).prependTo('#sap');\r
-       ok( expected == $('#sap').text(), "Check for prepending of element" );\r
+       equals( expected, $('#sap').text(), "Check for prepending of element" );\r
 \r
        reset();\r
        expected = "Try them out:YahooThis link has class=\"blog\": Simon Willison's Weblog";\r
        $([document.getElementById('yahoo'), document.getElementById('first')]).prependTo('#sap');\r
-       ok( expected == $('#sap').text(), "Check for prepending of array of elements" );\r
+       equals( expected, $('#sap').text(), "Check for prepending of array of elements" );\r
        \r
        reset();\r
        expected = "Try them out:YahooThis link has class=\"blog\": Simon Willison's Weblog";\r
        $("#yahoo, #first").prependTo('#sap');\r
-       ok( expected == $('#sap').text(), "Check for prepending of jQuery object" );\r
+       equals( expected, $('#sap').text(), "Check for prepending of jQuery object" );\r
        \r
        reset();\r
        $('<select id="prependSelect1"></select>').prependTo('form:last');\r
@@ -812,88 +812,88 @@ test("before(String|Element|Array&lt;Element&gt;|jQuery)", function() {
        expect(4);\r
        var expected = 'This is a normal link: bugaYahoo';\r
        $('#yahoo').before('<b>buga</b>');\r
-       ok( expected == $('#en').text(), 'Insert String before' );\r
+       equals( expected, $('#en').text(), 'Insert String before' );\r
        \r
        reset();\r
        expected = "This is a normal link: Try them out:Yahoo";\r
        $('#yahoo').before(document.getElementById('first'));\r
-       ok( expected == $('#en').text(), "Insert element before" );\r
+       equals( expected, $('#en').text(), "Insert element before" );\r
        \r
        reset();\r
        expected = "This is a normal link: Try them out:diveintomarkYahoo";\r
        $('#yahoo').before([document.getElementById('first'), document.getElementById('mark')]);\r
-       ok( expected == $('#en').text(), "Insert array of elements before" );\r
+       equals( expected, $('#en').text(), "Insert array of elements before" );\r
        \r
        reset();\r
        expected = "This is a normal link: Try them out:diveintomarkYahoo";\r
        $('#yahoo').before($("#first, #mark"));\r
-       ok( expected == $('#en').text(), "Insert jQuery before" );\r
+       equals( expected, $('#en').text(), "Insert jQuery before" );\r
 });\r
 \r
 test("insertBefore(String|Element|Array&lt;Element&gt;|jQuery)", function() {\r
        expect(4);\r
        var expected = 'This is a normal link: bugaYahoo';\r
        $('<b>buga</b>').insertBefore('#yahoo');\r
-       ok( expected == $('#en').text(), 'Insert String before' );\r
+       equals( expected, $('#en').text(), 'Insert String before' );\r
        \r
        reset();\r
        expected = "This is a normal link: Try them out:Yahoo";\r
        $(document.getElementById('first')).insertBefore('#yahoo');\r
-       ok( expected == $('#en').text(), "Insert element before" );\r
+       equals( expected, $('#en').text(), "Insert element before" );\r
        \r
        reset();\r
        expected = "This is a normal link: Try them out:diveintomarkYahoo";\r
        $([document.getElementById('first'), document.getElementById('mark')]).insertBefore('#yahoo');\r
-       ok( expected == $('#en').text(), "Insert array of elements before" );\r
+       equals( expected, $('#en').text(), "Insert array of elements before" );\r
        \r
        reset();\r
        expected = "This is a normal link: Try them out:diveintomarkYahoo";\r
        $("#first, #mark").insertBefore('#yahoo');\r
-       ok( expected == $('#en').text(), "Insert jQuery before" );\r
+       equals( expected, $('#en').text(), "Insert jQuery before" );\r
 });\r
 \r
 test("after(String|Element|Array&lt;Element&gt;|jQuery)", function() {\r
        expect(4);\r
        var expected = 'This is a normal link: Yahoobuga';\r
        $('#yahoo').after('<b>buga</b>');\r
-       ok( expected == $('#en').text(), 'Insert String after' );\r
+       equals( expected, $('#en').text(), 'Insert String after' );\r
        \r
        reset();\r
        expected = "This is a normal link: YahooTry them out:";\r
        $('#yahoo').after(document.getElementById('first'));\r
-       ok( expected == $('#en').text(), "Insert element after" );\r
+       equals( expected, $('#en').text(), "Insert element after" );\r
 \r
        reset();\r
        expected = "This is a normal link: YahooTry them out:diveintomark";\r
        $('#yahoo').after([document.getElementById('first'), document.getElementById('mark')]);\r
-       ok( expected == $('#en').text(), "Insert array of elements after" );\r
+       equals( expected, $('#en').text(), "Insert array of elements after" );\r
        \r
        reset();\r
        expected = "This is a normal link: YahooTry them out:diveintomark";\r
        $('#yahoo').after($("#first, #mark"));\r
-       ok( expected == $('#en').text(), "Insert jQuery after" );\r
+       equals( expected, $('#en').text(), "Insert jQuery after" );\r
 });\r
 \r
 test("insertAfter(String|Element|Array&lt;Element&gt;|jQuery)", function() {\r
        expect(4);\r
        var expected = 'This is a normal link: Yahoobuga';\r
        $('<b>buga</b>').insertAfter('#yahoo');\r
-       ok( expected == $('#en').text(), 'Insert String after' );\r
+       equals( expected, $('#en').text(), 'Insert String after' );\r
        \r
        reset();\r
        expected = "This is a normal link: YahooTry them out:";\r
        $(document.getElementById('first')).insertAfter('#yahoo');\r
-       ok( expected == $('#en').text(), "Insert element after" );\r
+       equals( expected, $('#en').text(), "Insert element after" );\r
 \r
        reset();\r
        expected = "This is a normal link: YahooTry them out:diveintomark";\r
        $([document.getElementById('mark'), document.getElementById('first')]).insertAfter('#yahoo');\r
-       ok( expected == $('#en').text(), "Insert array of elements after" );\r
+       equals( expected, $('#en').text(), "Insert array of elements after" );\r
        \r
        reset();\r
        expected = "This is a normal link: YahooTry them out:diveintomark";\r
        $("#mark, #first").insertAfter('#yahoo');\r
-       ok( expected == $('#en').text(), "Insert jQuery after" );\r
+       equals( expected, $('#en').text(), "Insert jQuery after" );\r
 });\r
 \r
 test("replaceWith(String|Element|Array&lt;Element&gt;|jQuery)", function() {\r
@@ -946,17 +946,17 @@ test("replaceAll(String|Element|Array&lt;Element&gt;|jQuery)", function() {
 \r
 test("end()", function() {\r
        expect(3);\r
-       ok( 'Yahoo' == $('#yahoo').parent().end().text(), 'Check for end' );\r
+       equals( 'Yahoo', $('#yahoo').parent().end().text(), 'Check for end' );\r
        ok( $('#yahoo').end(), 'Check for end with nothing to end' );\r
        \r
        var x = $('#yahoo');\r
        x.parent();\r
-       ok( 'Yahoo' == $('#yahoo').text(), 'Check for non-destructive behaviour' );\r
+       equals( 'Yahoo', $('#yahoo').text(), 'Check for non-destructive behaviour' );\r
 });\r
 \r
 test("find(String)", function() {\r
        expect(2);\r
-       ok( 'Yahoo' == $('#foo').find('.blogTest').text(), 'Check for find' );\r
+       equals( 'Yahoo', $('#foo').find('.blogTest').text(), 'Check for find' );\r
 \r
        // using contents will get comments regular, text, and comment nodes\r
        var j = $("#nonnodes").contents();\r
@@ -965,10 +965,10 @@ test("find(String)", function() {
 \r
 test("clone()", function() {\r
        expect(20);\r
-       ok( 'This is a normal link: Yahoo' == $('#en').text(), 'Assert text for #en' );\r
+       equals( 'This is a normal link: Yahoo', $('#en').text(), 'Assert text for #en' );\r
        var clone = $('#yahoo').clone();\r
-       ok( 'Try them out:Yahoo' == $('#first').append(clone).text(), 'Check for clone' );\r
-       ok( 'This is a normal link: Yahoo' == $('#en').text(), 'Reassert text for #en' );\r
+       equals( 'Try them out:Yahoo', $('#first').append(clone).text(), 'Check for clone' );\r
+       equals( 'This is a normal link: Yahoo', $('#en').text(), 'Reassert text for #en' );\r
 \r
        var cloneTags = [ \r
                "<table/>", "<tr/>", "<td/>", "<div/>", \r
@@ -1075,7 +1075,7 @@ test("$.extend(Object, Object)", function() {
        isObj( target, { bar:5 }, "Check to make sure a recursive obj doesn't go never-ending loop by not copying it over" );\r
 \r
        var ret = jQuery.extend(true, { foo: [] }, { foo: [0] } ); // 1907\r
-       ok( ret.foo.length == 1, "Check to make sure a value with coersion 'false' copies over when necessary to fix #1907" );\r
+       equals( ret.foo.length, 1, "Check to make sure a value with coersion 'false' copies over when necessary to fix #1907" );\r
 \r
        var ret = jQuery.extend(true, { foo: "1,2,3" }, { foo: [1, 2, 3] } );\r
        ok( typeof ret.foo != "string", "Check to make sure values equal with coersion (but not actually equal) overwrite correctly" );\r
@@ -1108,22 +1108,22 @@ test("$.extend(Object, Object)", function() {
 \r
 test("val()", function() {\r
        expect(4);\r
-       ok( $("#text1").val() == "Test", "Check for value of input element" );\r
-       ok( !$("#text1").val() == "", "Check for value of input element" );\r
+       equals( $("#text1").val(), "Test", "Check for value of input element" );\r
+       equals( !$("#text1").val(), "", "Check for value of input element" );\r
        // ticket #1714 this caused a JS error in IE\r
-       ok( $("#first").val() == "", "Check a paragraph element to see if it has a value" );\r
+       equals( $("#first").val(), "", "Check a paragraph element to see if it has a value" );\r
        ok( $([]).val() === undefined, "Check an empty jQuery object will return undefined from val" );\r
 });\r
 \r
 test("val(String)", function() {\r
        expect(4);\r
        document.getElementById('text1').value = "bla";\r
-       ok( $("#text1").val() == "bla", "Check for modified value of input element" );\r
+       equals( $("#text1").val(), "bla", "Check for modified value of input element" );\r
        $("#text1").val('test');\r
        ok ( document.getElementById('text1').value == "test", "Check for modified (via val(String)) value of input element" );\r
        \r
        $("#select1").val("3");\r
-       ok( $("#select1").val() == "3", "Check for modified (via val(String)) value of select element" );\r
+       equals( $("#select1").val(), "3", "Check for modified (via val(String)) value of select element" );\r
 \r
        // using contents will get comments regular, text, and comment nodes\r
        var j = $("#nonnodes").contents();\r
@@ -1161,7 +1161,7 @@ test("html(String)", function() {
        $("#main").html('foo <form><script type="text/javascript">ok( true, "$().html().evalScripts() Evals Scripts Twice in Firefox, see #975" );</script></form>');\r
 \r
        // it was decided that waiting to execute ALL scripts makes sense since nested ones have to wait anyway so this test case is changed, see #1959\r
-       $("#main").html("<script>ok(scriptorder++ == 0, 'Script is executed in order');ok($('#scriptorder').length == 1,'Execute after html (even though appears before)')<\/script><span id='scriptorder'><script>ok(scriptorder++ == 1, 'Script (nested) is executed in order');ok($('#scriptorder').length == 1,'Execute after html')<\/script></span><script>ok(scriptorder++ == 2, 'Script (unnested) is executed in order');ok($('#scriptorder').length == 1,'Execute after html')<\/script>");\r
+       $("#main").html("<script>equals(scriptorder++, 0, 'Script is executed in order');equals($('#scriptorder').length, 1,'Execute after html (even though appears before)')<\/script><span id='scriptorder'><script>equals(scriptorder++, 1, 'Script (nested) is executed in order');equals($('#scriptorder').length, 1,'Execute after html')<\/script></span><script>equals(scriptorder++, 2, 'Script (unnested) is executed in order');equals($('#scriptorder').length, 1,'Execute after html')<\/script>");\r
 \r
        setTimeout( start, 100 );\r
 });\r
@@ -1181,12 +1181,12 @@ test("filter()", function() {
 \r
 test("not()", function() {\r
        expect(8);\r
-       ok( $("#main > p#ap > a").not("#google").length == 2, "not('selector')" );\r
-       ok( $("#main > p#ap > a").not(document.getElementById("google")).length == 2, "not(DOMElement)" );\r
+       equals( $("#main > p#ap > a").not("#google").length, 2, "not('selector')" );\r
+       equals( $("#main > p#ap > a").not(document.getElementById("google")).length, 2, "not(DOMElement)" );\r
        isSet( $("p").not(".result").get(), q("firstp", "ap", "sndp", "en", "sap", "first"), "not('.class')" );\r
        isSet( $("p").not("#ap, #sndp, .result").get(), q("firstp", "en", "sap", "first"), "not('selector, selector')" );\r
        isSet( $("p").not($("#ap, #sndp, .result")).get(), q("firstp", "en", "sap", "first"), "not(jQuery)" );\r
-       ok( $("p").not(document.getElementsByTagName("p")).length == 0, "not(Array-like DOM collection)" );\r
+       equals( $("p").not(document.getElementsByTagName("p")).length, 0, "not(Array-like DOM collection)" );\r
        isSet( $("#form option").not("option.emptyopt:contains('Nothing'),[selected],[value='1']").get(), q("option1c", "option1d", "option2c", "option3d" ), "not('complex selector')");\r
        \r
        var selects = $("#form select");\r
@@ -1219,36 +1219,36 @@ test("children([String])", function() {
 \r
 test("parent([String])", function() {\r
        expect(5);\r
-       ok( $("#groups").parent()[0].id == "ap", "Simple parent check" );\r
-       ok( $("#groups").parent("p")[0].id == "ap", "Filtered parent check" );\r
-       ok( $("#groups").parent("div").length == 0, "Filtered parent check, no match" );\r
-       ok( $("#groups").parent("div, p")[0].id == "ap", "Check for multiple filters" );\r
+       equals( $("#groups").parent()[0].id, "ap", "Simple parent check" );\r
+       equals( $("#groups").parent("p")[0].id, "ap", "Filtered parent check" );\r
+       equals( $("#groups").parent("div").length, 0, "Filtered parent check, no match" );\r
+       equals( $("#groups").parent("div, p")[0].id, "ap", "Check for multiple filters" );\r
        isSet( $("#en, #sndp").parent().get(), q("foo"), "Check for unique results from parent" );\r
 });\r
        \r
 test("parents([String])", function() {\r
        expect(5);\r
-       ok( $("#groups").parents()[0].id == "ap", "Simple parents check" );\r
-       ok( $("#groups").parents("p")[0].id == "ap", "Filtered parents check" );\r
-       ok( $("#groups").parents("div")[0].id == "main", "Filtered parents check2" );\r
+       equals( $("#groups").parents()[0].id, "ap", "Simple parents check" );\r
+       equals( $("#groups").parents("p")[0].id, "ap", "Filtered parents check" );\r
+       equals( $("#groups").parents("div")[0].id, "main", "Filtered parents check2" );\r
        isSet( $("#groups").parents("p, div").get(), q("ap", "main"), "Check for multiple filters" );\r
        isSet( $("#en, #sndp").parents().get(), q("foo", "main", "dl", "body", "html"), "Check for unique results from parents" );\r
 });\r
 \r
 test("next([String])", function() {\r
        expect(4);\r
-       ok( $("#ap").next()[0].id == "foo", "Simple next check" );\r
-       ok( $("#ap").next("div")[0].id == "foo", "Filtered next check" );\r
-       ok( $("#ap").next("p").length == 0, "Filtered next check, no match" );\r
-       ok( $("#ap").next("div, p")[0].id == "foo", "Multiple filters" );\r
+       equals( $("#ap").next()[0].id, "foo", "Simple next check" );\r
+       equals( $("#ap").next("div")[0].id, "foo", "Filtered next check" );\r
+       equals( $("#ap").next("p").length, 0, "Filtered next check, no match" );\r
+       equals( $("#ap").next("div, p")[0].id, "foo", "Multiple filters" );\r
 });\r
        \r
 test("prev([String])", function() {\r
        expect(4);\r
-       ok( $("#foo").prev()[0].id == "ap", "Simple prev check" );\r
-       ok( $("#foo").prev("p")[0].id == "ap", "Filtered prev check" );\r
-       ok( $("#foo").prev("div").length == 0, "Filtered prev check, no match" );\r
-       ok( $("#foo").prev("p, div")[0].id == "ap", "Multiple filters" );\r
+       equals( $("#foo").prev()[0].id, "ap", "Simple prev check" );\r
+       equals( $("#foo").prev("p")[0].id, "ap", "Filtered prev check" );\r
+       equals( $("#foo").prev("div").length, 0, "Filtered prev check, no match" );\r
+       equals( $("#foo").prev("p, div")[0].id, "ap", "Multiple filters" );\r
 });\r
 \r
 test("show()", function() {\r
@@ -1339,12 +1339,12 @@ test("toggleClass(String)", function() {
 \r
 test("removeAttr(String", function() {\r
        expect(1);\r
-       ok( $('#mark').removeAttr("class")[0].className == "", "remove class" );\r
+       equals( $('#mark').removeAttr("class")[0].className, "", "remove class" );\r
 });\r
 \r
 test("text(String)", function() {\r
        expect(4);\r
-       ok( $("#foo").text("<div><b>Hello</b> cruel world!</div>")[0].innerHTML == "&lt;div&gt;&lt;b&gt;Hello&lt;/b&gt; cruel world!&lt;/div&gt;", "Check escaped text" );\r
+       equals( $("#foo").text("<div><b>Hello</b> cruel world!</div>")[0].innerHTML, "&lt;div&gt;&lt;b&gt;Hello&lt;/b&gt; cruel world!&lt;/div&gt;", "Check escaped text" );\r
 \r
        // using contents will get comments regular, text, and comment nodes\r
        var j = $("#nonnodes").contents();\r
@@ -1357,36 +1357,36 @@ test("text(String)", function() {
 test("$.each(Object,Function)", function() {\r
        expect(12);\r
        $.each( [0,1,2], function(i, n){\r
-               ok( i == n, "Check array iteration" );\r
+               equals( i, n, "Check array iteration" );\r
        });\r
        \r
        $.each( [5,6,7], function(i, n){\r
-               ok( i == n - 5, "Check array iteration" );\r
+               equals( i, n - 5, "Check array iteration" );\r
        });\r
         \r
        $.each( { name: "name", lang: "lang" }, function(i, n){\r
-               ok( i == n, "Check object iteration" );\r
+               equals( i, n, "Check object iteration" );\r
        });\r
 \r
         var total = 0;\r
         jQuery.each([1,2,3], function(i,v){ total += v; });\r
-        ok( total == 6, "Looping over an array" );\r
+        equals( total, 6, "Looping over an array" );\r
         total = 0;\r
         jQuery.each([1,2,3], function(i,v){ total += v; if ( i == 1 ) return false; });\r
-        ok( total == 3, "Looping over an array, with break" );\r
+        equals( total, 3, "Looping over an array, with break" );\r
         total = 0;\r
         jQuery.each({"a":1,"b":2,"c":3}, function(i,v){ total += v; });\r
-        ok( total == 6, "Looping over an object" );\r
+        equals( total, 6, "Looping over an object" );\r
         total = 0;\r
         jQuery.each({"a":3,"b":3,"c":3}, function(i,v){ total += v; return false; });\r
-        ok( total == 3, "Looping over an object, with break" );\r
+        equals( total, 3, "Looping over an object, with break" );\r
 });\r
 \r
 test("$.prop", function() {\r
        expect(2);\r
        var handle = function() { return this.id };\r
-       ok( $.prop($("#ap")[0], handle) == "ap", "Check with Function argument" );\r
-       ok( $.prop($("#ap")[0], "value") == "value", "Check with value argument" );\r
+       equals( $.prop($("#ap")[0], handle), "ap", "Check with Function argument" );\r
+       equals( $.prop($("#ap")[0], "value"), "value", "Check with value argument" );\r
 });\r
 \r
 test("$.className", function() {\r
@@ -1394,14 +1394,14 @@ test("$.className", function() {
        var x = $("<p>Hi</p>")[0];\r
        var c = $.className;\r
        c.add(x, "hi");\r
-       ok( x.className == "hi", "Check single added class" );\r
+       equals( x.className, "hi", "Check single added class" );\r
        c.add(x, "foo bar");\r
-       ok( x.className == "hi foo bar", "Check more added classes" );\r
+       equals( x.className, "hi foo bar", "Check more added classes" );\r
        c.remove(x);\r
-       ok( x.className == "", "Remove all classes" );\r
+       equals( x.className, "", "Remove all classes" );\r
        c.add(x, "hi foo bar");\r
        c.remove(x, "foo");\r
-       ok( x.className == "hi bar", "Check removal of one class" );\r
+       equals( x.className, "hi bar", "Check removal of one class" );\r
        ok( c.has(x, "hi"), "Check has1" );\r
        ok( c.has(x, "bar"), "Check has2" );\r
 });\r
@@ -1409,13 +1409,13 @@ test("$.className", function() {
 test("$.data", function() {\r
        expect(5);\r
        var div = $("#foo")[0];\r
-       ok( jQuery.data(div, "test") == undefined, "Check for no data exists" );\r
+       equals( jQuery.data(div, "test"), undefined, "Check for no data exists" );\r
        jQuery.data(div, "test", "success");\r
-       ok( jQuery.data(div, "test") == "success", "Check for added data" );\r
+       equals( jQuery.data(div, "test"), "success", "Check for added data" );\r
        jQuery.data(div, "test", "overwritten");\r
-       ok( jQuery.data(div, "test") == "overwritten", "Check for overwritten data" );\r
+       equals( jQuery.data(div, "test"), "overwritten", "Check for overwritten data" );\r
        jQuery.data(div, "test", undefined);\r
-       ok( jQuery.data(div, "test") == "overwritten", "Check that data wasn't removed");\r
+       equals( jQuery.data(div, "test"), "overwritten", "Check that data wasn't removed");\r
        jQuery.data(div, "test", null);\r
        ok( jQuery.data(div, "test") === null, "Check for null data");\r
 });\r
@@ -1423,13 +1423,13 @@ test("$.data", function() {
 test(".data()", function() {\r
        expect(18);\r
        var div = $("#foo");\r
-       ok( div.data("test") == undefined, "Check for no data exists" );\r
+       equals( div.data("test"), undefined, "Check for no data exists" );\r
        div.data("test", "success");\r
-       ok( div.data("test") == "success", "Check for added data" );\r
+       equals( div.data("test"), "success", "Check for added data" );\r
        div.data("test", "overwritten");\r
-       ok( div.data("test") == "overwritten", "Check for overwritten data" );\r
+       equals( div.data("test"), "overwritten", "Check for overwritten data" );\r
        div.data("test", undefined);\r
-       ok( div.data("test") == "overwritten", "Check that data wasn't removed");\r
+       equals( div.data("test"), "overwritten", "Check that data wasn't removed");\r
        div.data("test", null);\r
        ok( div.data("test") === null, "Check for null data");\r
        \r
@@ -1443,9 +1443,9 @@ test(".data()", function() {
                .bind("getData.foo",function(e,key){ gets[key] += 3; });\r
 \r
        div.data("test.foo", 2);\r
-       ok( div.data("test") == "overwritten", "Check for original data" );\r
-       ok( div.data("test.foo") == 2, "Check for namespaced data" );\r
-       ok( div.data("test.bar") == "overwritten", "Check for unmatched namespace" );\r
+       equals( div.data("test"), "overwritten", "Check for original data" );\r
+       equals( div.data("test.foo"), 2, "Check for namespaced data" );\r
+       equals( div.data("test.bar"), "overwritten", "Check for unmatched namespace" );\r
        equals( hits.test, 2, "Check triggered setter functions" );\r
        equals( gets.test, 5, "Check triggered getter functions" );\r
 \r
@@ -1453,9 +1453,9 @@ test(".data()", function() {
        gets.test = 0;\r
 \r
        div.data("test", 1);\r
-       ok( div.data("test") == 1, "Check for original data" );\r
-       ok( div.data("test.foo") == 2, "Check for namespaced data" );\r
-       ok( div.data("test.bar") == 1, "Check for unmatched namespace" );\r
+       equals( div.data("test"), 1, "Check for original data" );\r
+       equals( div.data("test.foo"), 2, "Check for namespaced data" );\r
+       equals( div.data("test.bar"), 1, "Check for unmatched namespace" );\r
        equals( hits.test, 1, "Check triggered setter functions" );\r
        equals( gets.test, 5, "Check triggered getter functions" );\r
 \r
@@ -1466,9 +1466,9 @@ test(".data()", function() {
                .bind("getData",function(e,key){ return key + "root"; })\r
                .bind("getData.foo",function(e,key){ return key + "foo"; });\r
 \r
-       ok( div.data("test") == "testroot", "Check for original data" );\r
-       ok( div.data("test.foo") == "testfoo", "Check for namespaced data" );\r
-       ok( div.data("test.bar") == "testroot", "Check for unmatched namespace" );\r
+       equals( div.data("test"), "testroot", "Check for original data" );\r
+       equals( div.data("test.foo"), "testfoo", "Check for namespaced data" );\r
+       equals( div.data("test.bar"), "testroot", "Check for unmatched namespace" );\r
 });\r
 \r
 test("$.removeData", function() {\r
@@ -1476,7 +1476,7 @@ test("$.removeData", function() {
        var div = $("#foo")[0];\r
        jQuery.data(div, "test", "testing");\r
        jQuery.removeData(div, "test");\r
-       ok( jQuery.data(div, "test") == undefined, "Check removal of data" );\r
+       equals( jQuery.data(div, "test"), undefined, "Check removal of data" );\r
 });\r
 \r
 test(".removeData()", function() {\r
@@ -1484,32 +1484,32 @@ test(".removeData()", function() {
        var div = $("#foo");\r
        div.data("test", "testing");\r
        div.removeData("test");\r
-       ok( div.data("test") == undefined, "Check removal of data" );\r
+       equals( div.data("test"), undefined, "Check removal of data" );\r
 \r
        div.data("test", "testing");\r
        div.data("test.foo", "testing2");\r
        div.removeData("test.bar");\r
-       ok( div.data("test.foo") == "testing2", "Make sure data is intact" );\r
-       ok( div.data("test") == "testing", "Make sure data is intact" );\r
+       equals( div.data("test.foo"), "testing2", "Make sure data is intact" );\r
+       equals( div.data("test"), "testing", "Make sure data is intact" );\r
 \r
        div.removeData("test");\r
-       ok( div.data("test.foo") == "testing2", "Make sure data is intact" );\r
-       ok( div.data("test") == undefined, "Make sure data is intact" );\r
+       equals( div.data("test.foo"), "testing2", "Make sure data is intact" );\r
+       equals( div.data("test"), undefined, "Make sure data is intact" );\r
 \r
        div.removeData("test.foo");\r
-       ok( div.data("test.foo") == undefined, "Make sure data is intact" );\r
+       equals( div.data("test.foo"), undefined, "Make sure data is intact" );\r
 });\r
 \r
 test("remove()", function() {\r
        expect(6);\r
        $("#ap").children().remove();\r
        ok( $("#ap").text().length > 10, "Check text is not removed" );\r
-       ok( $("#ap").children().length == 0, "Check remove" );\r
+       equals( $("#ap").children().length, 0, "Check remove" );\r
        \r
        reset();\r
        $("#ap").children().remove("a");\r
        ok( $("#ap").text().length > 10, "Check text is not removed" );\r
-       ok( $("#ap").children().length == 1, "Check filtered remove" );\r
+       equals( $("#ap").children().length, 1, "Check filtered remove" );\r
 \r
        // using contents will get comments regular, text, and comment nodes\r
        equals( $("#nonnodes").contents().length, 3, "Check node,textnode,comment remove works" );\r
@@ -1519,8 +1519,8 @@ test("remove()", function() {
 \r
 test("empty()", function() {\r
        expect(3);\r
-       ok( $("#ap").children().empty().text().length == 0, "Check text is removed" );\r
-       ok( $("#ap").children().length == 4, "Check elements are not removed" );\r
+       equals( $("#ap").children().empty().text().length, 0, "Check text is removed" );\r
+       equals( $("#ap").children().length, 4, "Check elements are not removed" );\r
 \r
        // using contents will get comments regular, text, and comment nodes\r
        var j = $("#nonnodes").contents();\r

diff --git a/test/unit/event.js b/test/unit/event.js
index 0a2914f3d1e3918ef0e6ed66befc282d0a756277..71ea774b60626791eab28f75d889cf0195d98896 100644 (file)
--- a/test/unit/event.js
+++ b/test/unit/event.js
@@ -4,7 +4,7 @@ test("bind(), with data", function() {
        expect(3);
        var handler = function(event) {
                ok( event.data, "bind() with data, check passed data exists" );
-               ok( event.data.foo == "bar", "bind() with data, Check value of passed data" );
+               equals( event.data.foo, "bar", "bind() with data, Check value of passed data" );
        };
        $("#firstp").bind("click", {foo: "bar"}, handler).click().unbind("click", handler);
 
@@ -15,9 +15,9 @@ test("bind(), with data, trigger with data", function() {
        expect(4);
        var handler = function(event, data) {
                ok( event.data, "check passed data exists" );
-               ok( event.data.foo == "bar", "Check value of passed data" );
+               equals( event.data.foo, "bar", "Check value of passed data" );
                ok( data, "Check trigger data" );
-               ok( data.bar == "foo", "Check value of trigger data" );
+               equals( data.bar, "foo", "Check value of trigger data" );
        };
        $("#firstp").bind("click", {foo: "bar"}, handler).trigger("click", [{bar: "foo"}]).unbind("click", handler);
 });
@@ -33,8 +33,8 @@ test("bind(), multiple events at once", function() {
                        mouseoverCounter += 1;
        };
        $("#firstp").bind("click mouseover", handler).trigger("click").trigger("mouseover");
-       ok( clickCounter == 1, "bind() with multiple events at once" );
-       ok( mouseoverCounter == 1, "bind() with multiple events at once" );
+       equals( clickCounter, 1, "bind() with multiple events at once" );
+       equals( mouseoverCounter, 1, "bind() with multiple events at once" );
 });
 
 test("bind(), no data", function() {
@@ -116,7 +116,7 @@ test("click()", function() {
        expect(5);
        $('<li><a href="#">Change location</a></li>').prependTo('#firstUL').find('a').bind('click', function() {
                var close = $('spanx', this); // same with $(this).find('span');
-               ok( close.length == 0, "Context element does not exist, length must be zero" );
+               equals( close.length, 0, "Context element does not exist, length must be zero" );
                ok( !close[0], "Context element does not exist, direct access to element must return undefined" );
                return false;
        }).click();
@@ -130,14 +130,14 @@ test("click()", function() {
                counter++;
        };
        $('#firstp').click();
-       ok( counter == 1, "Check that click, triggers onclick event handler also" );
+       equals( counter, 1, "Check that click, triggers onclick event handler also" );
        
        var clickCounter = 0;
        $('#simon1')[0].onclick = function(event) {
                clickCounter++;
        };
        $('#simon1').click();
-       ok( clickCounter == 1, "Check that click, triggers onclick event handler on an a tag also" );
+       equals( clickCounter, 1, "Check that click, triggers onclick event handler on an a tag also" );
 });
 
 test("unbind(event)", function() {
@@ -173,8 +173,8 @@ test("unbind(event)", function() {
                        mouseoverCounter += 1;
        };
        $("#firstp").bind("click mouseover", handler).unbind("click mouseover", handler).trigger("click").trigger("mouseover");
-       ok( clickCounter == 0, "unbind() with multiple events at once" );
-       ok( mouseoverCounter == 0, "unbind() with multiple events at once" );
+       equals( clickCounter, 0, "unbind() with multiple events at once" );
+       equals( mouseoverCounter, 0, "unbind() with multiple events at once" );
 });
 
 test("trigger(event, [data], [fn])", function() {
@@ -280,7 +280,7 @@ test("toggle(Function, Function, ...)", function() {
                preventDefault = function(e) { e.preventDefault() },
                link = $('#mark');
        link.click(preventDefault).click().toggle(fn1, fn2).click().click().click().click().click();
-       ok( count == 1, "Check for toggle(fn, fn)" );
+       equals( count, 1, "Check for toggle(fn, fn)" );
 
        $("#firstp").toggle(function () {
                equals(arguments.length, 4, "toggle correctly passes through additional triggered arguments, see #1701" )
@@ -290,9 +290,9 @@ test("toggle(Function, Function, ...)", function() {
        $("#simon1").one("click", function() {
                ok( true, "Execute event only once" );
                $(this).toggle(function() {
-                       ok( first++ == 0, "toggle(Function,Function) assigned from within one('xxx'), see #1054" );
+                       equals( first++, 0, "toggle(Function,Function) assigned from within one('xxx'), see #1054" );
                }, function() {
-                       ok( first == 1, "toggle(Function,Function) assigned from within one('xxx'), see #1054" );
+                       equals( first, 1, "toggle(Function,Function) assigned from within one('xxx'), see #1054" );
                });
                return false;
        }).click().click().click();
@@ -312,15 +312,15 @@ test("toggle(Function, Function, ...)", function() {
        
        var $div = $("<div>&nbsp;</div>").toggle( fns[0], fns[1], fns[2] );
        $div.click();
-       ok( turn == 1, "Trying toggle with 3 functions, attempt 1 yields 1");
+       equals( turn, 1, "Trying toggle with 3 functions, attempt 1 yields 1");
        $div.click();
-       ok( turn == 2, "Trying toggle with 3 functions, attempt 2 yields 2");
+       equals( turn, 2, "Trying toggle with 3 functions, attempt 2 yields 2");
        $div.click();
-       ok( turn == 3, "Trying toggle with 3 functions, attempt 3 yields 3");
+       equals( turn, 3, "Trying toggle with 3 functions, attempt 3 yields 3");
        $div.click();
-       ok( turn == 1, "Trying toggle with 3 functions, attempt 4 yields 1");
+       equals( turn, 1, "Trying toggle with 3 functions, attempt 4 yields 1");
        $div.click();
-       ok( turn == 2, "Trying toggle with 3 functions, attempt 5 yields 2");
+       equals( turn, 2, "Trying toggle with 3 functions, attempt 5 yields 2");
        
        $div.unbind('click',fns[0]);
        var data = $.data( $div[0], 'events' );

diff --git a/test/unit/fx.js b/test/unit/fx.js
index 1204e261cfe432d60839d4e5d8acbaf602384f7f..cb131ae7fae22e9f9eede0a4e19cb9f5b541ae55 100644 (file)
--- a/test/unit/fx.js
+++ b/test/unit/fx.js
@@ -6,7 +6,7 @@ test("animate(Hash, Object, Function)", function() {
        var hash = {opacity: 'show'};
        var hashCopy = $.extend({}, hash);
        $('#foo').animate(hash, 0, function() {
-               ok( hash.opacity == hashCopy.opacity, 'Check if animate changed the hash parameter' );
+               equals( hash.opacity, hashCopy.opacity, 'Check if animate changed the hash parameter' );
                start();
        });
 });
@@ -236,8 +236,8 @@ var to = {
 function checkOverflowDisplay(){
        var o = jQuery.css( this, "overflow" );
 
-       ok(o == "visible", "Overflow should be visible: " + o);
-       ok(jQuery.css( this, "display" ) == "inline", "Display shouldn't be tampered with.");
+       equals(o, "visible", "Overflow should be visible: " + o);
+       equals(jQuery.css( this, "display" ), "inline", "Display shouldn't be tampered with.");
 
        start();
 }
@@ -298,31 +298,31 @@ jQuery.each( from, function(fn, f){
        
                        elem.animate(anim, 50, function(){
                                if ( t_w == "show" )
-                                       ok( this.style.display == "block", "Showing, display should block: " + this.style.display);
+                                       equals( this.style.display, "block", "Showing, display should block: " + this.style.display);
                                        
                                if ( t_w == "hide"||t_w == "show" )
-                                       ok(this.style.width.indexOf(f_w) == 0, "Width must be reset to " + f_w + ": " + this.style.width);
+                                       equals(this.style.width.indexOf(f_w), 0, "Width must be reset to " + f_w + ": " + this.style.width);
                                        
                                if ( t_h == "hide"||t_h == "show" )
-                                       ok(this.style.height.indexOf(f_h) == 0, "Height must be reset to " + f_h + ": " + this.style.height);
+                                       equals(this.style.height.indexOf(f_h), 0, "Height must be reset to " + f_h + ": " + this.style.height);
                                        
                                var cur_o = jQuery.attr(this.style, "opacity");
                                if ( cur_o !== "" ) cur_o = parseFloat( cur_o );
        
                                if ( t_o == "hide"||t_o == "show" )
-                                       ok(cur_o == f_o, "Opacity must be reset to " + f_o + ": " + cur_o);
+                                       equals(cur_o, f_o, "Opacity must be reset to " + f_o + ": " + cur_o);
                                        
                                if ( t_w == "hide" )
-                                       ok(this.style.display == "none", "Hiding, display should be none: " + this.style.display);
+                                       equals(this.style.display, "none", "Hiding, display should be none: " + this.style.display);
                                        
                                if ( t_o.constructor == Number ) {
-                                       ok(cur_o == t_o, "Final opacity should be " + t_o + ": " + cur_o);
+                                       equals(cur_o, t_o, "Final opacity should be " + t_o + ": " + cur_o);
                                        
                                        ok(jQuery.curCSS(this, "opacity") != "" || cur_o == t_o, "Opacity should be explicitly set to " + t_o + ", is instead: " + cur_o);
                                }
                                        
                                if ( t_w.constructor == Number ) {
-                                       ok(this.style.width == t_w + "px", "Final width should be " + t_w + ": " + this.style.width);
+                                       equals(this.style.width, t_w + "px", "Final width should be " + t_w + ": " + this.style.width);
                                        
                                        var cur_w = jQuery.css(this,"width");
 
@@ -330,7 +330,7 @@ jQuery.each( from, function(fn, f){
                                }
                                        
                                if ( t_h.constructor == Number ) {
-                                       ok(this.style.height == t_h + "px", "Final height should be " + t_h + ": " + this.style.height);
+                                       equals(this.style.height, t_h + "px", "Final height should be " + t_h + ": " + this.style.height);
                                        
                                        var cur_h = jQuery.css(this,"height");
 
@@ -367,7 +367,7 @@ function checkState(){
        var self = this;
        jQuery.each(this.save, function(c,v){
                var cur = jQuery.css(self,c);
-               ok( v == cur, "Make sure that " + c + " is reset (Old: " + v + " Cur: " + cur + ")");
+               equals( v, cur, "Make sure that " + c + " is reset (Old: " + v + " Cur: " + cur + ")");
        });
        start();
 }

diff --git a/test/unit/selector.js b/test/unit/selector.js
index 9f3fb6f2c0f6598e6abf8c7b6ff57d16bf489c02..07c4434d093717c6abc1f1373bd86b5eaab9b69d 100644 (file)
--- a/test/unit/selector.js
+++ b/test/unit/selector.js
@@ -12,7 +12,7 @@ test("element", function() {
        t( "Element Selector", "body", ["body"] );
        t( "Element Selector", "html", ["html"] );
        t( "Parent Element", "div p", ["firstp","ap","sndp","en","sap","first"] );
-       ok( $("param", "#object1").length == 2, "Object/param as context" );
+       equals( $("param", "#object1").length, 2, "Object/param as context" );
        
        ok( $("#length").length, '<input name="length"> cannot be found under IE, see #945' );
        ok( $("#lengthtest input").length, '<input name="length"> cannot be found under IE, see #945' );
@@ -23,7 +23,7 @@ if ( location.protocol != "file:" ) {
                expect(1);
                stop();
                $.get("data/with_fries.xml", function(xml) {
-                       ok( $("foo_bar", xml).length == 1, "Element Selector with underscore" );
+                       equals( $("foo_bar", xml).length, 1, "Element Selector with underscore" );
                        start();
                });
        });
@@ -67,8 +67,8 @@ test("id", function() {
        t( "All Children of ID with no children", "#firstUL/*", [] );
        
        $('<a name="tName1">tName1 A</a><a name="tName2">tName2 A</a><div id="tName1">tName1 Div</div>').appendTo('#main');
-       ok( $("#tName1")[0].id == 'tName1', "ID selector with same value for a name attribute" );
-       ok( $("#tName2").length == 0, "ID selector non-existing but name attribute on an A tag" );
+       equals( $("#tName1")[0].id, 'tName1', "ID selector with same value for a name attribute" );
+       equals( $("#tName2").length, 0, "ID selector non-existing but name attribute on an A tag" );
        t( "ID Selector on Form with an input that has a name of 'id'", "#lengthtest", ["lengthtest"] );
        
        t( "ID selector with non-existant ancestor", "#asdfasdf #foobar", [] ); // bug #986