X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fselector%2FselectorTest.js;h=fea247ea3642858ea1cbfa91a8210d0f1eef8c9f;hb=0f7c89cd97de6ca644a834a119dda1e057fd724e;hp=422f84a4f9082ab738dc8365ebab8b3c0abf2edf;hpb=02483b4a593fb5ae9bb3925f6fe9641e31e2828e;p=jquery.git

diff --git a/src/selector/selectorTest.js b/src/selector/selectorTest.js
index 422f84a..fea247e 100644
--- a/src/selector/selectorTest.js
+++ b/src/selector/selectorTest.js
@@ -1,28 +1,35 @@
 module("selector");
 
 test("expressions - element", function() {
-	expect(7);
+	expect(6);
 	ok( $("*").size() >= 30, "Select all" );
 	t( "Element Selector", "div", ["main","foo"] );
 	t( "Element Selector", "body", ["body"] );
 	t( "Element Selector", "html", ["html"] );
 	t( "Parent Element", "div div", ["foo"] );
-	t( "Object/Param element", "#object param", ["param1", "param2"] );
-	ok( $("param", $("#object")[0]).length == 2, "Object/param as context" );
+	ok( $("param", "#object1").length == 2, "Object/param as context" );
 });
 
 test("expressions - id", function() {
-	expect(8);
+	expect(13);
 	t( "ID Selector", "#body", ["body"] );
 	t( "ID Selector w/ Element", "body#body", ["body"] );
 	t( "ID Selector w/ Element", "ul#first", [] );
+	t( "ID selector with existing ID descendant", "#firstp #simon1", ["simon1"] );
+	t( "ID selector with non-existant descendant", "#firstp #foobar", [] );
 	
 	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/*", []  );
+	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" );
+	
+	t( "ID selector with non-existant ancestor", "#asdfasdf #foobar", [] ); // bug #986
 });
 
 
@@ -125,7 +132,7 @@ test("expressions - pseudo (:) selctors", function() {
 });
 
 test("expressions - basic xpath", function() {
-	expect(14);
+	expect(15);
 	ok( jQuery.find("//*").length >= 30, "All Elements (//*)" );
 	t( "All Div Elements", "//div", ["main","foo"] );
 	t( "Absolute Path", "/html/body", ["body"] );
@@ -137,7 +144,11 @@ test("expressions - basic xpath", function() {
 	t( "Attribute Exists", "//a[@title]", ["google"] );
 	t( "Attribute Equals", "//a[@rel='bookmark']", ["simon1"] );
 	t( "Parent Axis", "//p/..", ["main","foo"] );
-	t( "Sibling Axis", "//p/../", ["firstp","ap","foo","first","firstUL","empty","form","floatTest","sndp","en","sap"] );
-	t( "Sibling Axis", "//p/../*", ["firstp","ap","foo","first","firstUL","empty","form","floatTest","sndp","en","sap"] );
+	t( "Sibling Axis", "//p/../", ["firstp","ap","foo","first","firstUL","empty","form","floatTest","iframe","sndp","en","sap"] );
+	t( "Sibling Axis", "//p/../*", ["firstp","ap","foo","first","firstUL","empty","form","floatTest","iframe","sndp","en","sap"] );
 	t( "Has Children", "//p[a]", ["firstp","ap","en","sap"] );
-});
\ No newline at end of file
+	
+	$("#foo").each(function() {
+		isSet( $("/p", this).get(), q("sndp", "en", "sap"), "Check XPath context" );
+	});
+});