From: John Resig Date: Tue, 29 Sep 2009 19:49:43 +0000 (+0000) Subject: Switched from using QUnit's isObj/isSet to the more robust same method. X-Git-Url: http://git.asbjorn.biz/?p=jquery.git;a=commitdiff_plain;h=4bda398e6aa63082c41bb0d06fcc184acd7f76c5 Switched from using QUnit's isObj/isSet to the more robust same method. --- diff --git a/test/unit/core.js b/test/unit/core.js index 3a3b42f..e67bc52 100644 --- a/test/unit/core.js +++ b/test/unit/core.js @@ -29,7 +29,7 @@ test("jQuery()", function() { var main = jQuery("#main"); - isSet( jQuery("div p", main).get(), q("sndp", "en", "sap"), "Basic selector with jQuery object as context" ); + same( jQuery("div p", main).get(), q("sndp", "en", "sap"), "Basic selector with jQuery object as context" ); /* // disabled since this test was doing nothing. i tried to fix it but i'm not sure @@ -376,12 +376,12 @@ test("size()", function() { test("get()", function() { expect(1); - isSet( jQuery("p").get(), q("firstp","ap","sndp","en","sap","first"), "Get All Elements" ); + same( jQuery("p").get(), q("firstp","ap","sndp","en","sap","first"), "Get All Elements" ); }); test("toArray()", function() { expect(1); - isSet ( jQuery("p").toArray(), + same( jQuery("p").toArray(), q("firstp","ap","sndp","en","sap","first"), "Convert jQuery object to an Array" ) }) @@ -400,8 +400,8 @@ test("get(-Number)",function() { test("add(String|Element|Array|undefined)", function() { expect(16); - isSet( jQuery("#sndp").add("#en").add("#sap").get(), q("sndp", "en", "sap"), "Check elements from document" ); - isSet( jQuery("#sndp").add( jQuery("#en")[0] ).add( jQuery("#sap") ).get(), q("sndp", "en", "sap"), "Check elements from document" ); + same( jQuery("#sndp").add("#en").add("#sap").get(), q("sndp", "en", "sap"), "Check elements from document" ); + same( jQuery("#sndp").add( jQuery("#en")[0] ).add( jQuery("#sap") ).get(), q("sndp", "en", "sap"), "Check elements from document" ); ok( jQuery([]).add(jQuery("#form")[0].elements).length >= 13, "Check elements from array" ); // For the time being, we're discontinuing support for jQuery(form.elements) since it's ambiguous in IE @@ -515,33 +515,33 @@ test("jQuery.extend(Object, Object)", function() { deepmerged = { foo: { bar: true, baz: true }, foo2: document }; jQuery.extend(settings, options); - isObj( settings, merged, "Check if extended: settings must be extended" ); - isObj( options, optionsCopy, "Check if not modified: options must not be modified" ); + same( settings, merged, "Check if extended: settings must be extended" ); + same( options, optionsCopy, "Check if not modified: options must not be modified" ); jQuery.extend(settings, null, options); - isObj( settings, merged, "Check if extended: settings must be extended" ); - isObj( options, optionsCopy, "Check if not modified: options must not be modified" ); + same( settings, merged, "Check if extended: settings must be extended" ); + same( options, optionsCopy, "Check if not modified: options must not be modified" ); jQuery.extend(true, deep1, deep2); - isObj( deep1.foo, deepmerged.foo, "Check if foo: settings must be extended" ); - isObj( deep2.foo, deep2copy.foo, "Check if not deep2: options must not be modified" ); + same( deep1.foo, deepmerged.foo, "Check if foo: settings must be extended" ); + same( deep2.foo, deep2copy.foo, "Check if not deep2: options must not be modified" ); equals( deep1.foo2, document, "Make sure that a deep clone was not attempted on the document" ); var empty = {}; var optionsWithLength = { foo: { length: -1 } }; jQuery.extend(true, empty, optionsWithLength); - isObj( empty.foo, optionsWithLength.foo, "The length property must copy correctly" ); + same( empty.foo, optionsWithLength.foo, "The length property must copy correctly" ); empty = {}; var optionsWithDate = { foo: { date: new Date } }; jQuery.extend(true, empty, optionsWithDate); - isObj( empty.foo, optionsWithDate.foo, "Dates copy correctly" ); + same( empty.foo, optionsWithDate.foo, "Dates copy correctly" ); var myKlass = function() {}; empty = {}; var optionsWithCustomObject = { foo: { date: new myKlass } }; jQuery.extend(true, empty, optionsWithCustomObject); - isObj( empty.foo, optionsWithCustomObject.foo, "Custom objects copy correctly" ); + same( empty.foo, optionsWithCustomObject.foo, "Custom objects copy correctly" ); var nullUndef; nullUndef = jQuery.extend({}, options, { xnumber2: null }); @@ -556,7 +556,7 @@ test("jQuery.extend(Object, Object)", function() { var target = {}; var recursive = { foo:target, bar:5 }; jQuery.extend(true, target, recursive); - isObj( target, { bar:5 }, "Check to make sure a recursive obj doesn't go never-ending loop by not copying it over" ); + same( target, { bar:5 }, "Check to make sure a recursive obj doesn't go never-ending loop by not copying it over" ); var ret = jQuery.extend(true, { foo: [] }, { foo: [0] } ); // 1907 equals( ret.foo.length, 1, "Check to make sure a value with coersion 'false' copies over when necessary to fix #1907" ); @@ -584,10 +584,10 @@ test("jQuery.extend(Object, Object)", function() { merged2 = { xnumber1: 5, xnumber2: 1, xstring1: "peter", xstring2: "xx", xxx: "newstringx" }; var settings = jQuery.extend({}, defaults, options1, options2); - isObj( settings, merged2, "Check if extended: settings must be extended" ); - isObj( defaults, defaultsCopy, "Check if not modified: options1 must not be modified" ); - isObj( options1, options1Copy, "Check if not modified: options1 must not be modified" ); - isObj( options2, options2Copy, "Check if not modified: options2 must not be modified" ); + same( settings, merged2, "Check if extended: settings must be extended" ); + same( defaults, defaultsCopy, "Check if not modified: options1 must not be modified" ); + same( options1, options1Copy, "Check if not modified: options1 must not be modified" ); + same( options2, options2Copy, "Check if not modified: options2 must not be modified" ); }); test("jQuery.each(Object,Function)", function() { diff --git a/test/unit/data.js b/test/unit/data.js index 8401fce..d21ec32 100644 --- a/test/unit/data.js +++ b/test/unit/data.js @@ -50,7 +50,7 @@ test(".data()", function() { var div = jQuery("#foo"); div.data("test", "success"); - isObj( div.data(), {test: "success"}, "data() get the entire data object" ) + same( div.data(), {test: "success"}, "data() get the entire data object" ) }) test(".data(String) and .data(String, Object)", function() { diff --git a/test/unit/fx.js b/test/unit/fx.js index 6b81322..c47fe55 100644 --- a/test/unit/fx.js +++ b/test/unit/fx.js @@ -57,7 +57,7 @@ test("animate option (queue === false)", function () { $foo.animate({width:'100px'}, 3000, function () { // should finish after unqueued animation so second order.push(2); - isSet( order, [ 1, 2 ], "Animations finished in the correct order" ); + same( order, [ 1, 2 ], "Animations finished in the correct order" ); start(); }); $foo.animate({fontSize:'2em'}, {queue:false, duration:10, complete:function () { diff --git a/test/unit/manipulation.js b/test/unit/manipulation.js index b9cb35d..0098416 100644 --- a/test/unit/manipulation.js +++ b/test/unit/manipulation.js @@ -602,7 +602,7 @@ test("val()", function() { equals( jQuery('#select2').val(), '3', 'Call val() on a single="single" select' ); - isSet( jQuery('#select3').val(), ['1', '2'], 'Call val() on a multiple="multiple" select' ); + same( jQuery('#select3').val(), ['1', '2'], 'Call val() on a multiple="multiple" select' ); equals( jQuery('#option3c').val(), '2', 'Call val() on a option element with value' ); diff --git a/test/unit/selector.js b/test/unit/selector.js index 22be51a..e7b42f2 100644 --- a/test/unit/selector.js +++ b/test/unit/selector.js @@ -16,17 +16,17 @@ test("element", function() { t( "Parent Element", "div p", ["firstp","ap","sndp","en","sap","first"] ); equals( jQuery("param", "#object1").length, 2, "Object/param as context" ); - isSet( jQuery("p", document.getElementsByTagName("div")), q("firstp","ap","sndp","en","sap","first"), "Finding elements with a context." ); - isSet( jQuery("p", "div"), q("firstp","ap","sndp","en","sap","first"), "Finding elements with a context." ); - isSet( jQuery("p", jQuery("div")), q("firstp","ap","sndp","en","sap","first"), "Finding elements with a context." ); - isSet( jQuery("div").find("p"), q("firstp","ap","sndp","en","sap","first"), "Finding elements with a context." ); + same( jQuery("p", document.getElementsByTagName("div")).get(), q("firstp","ap","sndp","en","sap","first"), "Finding elements with a context." ); + same( jQuery("p", "div").get(), q("firstp","ap","sndp","en","sap","first"), "Finding elements with a context." ); + same( jQuery("p", jQuery("div")).get(), q("firstp","ap","sndp","en","sap","first"), "Finding elements with a context." ); + same( jQuery("div").find("p").get(), q("firstp","ap","sndp","en","sap","first"), "Finding elements with a context." ); ok( jQuery("#length").length, '<input name="length"> cannot be found under IE, see #945' ); ok( jQuery("#lengthtest input").length, '<input name="length"> cannot be found under IE, see #945' ); // Check for unique-ness and sort order - isSet( jQuery("*"), jQuery("*, *"), "Check for duplicates: *, *" ); - isSet( jQuery("p"), jQuery("p, div p"), "Check for duplicates: p, div p" ); + same( jQuery("*").get(), jQuery("*, *").get(), "Check for duplicates: *, *" ); + same( jQuery("p").get(), jQuery("p, div p").get(), "Check for duplicates: p, div p" ); t( "Checking sort order", "h2, h1", ["header", "banner", "userAgent"] ); t( "Checking sort order", "h2:first, h1:first", ["header", "banner"] ); @@ -103,7 +103,7 @@ test("id", function() { t( "ID selector with non-existant ancestor", "#asdfasdf #foobar", [] ); // bug #986 - isSet( jQuery("body").find("div#form"), [], "ID selector within the context of another element" ); + same( jQuery("body").find("div#form").get(), [], "ID selector within the context of another element" ); t( "Underscore ID", "#types_all", ["types_all"] ); t( "Dash ID", "#fx-queue", ["fx-queue"] ); @@ -119,10 +119,10 @@ test("class", function() { t( "Class Selector w/ Element", "a.blog", ["mark","simon"] ); t( "Parent Class Selector", "p .blog", ["mark","simon"] ); - isSet( jQuery(".blog", document.getElementsByTagName("p")), q("mark", "simon"), "Finding elements with a context." ); - isSet( jQuery(".blog", "p"), q("mark", "simon"), "Finding elements with a context." ); - isSet( jQuery(".blog", jQuery("p")), q("mark", "simon"), "Finding elements with a context." ); - isSet( jQuery("p").find(".blog"), q("mark", "simon"), "Finding elements with a context." ); + same( jQuery(".blog", document.getElementsByTagName("p")).get(), q("mark", "simon"), "Finding elements with a context." ); + same( jQuery(".blog", "p").get(), q("mark", "simon"), "Finding elements with a context." ); + same( jQuery(".blog", jQuery("p")).get(), q("mark", "simon"), "Finding elements with a context." ); + same( jQuery("p").find(".blog").get(), q("mark", "simon"), "Finding elements with a context." ); t( "Class selector using UTF8", ".台北Táiběi", ["utf8class1"] ); //t( "Class selector using UTF8", ".台北", ["utf8class1","utf8class2"] ); @@ -140,11 +140,11 @@ test("class", function() { var div = document.createElement("div"); div.innerHTML = "
"; - isSet( jQuery(".e", div), [ div.firstChild ], "Finding a second class." ); + same( jQuery(".e", div).get(), [ div.firstChild ], "Finding a second class." ); div.lastChild.className = "e"; - isSet( jQuery(".e", div), [ div.firstChild, div.lastChild ], "Finding a modified class." ); + same( jQuery(".e", div).get(), [ div.firstChild, div.lastChild ], "Finding a modified class." ); }); test("name", function() { @@ -160,8 +160,8 @@ test("name", function() { t( "Name selector for grouped input", "input[name='types[]']", ["types_all", "types_anime", "types_movie"] ) - isSet( jQuery("#form").find("input[name=action]"), q("text1"), "Name selector within the context of another element" ); - isSet( jQuery("#form").find("input[name='foo[bar]']"), q("hidden2"), "Name selector for grouped form element within the context of another element" ); + same( jQuery("#form").find("input[name=action]").get(), q("text1"), "Name selector within the context of another element" ); + same( jQuery("#form").find("input[name='foo[bar]']").get(), q("hidden2"), "Name selector for grouped form element within the context of another element" ); var a = jQuery('tName1 AtName2 A
tName1 Div
').appendTo('#main'); @@ -205,9 +205,9 @@ test("child and adjacent", function() { t( "No element deep selector", "div.foo > span > a", [] ); t( "No element not selector", ".container div:not(.excluded) div", [] ); - isSet( jQuery("> :first", document.getElementById("nothiddendiv")), q("nothiddendivchild"), "Verify child context positional selctor" ); - isSet( jQuery("> :eq(0)", document.getElementById("nothiddendiv")), q("nothiddendivchild"), "Verify child context positional selctor" ); - isSet( jQuery("> *:first", document.getElementById("nothiddendiv")), q("nothiddendivchild"), "Verify child context positional selctor" ); + same( jQuery("> :first", document.getElementById("nothiddendiv")).get(), q("nothiddendivchild"), "Verify child context positional selctor" ); + same( jQuery("> :eq(0)", document.getElementById("nothiddendiv")).get(), q("nothiddendivchild"), "Verify child context positional selctor" ); + same( jQuery("> *:first", document.getElementById("nothiddendiv")).get(), q("nothiddendivchild"), "Verify child context positional selctor" ); t( "Non-existant ancestors", ".fototab > .thumbnails > a", [] ); diff --git a/test/unit/traversing.js b/test/unit/traversing.js index 2793f2f..780d30f 100644 --- a/test/unit/traversing.js +++ b/test/unit/traversing.js @@ -53,9 +53,9 @@ test("is(String)", function() { test("filter(Selector)", function() { expect(5); - isSet( jQuery("#form input").filter(":checked").get(), q("radio2", "check1"), "filter(String)" ); - isSet( jQuery("p").filter("#ap, #sndp").get(), q("ap", "sndp"), "filter('String, String')" ); - isSet( jQuery("p").filter("#ap,#sndp").get(), q("ap", "sndp"), "filter('String,String')" ); + same( jQuery("#form input").filter(":checked").get(), q("radio2", "check1"), "filter(String)" ); + same( jQuery("p").filter("#ap, #sndp").get(), q("ap", "sndp"), "filter('String, String')" ); + same( jQuery("p").filter("#ap,#sndp").get(), q("ap", "sndp"), "filter('String,String')" ); // using contents will get comments regular, text, and comment nodes var j = jQuery("#nonnodes").contents(); @@ -66,68 +66,68 @@ test("filter(Selector)", function() { test("filter(Function)", function() { expect(1); - isSet( jQuery("p").filter(function() { return !jQuery("a", this).length }).get(), q("sndp", "first"), "filter(Function)" ); + same( jQuery("p").filter(function() { return !jQuery("a", this).length }).get(), q("sndp", "first"), "filter(Function)" ); }); test("filter(Element)", function() { expect(1); var element = document.getElementById("text1"); - isSet( jQuery("#form input").filter(element).get(), q("text1"), "filter(Element)" ); + same( jQuery("#form input").filter(element).get(), q("text1"), "filter(Element)" ); }); test("filter(Array)", function() { expect(1); var elements = [ document.getElementById("text1") ]; - isSet( jQuery("#form input").filter(elements).get(), q("text1"), "filter(Element)" ); + same( jQuery("#form input").filter(elements).get(), q("text1"), "filter(Element)" ); }); test("filter(jQuery)", function() { expect(1); var elements = jQuery("#text1"); - isSet( jQuery("#form input").filter(elements).get(), q("text1"), "filter(Element)" ); + same( jQuery("#form input").filter(elements).get(), q("text1"), "filter(Element)" ); }) test("closest()", function() { expect(9); - isSet( jQuery("body").closest("body").get(), q("body"), "closest(body)" ); - isSet( jQuery("body").closest("html").get(), q("html"), "closest(html)" ); - isSet( jQuery("body").closest("div").get(), [], "closest(div)" ); - isSet( jQuery("#main").closest("span,#html").get(), q("html"), "closest(span,#html)" ); + same( jQuery("body").closest("body").get(), q("body"), "closest(body)" ); + same( jQuery("body").closest("html").get(), q("html"), "closest(html)" ); + same( jQuery("body").closest("div").get(), [], "closest(div)" ); + same( jQuery("#main").closest("span,#html").get(), q("html"), "closest(span,#html)" ); - isSet( jQuery("div:eq(1)").closest("div:first").get(), [], "closest(div:first)" ); - isSet( jQuery("div").closest("body:first div:last").get(), q("fx-tests"), "closest(body:first div:last)" ); + same( jQuery("div:eq(1)").closest("div:first").get(), [], "closest(div:first)" ); + same( jQuery("div").closest("body:first div:last").get(), q("fx-tests"), "closest(body:first div:last)" ); // Test .closest() limited by the context var jq = jQuery("#nothiddendivchild"); - isSet( jq.closest("html", document.body).get(), [], "Context limited." ); - isSet( jq.closest("body", document.body).get(), [], "Context limited." ); - isSet( jq.closest("#nothiddendiv", document.body).get(), q("nothiddendiv"), "Context not reached." ); + same( jq.closest("html", document.body).get(), [], "Context limited." ); + same( jq.closest("body", document.body).get(), [], "Context limited." ); + same( jq.closest("#nothiddendiv", document.body).get(), q("nothiddendiv"), "Context not reached." ); }); test("not(Selector)", function() { expect(7); equals( jQuery("#main > p#ap > a").not("#google").length, 2, "not('selector')" ); - isSet( jQuery("p").not(".result").get(), q("firstp", "ap", "sndp", "en", "sap", "first"), "not('.class')" ); - isSet( jQuery("p").not("#ap, #sndp, .result").get(), q("firstp", "en", "sap", "first"), "not('selector, selector')" ); - isSet( jQuery("#form option").not("option.emptyopt:contains('Nothing'),[selected],[value='1']").get(), q("option1c", "option1d", "option2c", "option3d", "option3e" ), "not('complex selector')"); + same( jQuery("p").not(".result").get(), q("firstp", "ap", "sndp", "en", "sap", "first"), "not('.class')" ); + same( jQuery("p").not("#ap, #sndp, .result").get(), q("firstp", "en", "sap", "first"), "not('selector, selector')" ); + same( jQuery("#form option").not("option.emptyopt:contains('Nothing'),[selected],[value='1']").get(), q("option1c", "option1d", "option2c", "option3d", "option3e" ), "not('complex selector')"); - isSet( jQuery('#ap *').not('code'), q("google", "groups", "anchor1", "mark"), "not('tag selector')" ); - isSet( jQuery('#ap *').not('code, #mark'), q("google", "groups", "anchor1"), "not('tag, ID selector')" ); - isSet( jQuery('#ap *').not('#mark, code'), q("google", "groups", "anchor1"), "not('ID, tag selector')"); + same( jQuery('#ap *').not('code').get(), q("google", "groups", "anchor1", "mark"), "not('tag selector')" ); + same( jQuery('#ap *').not('code, #mark').get(), q("google", "groups", "anchor1"), "not('tag, ID selector')" ); + same( jQuery('#ap *').not('#mark, code').get(), q("google", "groups", "anchor1"), "not('ID, tag selector')"); }); test("not(Element)", function() { expect(1); var selects = jQuery("#form select"); - isSet( selects.not( selects[1] ), q("select1", "select3"), "filter out DOM element"); + same( selects.not( selects[1] ).get(), q("select1", "select3"), "filter out DOM element"); }); test("not(Function)", function() { - isSet( jQuery("p").not(function() { return jQuery("a", this).length }).get(), q("sndp", "first"), "not(Function)" ); + same( jQuery("p").not(function() { return jQuery("a", this).length }).get(), q("sndp", "first"), "not(Function)" ); }); test("not(Array)", function() { @@ -140,32 +140,32 @@ test("not(Array)", function() { test("not(jQuery)", function() { expect(1); - isSet( jQuery("p").not(jQuery("#ap, #sndp, .result")).get(), q("firstp", "en", "sap", "first"), "not(jQuery)" ); + same( jQuery("p").not(jQuery("#ap, #sndp, .result")).get(), q("firstp", "en", "sap", "first"), "not(jQuery)" ); }) test("andSelf()", function() { expect(4); - isSet( jQuery("#en").siblings().andSelf().get(), q("sndp", "en", "sap"), "Check for siblings and self" ); - isSet( jQuery("#foo").children().andSelf().get(), q("foo", "sndp", "en", "sap"), "Check for children and self" ); - isSet( jQuery("#sndp, #en").parent().andSelf().get(), q("foo","sndp","en"), "Check for parent and self" ); - isSet( jQuery("#groups").parents("p, div").andSelf().get(), q("main", "ap", "groups"), "Check for parents and self" ); + same( jQuery("#en").siblings().andSelf().get(), q("sndp", "en", "sap"), "Check for siblings and self" ); + same( jQuery("#foo").children().andSelf().get(), q("foo", "sndp", "en", "sap"), "Check for children and self" ); + same( jQuery("#sndp, #en").parent().andSelf().get(), q("foo","sndp","en"), "Check for parent and self" ); + same( jQuery("#groups").parents("p, div").andSelf().get(), q("main", "ap", "groups"), "Check for parents and self" ); }); test("siblings([String])", function() { expect(5); - isSet( jQuery("#en").siblings().get(), q("sndp", "sap"), "Check for siblings" ); - isSet( jQuery("#sndp").siblings(":has(code)").get(), q("sap"), "Check for filtered siblings (has code child element)" ); - isSet( jQuery("#sndp").siblings(":has(a)").get(), q("en", "sap"), "Check for filtered siblings (has anchor child element)" ); - isSet( jQuery("#foo").siblings("form, b").get(), q("form", "floatTest", "lengthtest", "name-tests", "testForm"), "Check for multiple filters" ); + same( jQuery("#en").siblings().get(), q("sndp", "sap"), "Check for siblings" ); + same( jQuery("#sndp").siblings(":has(code)").get(), q("sap"), "Check for filtered siblings (has code child element)" ); + same( jQuery("#sndp").siblings(":has(a)").get(), q("en", "sap"), "Check for filtered siblings (has anchor child element)" ); + same( jQuery("#foo").siblings("form, b").get(), q("form", "floatTest", "lengthtest", "name-tests", "testForm"), "Check for multiple filters" ); var set = q("sndp", "en", "sap"); - isSet( jQuery("#en, #sndp").siblings().get(), set, "Check for unique results from siblings" ); + same( jQuery("#en, #sndp").siblings().get(), set, "Check for unique results from siblings" ); }); test("children([String])", function() { expect(3); - isSet( jQuery("#foo").children().get(), q("sndp", "en", "sap"), "Check for children" ); - isSet( jQuery("#foo").children(":has(code)").get(), q("sndp", "sap"), "Check for filtered children" ); - isSet( jQuery("#foo").children("#en, #sap").get(), q("en", "sap"), "Check for multiple filters" ); + same( jQuery("#foo").children().get(), q("sndp", "en", "sap"), "Check for children" ); + same( jQuery("#foo").children(":has(code)").get(), q("sndp", "sap"), "Check for filtered children" ); + same( jQuery("#foo").children("#en, #sap").get(), q("en", "sap"), "Check for multiple filters" ); }); test("parent([String])", function() { @@ -174,7 +174,7 @@ test("parent([String])", function() { equals( jQuery("#groups").parent("p")[0].id, "ap", "Filtered parent check" ); equals( jQuery("#groups").parent("div").length, 0, "Filtered parent check, no match" ); equals( jQuery("#groups").parent("div, p")[0].id, "ap", "Check for multiple filters" ); - isSet( jQuery("#en, #sndp").parent().get(), q("foo"), "Check for unique results from parent" ); + same( jQuery("#en, #sndp").parent().get(), q("foo"), "Check for unique results from parent" ); }); test("parents([String])", function() { @@ -182,8 +182,8 @@ test("parents([String])", function() { equals( jQuery("#groups").parents()[0].id, "ap", "Simple parents check" ); equals( jQuery("#groups").parents("p")[0].id, "ap", "Filtered parents check" ); equals( jQuery("#groups").parents("div")[0].id, "main", "Filtered parents check2" ); - isSet( jQuery("#groups").parents("p, div").get(), q("main", "ap"), "Check for multiple filters" ); - isSet( jQuery("#en, #sndp").parents().get(), q("foo", "main", "dl", "body", "html"), "Check for unique results from parents" ); + same( jQuery("#groups").parents("p, div").get(), q("main", "ap"), "Check for multiple filters" ); + same( jQuery("#en, #sndp").parents().get(), q("foo", "main", "dl", "body", "html"), "Check for unique results from parents" ); }); test("next([String])", function() { @@ -207,14 +207,14 @@ test("slice()", function() { var $links = jQuery("#ap a"); - isSet( $links.slice(1,2), q("groups"), "slice(1,2)" ); - isSet( $links.slice(1), q("groups", "anchor1", "mark"), "slice(1)" ); - isSet( $links.slice(0,3), q("google", "groups", "anchor1"), "slice(0,3)" ); - isSet( $links.slice(-1), q("mark"), "slice(-1)" ); + same( $links.slice(1,2).get(), q("groups"), "slice(1,2)" ); + same( $links.slice(1).get(), q("groups", "anchor1", "mark"), "slice(1)" ); + same( $links.slice(0,3).get(), q("google", "groups", "anchor1"), "slice(0,3)" ); + same( $links.slice(-1).get(), q("mark"), "slice(-1)" ); - isSet( $links.eq(1), q("groups"), "eq(1)" ); - isSet( $links.eq('2'), q("anchor1"), "eq('2')" ); - isSet( $links.eq(-1), q("mark"), "eq(-1)" ); + same( $links.eq(1).get(), q("groups"), "eq(1)" ); + same( $links.eq('2').get(), q("anchor1"), "eq('2')" ); + same( $links.eq(-1).get(), q("mark"), "eq(-1)" ); }); test("first()/last()", function() { @@ -222,28 +222,28 @@ test("first()/last()", function() { var $links = jQuery("#ap a"), $none = jQuery("asdf"); - isSet( $links.first(), q("google"), "first()" ); - isSet( $links.last(), q("mark"), "last()" ); + same( $links.first().get(), q("google"), "first()" ); + same( $links.last().get(), q("mark"), "last()" ); - isSet( $none.first(), [], "first() none" ); - isSet( $none.last(), [], "last() none" ); + same( $none.first().get(), [], "first() none" ); + same( $none.last().get(), [], "last() none" ); }); test("map()", function() { expect(2);//expect(6); - isSet( + same( jQuery("#ap").map(function(){ return jQuery(this).find("a").get(); - }), + }).get(), q("google", "groups", "anchor1", "mark"), "Array Map" ); - isSet( + same( jQuery("#ap > a").map(function(){ return this.parentNode; - }), + }).get(), q("ap","ap","ap"), "Single Map" );