Tweaked one of the selector tests.

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

diff --git a/test/unit/selector.js b/test/unit/selector.js
index 4e6feaf..11112a5 100644 (file)
--- a/test/unit/selector.js
+++ b/test/unit/selector.js
@@ -21,11 +21,15 @@ test("element", function() {
 });
 
 if ( location.protocol != "file:" ) {
-       test("Element Selector with underscore", function() {
-               expect(1);
+       test("XML Document Selectors", function() {
+               expect(5);
                stop();
                jQuery.get("data/with_fries.xml", function(xml) {
                        equals( jQuery("foo_bar", xml).length, 1, "Element Selector with underscore" );
+                       equals( jQuery("property[name=prop2]", xml).length, 1, "Attribute selector with name" );
+                       equals( jQuery("[name=prop2]", xml).length, 1, "Attribute selector with name" );
+                       equals( jQuery("#seite1", xml).length, 1, "Attribute selector with ID" );
+                       equals( jQuery("component#seite1", xml).length, 1, "Attribute selector with ID" );
                        start();
                });
        });
@@ -88,8 +92,9 @@ test("id", function() {
 });
 
 test("class", function() {
-       expect(15);
+       expect(16);
        t( "Class Selector", ".blog", ["mark","simon"] );
+       t( "Class Selector", ".GROUPS", ["groups"] );
        t( "Class Selector", ".blog.link", ["simon"] );
        t( "Class Selector w/ Element", "a.blog", ["mark","simon"] );
        t( "Parent Class Selector", "p .blog", ["mark","simon"] );
@@ -100,7 +105,7 @@ test("class", function() {
        t( "Class selector using UTF8", ".台北Táiběi, .台北", ["utf8class1","utf8class2"] );
        t( "Descendant class selector using UTF8", "div .台北Táiběi", ["utf8class1"] );
        t( "Child class selector using UTF8", "form > .台北Táiběi", ["utf8class1"] );
-       
+
        t( "Escaped Class", ".foo\\:bar", ["foo:bar"] );
        t( "Escaped Class", ".test\\.foo\\[5\\]bar", ["test.foo[5]bar"] );
        t( "Descendant scaped Class", "div .foo\\:bar", ["foo:bar"] );
@@ -128,16 +133,10 @@ test("name", function() {
 test("multiple", function() {
        expect(4);
        
-       var results = ["mark","simon","firstp","ap","sndp","en","sap","first"];
-       
-       if ( document.querySelectorAll ) {
-               results = ["firstp","ap","mark","sndp","en","sap","simon","first"];
-       }
-       
-       t( "Comma Support", "a.blog, p", results);
-       t( "Comma Support", "a.blog , p", results);
-       t( "Comma Support", "a.blog ,p", results);
-       t( "Comma Support", "a.blog,p", results);
+       t( "Comma Support", "h2, p", ["banner","userAgent","firstp","ap","sndp","en","sap","first"]);
+       t( "Comma Support", "h2 , p", ["banner","userAgent","firstp","ap","sndp","en","sap","first"]);
+       t( "Comma Support", "h2 , p", ["banner","userAgent","firstp","ap","sndp","en","sap","first"]);
+       t( "Comma Support", "h2,p", ["banner","userAgent","firstp","ap","sndp","en","sap","first"]);
 });
 
 test("child and adjacent", function() {
@@ -205,7 +204,7 @@ test("child and adjacent", function() {
 });
 
 test("attributes", function() {
-       expect(34);
+       expect(35);
        t( "Attribute Exists", "a[title]", ["google"] );
        t( "Attribute Exists", "*[title]", ["google"] );
        t( "Attribute Exists", "[title]", ["google"] );
@@ -224,12 +223,6 @@ test("attributes", function() {
        t( "for Attribute", "form label[for]", ["label-for"] );
        t( "for Attribute in form", "#form [for=action]", ["label-for"] );
        
-       var results = ["hidden1","radio1","radio2"];
-       
-       if ( document.querySelectorAll ) {
-               results = ["radio1", "radio2", "hidden1"];
-       }
-
        t( "Attribute containing []", "input[name^='foo[']", ["hidden2"] );
        t( "Attribute containing []", "input[name^='foo[bar]']", ["hidden2"] );
        t( "Attribute containing []", "input[name*='[bar]']", ["hidden2"] );
@@ -238,15 +231,16 @@ test("attributes", function() {
        t( "Attribute containing []", "input[name$='foo[bar]']", ["hidden2"] );
        t( "Attribute containing []", "input[name*='foo[bar]']", ["hidden2"] );
        
-       t( "Multiple Attribute Equals", "#form input[type='hidden'],#form input[type='radio']", results );
-       t( "Multiple Attribute Equals", "#form input[type=\"hidden\"],#form input[type='radio']", results );
-       t( "Multiple Attribute Equals", "#form input[type=hidden],#form input[type=radio]", results );
+       t( "Multiple Attribute Equals", "#form input[type='radio'], #form input[type='hidden']", ["radio1", "radio2", "hidden1"] );
+       t( "Multiple Attribute Equals", "#form input[type='radio'], #form input[type=\"hidden\"]", ["radio1", "radio2", "hidden1"] );
+       t( "Multiple Attribute Equals", "#form input[type='radio'], #form input[type=hidden]", ["radio1", "radio2", "hidden1"] );
        
        t( "Attribute selector using UTF8", "span[lang=中文]", ["台北"] );
        
        t( "Attribute Begins With", "a[href ^= 'http://www']", ["google","yahoo"] );
        t( "Attribute Ends With", "a[href $= 'org/']", ["mark"] );
        t( "Attribute Contains", "a[href *= 'google']", ["google","groups"] );
+       t( "Attribute Is Not Equal", "#ap a[hreflang!='en']", ["google","groups","anchor1"] );
        
        t("Select options via :selected", "#select1 option:selected", ["option1a"] );
        t("Select options via :selected", "#select2 option:selected", ["option2d"] );
@@ -301,7 +295,7 @@ test("pseudo (:) selectors", function() {
        t( "Check position filtering", "select:lt(2) :not(:first)", ["option1b", "option1c", "option1d", "option2a", "option2b", "option2c", "option2d"] );
        t( "Check position filtering", "div.nothiddendiv:eq(0)", ["nothiddendiv"] );
        t( "Check position filtering", "div.nothiddendiv:last", ["nothiddendiv"] );
-       t( "Check position filtering", "div.nothiddendiv:not(:gt(0))", ["nothiddendiv"] );
+       t( "Check position filtering", "div.nothiddendiv:not(:lt(0))", ["nothiddendiv"] );
 
        t( "Check element position", "div div:eq(0)", ["nothiddendivchild"] );
        t( "Check element position", "div div:eq(5)", ["fadeout"] );