test runner: the changes are:

[jquery.git] / test / unit / selector.js

diff --git a/test/unit/selector.js b/test/unit/selector.js
index 2c80d79..c8a6e93 100644 (file)
--- a/test/unit/selector.js
+++ b/test/unit/selector.js
@@ -2,8 +2,8 @@ module("selector");
 
 test("element", function() {
        expect(9);
-       ok( $("*").size() >= 30, "Select all" );
-       var all = $("*"), good = true;
+       ok( jQuery("*").size() >= 30, "Select all" );
+       var all = jQuery("*"), good = true;
        for ( var i = 0; i < all.length; i++ )
                if ( all[i].nodeType == 8 )
                        good = false;
@@ -12,18 +12,18 @@ 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( jQuery("param", "#object1").length, 2, "Object/param as context" );
        
-       ok( $("#length").length, '&lt;input name="length"&gt; cannot be found under IE, see #945' );
-       ok( $("#lengthtest input").length, '&lt;input name="length"&gt; cannot be found under IE, see #945' );
+       ok( jQuery("#length").length, '&lt;input name="length"&gt; cannot be found under IE, see #945' );
+       ok( jQuery("#lengthtest input").length, '&lt;input name="length"&gt; cannot be found under IE, see #945' );
 });
 
 if ( location.protocol != "file:" ) {
        test("Element Selector with underscore", function() {
                expect(1);
                stop();
-               $.get("data/with_fries.xml", function(xml) {
-                       ok( $("foo_bar", xml).length == 1, "Element Selector with underscore" );
+               jQuery.get("data/with_fries.xml", function(xml) {
+                       equals( jQuery("foo_bar", xml).length, 1, "Element Selector with underscore" );
                        start();
                });
        });
@@ -59,21 +59,21 @@ test("id", function() {
        t( "Child escaped ID", "form > #foo\\:bar", ["foo:bar"] );
        t( "Child escaped ID", "form > #test\\.foo\\[5\\]bar", ["test.foo[5]bar"] );
        
-       t( "ID Selector, child ID present", "#form > #radio1", ["radio1"] );  // bug #267
-       t( "ID Selector, not an ancestor ID", "#form  #first", [] );
+       t( "ID Selector, child ID present", "#form > #radio1", ["radio1"] ); // bug #267
+       t( "ID Selector, not an ancestor ID", "#form #first", [] );
        t( "ID Selector, not a child ID", "#form > #option1a", [] );
        
        t( "All Children of ID", "#foo > *", ["sndp", "en", "sap"] );
        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" );
+       jQuery('<a name="tName1">tName1 A</a><a name="tName2">tName2 A</a><div id="tName1">tName1 Div</div>').appendTo('#main');
+       equals( jQuery("#tName1")[0].id, 'tName1', "ID selector with same value for a name attribute" );
+       equals( jQuery("#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
 
-       isSet( $("body").find("div#form"), [], "ID selector within the context of another element" );
+       isSet( jQuery("body").find("div#form"), [], "ID selector within the context of another element" );
 });
 
 test("class", function() {
@@ -182,7 +182,7 @@ test("attributes", function() {
 });
 
 test("pseudo (:) selectors", function() {
-       expect(32);
+       expect(35);
        t( "First Child", "p:first-child", ["firstp","sndp"] );
        t( "Last Child", "p:last-child", ["sap"] );
        t( "Only Child", "a:only-child", ["simon1","anchor1","yahoo","anchor2"] );
@@ -193,8 +193,11 @@ test("pseudo (:) selectors", function() {
        t( "Selected Option Element", "#form option:selected", ["option1a","option2d","option3b","option3c"] );
        t( "Text Contains", "a:contains('Google')", ["google","groups"] );
        t( "Text Contains", "a:contains('Google Groups')", ["groups"] );
-       t( "Element Preceded By", "p ~ div", ["foo","fx-queue","fx-tests"] );
+       t( "Element Preceded By", "p ~ div", ["foo","fx-queue","fx-tests", "moretests"] );
        t( "Not", "a.blog:not(.link)", ["mark"] );
+       t( "Not - multiple", "#form option:not(:contains('Nothing'),#option1b,:selected)", ["option1c", "option1d", "option2b", "option2c", "option3d"] );
+       t( "Not - complex", "#form option:not([id^='opt']:gt(0):nth-child(-n+3))", [ "option1a", "option1d", "option2d", "option3d"] );
+       t( "Not - recursive", "#form option:not(:not(:selected))[id^='option3']", [ "option3b", "option3c"] );
        
        t( "nth Element", "p:nth(1)", ["ap"] );
        t( "First Element", "p:first", ["firstp"] );