X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fselector.js;h=498ac567b1fe16541aaa447a8acd678dc7fa5fa4;hb=1ba2df02d6242d734297344a85b7bea3788a0671;hp=0a5d0bbff0664da890d78b237c4ffa0389e0add8;hpb=872d18c10e8ad1583b3a40671527355aa930aea7;p=jquery.git

diff --git a/test/unit/selector.js b/test/unit/selector.js
index 0a5d0bb..498ac56 100644
--- a/test/unit/selector.js
+++ b/test/unit/selector.js
@@ -1,7 +1,7 @@
 module("selector");
 
 test("element", function() {
-	expect(18);
+	expect(19);
 	reset();
 
 	ok( jQuery("*").size() >= 30, "Select all" );
@@ -20,6 +20,8 @@ test("element", function() {
 	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." );
+
+	same( jQuery("#form").find("select").get(), q("select1","select2","select3"), "Finding selects 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' );
@@ -51,10 +53,11 @@ if ( location.protocol != "file:" ) {
 }
 
 test("broken", function() {
-	expect(7);
+	expect(8);
 	function broken(name, selector) {
 		try {
 			jQuery(selector);
+			ok( false, name + ": " + selector );
 		} catch(e){
 			ok(  typeof e === "string" && e.indexOf("Syntax error") >= 0,
 				name + ": " + selector );
@@ -68,6 +71,7 @@ test("broken", function() {
 	broken( "Broken Selector", "()", [] );
 	broken( "Broken Selector", "<>", [] );
 	broken( "Broken Selector", "{}", [] );
+	broken( "Doesn't exist", ":visble", [] );
 });
 
 test("id", function() {
@@ -96,9 +100,11 @@ test("id", function() {
 	t( "All Children of ID", "#foo > *", ["sndp", "en", "sap"] );
 	t( "All Children of ID with no children", "#firstUL > *", [] );
 	
-	jQuery('<a name="tName1">tName1 A</a><a name="tName2">tName2 A</a><div id="tName1">tName1 Div</div>').appendTo('#main');
+	var a = jQuery('<div><a name="tName1">tName1 A</a><a name="tName2">tName2 A</a><div id="tName1">tName1 Div</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" );
+	a.remove();
+
 	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
@@ -148,7 +154,7 @@ test("class", function() {
 });
 
 test("name", function() {
-	expect(11);
+	expect(14);
 
 	t( "Name selector", "input[name=action]", ["text1"] );
 	t( "Name selector with single quotes", "input[name='action']", ["text1"] );
@@ -163,10 +169,14 @@ test("name", function() {
 	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('<a id="tName1ID" name="tName1">tName1 A</a><a id="tName2ID" name="tName2">tName2 A</a><div id="tName1">tName1 Div</div>').appendTo('#main');
+	var a = jQuery('<div><a id="tName1ID" name="tName1">tName1 A</a><a id="tName2ID" name="tName2">tName2 A</a><div id="tName1">tName1 Div</div></div>').appendTo('#main').children();
+
+	equals( a.length, 3, "Make sure the right number of elements were inserted." );
+	equals( a[1].id, "tName2ID", "Make sure the right number of elements were inserted." );
 
 	t( "Find elements that have similar IDs", "[name=tName1]", ["tName1ID"] );
 	t( "Find elements that have similar IDs", "[name=tName2]", ["tName2ID"] );
+	t( "Find elements that have similar IDs", "#tName2ID", ["tName2ID"] );
 
 	a.remove();
 });
@@ -181,7 +191,7 @@ test("multiple", function() {
 });
 
 test("child and adjacent", function() {
-	expect(24);
+	expect(27);
 	t( "Child", "p > a", ["simon1","google","groups","mark","yahoo","simon"] );
 	t( "Child", "p> a", ["simon1","google","groups","mark","yahoo","simon"] );
 	t( "Child", "p >a", ["simon1","google","groups","mark","yahoo","simon"] );
@@ -198,12 +208,15 @@ test("child and adjacent", function() {
 	t( "Adjacent", "p[lang=en] + p", ["sap"] );
 	t( "Adjacent", "a.GROUPS + code + a", ["mark"] );
 	t( "Comma, Child, and Adjacent", "a + a, code > a", ["groups","anchor1","anchor2"] );
-	t( "Element Preceded By", "p ~ div", ["foo", "moretests","tabindex-tests", "liveHandlerOrder"] );
+	t( "Element Preceded By", "p ~ div", ["foo", "moretests","tabindex-tests", "liveHandlerOrder", "siblingTest"] );
+	t( "Element Preceded By", "#first ~ div", ["moretests","tabindex-tests", "liveHandlerOrder", "siblingTest"] );
+	t( "Element Preceded By", "#groups ~ a", ["mark"] );
+	t( "Element Preceded By", "#length ~ input", ["idTest"] );
+	t( "Element Preceded By", "#siblingfirst ~ em", ["siblingnext"] );
 
 	t( "Verify deep class selector", "div.blah > p > a", [] );
 
 	t( "No element deep selector", "div.foo > span > a", [] );
-	t( "No element not selector", ".container div:not(.excluded) div", [] );
 
 	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" );
@@ -213,7 +226,7 @@ test("child and adjacent", function() {
 });
 
 test("attributes", function() {
-	expect(37);
+	expect(34);
 	t( "Attribute Exists", "a[title]", ["google"] );
 	t( "Attribute Exists", "*[title]", ["google"] );
 	t( "Attribute Exists", "[title]", ["google"] );
@@ -259,10 +272,6 @@ test("attributes", function() {
 	t("Select options via :selected", "#select3 option:selected", ["option3b", "option3c"] );
 	
 	t( "Grouped Form Elements", "input[name='foo[bar]']", ["hidden2"] );
-	
-	t( ":not() Existing attribute", "#form select:not([multiple])", ["select1", "select2"]);
-	t( ":not() Equals attribute", "#form select:not([name=select1])", ["select2", "select3"]);
-	t( ":not() Equals quoted attribute", "#form select:not([name='select1'])", ["select2", "select3"]);
 });
 
 test("pseudo - child", function() {
@@ -326,7 +335,7 @@ test("pseudo - misc", function() {
 
 
 test("pseudo - :not", function() {
-	expect(17);
+	expect(24);
 	t( "Not", "a.blog:not(.link)", ["mark"] );
 	t( "Not - multiple", "#form option:not(:contains('Nothing'),#option1b,:selected)", ["option1c", "option1d", "option2b", "option2c", "option3d", "option3e"] );
 	t( "Not - recursive", "#form option:not(:not(:selected))[id^='option3']", [ "option3b", "option3c"] );
@@ -346,6 +355,16 @@ test("pseudo - :not", function() {
 	t( ":not Multiple", "p:not(p,a)", [] );
 	t( ":not Multiple", "p:not(a,p,b)", [] );
 	t( ":not Multiple", ":input:not(:image,:input,:submit)", [] );
+
+	t( "No element not selector", ".container div:not(.excluded) div", [] );
+
+	t( ":not() Existing attribute", "#form select:not([multiple])", ["select1", "select2"]);
+	t( ":not() Equals attribute", "#form select:not([name=select1])", ["select2", "select3"]);
+	t( ":not() Equals quoted attribute", "#form select:not([name='select1'])", ["select2", "select3"]);
+
+	t( ":not() Multiple Class", "#foo a:not(.blog)", ["yahoo","anchor2"] );
+	t( ":not() Multiple Class", "#foo a:not(.link)", ["yahoo","anchor2"] );
+	t( ":not() Multiple Class", "#foo a:not(.blog.link)", ["yahoo","anchor2"] );
 });
 
 test("pseudo - position", function() {	
@@ -371,7 +390,7 @@ test("pseudo - position", function() {
 
 	t( "Check element position", "div div:eq(0)", ["nothiddendivchild"] );
 	t( "Check element position", "div div:eq(5)", ["t2037"] );
-	t( "Check element position", "div div:eq(27)", ["hide"] );
+	t( "Check element position", "div div:eq(28)", ["hide"] );
 	t( "Check element position", "div div:first", ["nothiddendivchild"] );
 	t( "Check element position", "div > div:first", ["nothiddendivchild"] );
 	t( "Check element position", "#dl div:first div:first", ["foo"] );